[FFmpeg-cvslog] avformat/avidec: fix handling dv in avi

[Michael Niedermayer]

ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 21 03:08:20 2014 +0100| [2d0b2db27e84f978801a81e9ce542f4b544992a8] | committer: Carl Eugen Hoyos

avformat/avidec: fix handling dv in avi

Fixes Ticket4086

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit f0ae0354d3f04c369257c2a28557524d28c5df15)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d0b2db27e84f978801a81e9ce542f4b544992a8
---

 libavformat/avidec.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 449c065..86bea76 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1081,7 +1081,7 @@ start_sync:
             goto start_sync;
         }
 
-        n = avi->dv_demux ? 0 : get_stream_idx(d);
+        n = get_stream_idx(d);
 
         if (!((i - avi->last_pkt_pos) & 1) &&
             get_stream_idx(d + 1) < s->nb_streams)
@@ -1093,6 +1093,9 @@ start_sync:
             goto start_sync;
         }
 
+        if (avi->dv_demux && n != 0)
+            continue;
+
         // parse ##dc/##wb
         if (n < s->nb_streams) {
             AVStream *st;