Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 10:30:39 +0000 (12:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 10:32:29 +0000 (12:32 +0200)
* qatar/master:
  dsputil: Make dsputil selectable

Conflicts:
configure
libavcodec/Makefile
libavcodec/x86/Makefile
libavcodec/x86/constants.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_mmx.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/Makefile
libavcodec/x86/Makefile
libavcodec/x86/constants.c
libavcodec/x86/dsputil_mmx.c

diff --cc configure
+++ b/configure
@@@ -1690,7 -1505,7 +1690,8 @@@ log2_deps="!msvcrt
  # subsystems
  dct_select="rdft"
  error_resilience_select="dsputil"
 +frame_thread_encoder_deps="encoders threads"
+ lpc_select="dsputil"
  mdct_select="fft"
  rdft_select="fft"
  mpegaudio_select="mpegaudiodsp"
@@@ -1709,12 -1524,15 +1710,16 @@@ alac_encoder_select="lpc
  als_decoder_select="dsputil"
  amrnb_decoder_select="lsp"
  amrwb_decoder_select="lsp"
+ amv_decoder_select="dsputil"
 +amv_encoder_select="aandcttables"
  ape_decoder_select="dsputil"
- asv_decoder_select="dsputil"
+ asv1_decoder_select="dsputil"
+ asv1_encoder_select="dsputil"
+ asv2_decoder_select="dsputil"
+ asv2_encoder_select="dsputil"
  atrac1_decoder_select="mdct sinewin"
  atrac3_decoder_select="mdct"
 -bink_decoder_select="dsputil"
 +bink_decoder_select="dsputil hpeldsp"
  binkaudio_dct_decoder_select="mdct rdft dct sinewin"
  binkaudio_rdft_decoder_select="mdct rdft sinewin"
  cavs_decoder_select="dsputil golomb h264chroma videodsp"
@@@ -1732,12 -1550,12 +1738,13 @@@ dxa_decoder_select="zlib
  eac3_decoder_select="ac3_decoder"
  eac3_encoder_select="ac3_encoder"
  eamad_decoder_select="aandcttables dsputil mpegvideo"
 -eatgq_decoder_select="aandcttables dsputil"
 +eatgq_decoder_select="aandcttables"
  eatqi_decoder_select="aandcttables error_resilience mpegvideo"
 +exr_decoder_select="zlib"
  ffv1_decoder_select="dsputil golomb rangecoder"
- ffv1_encoder_select="rangecoder"
- ffvhuff_encoder_select="huffman"
+ ffv1_encoder_select="dsputil rangecoder"
+ ffvhuff_decoder_select="dsputil"
+ ffvhuff_encoder_select="dsputil huffman"
  flac_decoder_select="golomb"
  flac_encoder_select="dsputil golomb lpc"
  flashsv_decoder_select="zlib"
@@@ -1758,20 -1574,21 +1765,21 @@@ h263p_encoder_select="h263_encoder
  h264_decoder_select="golomb h264chroma h264dsp h264pred h264qpel videodsp"
  h264_decoder_suggest="error_resilience"
  huffyuv_decoder_select="dsputil"
- huffyuv_encoder_select="huffman"
- iac_decoder_select="fft mdct sinewin"
+ huffyuv_encoder_select="dsputil huffman"
+ iac_decoder_select="dsputil fft mdct sinewin"
  imc_decoder_select="dsputil fft mdct sinewin"
 -indeo3_decoder_select="dsputil"
 -interplay_video_decoder_select="dsputil"
 +indeo3_decoder_select="hpeldsp"
 +interplay_video_decoder_select="hpeldsp"
- jpegls_decoder_select="golomb"
+ jpegls_decoder_select="dsputil golomb"
  jpegls_encoder_select="golomb"
  jv_decoder_select="dsputil"
  lagarith_decoder_select="dsputil"
  ljpeg_encoder_select="aandcttables mpegvideoenc"
  loco_decoder_select="golomb"
  mdec_decoder_select="dsputil error_resilience mpegvideo"
 -mimic_decoder_select="dsputil"
 -mjpeg_decoder_select="dsputil"
 -mjpegb_decoder_select="dsputil"
 +mimic_decoder_select="dsputil hpeldsp"
 +mjpeg_decoder_select="dsputil hpeldsp"
++mjpegb_decoder_select="dsputil hpeldsp"
  mjpeg_encoder_select="aandcttables dsputil mpegvideoenc"
  mlp_decoder_select="dsputil mlp_parser"
  motionpixels_decoder_select="dsputil"
@@@ -1804,9 -1622,10 +1813,10 @@@ mxpeg_decoder_select="dsputil
  nellymoser_decoder_select="mdct sinewin"
  nellymoser_encoder_select="audio_frame_queue mdct sinewin"
  nuv_decoder_select="dsputil lzo"
 -png_decoder_select="dsputil zlib"
 +png_decoder_select="zlib"
  png_encoder_select="dsputil zlib"
  prores_decoder_select="dsputil"
+ prores_encoder_select="dsputil"
  qcelp_decoder_select="lsp"
  qdm2_decoder_select="mdct rdft mpegaudiodsp"
  ra_144_encoder_select="audio_frame_queue lpc"
@@@ -1820,21 -1638,19 +1830,24 @@@ rv30_decoder_select="error_resilience g
  rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo videodsp"
  shorten_decoder_select="golomb"
  sipr_decoder_select="lsp"
 -svq1_decoder_select="dsputil"
 -svq1_encoder_select="aandcttables dsputil mpegvideoenc"
 +snow_decoder_select="dsputil dwt h264qpel hpeldsp rangecoder"
 +snow_encoder_select="aandcttables dsputil dwt h264qpel hpeldsp mpegvideoenc rangecoder"
 +sonic_decoder_select="golomb"
 +sonic_encoder_select="golomb"
 +sonic_ls_encoder_select="golomb"
+ sp5x_decoder_select="dsputil"
- svq3_decoder_select="dsputil golomb h264chroma h264dsp h264pred h264qpel mpegvideo videodsp"
 +svq1_decoder_select="hpeldsp"
 +svq1_encoder_select="aandcttables dsputil hpeldsp mpegvideoenc"
+ svq3_decoder_select="golomb h264chroma h264dsp h264pred h264qpel mpegvideo videodsp"
  svq3_decoder_suggest="error_resilience zlib"
  tak_decoder_select="dsputil"
  theora_decoder_select="vp3_decoder"
  tiff_decoder_suggest="zlib"
  tiff_encoder_suggest="zlib"
 -truehd_decoder_select="mlp_decoder"
+ thp_decoder_select="dsputil"
 +truehd_decoder_select="mlp_parser"
  truemotion2_decoder_select="dsputil"
+ truespeech_decoder_select="dsputil"
  tscc_decoder_select="zlib"
  twinvq_decoder_select="mdct lsp sinewin"
  utvideo_decoder_select="dsputil"
@@@ -35,12 -30,10 +35,11 @@@ OBJS = allcodecs.
  OBJS-$(CONFIG_AANDCTTABLES)            += aandcttab.o
  OBJS-$(CONFIG_AC3DSP)                  += ac3dsp.o
  OBJS-$(CONFIG_AUDIO_FRAME_QUEUE)       += audio_frame_queue.o
 +OBJS-$(CONFIG_CRYSTALHD)               += crystalhd.o
  OBJS-$(CONFIG_DCT)                     += dct.o dct32_fixed.o dct32_float.o
  OBJS-$(CONFIG_DXVA2)                   += dxva2.o
- OBJS-$(CONFIG_DSPUTIL)                 += dsputil.o faanidct.o \
-                                           simple_idct.o \
-                                           jrevdct.o
+ OBJS-$(CONFIG_DSPUTIL)                 += dsputil.o faanidct.o          \
+                                           simple_idct.o jrevdct.o
  OBJS-$(CONFIG_ENCODERS)                += faandct.o jfdctfst.o jfdctint.o
  OBJS-$(CONFIG_ERROR_RESILIENCE)        += error_resilience.o
  FFT-OBJS-$(CONFIG_HARDCODED_TABLES)    += cos_tables.o cos_fixed_tables.o
@@@ -50,8 -43,10 +50,12 @@@ MMX-OBJS-$(CONFIG_VC1_DECODER)         
  YASM-OBJS-$(CONFIG_AAC_DECODER)        += x86/sbrdsp.o
  YASM-OBJS-$(CONFIG_AC3DSP)             += x86/ac3dsp.o
  YASM-OBJS-$(CONFIG_DCT)                += x86/dct32.o
 -                                          x86/hpeldsp.o                 \
 +YASM-OBJS-$(CONFIG_DIRAC_DECODER)      += x86/diracdsp_mmx.o x86/diracdsp_yasm.o\
 +                                          x86/dwt_yasm.o
+ YASM-OBJS-$(CONFIG_DSPUTIL)            += x86/dsputil.o                 \
 -                                          x86/qpel.o
++                                          x86/fpelbase.o                \
+                                           x86/mpeg4qpel.o               \
++                                          x86/qpelbase.o
  YASM-OBJS-$(CONFIG_ENCODERS)           += x86/dsputilenc.o
  YASM-OBJS-$(CONFIG_FFT)                += x86/fft.o
  YASM-OBJS-$(CONFIG_H263_DECODER)       += x86/h263_loopfilter.o
@@@ -86,12 -76,6 +90,7 @@@ YASM-OBJS-$(CONFIG_VORBIS_DECODER)     
  YASM-OBJS-$(CONFIG_VP3DSP)             += x86/vp3dsp.o
  YASM-OBJS-$(CONFIG_VP6_DECODER)        += x86/vp56dsp.o
  YASM-OBJS-$(CONFIG_VP8_DECODER)        += x86/vp8dsp.o
 +YASM-OBJS-$(CONFIG_WEBP_DECODER)       += x86/vp8dsp.o
  
- YASM-OBJS-$(CONFIG_DSPUTIL)            += x86/dsputil.o                 \
-                                           x86/mpeg4qpel.o               \
-                                           x86/qpelbase.o                \
-                                           x86/fpelbase.o
  YASM-OBJS                              += x86/deinterlace.o             \
-                                           x86/fmtconvert.o
+                                           x86/fmtconvert.o              \
Simple merge
Simple merge