aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/cafenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-19 23:40:03 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-03-20 00:03:19 +0100
commit479fb7b8afcf0711b93b48c7d634e9f464d8b336 (patch)
tree53f46f6c9f02c4e8b8d9ad1a86f27078e520dc2f /libavformat/cafenc.c
parent87c1783c77f4e688edceec165eaef287bd127622 (diff)
parent18ba94c6f9e08fc71cb5c4944bc6e4e1196e4634 (diff)
downloadffmpeg-479fb7b8afcf0711b93b48c7d634e9f464d8b336.tar.gz
Merge remote-tracking branch 'qatar/master'
* 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>
Diffstat (limited to 'libavformat/cafenc.c')
0 files changed, 0 insertions, 0 deletions