diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-15 23:41:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-26 16:58:33 +0100 |
| commit | fddf95da951204a75f52690a5f4cdb58fc3e5396 (patch) | |
| tree | d0af0cbbb533075d2efaf5320902dc6e2949adf7 /libavformat | |
| parent | cd7598fb1bbacb3f1d95bd7e36d51cba3910e876 (diff) | |
| download | ffmpeg-fddf95da951204a75f52690a5f4cdb58fc3e5396.tar.gz | |
avformat/utils: Do not init parser if probing is unfinished
Fixes assertion failure
Fixes: 136f8b8d47af7892306625e597dee655/signal_sigabrt_7ffff6ae7cc9_8941_ab11bea57c84796418f481f873dc31ba.dvr_ms
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 1ef336e912a7a3a13a9933825a56c421f891e44b)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 496b656378..3413a7ff50 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3037,7 +3037,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) st->codec->time_base = st->time_base; } // only for the split stuff - if (!st->parser && !(ic->flags & AVFMT_FLAG_NOPARSE)) { + if (!st->parser && !(ic->flags & AVFMT_FLAG_NOPARSE) && st->request_probe <= 0) { st->parser = av_parser_init(st->codec->codec_id); if (st->parser) { if (st->need_parsing == AVSTREAM_PARSE_HEADERS) { |