From 31b7ab9f0699ce06858f117243d16847cc0a40eb Mon Sep 17 00:00:00 2001 From: James Almer Date: Sat, 9 Aug 2014 22:01:47 -0300 Subject: [PATCH] lavf/mpegts: remove obsolete ff_mpegts_parse_* cruft Signed-off-by: James Almer Signed-off-by: Michael Niedermayer --- libavformat/mpegts.c | 18 ------------------ libavformat/mpegts.h | 7 ------- 2 files changed, 25 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index a2456a3861..d2a25317d9 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2675,24 +2675,6 @@ void avpriv_mpegts_parse_close(MpegTSContext *ts) av_free(ts); } -#if LIBAVFORMAT_VERSION_MAJOR < 56 -MpegTSContext *ff_mpegts_parse_open(AVFormatContext *s) -{ - return avpriv_mpegts_parse_open(s); -} - -int ff_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt, - const uint8_t *buf, int len) -{ - return avpriv_mpegts_parse_packet(ts, pkt, buf, len); -} - -void ff_mpegts_parse_close(MpegTSContext *ts) -{ - avpriv_mpegts_parse_close(ts); -} -#endif - AVInputFormat ff_mpegts_demuxer = { .name = "mpegts", .long_name = NULL_IF_CONFIG_SMALL("MPEG-TS (MPEG-2 Transport Stream)"), diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h index 1cd1ba1770..84f30983c1 100644 --- a/libavformat/mpegts.h +++ b/libavformat/mpegts.h @@ -68,13 +68,6 @@ int avpriv_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt, const uint8_t *buf, int len); void avpriv_mpegts_parse_close(MpegTSContext *ts); -#if LIBAVFORMAT_VERSION_MAJOR < 56 -MpegTSContext *ff_mpegts_parse_open(AVFormatContext *s); -int ff_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt, - const uint8_t *buf, int len); -void ff_mpegts_parse_close(MpegTSContext *ts); -#endif - typedef struct SLConfigDescr { int use_au_start; int use_au_end;