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 /libavcodec/ppc | |
| parent | 3500eccb8e7fce470a8cf746fdd4bc1ee0798215 (diff) | |
| parent | d42191c78befc1983f23b1899b2dda513b72f1ed (diff) | |
| download | ffmpeg-streaming-115a9b5091cd1be8d370f2d7ec1821df595decc7.zip ffmpeg-streaming-115a9b5091cd1be8d370f2d7ec1821df595decc7.tar.gz | |
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 'libavcodec/ppc')
| -rw-r--r-- | libavcodec/ppc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile index 30d04b8..bd4f427 100644 --- a/libavcodec/ppc/Makefile +++ b/libavcodec/ppc/Makefile @@ -20,6 +20,7 @@ OBJS-$(CONFIG_MPEGVIDEOENC) += ppc/mpegvideoencdsp.o OBJS-$(CONFIG_PIXBLOCKDSP) += ppc/pixblockdsp.o OBJS-$(CONFIG_VIDEODSP) += ppc/videodsp_ppc.o OBJS-$(CONFIG_VP3DSP) += ppc/vp3dsp_altivec.o +OBJS-$(CONFIG_VP8DSP) += ppc/vp8dsp_altivec.o # decoders/encoders OBJS-$(CONFIG_LLAUDDSP) += ppc/lossless_audiodsp_altivec.o @@ -27,4 +28,3 @@ OBJS-$(CONFIG_SVQ1_ENCODER) += ppc/svq1enc_altivec.o OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o OBJS-$(CONFIG_VORBIS_DECODER) += ppc/vorbisdsp_altivec.o OBJS-$(CONFIG_VP7_DECODER) += ppc/vp8dsp_altivec.o -OBJS-$(CONFIG_VP8_DECODER) += ppc/vp8dsp_altivec.o |
