Commit Graph

17 Commits

Author SHA1 Message Date
Clément Bœsch 215b7724e7 lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info(). 2011-12-03 03:24:32 +01:00
Michael Niedermayer eae3cf06a5 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  flvdec: Fix invalid pointer deferences when parsing index
  configure: disable hardware capabilities ELF section with suncc on Solaris x86
  Use explicit struct initializers for AVCodec declarations.
  Use explicit struct initializers for AVOutputFormat/AVInputFormat declarations.
  adpcmenc: Set bits_per_coded_sample
  adpcmenc: fix QT IMA ADPCM encoder
  adpcmdec: Fix QT IMA ADPCM decoder
  permit decoding of multichannel ADPCM_EA_XAS
  Fix input buffer size check in adpcm_ea decoder.
  fft: avoid a signed overflow
  mpegps: Handle buffer exhaustion when reading packets.

Conflicts:
	libavcodec/adpcm.c
	libavcodec/adpcmenc.c
	libavdevice/alsa-audio-enc.c
	libavformat/flvdec.c
	libavformat/mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-24 22:39:52 +02:00
Diego Biurrun 30b4ee7901 Use explicit struct initializers for AVOutputFormat/AVInputFormat declarations. 2011-09-24 12:11:17 +02:00
Nicolas George 84c2d8af13 ALSA: implement get_output_timestamp. 2011-07-01 09:49:32 +02:00
Nicolas George d1b029dec9 ALSA encoder: correctly set time_base. 2011-07-01 09:44:54 +02:00
Nicolas George 147bcf27c4 ALSA: implement channel layout for playback.
Currently quad, 5.0, 5.1 and 7.1 are implemented.
Implementing support for other formats/layouts and capture should be
straightforward.

5.0 and 7.1 support by Carl Eugen Hoyos.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-06-23 08:49:48 +02:00
Stefano Sabatini 6b899e16de lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
Nicolas George 813dbb4442 ALSA: implement channel layout for playback.
Currently, only S16 quad, 5.1 and 7.1 are implemented.
Implementing support for other formats/layouts and capture should be
straightforward.

7.1 support by Carl Eugen Hoyos.
2011-03-26 16:50:09 +01:00
Mans Rullgard 2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Diego Elio Pettenò 66355be3c3 Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
(cherry picked from commit c6610a216e)
2011-01-28 03:15:34 +01:00
Diego Elio Pettenò c6610a216e Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
2011-01-26 22:10:09 +00:00
Diego Biurrun ba87f0801d Remove explicit filename from Doxygen @file commands.
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +00:00
Matthieu Castet 419bddd366 Include alsa headers before the internal FFmpeg headers.
This avoids symbol redefinitions problems, for example avoids the "free"
symbol to be redefined before system headers actually using it are
included, thus breaking compilation. In particular this change allows
to build FFmpeg with salsa.

Patch by matthieu castet <$surname.mat?hieu@free fr>.

Originally committed as revision 20665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 23:30:46 +00:00
Ivo van Poorten 244c8d100a consistency with other files: av_cold static ---> static av_cold
Originally committed as revision 20662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 22:39:38 +00:00
Daniel Verkamp cf6bae6883 Change codec_id type to enum CodecID, fix warning.
Patch by Daniel Verkamp daniel @ drv @ nu.

Originally committed as revision 18768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-06 22:38:21 +00:00
Diego Biurrun bad5537e2c Use full internal pathname in doxygen @file directives.
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Nicolas George 35fd81224a Add ALSA support in libavdevice.
Patch by Nicolas George: name surname normalesup org
Original thread: [FFmpeg-devel] [PATCH] ALSA for libavdevice
Date: 12/09/2008 07:17 PM

Originally committed as revision 16800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-26 09:16:09 +00:00