highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/avidec: fix handling dv in avi

Browse Source 
Fixes Ticket4086

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f0ae0354d3f04c369257c2a28557524d28c5df15)
This commit is contained in:
Michael Niedermayer 2014-11-21 03:08:20 +01:00 committed by Carl Eugen Hoyos
parent 057ee35924
commit 944570906b
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

@ -1141,7 +1141,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)
@ -1153,6 +1153,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;