summaryrefslogtreecommitdiff
path: root/libavformat/mpegts.h
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2014-08-06 20:59:56 -0300
committerMichael Niedermayer <michaelni@gmx.at>2014-08-07 04:28:11 +0200
commit5b12b4fc4b2217a5ea69c4ca6dbb5debeb39bb2b (patch)
tree2af04d514b854ec70a99272c2f352dfa4702726e /libavformat/mpegts.h
parent1c59419419d2bdff50627ab15fb4abff4cdb3b29 (diff)
downloadffmpeg-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.h')
-rw-r--r--libavformat/mpegts.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
index 50a02590fa..1cd1ba1770 100644
--- a/libavformat/mpegts.h
+++ b/libavformat/mpegts.h
@@ -63,10 +63,17 @@
typedef struct MpegTSContext MpegTSContext;
+MpegTSContext *avpriv_mpegts_parse_open(AVFormatContext *s);
+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;