From aefea4d0de614a33b12419f7cbac101e2565ca0c Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Sun, 9 Sep 2012 16:03:52 +0300 Subject: Rename ff_put_string to avpriv_put_string MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows using it from libavformat as well. This will be used by the RTP/JPEG depacketizer. Signed-off-by: Martin Storsjö --- libavcodec/mjpegenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavcodec/mjpegenc.c') diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index d369d36520..f976e28759 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -161,7 +161,7 @@ static void jpeg_put_comments(MpegEncContext *s) /* JFIF header */ put_marker(p, APP0); put_bits(p, 16, 16); - ff_put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too */ + avpriv_put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too */ put_bits(p, 16, 0x0201); /* v 1.02 */ put_bits(p, 8, 0); /* units type: 0 - aspect ratio */ put_bits(p, 16, s->avctx->sample_aspect_ratio.num); @@ -176,7 +176,7 @@ static void jpeg_put_comments(MpegEncContext *s) flush_put_bits(p); ptr = put_bits_ptr(p); put_bits(p, 16, 0); /* patched later */ - ff_put_string(p, LIBAVCODEC_IDENT, 1); + avpriv_put_string(p, LIBAVCODEC_IDENT, 1); size = strlen(LIBAVCODEC_IDENT)+3; AV_WB16(ptr, size); } @@ -188,7 +188,7 @@ static void jpeg_put_comments(MpegEncContext *s) flush_put_bits(p); ptr = put_bits_ptr(p); put_bits(p, 16, 0); /* patched later */ - ff_put_string(p, "CS=ITU601", 1); + avpriv_put_string(p, "CS=ITU601", 1); size = strlen("CS=ITU601")+3; AV_WB16(ptr, size); } -- cgit v1.2.3