diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 22:04:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 22:04:51 +0100 |
| commit | 1618f162a9daa1048c08eefe8086f78ea45e3647 (patch) | |
| tree | ec1c56645973ed1f52f5bed42ba2b085e8be7a7c /configure | |
| parent | 85d2b0987baeb980234c17be076108d53ffe0cd6 (diff) | |
| parent | d48430c367947a64647c6959cf472f2c01778b17 (diff) | |
Merge commit 'd48430c367947a64647c6959cf472f2c01778b17'
* commit 'd48430c367947a64647c6959cf472f2c01778b17':
build: Let the SVQ3 decoder depend on the H.264 decoder
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2027,8 +2027,8 @@ sonic_ls_encoder_select="golomb" sp5x_decoder_select="mjpeg_decoder" svq1_decoder_select="hpeldsp" svq1_encoder_select="aandcttables dsputil hpeldsp mpegvideoenc" -svq3_decoder_select="golomb h264chroma h264dsp h264pred h264qpel hpeldsp mpegvideo videodsp" -svq3_decoder_suggest="error_resilience zlib" +svq3_decoder_select="h264_decoder hpeldsp mpegvideo" +svq3_decoder_suggest="zlib" tak_decoder_select="dsputil" theora_decoder_select="vp3_decoder" tiff_decoder_suggest="zlib" |