ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Nov 21 03:08:20 2014 +0100| [f0ae0354d3f04c369257c2a28557524d28c5df15] | committer: Michael Niedermayer
avformat/avidec: fix handling dv in avi Fixes Ticket4086 Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f0ae0354d3f04c369257c2a28557524d28c5df15 --- libavformat/avidec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 0cdcc08..78a6dea 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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
