diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-08 02:11:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-08 02:11:31 +0200 |
| commit | 653cdf42ee90d11b96c364c7fe627072e33abf32 (patch) | |
| tree | f4b484b0e164331d27e5156ce5087583a97b2131 /libavcodec/aacenc.c | |
| parent | 829e43017fa733479a72e6518bb9c1f0da441dc5 (diff) | |
| parent | a9fc88ea93b2648e043a2bb863cfacabc8c3342d (diff) | |
| download | ffmpeg-653cdf42ee90d11b96c364c7fe627072e33abf32.tar.gz | |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
Prepare for 9.10 RELEASE
h263dec: Remove a hack that can cause infinite loops
mpegvideo: Initialize chroma_*_shift and codec_tag even if the size is 0
vc1dec: Don't decode slices when the latest slice header failed to decode
Conflicts:
RELEASE
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacenc.c')
0 files changed, 0 insertions, 0 deletions