ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Nov 28 21:06:45 2015 +0100| [0fc61c6ab6912a2f0c40fdd3f3c591bc2a33efd4] | committer: Luca Barbato
avi: Validate the stream-id for DV as well Avoid false positives while syncing. Bug-Id: ffmpeg/4086 Bug-Id: 879 Signed-off-by: Michael Niedermayer <michae...@gmx.at> Signed-off-by: Luca Barbato <lu_z...@gentoo.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0fc61c6ab6912a2f0c40fdd3f3c591bc2a33efd4 --- libavformat/avidec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 43c178f..477e045 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -995,7 +995,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) @@ -1007,6 +1007,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
