From: Marton Balint <cus@passwd.hu>
Date: Sat, 26 Sep 2020 18:30:27 +0000 (+0200)
Subject: avformat/mpegts: make sure mpegts_resync do not run out of the initially requested... 
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2933ee8ff09f3a9e2ae313da80b0a510474f53f4;p=ffmpeg

avformat/mpegts: make sure mpegts_resync do not run out of the initially requested probe buffer

Signed-off-by: Marton Balint <cus@passwd.hu>
---

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 50d4d5e9bc6..432b1c3ea26 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -3051,10 +3051,11 @@ static int mpegts_read_header(AVFormatContext *s)
     MpegTSContext *ts = s->priv_data;
     AVIOContext *pb   = s->pb;
     int64_t pos, probesize = s->probesize;
+    int64_t seekback = FFMAX(s->probesize, (int64_t)ts->resync_size + PROBE_PACKET_MAX_BUF);
 
     s->internal->prefer_codec_framerate = 1;
 
-    if (ffio_ensure_seekback(pb, probesize) < 0)
+    if (ffio_ensure_seekback(pb, seekback) < 0)
         av_log(s, AV_LOG_WARNING, "Failed to allocate buffers for seekback\n");
 
     pos = avio_tell(pb);