diff options
| author | Michael Niedermayer <[email protected]> | 2015-07-17 22:31:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-07-17 22:31:45 +0200 |
| commit | 3500eccb8e7fce470a8cf746fdd4bc1ee0798215 (patch) | |
| tree | a1c705dcd340394630ea773a2dec027ba682c45c | |
| parent | fd29dd432c56b524e3a10c2274935efa27220682 (diff) | |
| parent | d4aea1aa4060fb5ba7f5f426823b697d2a5af08b (diff) | |
Merge commit 'd4aea1aa4060fb5ba7f5f426823b697d2a5af08b'
* commit 'd4aea1aa4060fb5ba7f5f426823b697d2a5af08b':
configure: Factor out vp56dsp module
Merged-by: Michael Niedermayer <[email protected]>
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | libavcodec/Makefile | 6 |
2 files changed, 6 insertions, 5 deletions
@@ -1953,6 +1953,7 @@ CONFIG_EXTRA=" tpeldsp videodsp vp3dsp + vp56dsp wma_freqs " @@ -2333,8 +2334,8 @@ vc1image_decoder_select="vc1_decoder" vorbis_decoder_select="mdct" vorbis_encoder_select="mdct" vp3_decoder_select="hpeldsp vp3dsp videodsp" -vp5_decoder_select="h264chroma hpeldsp videodsp vp3dsp" -vp6_decoder_select="h264chroma hpeldsp huffman videodsp vp3dsp" +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" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c40f09f7f2..fc6e2e9da8 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -114,6 +114,7 @@ OBJS-$(CONFIG_TEXTUREDSPENC) += texturedspenc.o OBJS-$(CONFIG_TPELDSP) += tpeldsp.o OBJS-$(CONFIG_VIDEODSP) += videodsp.o OBJS-$(CONFIG_VP3DSP) += vp3dsp.o +OBJS-$(CONFIG_VP56DSP) += vp56dsp.o OBJS-$(CONFIG_WMA_FREQS) += wma_freqs.o # decoders/encoders @@ -525,9 +526,8 @@ OBJS-$(CONFIG_VORBIS_DECODER) += vorbisdec.o vorbisdsp.o vorbis.o \ OBJS-$(CONFIG_VORBIS_ENCODER) += vorbisenc.o vorbis.o \ vorbis_data.o OBJS-$(CONFIG_VP3_DECODER) += vp3.o -OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o vp56dsp.o \ - vp56rac.o -OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o vp56dsp.o \ +OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o vp56rac.o +OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o \ vp6dsp.o vp56rac.o OBJS-$(CONFIG_VP7_DECODER) += vp8.o vp8dsp.o vp56rac.o OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp8dsp.o vp56rac.o |