diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 11:30:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 11:31:40 +0200 |
| commit | 5fcd0a80a25deb4b0a59779dd00ee0f6b0312e6b (patch) | |
| tree | c1482c457daa7b33666070d9b01fac3e25598625 /libavformat | |
| parent | dd0429e1de54a6f583384cde010967cad7c10688 (diff) | |
| parent | ceec6e792e4b5baaa23b220f4fd33417631f5288 (diff) | |
Merge commit 'ceec6e792e4b5baaa23b220f4fd33417631f5288'
* commit 'ceec6e792e4b5baaa23b220f4fd33417631f5288':
avi: directly resync on DV in AVI read failure
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 60375394d7..44ab9d9a3f 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1162,6 +1162,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) { |