From f1e9398621af0bc9d166014e4ce6996bb4f141d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Mon, 25 Mar 2013 14:11:41 +0200 Subject: lavc: Rename avpriv_mpv_find_start_code after moving out from mpegvideo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also move the declaration to internal.h, and add restrict qualifiers to the declaration (as in the implementation). Signed-off-by: Martin Storsjö --- libavformat/mpegtsenc.c | 5 +++-- libavformat/rtpenc_mpv.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'libavformat') diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 44a5e5b089..8efd93ef31 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -22,9 +22,10 @@ #include "libavutil/bswap.h" #include "libavutil/crc.h" #include "libavutil/dict.h" +#include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" -#include "libavcodec/mpegvideo.h" +#include "libavcodec/internal.h" #include "avformat.h" #include "internal.h" #include "mpegts.h" @@ -1019,7 +1020,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) } do { - p = avpriv_mpv_find_start_code(p, buf_end, &state); + p = avpriv_find_start_code(p, buf_end, &state); av_dlog(s, "nal %d\n", state & 0x1f); } while (p < buf_end && (state & 0x1f) != 9 && (state & 0x1f) != 5 && (state & 0x1f) != 1); diff --git a/libavformat/rtpenc_mpv.c b/libavformat/rtpenc_mpv.c index 37dedc33f5..70248c408a 100644 --- a/libavformat/rtpenc_mpv.c +++ b/libavformat/rtpenc_mpv.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/mpegvideo.h" +#include "libavcodec/internal.h" #include "avformat.h" #include "rtpenc.h" @@ -56,7 +56,7 @@ void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size) r1 = buf1; while (1) { start_code = -1; - r = avpriv_mpv_find_start_code(r1, end, &start_code); + r = avpriv_find_start_code(r1, end, &start_code); if((start_code & 0xFFFFFF00) == 0x100) { /* New start code found */ if (start_code == 0x100) { -- cgit v1.2.3