Age | Commit message (Collapse) | Author |
|
* 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>
|
|
|
|
* qatar/master: (35 commits)
fix space type in Changelog
ZeroCodec Decoder
RealAudio Lossless decoder
rtpenc: Use AVFormatContext.packet_size instead of a private option
url: Document the expected behaviour of url_read
libavformat: Use AVFormatContext.probesize in init_input
docs: Fix a stray reference to tags in the generic doxy on dicts
cosmetics: Align some AVInput/OutputFormat declarations
zmbv: check decompress result
zmbv: correct indentation
adpcm: convert adpcm_thp to bytestream2.
adpcm: convert adpcm_yamaha to bytestream2.
adpcm: convert adpcm_swf to bytestream2.
adpcm: convert adpcm_sbpro to bytestream2.
adpcm: convert adpcm_ct to bytestream2.
adpcm: convert adpcm_ima_amv/smjpeg to bytestream2.
adpcm: convert adpcm_ea_xas to bytestream2.
adpcm: convert adpcm_ea_r1/2/3 to bytestream2.
adpcm: convert ea_maxis_xa to bytestream2.
adpcm: convert adpcm_ea to bytestream2.
...
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/adpcm.c
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavcodec/zerocodec.c
libavcodec/zmbv.c
libavformat/riff.c
libavformat/url.h
tests/ref/fate/truemotion1-15
tests/ref/fate/truemotion1-24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
|
Patch by Francesco Lavra <francescolavra interfree it>.
Originally committed as revision 23360 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 19786 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17396 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 9156 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 8747 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
buf_size checks
Originally committed as revision 8677 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Patch by Sam Hocevar sam+ffmpeg zoy org
Originally committed as revision 8564 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
patch by Steve Lhomme, slhomme divxcorp com
Originally committed as revision 6868 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 6864 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 6774 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
and fix GPL/LGPL version mismatches.
Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 6536 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 6393 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Check for errors returned by rm_read_audio_stream_info
Check for overflow in aac extradata allocation
Originally committed as revision 5455 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 5454 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 5370 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 5083 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 4772 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Based on patch by "mkhodor7 <-> yahoo | com"
Originally committed as revision 4759 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Credits to Mikulas Patocka (mikulas at artax karlin mff cuni cz)
Originally committed as revision 4748 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Add cook demucing, change rm demuxer so that it reorders audio packets
before sending them to the decoder, and send minimum decodeable sized
packets; pass only real codec extradata fo the decoder
Fix 28_8 decoder for the new demuxer strategy
Originally committed as revision 4726 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
in libavformat to allow building (de)coders and (de)muxers independently at
some point + support for this option in configure.
Originally committed as revision 4611 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
AVCodecContext dont randomize AVStream and break binary compatibility
Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 4314 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 4155 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 4051 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 3993 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 3992 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 3860 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 3809 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 3796 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 3739 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 3738 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 3737 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 3736 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 3735 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 3734 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 3733 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 3732 to svn://svn.ffmpeg.org/ffmpeg/trunk
|