summaryrefslogtreecommitdiff
path: root/libavformat/mpegts.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2015-09-01 09:19:49 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2015-09-01 09:19:49 +0200
commit670d8ecfae5201f8c2d5693495c2f763cbbc2d72 (patch)
tree9bb894f5e6a9b39eca1c8d69e0f3848de7aefe8a /libavformat/mpegts.c
parent0cb6c0ec488e324443b49b36f1224d3e5af420c4 (diff)
lavf: Remove probesize32 and max_analyze_duration32 on version bump.
Add FF_API_PROBESIZE_32 to allow removing 32bit probesize and 32bit max_analyze_duration after the next libavformat version bump.
Diffstat (limited to 'libavformat/mpegts.c')
-rw-r--r--libavformat/mpegts.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index eac6d9e66c..3500fc197a 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -2510,7 +2510,12 @@ static int mpegts_read_header(AVFormatContext *s)
AVIOContext *pb = s->pb;
uint8_t buf[8 * 1024] = {0};
int len;
- int64_t pos, probesize = s->probesize ? s->probesize : s->probesize2;
+ int64_t pos, probesize =
+#if FF_API_PROBESIZE_32
+ s->probesize ? s->probesize : s->probesize2;
+#else
+ s->probesize;
+#endif
if (ffio_ensure_seekback(pb, probesize) < 0)
av_log(s, AV_LOG_WARNING, "Failed to allocate buffers for seekback\n");