diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-27 16:43:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-27 16:43:09 +0200 |
| commit | 9b89041a86a4eccc1ffe50e7857b2d5c1c5fe8b4 (patch) | |
| tree | 3edcc8f6f6bbcc7e2f61b18b1e16c57410593114 /libavcodec/vc1.c | |
| parent | 09fcc2f865f5c8cc9dfbe9b3b55157a756d5fa9f (diff) | |
| parent | c02d4c1a98aef485be25228b33adb4ce357173e4 (diff) | |
| download | ffmpeg-9b89041a86a4eccc1ffe50e7857b2d5c1c5fe8b4.tar.gz | |
Merge commit 'c02d4c1a98aef485be25228b33adb4ce357173e4' into release/1.1
* commit 'c02d4c1a98aef485be25228b33adb4ce357173e4':
adpcm: Write the correct number of samples for ima-dk4
imc: Catch a division by zero
atrac3: Error on impossible encoding/channel combinations
atrac3: set the getbits context the right buffer_end
atrac3: fix error handling
qdm2: check and reset dithering index per channel
qdm2: formatting cosmetics
qdm2: use init_static_data
westwood_vqa: do not free extradata on error in read_header
vqavideo: check the version
rmdec: Use the AVIOContext given as parameter in rm_read_metadata()
avio: Handle AVERROR_EOF in the same way as the return value 0
Conflicts:
libavcodec/adpcm.c
libavcodec/qdm2.c
libavcodec/vqavideo.c
libavformat/rmdec.c
libavformat/westwood_vqa.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1.c')
0 files changed, 0 insertions, 0 deletions