diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-05 17:04:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-05 18:23:11 +0100 |
| commit | c7174d5204bf062f8017513ca4b64800ff0cdc5e (patch) | |
| tree | cdc6026ce1a1670fe242ee21df5010e42ec77c57 | |
| parent | ff30907205fc4a9666a7ee93ca456e3a5bcacbc0 (diff) | |
| download | ffmpeg-c7174d5204bf062f8017513ca4b64800ff0cdc5e.tar.gz | |
avformat/mpegts: Only start probing data streams within probe_packets
Fixes assertion failure
Fixes: 4321db8ac331f5967ebfbfe80ce5eb78/signal_sigabrt_7ffff6ae7cc9_7213_0d6457b9d6897fa7c78507fa5de53510.ts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3692d859f45fa8765fa5a330e79108b03c17c6bd)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/mpegts.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index ed0a86b337..65824dd01a 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -841,6 +841,7 @@ static int mpegts_set_stream_info(AVStream *st, PESContext *pes, if ((st->codec->codec_id == AV_CODEC_ID_NONE || (st->request_probe > 0 && st->request_probe < AVPROBE_SCORE_STREAM_RETRY / 5)) && !avcodec_is_open(st->codec) && + st->probe_packets > 0 && stream_type == STREAM_TYPE_PRIVATE_DATA) { st->codec->codec_type = AVMEDIA_TYPE_DATA; st->codec->codec_id = AV_CODEC_ID_BIN_DATA; |