aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-08-06 03:52:48 +0200
committerReinhard Tartler <siretart@tauware.de>2014-01-05 17:34:06 -0500
commit61057f4604eb909ac2b37f08c7d2b0ed758fd4bf (patch)
tree7a7786de2947a60b516e961230d1e963fb262532
parentd149c14a2263cf17e09a18e577b7a99043e26fbc (diff)
downloadffmpeg-61057f4604eb909ac2b37f08c7d2b0ed758fd4bf.tar.gz
avi: directly resync on DV in AVI read failure
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit ceec6e792e4b5baaa23b220f4fd33417631f5288) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
-rw-r--r--libavformat/avidec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index e0c1988803..109b0ab5d8 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -990,6 +990,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){