diff options
| author | Martin Storsjö <martin@martin.st> | 2012-09-09 16:03:52 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-09-09 22:22:12 +0300 |
| commit | aefea4d0de614a33b12419f7cbac101e2565ca0c (patch) | |
| tree | f7ddf4680f86deafb3145a22583c12eec331b713 /libavcodec | |
| parent | a0845bae49a7ac9a7b33c846db457c471a6c8deb (diff) | |
| download | ffmpeg-aefea4d0de614a33b12419f7cbac101e2565ca0c.tar.gz | |
Rename ff_put_string to avpriv_put_string
This allows using it from libavformat as well. This will be used
by the RTP/JPEG depacketizer.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/bitstream.c | 2 | ||||
| -rw-r--r-- | libavcodec/mjpegenc.c | 6 | ||||
| -rw-r--r-- | libavcodec/mpeg4videoenc.c | 2 | ||||
| -rw-r--r-- | libavcodec/put_bits.h | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index f77b9c4e3f..93ea9e228d 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -46,7 +46,7 @@ void avpriv_align_put_bits(PutBitContext *s) put_bits(s,s->bit_left & 7,0); } -void ff_put_string(PutBitContext *pb, const char *string, int terminate_string) +void avpriv_put_string(PutBitContext *pb, const char *string, int terminate_string) { while(*string){ put_bits(pb, 8, *string); 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); } diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 9320276868..42d1ba8e2f 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1022,7 +1022,7 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n if(!(s->flags & CODEC_FLAG_BITEXACT)){ put_bits(&s->pb, 16, 0); put_bits(&s->pb, 16, 0x1B2); /* user_data */ - ff_put_string(&s->pb, LIBAVCODEC_IDENT, 0); + avpriv_put_string(&s->pb, LIBAVCODEC_IDENT, 0); } } diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h index 6e812670b8..f19a7c689b 100644 --- a/libavcodec/put_bits.h +++ b/libavcodec/put_bits.h @@ -98,7 +98,7 @@ static inline void flush_put_bits(PutBitContext *s) #ifdef BITSTREAM_WRITER_LE #define avpriv_align_put_bits align_put_bits_unsupported_here -#define ff_put_string ff_put_string_unsupported_here +#define avpriv_put_string ff_put_string_unsupported_here #define avpriv_copy_bits avpriv_copy_bits_unsupported_here #else /** @@ -111,7 +111,7 @@ void avpriv_align_put_bits(PutBitContext *s); * * @param terminate_string 0-terminates the written string if value is 1 */ -void ff_put_string(PutBitContext *pb, const char *string, int terminate_string); +void avpriv_put_string(PutBitContext *pb, const char *string, int terminate_string); /** * Copy the content of src to the bitstream. |