Merge branch 'master' into 0.11

This commit is contained in:
Wim Taymans 2011-11-02 10:31:57 +01:00
commit 59769ca0c8

View file

@ -316,7 +316,7 @@ else
# Enable pic and static so that we get .a files, but with PIC code. # Enable pic and static so that we get .a files, but with PIC code.
embffmpeg_configure_args="$embffmpeg_configure_args --disable-avserver --disable-avplay\ embffmpeg_configure_args="$embffmpeg_configure_args --disable-avserver --disable-avplay\
--disable-ffmpeg --disable-avprobe --enable-postproc --enable-static --enable-pic \ --disable-ffmpeg --disable-avprobe --enable-static --enable-pic \
--disable-encoder=flac --disable-decoder=cavs --disable-protocols --disable-devices\ --disable-encoder=flac --disable-decoder=cavs --disable-protocols --disable-devices\
--disable-network --disable-hwaccels --disable-filters --disable-doc\ --disable-network --disable-hwaccels --disable-filters --disable-doc\
--enable-optimizations" --enable-optimizations"