Changeset 1022

Timestamp:

01/28/09 23:41:04 (19 months ago)

Author:

astrange

Message:

- Fix compilation due to libavutil headers moving around (requires #undef hacks)
- Make FourCCString() show hex for fourccs like 0x01
- Disable warnings in ffmpeg build, and restore half the optimization CFLAGS

Location:

trunk

Files:

• Codecprintf.c (modified) (1 diff)
• bitstream_info.c (modified) (2 diffs)
• createStaticLibs.sh (modified) (5 diffs)
• ff_private.c (modified) (1 diff)

trunk/Codecprintf.c

@@ -51 +51 @@
 const char *FourCCString(FourCharCode c)
 {
-    static unsigned char fourcc[5] = {0};
+    static char fourcc[sizeof("0xFFFF")] = {0};
     int i;
     
-    for (i = 0; i < 4; i++) fourcc[i] = c >> 8*(3-i);
+        //not a fourcc or twocc
+        if (c < '\0\0AA') {
+                snprintf(fourcc, sizeof(fourcc), "%#x", (unsigned)c);
+        } else {
+                for (i = 0; i < 4; i++) fourcc[i] = c >> 8*(3-i);
+                fourcc[4] = '\0';
+        }
     
     return (char*)fourcc;

trunk/bitstream_info.c

@@ -20 +20 @@
 
 #include "bswap.h"
+#include "libavutil/internal.h"
 #include "mpegvideo.h"
 #include "parser.h"
@@ -25 +26 @@
 
 #include "CodecIDs.h"
+
+#undef malloc
+#undef free
 
 int inline MININT(int a, int b)

trunk/createStaticLibs.sh

@@ -8 +8 @@
 
 generalConfigureOptions="--disable-muxers --disable-encoders --disable-stripping --enable-pthreads --disable-ffmpeg --disable-network --disable-ffplay --disable-vhook --disable-ffserver"
-sdkflags="-isysroot $SDKROOT -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -ggdb -gstabs -Dattribute_deprecated="
+cflags="-isysroot $SDKROOT -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -ggdb -gstabs -Dattribute_deprecated= -w"
 
 if [ "$BUILD_STYLE" = "Development" ] ; then
     generalConfigureOptions="$generalConfigureOptions --disable-optimizations --disable-mmx"
+else
     optcflags="-falign-loops=16 -fweb -fstrict-aliasing -finline-limit=1000"
 fi
@@ -22 +23 @@
 
 if [ $no_pic -gt 0 ]; then
-    sdkflags="$sdkflags -mdynamic-no-pic" # ld can't handle -fno-pic on ppc
+    cflags="$cflags -mdynamic-no-pic" # ld can't handle -fno-pic on ppc
 else
     #no-pic only on pre-leopard
@@ -29 +30 @@
 fi 
 
-export sdkflags
+export cflags
 
 x86tune="generic"
@@ -122 +123 @@
         if [ "$oldbuildid_ffmpeg" != "quick" ] ; then
             if [ `arch` = ppc ] ; then
-                "$SRCROOT/ffmpeg/configure" --cc=$CC --enable-cross-compile --arch=i386 --extra-ldflags="$sdkflags -arch i386" --extra-cflags="-arch i386 $sdkflags $optcflags" $extraConfigureOptions $generalConfigureOptions --cpu=pentium-m 
+                "$SRCROOT/ffmpeg/configure" --cc=$CC --enable-cross-compile --arch=i386 --extra-ldflags="$cflags -arch i386" --extra-cflags="-arch i386 $cflags $optcflags" $extraConfigureOptions $generalConfigureOptions --cpu=pentium-m 
             else
-                "$SRCROOT/ffmpeg/configure" --cc=$CC --extra-cflags="$sdkflags $optcflags" $extraConfigureOptions $generalConfigureOptions --cpu=pentium-m
+                "$SRCROOT/ffmpeg/configure" --cc=$CC --extra-cflags="$cflags $optcflags" $extraConfigureOptions $generalConfigureOptions --cpu=pentium-m
             fi
         
@@ -152 +153 @@
         if [ "$oldbuildid_ffmpeg" != "quick" ] ; then
             if [ `arch` = ppc ] ; then
-                "$SRCROOT/ffmpeg/configure" --cc=$CC --extra-cflags="-faltivec $sdkflags $optcflags" $extraConfigureOptions $generalConfigureOptions
+                "$SRCROOT/ffmpeg/configure" --cc=$CC --extra-cflags="-faltivec $cflags $optcflags" $extraConfigureOptions $generalConfigureOptions
             else
-                "$SRCROOT/ffmpeg/configure" --cc=$CC --enable-cross-compile --arch=ppc  --extra-ldflags="$sdkflags -arch ppc" --extra-cflags="-faltivec -arch ppc $sdkflags $optcflags" $extraConfigureOptions $generalConfigureOptions
+                "$SRCROOT/ffmpeg/configure" --cc=$CC --enable-cross-compile --arch=ppc  --extra-ldflags="$cflags -arch ppc" --extra-cflags="-faltivec -arch ppc $cflags $optcflags" $extraConfigureOptions $generalConfigureOptions
             fi
         

trunk/ff_private.c

@@ -23 +23 @@
 #include "ff_private.h"
 #include "avcodec.h"
+#include "libavutil/internal.h"
 #include "mpegaudio.h"
 #include "Codecprintf.h"
 #include "CommonUtils.h"
 #include "CodecIDs.h"
+
+#undef malloc
+#undef free
 
 #include <CoreServices/CoreServices.h>