summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2009-11-25 19:25:21 +0000
committerjstebbins <[email protected]>2009-11-25 19:25:21 +0000
commit484ee83aa7f0f2fad57c6a579d92dfa9dfa61f97 (patch)
tree5b7d02166be9d1d048cd1c3193166d80c91b5222
parent5a0471ce2d3c95c6d7610e1c3bc2e01c7e041409 (diff)
MacGui: fix crash caused by ffmpeg initialization problem
some of ffmpegs mmx functions rely on a flag being initialized This gets initialized by ffmpeg encoder/decoder initialization, but the preview is using ffmpeg functions before any encoder/decoder is initialized git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2978 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--macosx/main.mm6
1 files changed, 6 insertions, 0 deletions
diff --git a/macosx/main.mm b/macosx/main.mm
index 9927a44e7..5f73a0c60 100644
--- a/macosx/main.mm
+++ b/macosx/main.mm
@@ -25,8 +25,14 @@ void hb_error_handler( const char *errmsg )
}
}
+extern "C" {
+extern int mm_flags;
+int mm_support();
+}
+
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 );