summaryrefslogtreecommitdiffstats
path: root/libavcodec/Makefile
diff options
context:
space:
mode:
authorMark Thompson <sw@jkqxz.net>2016-10-26 21:29:08 +0100
committerMark Thompson <sw@jkqxz.net>2016-11-14 19:38:19 +0000
commitb6582b29277e00e5d49f400e58beefa5a21d83b8 (patch)
treebf40206ac945258ba81be3b8705db14384aa673a /libavcodec/Makefile
parentfea4dc05b41f5465bedc786b67966f204ec6150c (diff)
downloadffmpeg-streaming-b6582b29277e00e5d49f400e58beefa5a21d83b8.zip
ffmpeg-streaming-b6582b29277e00e5d49f400e58beefa5a21d83b8.tar.gz
qsv: Add VC-1 decoder
It uses the same code as the MPEG-2 decoder, so the file is renamed to contain all "other" (that is, not H.26[45]) codecs.
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r--libavcodec/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 66a6c66..08b510a 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -328,7 +328,7 @@ OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o
OBJS-$(CONFIG_MPEG_XVMC_DECODER) += mpegvideo_xvmc.o
OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o
OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpeg12.o
-OBJS-$(CONFIG_MPEG2_QSV_DECODER) += qsvdec_mpeg2.o
+OBJS-$(CONFIG_MPEG2_QSV_DECODER) += qsvdec_other.o
OBJS-$(CONFIG_MPEG2_QSV_ENCODER) += qsvenc_mpeg2.o
OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o
OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpeg12.o
@@ -461,6 +461,7 @@ OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1_block.o vc1_loopfilter.o
msmpeg4dec.o msmpeg4.o msmpeg4data.o \
wmv2data.o
OBJS-$(CONFIG_VC1_MMAL_DECODER) += mmaldec.o
+OBJS-$(CONFIG_VC1_QSV_DECODER) += qsvdec_other.o
OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o
OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdaudio.o
OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdvideo.o
OpenPOWER on IntegriCloud