Bump ffmpeg from 22950 to 25082

It's been 5 months since an ffmpeg bump.

One negative is that we loose LATM support.
The LATM patch is just impossible to apply
anymore since ffmpeg dropped support for using
the external faad lib. There are ifdef's in the
code should anyone wish to revert to an earlier
ffmpeg and enable LATM.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3526 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 20 insertions, 6 deletions

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index d329c9d28..a163f5237 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -719,6 +719,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -751,6 +752,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -818,6 +820,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -856,6 +859,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -944,6 +948,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -982,6 +987,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1070,6 +1076,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1108,6 +1115,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1196,6 +1204,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1234,6 +1243,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1325,6 +1335,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1363,6 +1374,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1454,6 +1466,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1492,6 +1505,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1583,6 +1597,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1621,6 +1636,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1712,6 +1728,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1750,6 +1767,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1849,6 +1867,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1891,6 +1910,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
diff --git a/macosx/main.mm b/macosx/main.mm
index 0d0b01a6a..260a8ad92 100644
--- a/macosx/main.mm
+++ b/macosx/main.mm
@@ -29,11 +29,6 @@ void hb_error_handler( const char *errmsg )
 }
 }
 
-extern "C" {
-extern int mm_flags;
-int mm_support();
-}
-
 char * str_printf(const char *fmt, ...)
 {
     /* Guess we need no more than 100 bytes. */
@@ -143,7 +138,6 @@ int main( int argc, const char ** argv )
             }
         }
     }
-    mm_flags = mm_support();
     signal( SIGINT, SigHandler );
     hb_register_error_handler(&hb_error_handler);
     return NSApplicationMain( argc, argv );