Commit 3fee9fa0 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '28bc406c'

* commit '28bc406c':
  mjpeg: Use hpeldsp instead of dsputil for half-pel functions
  svq1enc: Use hpeldsp instead of dsputil for half-pel functions

Conflicts:
	configure
	libavcodec/mjpegdec.c
	libavcodec/svq1enc.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ab4ba6b7 28bc406c
...@@ -1712,7 +1712,7 @@ alac_encoder_select="lpc" ...@@ -1712,7 +1712,7 @@ alac_encoder_select="lpc"
als_decoder_select="dsputil" als_decoder_select="dsputil"
amrnb_decoder_select="lsp" amrnb_decoder_select="lsp"
amrwb_decoder_select="lsp" amrwb_decoder_select="lsp"
amv_decoder_select="dsputil" amv_decoder_select="dsputil hpeldsp"
amv_encoder_select="aandcttables" amv_encoder_select="aandcttables"
ape_decoder_select="dsputil" ape_decoder_select="dsputil"
asv1_decoder_select="dsputil" asv1_decoder_select="dsputil"
...@@ -1772,7 +1772,7 @@ iac_decoder_select="dsputil fft mdct sinewin" ...@@ -1772,7 +1772,7 @@ iac_decoder_select="dsputil fft mdct sinewin"
imc_decoder_select="dsputil fft mdct sinewin" imc_decoder_select="dsputil fft mdct sinewin"
indeo3_decoder_select="hpeldsp" indeo3_decoder_select="hpeldsp"
interplay_video_decoder_select="hpeldsp" interplay_video_decoder_select="hpeldsp"
jpegls_decoder_select="dsputil golomb" jpegls_decoder_select="dsputil golomb hpeldsp"
jpegls_encoder_select="golomb" jpegls_encoder_select="golomb"
jv_decoder_select="dsputil" jv_decoder_select="dsputil"
lagarith_decoder_select="dsputil" lagarith_decoder_select="dsputil"
...@@ -1811,7 +1811,7 @@ msmpeg4v2_encoder_select="h263_encoder" ...@@ -1811,7 +1811,7 @@ msmpeg4v2_encoder_select="h263_encoder"
msmpeg4v3_decoder_select="h263_decoder" msmpeg4v3_decoder_select="h263_decoder"
msmpeg4v3_encoder_select="h263_encoder" msmpeg4v3_encoder_select="h263_encoder"
mss2_decoder_select="error_resilience vc1_decoder" mss2_decoder_select="error_resilience vc1_decoder"
mxpeg_decoder_select="dsputil" mxpeg_decoder_select="dsputil hpeldsp"
nellymoser_decoder_select="mdct sinewin" nellymoser_decoder_select="mdct sinewin"
nellymoser_encoder_select="audio_frame_queue mdct sinewin" nellymoser_encoder_select="audio_frame_queue mdct sinewin"
nuv_decoder_select="dsputil lzo" nuv_decoder_select="dsputil lzo"
...@@ -1837,7 +1837,7 @@ snow_encoder_select="aandcttables dsputil dwt h264qpel hpeldsp mpegvideoenc rang ...@@ -1837,7 +1837,7 @@ snow_encoder_select="aandcttables dsputil dwt h264qpel hpeldsp mpegvideoenc rang
sonic_decoder_select="golomb" sonic_decoder_select="golomb"
sonic_encoder_select="golomb" sonic_encoder_select="golomb"
sonic_ls_encoder_select="golomb" sonic_ls_encoder_select="golomb"
sp5x_decoder_select="dsputil" sp5x_decoder_select="dsputil hpeldsp"
svq1_decoder_select="hpeldsp" svq1_decoder_select="hpeldsp"
svq1_encoder_select="aandcttables dsputil hpeldsp mpegvideoenc" svq1_encoder_select="aandcttables dsputil hpeldsp mpegvideoenc"
svq3_decoder_select="golomb h264chroma h264dsp h264pred h264qpel hpeldsp mpegvideo videodsp" svq3_decoder_select="golomb h264chroma h264dsp h264pred h264qpel hpeldsp mpegvideo videodsp"
...@@ -1846,7 +1846,7 @@ tak_decoder_select="dsputil" ...@@ -1846,7 +1846,7 @@ tak_decoder_select="dsputil"
theora_decoder_select="vp3_decoder" theora_decoder_select="vp3_decoder"
tiff_decoder_suggest="zlib" tiff_decoder_suggest="zlib"
tiff_encoder_suggest="zlib" tiff_encoder_suggest="zlib"
thp_decoder_select="dsputil" thp_decoder_select="dsputil hpeldsp"
truehd_decoder_select="mlp_parser" truehd_decoder_select="mlp_parser"
truemotion2_decoder_select="dsputil" truemotion2_decoder_select="dsputil"
truespeech_decoder_select="dsputil" truespeech_decoder_select="dsputil"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment