a5d4e94a97
Support iLBC in caf.
2012-11-19 10:19:50 +01:00
7a72695c05
Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
...
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
Replace all CODEC_ID_* with AV_CODEC_ID_*
lavc: add AV prefix to codec ids.
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
ffprobe.c
ffserver.c
libavcodec/8svx.c
libavcodec/avcodec.h
libavcodec/dnxhd_parser.c
libavcodec/dvdsubdec.c
libavcodec/error_resilience.c
libavcodec/h263dec.c
libavcodec/libvorbisenc.c
libavcodec/mjpeg_parser.c
libavcodec/mjpegenc.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/pcm.c
libavcodec/r210dec.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/version.h
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/v4l2.c
libavformat/asfdec.c
libavformat/asfenc.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/caf.c
libavformat/electronicarts.c
libavformat/flacdec.c
libavformat/flvdec.c
libavformat/flvenc.c
libavformat/framecrcenc.c
libavformat/img2.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/matroska.c
libavformat/matroskadec.c
libavformat/matroskaenc.c
libavformat/mov.c
libavformat/movenc.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegts.c
libavformat/mxf.c
libavformat/mxfdec.c
libavformat/mxfenc.c
libavformat/nsvdec.c
libavformat/nut.c
libavformat/oggenc.c
libavformat/pmpdec.c
libavformat/rawdec.c
libavformat/rawenc.c
libavformat/riff.c
libavformat/sdp.c
libavformat/utils.c
libavformat/vocenc.c
libavformat/wtv.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-07 22:45:46 +02:00
36ef5369ee
Replace all CODEC_ID_* with AV_CODEC_ID_*
2012-08-07 16:00:24 +02:00
222b333ed5
Cosmetics: Restore alphabetical order.
2011-08-01 00:58:49 +02:00
88084eecdf
Use little endian for caf codec tags.
2011-07-24 23:52:42 +02:00
45ecc7a294
Support adpcm_ima_wav and adpcm_ms in caf.
2011-07-12 17:35:20 +02:00
afa218f372
Add another MP3 CAF codec tag.
2011-07-12 16:09:10 +02:00
43e96d0466
Support gsm_ms in caf files.
2011-07-09 17:13:13 +02:00
0c3803f6bb
Support decoding of amr_nb and gsm in caf.
2011-05-15 03:25:57 +02:00
91b782720f
Move channel chunk reading function to isom.c.
...
Move ff_read_chan_chunk() to isom.c and rename it as ff_mov_read_chan().
2011-04-28 10:45:32 +02:00
058aabd475
Fix caf channel layouts ITU_2_2 and DVD_6.
2011-04-28 00:10:55 +02:00
ab1572609f
10l: Add misssing CR/LF.
2011-04-23 10:41:44 +02:00
8bb5d1c39c
Support channel layout when demuxing caf files.
2011-04-23 10:30:18 +02:00
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
80b39e1ca6
Move AVCodecTag from riff.h into internal.h.
...
Patch by Francesco Lavra, francescolavra interfree it
Originally committed as revision 23250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-22 16:01:32 +00:00
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
bc2d2a07d5
Make AVCodecTag.id enum CodecID and use CODEC_ID_NONE instead of 0.
...
Originally committed as revision 20250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-16 14:46:06 +00:00
5f14b56593
Core Audio Format demuxer
...
Originally committed as revision 19879 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 12:26:59 +00:00
Carl Eugen Hoyos
Michael Niedermayer
Anton Khirnov
Mans Rullgard
Francesco Lavra
Diego Biurrun
Carl Eugen Hoyos
Peter Ross