virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

avi: Validate the stream-id for DV as well

Browse Source 
Avoid false positives while syncing.

Bug-Id: ffmpeg/4086
Bug-Id: 879

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Michael Niedermayer 2015-11-28 21:06:45 +01:00 committed by Luca Barbato
parent d017ed878a
commit 0fc61c6ab6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/avidec.c
View File

@ -995,7 +995,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)
@ -1007,6 +1007,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;