diff options
| author | James Almer <jamrial@gmail.com> | 2015-09-16 01:46:50 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2015-09-17 11:36:16 -0300 |
| commit | 655b6dcb34b25d591e15ede17673ea6cb8074711 (patch) | |
| tree | 6a31b795fb22a327663b7643ea49abc9bbb55a2d /libavformat/mpegts.c | |
| parent | 245bf7c18a71fa3800bb4c3fcea5e08ba90b4f2c (diff) | |
| download | ffmpeg-655b6dcb34b25d591e15ede17673ea6cb8074711.tar.gz | |
lavc/lavf: remove incompatible abi checks for the new 64bit fields
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index c35cc9ddf5..44d176e91f 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2512,12 +2512,7 @@ static int mpegts_read_header(AVFormatContext *s) AVIOContext *pb = s->pb; uint8_t buf[8 * 1024] = {0}; int len; - int64_t pos, probesize = -#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI - s->probesize ? s->probesize : s->probesize2; -#else - s->probesize; -#endif + int64_t pos, probesize = s->probesize; if (ffio_ensure_seekback(pb, probesize) < 0) av_log(s, AV_LOG_WARNING, "Failed to allocate buffers for seekback\n"); |