summaryrefslogtreecommitdiffstats
path: root/macosx/main.mm
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2010-09-14 16:38:12 +0000
committerjstebbins <[email protected]>2010-09-14 16:38:12 +0000
commit50a9b814396811fc33885d70d2798a6c8c1c595e (patch)
tree7eee7df15967f65c5ad17e5f2ec33e886afc68ae /macosx/main.mm
parentc1a82127fc2d99293cf27d3821d5ab85c93cc4ec (diff)
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
Diffstat (limited to 'macosx/main.mm')
-rw-r--r--macosx/main.mm6
1 files changed, 0 insertions, 6 deletions
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 );