Commit f0ae0354 authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/avidec: fix handling dv in avi

Fixes Ticket4086
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent ab922f9e
...@@ -1150,7 +1150,7 @@ start_sync: ...@@ -1150,7 +1150,7 @@ start_sync:
goto 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) && if (!((i - avi->last_pkt_pos) & 1) &&
get_stream_idx(d + 1) < s->nb_streams) get_stream_idx(d + 1) < s->nb_streams)
...@@ -1162,6 +1162,9 @@ start_sync: ...@@ -1162,6 +1162,9 @@ start_sync:
goto start_sync; goto start_sync;
} }
if (avi->dv_demux && n != 0)
continue;
// parse ##dc/##wb // parse ##dc/##wb
if (n < s->nb_streams) { if (n < s->nb_streams) {
AVStream *st; AVStream *st;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment