diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-10 18:06:35 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-10 18:06:35 +0100 |
commit | b7a750f67f68b41d5f3215906a5282b9cb7937d3 (patch) | |
tree | f08ed568b4c402148c9051f16e389652b85e3fac /libavformat | |
parent | 41216ebb9e53bfa25b1bf39b66c15ab7d2902929 (diff) | |
parent | cb5d0ea0bec119ecbe327bd7d3834987ab42ec1a (diff) | |
download | ffmpeg-b7a750f67f68b41d5f3215906a5282b9cb7937d3.tar.gz |
Merge commit 'cb5d0ea0bec119ecbe327bd7d3834987ab42ec1a' into release/0.10
* commit 'cb5d0ea0bec119ecbe327bd7d3834987ab42ec1a':
flashsv: Check diff_start diff_height values
dsputil/pngdsp: fix signed/unsigned type in end comparison
vqavideo: check chunk sizes before reading chunks
avi: directly resync on DV in AVI read failure
get_bits: change the failure condition in init_get_bits
twinvq: Cope with gcc-4.8.2 miscompilation
Conflicts:
libavcodec/dsputil.c
libavcodec/flashsv.c
libavcodec/get_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/avidec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 1d4bcf7cbb..5a8d5a7741 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1051,6 +1051,8 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt) int size = avpriv_dv_get_packet(avi->dv_demux, pkt); if (size >= 0) return size; + else + goto resync; } if(avi->non_interleaved){ |