diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 22:21:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 22:21:36 +0200 |
| commit | fd29dd432c56b524e3a10c2274935efa27220682 (patch) | |
| tree | 7bb73788180a90bceeff8aa21678a0a616ffaaaa /configure | |
| parent | 189f2ed902a6044a4eba4a2ef221afefd69d8eec (diff) | |
| parent | 5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418 (diff) | |
Merge commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418'
* commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418':
configure: Factor out rv34dsp module
Conflicts:
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
@@ -1944,6 +1944,7 @@ CONFIG_EXTRA=" riffenc rtpdec rtpenc_chain + rv34dsp sinewin snappy startcode @@ -2298,8 +2299,8 @@ rv10_decoder_select="error_resilience h263_decoder h263dsp mpeg_er" rv10_encoder_select="h263_encoder" rv20_decoder_select="error_resilience h263_decoder h263dsp mpeg_er" rv20_encoder_select="h263_encoder" -rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpeg_er mpegvideo videodsp" -rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpeg_er mpegvideo videodsp" +rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpeg_er mpegvideo rv34dsp videodsp" +rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpeg_er mpegvideo rv34dsp videodsp" shorten_decoder_select="golomb" sipr_decoder_select="lsp" snow_decoder_select="dwt h264qpel hpeldsp me_cmp rangecoder videodsp" |