Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2012-12-30 22:40:20 +0400
committerLuca Barbato <lu_zero@gentoo.org>2013-01-14 22:20:47 +0400
commit3f111804eb5c603a344706b84b7164cbf7b4e0df (patch)
tree512f926d6ae83bd6d3331146af5d7286812112f2 /libavcodec/Makefile
parentdab1f543fcac7ad3dcdd427fc1b859667c82aaa2 (diff)
libvpx: make vp8 and vp9 selectable
Support older libvpx versions.
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r--libavcodec/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 2330f85fbb..f1a07d0a98 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -594,8 +594,10 @@ OBJS-$(CONFIG_LIBVO_AACENC_ENCODER) += libvo-aacenc.o mpeg4audio.o
OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER) += libvo-amrwbenc.o
OBJS-$(CONFIG_LIBVORBIS_ENCODER) += libvorbis.o audio_frame_queue.o \
vorbis_data.o vorbis_parser.o
-OBJS-$(CONFIG_LIBVPX_DECODER) += libvpxdec.o
-OBJS-$(CONFIG_LIBVPX_ENCODER) += libvpxenc.o
+OBJS-$(CONFIG_LIBVPX_VP8_DECODER) += libvpxdec.o
+OBJS-$(CONFIG_LIBVPX_VP8_ENCODER) += libvpxenc.o
+OBJS-$(CONFIG_LIBVPX_VP9_DECODER) += libvpxdec.o
+OBJS-$(CONFIG_LIBVPX_VP9_ENCODER) += libvpxenc.o
OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o
OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o
OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o