[Ffmpeg-devel] Build problem (plus fix) on Mac OS X

[Diego Biurrun]

On Fri, Sep 16, 2005 at 01:23:27PM +0200, Michael Niedermayer wrote:
> 
> On Fri, Sep 16, 2005 at 10:53:54AM +0200, Jack Jansen wrote:
> > Ffmpeg defines a symbol put_string (in libavcodec/bitstream.c) that  
> > clashes with a symbol defined in /usr/lib/liibiconv.dylib on Mac OS X.
> > 
> > The attached patch (wrt. current CVS head) fixes this by defining  
> > put_string as ffmpeg_put_string.
> 
> rejected, naming it put_string() is the bug, leaving it with that name
> isnt a fix, rename it to ff_put_string()

I'll commit the attached patch that does the rename during the next days
if nobody objects.

Diego
-------------- next part --------------
--- libavcodec/bitstream.c	11 May 2005 01:46:13 -0000	1.55
+++ libavcodec/bitstream.c	17 Sep 2005 17:54:29 -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);
--- libavcodec/bitstream.h	17 Jun 2005 15:02:52 -0000	1.153
+++ libavcodec/bitstream.h	17 Sep 2005 17:54:29 -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 */
--- libavcodec/h263.c	26 Aug 2005 19:05:43 -0000	1.289
+++ libavcodec/h263.c	17 Sep 2005 17:54:31 -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);
     }
 }
 
--- libavcodec/mjpeg.c	26 Aug 2005 19:05:44 -0000	1.113
+++ libavcodec/mjpeg.c	17 Sep 2005 17:54:32 -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;