Rename put_string to ff_put_string to avoid a symbol clash on Mac OS X.

Originally committed as revision 4597 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index fcd4fd9cb24922926ca43232885955c4d65e8d95..a8f456bd245c6526abd987b46de6b707febfac64 100644 (file)
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
@@ -37,7 +37,7 @@ void align_put_bits(PutBitContext *s)
 #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);

diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h
index 0e60ea1d444242d9d8a006cfec3db83c8c8bb920..26dee2df8861ce7c607e86f790fa9f2c4ce6c26b 100644 (file)
--- a/libavcodec/bitstream.h
+++ b/libavcodec/bitstream.h
@@ -95,7 +95,7 @@ static inline void flush_put_bits(PutBitContext *s)
 }
 
 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 */

diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 5ba6a66ab67623cb57916d10db3596916e577766..f640968db1d50612d4424d4f46fe39e5f1543b6f 100644 (file)
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -2396,7 +2396,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 */
-       put_string(&s->pb, LIBAVCODEC_IDENT, 0);
+       ff_put_string(&s->pb, LIBAVCODEC_IDENT, 0);
     }
 }
 

diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c
index 38078076ec2a4f7d6f0348f4eba5f9e5b3dfe38c..e8bba06190e1799dfdc1a59005b495a999ae1446 100644 (file)
--- a/libavcodec/mjpeg.c
+++ b/libavcodec/mjpeg.c
@@ -380,7 +380,7 @@ static void jpeg_put_comments(MpegEncContext *s)
     /* 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 @@ static void jpeg_put_comments(MpegEncContext *s)
         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 @@ static void jpeg_put_comments(MpegEncContext *s)
         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;