Updated FFmpeg source code and rebuilt adding AAC support.

BigHillSoftware · Apr 19, 2013 · 3df2a29 · 3df2a29
1 parent 60594f8
commit 3df2a29
Show file tree

Hide file tree

Showing 148 changed files with 6,553 additions and 3,544 deletions.
diff --git a/FFmpeg/build-ffmpeg-iOS6-MacOSX-libs.sh b/FFmpeg/build-ffmpeg-iOS6-MacOSX-libs.sh
@@ -31,15 +31,14 @@ echo Configure for armv7 build
 ./configure \
 --cc=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc \
 --as='/usr/local/bin/gas-preprocessor.pl /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc' \
---sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.0.sdk \
+--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk \
 --target-os=darwin \
 --arch=arm \
 --cpu=cortex-a8 \
---extra-cflags='-arch armv7' \
---extra-ldflags='-arch armv7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.0.sdk' \
+--extra-cflags='-arch armv7 -strict -2' \
+--extra-ldflags='-arch armv7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk' \
 --prefix=../output/iOS6/armv7 \
 --enable-cross-compile \
-#--enable-libx264 \
 --disable-armv5te \
 --disable-swscale-alpha \
 --disable-doc \
@@ -68,12 +67,10 @@ echo Configure for i386
 --target-os=darwin \
 --arch=i386 \
 --cpu=i386 \
---extra-cflags='-arch i386' \
+--extra-cflags='-arch i386 -strict -2' \
 --extra-ldflags='-arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk' \
 --prefix=../output/MacOSX/i386 \
 --enable-cross-compile \
-#--enable-libx264 \
---disable-armv5te \
 --disable-swscale-alpha \
 --disable-doc \
 --disable-ffmpeg \
@@ -86,7 +83,7 @@ echo Configure for i386
 # Make
 make clean
 #make
-make && sudo make install
+make && make install
 
 # * BUILD FOR x86_64 *
 
@@ -99,12 +96,10 @@ echo Configure for x86_64
 --target-os=darwin \
 --arch=x86_64 \
 --cpu=x86_64 \
---extra-cflags='-arch x86_64' \
+--extra-cflags='-arch x86_64 -strict -2' \
 --extra-ldflags='-arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk' \
 --prefix=../output/MacOSX/x86_64 \
 --enable-cross-compile \
-#--enable-libx264 \
---disable-armv5te \
 --disable-swscale-alpha \
 --disable-doc \
 --disable-ffmpeg \
@@ -117,7 +112,7 @@ echo Configure for x86_64
 # Make
 make clean
 #make
-make && sudo make install
+make && make install
 
 # *** BUILD Universal ***
 

diff --git a/FFmpeg/gas-preprocessor.pl b/FFmpeg/gas-preprocessor.pl
@@ -367,8 +367,11 @@ sub expand_macros {
 }
 
 close(ASMFILE) or exit 1;
-open(ASMFILE, "|-", @gcc_cmd) or die "Error running assembler";
-#open(ASMFILE, ">/tmp/a.S") or die "Error running assembler";
+if ($ENV{GASPP_DEBUG}) {
+    open(ASMFILE, ">&STDOUT");
+} else {
+    open(ASMFILE, "|-", @gcc_cmd) or die "Error running assembler";
+}
 
 my @sections;
 my $num_repts;
@@ -433,8 +436,12 @@ sub expand_macros {
         $thumb_labels{$1}++;
     }
 
-    if ($line =~ /^\s*((\w+:)?blx?|\.globl)\s+(\w+)/) {
-        $call_targets{$3}++;
+    if ($line =~ /^\s*((\w+\s*:\s*)?bl?x?(?:..)?(?:\.w)?|\.globl)\s+(\w+)/) {
+        if (exists $thumb_labels{$3}) {
+            print ASMFILE ".thumb_func $3\n";
+        } else {
+            $call_targets{$3}++;
+        }
     }
 
     # @l -> lo16()  @ha -> ha16()
@@ -516,7 +523,9 @@ sub expand_macros {
 print ASMFILE ".text\n";
 print ASMFILE ".align 2\n";
 foreach my $literal (keys %literal_labels) {
-    print ASMFILE "$literal_labels{$literal}:\n .word $literal\n";
+    my $label = $literal_labels{$literal};
+    print ASMFILE ".set Lval_$label, $literal\n";
+    print ASMFILE "$label: .word Lval_$label\n";
 }
 
 map print(ASMFILE ".thumb_func $_\n"),