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 | |
| 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>
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | libavcodec/Makefile | 3 | ||||
| -rw-r--r-- | libavcodec/x86/Makefile | 2 | ||||
| -rw-r--r-- | libavutil/intmath.h | 6 |
4 files changed, 4 insertions, 12 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 diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0e9de98176..450086d29a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -163,8 +163,7 @@ OBJS-$(CONFIG_DVVIDEO_ENCODER) += dv.o dvdata.o dv_profile.o OBJS-$(CONFIG_DXA_DECODER) += dxa.o OBJS-$(CONFIG_DXTORY_DECODER) += dxtory.o OBJS-$(CONFIG_EAC3_DECODER) += eac3dec.o eac3_data.o -OBJS-$(CONFIG_EAC3_ENCODER) += eac3enc.o ac3enc.o ac3enc_float.o \ - ac3tab.o ac3.o kbdwin.o eac3_data.o +OBJS-$(CONFIG_EAC3_ENCODER) += eac3enc.o eac3_data.o OBJS-$(CONFIG_EACMV_DECODER) += eacmv.o OBJS-$(CONFIG_EAMAD_DECODER) += eamad.o eaidct.o mpeg12.o \ mpeg12data.o diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 21eeb05bf3..73a6a6032c 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -9,7 +9,6 @@ MMX-OBJS += x86/dsputil_mmx.o \ x86/idct_mmx_xvid.o \ x86/idct_sse2_xvid.o \ x86/motion_est_mmx.o \ - x86/mpegvideo_mmx.o \ x86/simple_idct_mmx.o \ MMX-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o @@ -25,6 +24,7 @@ MMX-OBJS-$(CONFIG_H264DSP) += x86/h264dsp_init.o MMX-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o MMX-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodec_mmx.o +MMX-OBJS-$(CONFIG_MPEGVIDEO) += x86/mpegvideo_mmx.o MMX-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp_init.o MMX-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp_init.o MMX-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp_init.o diff --git a/libavutil/intmath.h b/libavutil/intmath.h index 0feedf8cfd..9cba406abd 100644 --- a/libavutil/intmath.h +++ b/libavutil/intmath.h @@ -50,11 +50,7 @@ extern const uint32_t ff_inverse[257]; #endif /* AV_GCC_VERSION_AT_LEAST(3,4) */ #ifndef FASTDIV -# if CONFIG_FASTDIV -# define FASTDIV(a,b) ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32)) -# else -# define FASTDIV(a,b) ((a) / (b)) -# endif +# define FASTDIV(a,b) ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32)) #endif /* FASTDIV */ #include "common.h" |