diff options
| author | Michael Niedermayer <[email protected]> | 2015-11-15 23:41:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-11-19 03:51:39 +0100 |
| commit | 7c3fc6bf06413e3ef35f13d38374a59719f4f555 (patch) | |
| tree | 0a889f4667dbbf2f92baff1594db437fcf98d34f | |
| parent | b7d98b2fe7f66b09c50fb7d59b0b5287845fca89 (diff) | |
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 <[email protected]>
(cherry picked from commit 1ef336e912a7a3a13a9933825a56c421f891e44b)
Signed-off-by: Michael Niedermayer <[email protected]>
| -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 41f72ffbc7..e5b1c587b9 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3059,7 +3059,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) { |