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/rtpdec_mpegts.c | |
| parent | 1c59419419d2bdff50627ab15fb4abff4cdb3b29 (diff) | |
| download | android_external_ffmpeg-5b12b4fc4b2217a5ea69c4ca6dbb5debeb39bb2b.tar.gz android_external_ffmpeg-5b12b4fc4b2217a5ea69c4ca6dbb5debeb39bb2b.tar.bz2 android_external_ffmpeg-5b12b4fc4b2217a5ea69c4ca6dbb5debeb39bb2b.zip | |
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/rtpdec_mpegts.c')
| -rw-r--r-- | libavformat/rtpdec_mpegts.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/rtpdec_mpegts.c b/libavformat/rtpdec_mpegts.c index 5b851c4fd7..0c2b71745e 100644 --- a/libavformat/rtpdec_mpegts.c +++ b/libavformat/rtpdec_mpegts.c @@ -40,14 +40,14 @@ static void mpegts_free_context(PayloadContext *data) if (!data) return; if (data->ts) - ff_mpegts_parse_close(data->ts); + avpriv_mpegts_parse_close(data->ts); av_free(data); } static av_cold int mpegts_init(AVFormatContext *ctx, int st_index, PayloadContext *data) { - data->ts = ff_mpegts_parse_open(ctx); + data->ts = avpriv_mpegts_parse_open(ctx); if (!data->ts) return AVERROR(ENOMEM); return 0; @@ -72,8 +72,8 @@ static int mpegts_handle_packet(AVFormatContext *ctx, PayloadContext *data, if (!buf) { if (data->read_buf_index >= data->read_buf_size) return AVERROR(EAGAIN); - ret = ff_mpegts_parse_packet(data->ts, pkt, data->buf + data->read_buf_index, - data->read_buf_size - data->read_buf_index); + ret = avpriv_mpegts_parse_packet(data->ts, pkt, data->buf + data->read_buf_index, + data->read_buf_size - data->read_buf_index); if (ret < 0) return AVERROR(EAGAIN); data->read_buf_index += ret; @@ -83,8 +83,8 @@ static int mpegts_handle_packet(AVFormatContext *ctx, PayloadContext *data, return 0; } - ret = ff_mpegts_parse_packet(data->ts, pkt, buf, len); - /* The only error that can be returned from ff_mpegts_parse_packet + ret = avpriv_mpegts_parse_packet(data->ts, pkt, buf, len); + /* The only error that can be returned from avpriv_mpegts_parse_packet * is "no more data to return from the provided buffer", so return * AVERROR(EAGAIN) for all errors */ if (ret < 0) |