diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-04-25 13:54:26 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-04-25 14:17:59 +0200 |
| commit | 5e9de76f54e54d1c4e1f060f4e93e73cd7706828 (patch) | |
| tree | 83d48a990e24ae38d7e055c07f3538daca976e74 /libavformat | |
| parent | 6c9364168310ddb27059d07fdc04da84778d5f0b (diff) | |
| download | ffmpeg-5e9de76f54e54d1c4e1f060f4e93e73cd7706828.tar.gz | |
Do not set non_interleaved for DV-in-AVI.
It does not make sense (DV is interleaved by design) and
it avoids a crash when the non-interleaved code tries to
use the priv_data of streams created by the DV demuxer.
The crash could be avoided differently, but then that stream
would still lack an index and would not play correctly in
non-interleaved mode.
Fixes e.g. samples/ffmpeg-bugs/roundup/issue1514/Dennis0002_video1.avi
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avidec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 83c55d08e9..d8df55b591 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -734,6 +734,10 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) if(st->nb_index_entries) break; } + // DV-in-AVI cannot be non-interleaved, if set this must be + // a mis-detection. + if(avi->dv_demux) + avi->non_interleaved=0; if(i==s->nb_streams && avi->non_interleaved) { av_log(s, AV_LOG_WARNING, "non-interleaved AVI without index, switching to interleaved\n"); avi->non_interleaved=0; |