[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec bitstream.c, 1.55, 1.56 bitstream.h, 1.153, 1.154 h263.c, 1.289, 1.290 mjpeg.c, 1.113, 1.114

[Diego Biurrun CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv26062/libavcodec

Modified Files:
	bitstream.c bitstream.h h263.c mjpeg.c 
Log Message:
Rename put_string to ff_put_string to avoid a symbol clash on Mac OS X.


Index: bitstream.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/bitstream.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- bitstream.c	11 May 2005 01:46:13 -0000	1.55
+++ bitstream.c	18 Sep 2005 21:21:00 -0000	1.56
@@ -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);

Index: bitstream.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/bitstream.h,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- bitstream.h	17 Jun 2005 15:02:52 -0000	1.153
+++ bitstream.h	18 Sep 2005 21:21:00 -0000	1.154
@@ -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 */

Index: h263.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h263.c,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -d -r1.289 -r1.290
--- h263.c	26 Aug 2005 19:05:43 -0000	1.289
+++ h263.c	18 Sep 2005 21:21:00 -0000	1.290
@@ -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);
     }
 }
 

Index: mjpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mjpeg.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- mjpeg.c	26 Aug 2005 19:05:44 -0000	1.113
+++ mjpeg.c	18 Sep 2005 21:21:01 -0000	1.114
@@ -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;