Commit 79b3363c authored by Dennis van Amerongen's avatar Dennis van Amerongen

* modules/codec/x264.c: Revert [16936] (temporarily fix x264 encoding on...

* modules/codec/x264.c: Revert [16936] (temporarily fix x264 encoding on darwin/x86 by disabling all CPU optimisations) as this shouldn't be a problem anymore..
parent 200d5f1d
...@@ -561,13 +561,8 @@ vlc_module_begin(); ...@@ -561,13 +561,8 @@ vlc_module_begin();
/* Input/Output */ /* Input/Output */
#if defined(__DARWIN__) && defined(__INTEL__)
add_bool( SOUT_CFG_PREFIX "asm", 0, NULL, ASM_TEXT,
ASM_LONGTEXT, VLC_FALSE );
#else
add_bool( SOUT_CFG_PREFIX "asm", 1, NULL, ASM_TEXT, add_bool( SOUT_CFG_PREFIX "asm", 1, NULL, ASM_TEXT,
ASM_LONGTEXT, VLC_FALSE ); ASM_LONGTEXT, VLC_FALSE );
#endif
/* x264 psnr = 1 (default). disable PSNR computation for speed. */ /* x264 psnr = 1 (default). disable PSNR computation for speed. */
add_bool( SOUT_CFG_PREFIX "psnr", 0, NULL, PSNR_TEXT, add_bool( SOUT_CFG_PREFIX "psnr", 0, NULL, PSNR_TEXT,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment