Commit cec52bce authored by Felix Paul Kühne's avatar Felix Paul Kühne

* forward port my fixed temporary fix and re-enable x264 in the contribs

parent 9d7bec36
......@@ -145,13 +145,10 @@ ifdef HAVE_DARWIN_OS
.dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \
.png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
.glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal \
.libdca .tag .goom2k4
.libdca .tag .x264 .goom2k4
# .expat .clinkcc don't work with SDK yet
# .glib .libidl .gecko are required to build the mozilla plugin
# .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package
ifneq ($(HOST),i686-apple-darwin8)
all: .x264
endif
else
ifdef HAVE_BEOS
......
......@@ -534,8 +534,13 @@ vlc_module_begin();
/* 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,
ASM_LONGTEXT, VLC_FALSE );
#endif
/* x264 psnr = 1 (default). disable PSNR computation for speed. */
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