diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 10:12:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 10:12:07 +0200 |
| commit | ab4ba6b74d9ef287991e68b5b21d9539ea10a628 (patch) | |
| tree | 819dc7b11916f5c7c21638469df63dab925a52d9 /configure | |
| parent | 3c6621708b9392cd8a11dab6bb9e98f1804dcf47 (diff) | |
| parent | 2f6bc5f7c193477c2ebc0acce8f2d5551445e129 (diff) | |
| download | ffmpeg-ab4ba6b74d9ef287991e68b5b21d9539ea10a628.tar.gz | |
Merge commit '2f6bc5f7c193477c2ebc0acce8f2d5551445e129'
* 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>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1840,7 +1840,7 @@ sonic_ls_encoder_select="golomb" sp5x_decoder_select="dsputil" svq1_decoder_select="hpeldsp" 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" |