diff options
| author | Michael Niedermayer <[email protected]> | 2014-11-21 03:08:20 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <[email protected]> | 2014-11-21 10:23:35 +0100 |
| commit | 2d0b2db27e84f978801a81e9ce542f4b544992a8 (patch) | |
| tree | c7ab86ca40d27260035b81398017d75efaa465a3 | |
| parent | fc82ba06ee87e16b65ba1a426641e3484a69da71 (diff) | |
avformat/avidec: fix handling dv in avi
Fixes Ticket4086
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit f0ae0354d3f04c369257c2a28557524d28c5df15)
| -rw-r--r-- | libavformat/avidec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 449c0656f6..86bea76624 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; |