diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-21 03:08:20 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-11-21 09:30:59 +0100 |
| commit | 944570906b7433846352cbb14730e96e94d232ab (patch) | |
| tree | b6831e6aa8dbda10b0b9bd21d3ce7674b03ef6e4 /libavformat | |
| parent | 057ee35924187979ae41f8c3f84fe16659a68656 (diff) | |
| download | ffmpeg-944570906b7433846352cbb14730e96e94d232ab.tar.gz | |
avformat/avidec: fix handling dv in avi
Fixes Ticket4086
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f0ae0354d3f04c369257c2a28557524d28c5df15)
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avidec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 5b260e2542..a73bf98474 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1141,7 +1141,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) @@ -1153,6 +1153,9 @@ start_sync: goto start_sync; } + if (avi->dv_demux && n != 0) + continue; + // parse ##dc/##wb if (n < s->nb_streams) { AVStream *st; |