Merge commit '2f6bc5f7c193477c2ebc0acce8f2d5551445e129'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 08:12:07 +0000 (10:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 08:12:07 +0000 (10:12 +0200)
* commit '2f6bc5f7c193477c2ebc0acce8f2d5551445e129':
  svq3: Use hpeldsp instead of dsputil for half-pel functions
  mpegvideo: Use hpeldsp instead of dsputil for half-pel functions
  svq1: Use hpeldsp instead of dsputil for half-pel functions
  mimic: Use hpeldsp instead of dsputil for half-pel functions

Conflicts:
configure
libavcodec/motion_est.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/motion_est.c

diff --cc configure
+++ b/configure
@@@ -1832,15 -1639,10 +1832,15 @@@ 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"
 +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"
  svq1_decoder_select="hpeldsp"
 -svq1_encoder_select="aandcttables dsputil mpegvideoenc"
 +svq1_encoder_select="aandcttables dsputil hpeldsp mpegvideoenc"
- svq3_decoder_select="golomb h264chroma h264dsp h264pred h264qpel mpegvideo videodsp"
+ svq3_decoder_select="golomb h264chroma h264dsp h264pred h264qpel hpeldsp mpegvideo videodsp"
  svq3_decoder_suggest="error_resilience zlib"
  tak_decoder_select="dsputil"
  theora_decoder_select="vp3_decoder"
Simple merge