diff options
author | James Almer <jamrial@gmail.com> | 2014-08-06 20:59:56 -0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 04:28:11 +0200 |
commit | 5b12b4fc4b2217a5ea69c4ca6dbb5debeb39bb2b (patch) | |
tree | 2af04d514b854ec70a99272c2f352dfa4702726e /libavformat/mpegts.c | |
parent | 1c59419419d2bdff50627ab15fb4abff4cdb3b29 (diff) | |
download | ffmpeg-5b12b4fc4b2217a5ea69c4ca6dbb5debeb39bb2b.tar.gz |
lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()
The were wrongly being exported and used by libavdevice
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.c')
-rw-r--r-- | libavformat/mpegts.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 405cade417..55816de6c0 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2625,7 +2625,7 @@ static int64_t mpegts_get_dts(AVFormatContext *s, int stream_index, /**************************************************************/ /* parsing functions - called from other demuxers such as RTP */ -MpegTSContext *ff_mpegts_parse_open(AVFormatContext *s) +MpegTSContext *avpriv_mpegts_parse_open(AVFormatContext *s) { MpegTSContext *ts; @@ -2644,8 +2644,8 @@ MpegTSContext *ff_mpegts_parse_open(AVFormatContext *s) /* return the consumed length if a packet was output, or -1 if no * packet is output */ -int ff_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt, - const uint8_t *buf, int len) +int avpriv_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt, + const uint8_t *buf, int len) { int len1; @@ -2669,12 +2669,30 @@ int ff_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt, return len1 - len; } -void ff_mpegts_parse_close(MpegTSContext *ts) +void avpriv_mpegts_parse_close(MpegTSContext *ts) { mpegts_free(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) +{ + return avpriv_mpegts_parse_close(ts); +} +#endif + AVInputFormat ff_mpegts_demuxer = { .name = "mpegts", .long_name = NULL_IF_CONFIG_SMALL("MPEG-TS (MPEG-2 Transport Stream)"), |