summaryrefslogtreecommitdiff
path: root/libavformat/avidec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-21 03:08:20 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-21 03:34:13 +0100
commitf0ae0354d3f04c369257c2a28557524d28c5df15 (patch)
tree5e1ff46bc7237b1a25ac202108aff741e2d02181 /libavformat/avidec.c
parentab922f9ef1e4d7ec220867d3de1fb1a5aa71faee (diff)
avformat/avidec: fix handling dv in avi
Fixes Ticket4086 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avidec.c')
-rw-r--r--libavformat/avidec.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 0cdcc08f65..78a6deae7d 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1150,7 +1150,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)
@@ -1162,6 +1162,9 @@ start_sync:
goto start_sync;
}
+ if (avi->dv_demux && n != 0)
+ continue;
+
// parse ##dc/##wb
if (n < s->nb_streams) {
AVStream *st;