diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 22:45:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 22:45:34 +0200 |
| commit | 115a9b5091cd1be8d370f2d7ec1821df595decc7 (patch) | |
| tree | 09f7bc3e24dd76c88fa563a60b11a898b1a96094 /configure | |
| parent | 3500eccb8e7fce470a8cf746fdd4bc1ee0798215 (diff) | |
| parent | d42191c78befc1983f23b1899b2dda513b72f1ed (diff) | |
Merge commit 'd42191c78befc1983f23b1899b2dda513b72f1ed'
* commit 'd42191c78befc1983f23b1899b2dda513b72f1ed':
configure: Factor out vp8dsp module
Conflicts:
configure
libavcodec/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1954,6 +1954,7 @@ CONFIG_EXTRA=" videodsp vp3dsp vp56dsp + vp8dsp wma_freqs " @@ -2338,8 +2339,8 @@ vp5_decoder_select="h264chroma hpeldsp videodsp vp3dsp vp56dsp" vp6_decoder_select="h264chroma hpeldsp huffman videodsp vp3dsp vp56dsp" vp6a_decoder_select="vp6_decoder" vp6f_decoder_select="vp6_decoder" -vp7_decoder_select="h264pred videodsp" -vp8_decoder_select="h264pred videodsp" +vp7_decoder_select="h264pred videodsp vp8dsp" +vp8_decoder_select="h264pred videodsp vp8dsp" vp9_decoder_select="videodsp vp9_parser" webp_decoder_select="vp8_decoder" wmalossless_decoder_select="llauddsp" |