Quoting Luca Barbato (2015-11-28 21:06:45) > From: Michael Niedermayer <[email protected]> > > Avoid false positives while syncing. > > Bug-Id: ffmpeg/4086 > Bug-Id: 879 > > Signed-off-by: Michael Niedermayer <[email protected]> > Signed-off-by: Luca Barbato <[email protected]> > --- > libavformat/avidec.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/libavformat/avidec.c b/libavformat/avidec.c > index ae55e3d..674a023 100644 > --- a/libavformat/avidec.c > +++ b/libavformat/avidec.c > @@ -994,7 +994,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) > @@ -1006,6 +1006,9 @@ start_sync: > goto start_sync; > } > > + if (avi->dv_demux && n != 0) > + continue; > + > // parse ##dc/##wb > if (n < s->nb_streams) { > AVStream *st; > -- > 2.6.2.402.g2635c2b.dirty
LGTM -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
