diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 13:21:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 13:21:18 +0200 |
| commit | 3fee9fa0223263d0bcc1eb108a9499180705d3be (patch) | |
| tree | e720e52bf172723070479878eeb30a89686597d4 /configure | |
| parent | ab4ba6b74d9ef287991e68b5b21d9539ea10a628 (diff) | |
| parent | 28bc406c84b04a5f1458b90ff52ddbec73e46202 (diff) | |
| download | ffmpeg-3fee9fa0223263d0bcc1eb108a9499180705d3be.tar.gz | |
Merge commit '28bc406c84b04a5f1458b90ff52ddbec73e46202'
* commit '28bc406c84b04a5f1458b90ff52ddbec73e46202':
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: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1712,7 +1712,7 @@ alac_encoder_select="lpc" als_decoder_select="dsputil" amrnb_decoder_select="lsp" amrwb_decoder_select="lsp" -amv_decoder_select="dsputil" +amv_decoder_select="dsputil hpeldsp" amv_encoder_select="aandcttables" ape_decoder_select="dsputil" asv1_decoder_select="dsputil" @@ -1772,7 +1772,7 @@ iac_decoder_select="dsputil fft mdct sinewin" imc_decoder_select="dsputil fft mdct sinewin" indeo3_decoder_select="hpeldsp" interplay_video_decoder_select="hpeldsp" -jpegls_decoder_select="dsputil golomb" +jpegls_decoder_select="dsputil golomb hpeldsp" jpegls_encoder_select="golomb" jv_decoder_select="dsputil" lagarith_decoder_select="dsputil" @@ -1811,7 +1811,7 @@ msmpeg4v2_encoder_select="h263_encoder" msmpeg4v3_decoder_select="h263_decoder" msmpeg4v3_encoder_select="h263_encoder" mss2_decoder_select="error_resilience vc1_decoder" -mxpeg_decoder_select="dsputil" +mxpeg_decoder_select="dsputil hpeldsp" nellymoser_decoder_select="mdct sinewin" nellymoser_encoder_select="audio_frame_queue mdct sinewin" nuv_decoder_select="dsputil lzo" @@ -1837,7 +1837,7 @@ snow_encoder_select="aandcttables dsputil dwt h264qpel hpeldsp mpegvideoenc rang sonic_decoder_select="golomb" sonic_encoder_select="golomb" sonic_ls_encoder_select="golomb" -sp5x_decoder_select="dsputil" +sp5x_decoder_select="dsputil hpeldsp" svq1_decoder_select="hpeldsp" svq1_encoder_select="aandcttables dsputil hpeldsp mpegvideoenc" svq3_decoder_select="golomb h264chroma h264dsp h264pred h264qpel hpeldsp mpegvideo videodsp" @@ -1846,7 +1846,7 @@ tak_decoder_select="dsputil" theora_decoder_select="vp3_decoder" tiff_decoder_suggest="zlib" tiff_encoder_suggest="zlib" -thp_decoder_select="dsputil" +thp_decoder_select="dsputil hpeldsp" truehd_decoder_select="mlp_parser" truemotion2_decoder_select="dsputil" truespeech_decoder_select="dsputil" |