Mercurial > libavcodec.hg
changeset 2885:5dfb90019814 libavcodec
Rename put_string to ff_put_string to avoid a symbol clash on Mac OS X.
| author | diego |
|---|---|
| date | Sun, 18 Sep 2005 21:21:01 +0000 |
| parents | a332778dfa06 |
| children | 5576a9349ab6 |
| files | bitstream.c bitstream.h h263.c mjpeg.c |
| diffstat | 4 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/bitstream.c Sun Sep 18 14:45:17 2005 +0000 +++ b/bitstream.c Sun Sep 18 21:21:01 2005 +0000 @@ -37,7 +37,7 @@ #endif } -void put_string(PutBitContext * pbc, char *s, int put_zero) +void ff_put_string(PutBitContext * pbc, char *s, int put_zero) { while(*s){ put_bits(pbc, 8, *s);
--- a/bitstream.h Sun Sep 18 14:45:17 2005 +0000 +++ b/bitstream.h Sun Sep 18 21:21:01 2005 +0000 @@ -95,7 +95,7 @@ } void align_put_bits(PutBitContext *s); -void put_string(PutBitContext * pbc, char *s, int put_zero); +void ff_put_string(PutBitContext * pbc, char *s, int put_zero); /* bit input */ /* buffer, buffer_end and size_in_bits must be present and used by every reader */
--- a/h263.c Sun Sep 18 14:45:17 2005 +0000 +++ b/h263.c Sun Sep 18 21:21:01 2005 +0000 @@ -2396,7 +2396,7 @@ if(!(s->flags & CODEC_FLAG_BITEXACT)){ put_bits(&s->pb, 16, 0); put_bits(&s->pb, 16, 0x1B2); /* user_data */ - put_string(&s->pb, LIBAVCODEC_IDENT, 0); + ff_put_string(&s->pb, LIBAVCODEC_IDENT, 0); } }
--- a/mjpeg.c Sun Sep 18 14:45:17 2005 +0000 +++ b/mjpeg.c Sun Sep 18 21:21:01 2005 +0000 @@ -380,7 +380,7 @@ /* JFIF header */ put_marker(p, APP0); put_bits(p, 16, 16); - put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too */ + ff_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); @@ -395,7 +395,7 @@ flush_put_bits(p); ptr = pbBufPtr(p); put_bits(p, 16, 0); /* patched later */ - put_string(p, LIBAVCODEC_IDENT, 1); + ff_put_string(p, LIBAVCODEC_IDENT, 1); size = strlen(LIBAVCODEC_IDENT)+3; ptr[0] = size >> 8; ptr[1] = size; @@ -408,7 +408,7 @@ flush_put_bits(p); ptr = pbBufPtr(p); put_bits(p, 16, 0); /* patched later */ - put_string(p, "CS=ITU601", 1); + ff_put_string(p, "CS=ITU601", 1); size = strlen("CS=ITU601")+3; ptr[0] = size >> 8; ptr[1] = size;