Changeset 893

Timestamp:

05/23/08 22:54:33 (6 months ago)

Author:

astrange

Message:

Merge trunk to the release branch.

Files:

• branches/perian-1.1/Subtitles/SubContext.m (modified) (1 diff)
• branches/perian-1.1/createStaticLibs.sh (modified) (2 diffs)

branches/perian-1.1/Subtitles/SubContext.m

@@ -95 +95 @@
-                NSString *tmp;
-                delegate = delegate_;
+                NSString *sv;
-                                
-#define sv(fn, n) fn = [[s objectForKey: @""#n] retain]
-fn = [[s objectForKey:@""#n] floatValue]
+sv = [s objectForKey:@""#n]; fn = sv ? [sv floatValue] : 0.;
-#define iv(fn, n) fn = [[s objectForKey:@""#n] intValue]
-#define bv(fn, n) fn = [[s objectForKey:@""#n] intValue] != 0

branches/perian-1.1/createStaticLibs.sh

@@ -106 +106 @@
-        if [ "$oldbuildid_ffmpeg" != "quick" ] ; then
-            if [ `arch` = ppc ] ; then
-'-arch i386' --extra-cflags='-arch i386 $sdkflags $optCFlags'
+"$sdkflags -arch i386" --extra-cflags="-arch i386 $sdkflags $optCFlags"
-            else
-                "$SRCROOT/ffmpeg/configure" --extra-cflags='$sdkflags $optCFlags' $extraConfigureOptions $generalConfigureOptions --cpu=pentium-m
@@ -138 +138 @@
-                "$SRCROOT/ffmpeg/configure" --extra-cflags='-faltivec $sdkflags $optCFlags' $extraConfigureOptions $generalConfigureOptions
-            else
-'-arch ppc' --extra-cflags='-faltivec -arch ppc $sdkflags $optCFlags'
+"$sdkflags -arch ppc" --extra-cflags="-faltivec -arch ppc $sdkflags $optCFlags"
-            fi
-