diff options
author | James Almer <jamrial@gmail.com> | 2014-08-09 22:01:47 -0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-11 13:46:53 +0200 |
commit | 31b7ab9f0699ce06858f117243d16847cc0a40eb (patch) | |
tree | 31c53d04bd94686609988058349e5b2221b2cf3c | |
parent | 59ecd4882df902e6a81986419333977e614faccf (diff) | |
download | ffmpeg-31b7ab9f0699ce06858f117243d16847cc0a40eb.tar.gz |
lavf/mpegts: remove obsolete ff_mpegts_parse_* cruft
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavformat/mpegts.c | 18 | ||||
-rw-r--r-- | libavformat/mpegts.h | 7 |
2 files changed, 0 insertions, 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; |