diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-22 14:37:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-22 14:37:03 +0200 |
| commit | 36999606902ce5c53636552ec46df5a38fd3bd6b (patch) | |
| tree | c081b062a579c147efab57f8eaab5f283be085df /configure | |
| parent | a7219529d1b872f6a8e36788de44aa3ab0a7b05e (diff) | |
| parent | 6fa488678f39fe45abe898fd7ef457849d0a8d99 (diff) | |
| download | ffmpeg-36999606902ce5c53636552ec46df5a38fd3bd6b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: x86: Only compile mpegvideo optimizations when necessary
configure: Drop fastdiv option
build: Make the E-AC-3 encoder select the AC-3 encoder
fate: flac: Only run tests requiring samples when samples are available
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -261,7 +261,6 @@ Advanced options (experts only): --enable-sram allow use of on-chip SRAM --enable-thumb compile for Thumb instruction set --disable-symver disable symbol versioning - --disable-fastdiv disable table-based division --enable-hardcoded-tables use hardcoded tables instead of runtime generation --disable-safe-bitstream-reader disable buffer boundary checking in bitreaders @@ -1080,7 +1079,6 @@ CONFIG_LIST=" dwt dxva2 fast_unaligned - fastdiv fft fontconfig frei0r @@ -1528,7 +1526,7 @@ dirac_decoder_select="dwt golomb" dnxhd_encoder_select="aandcttables mpegvideoenc" dxa_decoder_select="zlib" eac3_decoder_select="ac3_decoder" -eac3_encoder_select="mdct ac3dsp" +eac3_encoder_select="ac3_encoder" eamad_decoder_select="aandcttables error_resilience" eatgq_decoder_select="aandcttables" eatqi_decoder_select="aandcttables error_resilience mpegvideo" @@ -1992,7 +1990,6 @@ enable swscale enable asm enable debug enable doc -enable fastdiv enable network enable optimizations enable safe_bitstream_reader |