diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 03:16:21 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 03:16:21 +0300 |
commit | b12eacb3837cad2daaeda1f77ceb1045bca68789 (patch) | |
tree | 10428214a95fd2fce6c115ebf0dac9c709d35b4f /libavcodec/Makefile | |
parent | 151ae8ea5b54e12da6d53fa96d67026371e760ea (diff) | |
parent | d0a63d8b989647ffdb5f40da8e1feaffe1a8e791 (diff) |
Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'
* commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791':
qsvdec: split off some code that will be shared with the encoder
Conflicts:
libavcodec/Makefile
libavcodec/qsvdec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r-- | libavcodec/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index bc2324f780..cef5b1623d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -92,6 +92,7 @@ OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ OBJS-$(CONFIG_NVENC) += nvenc.o OBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o OBJS-$(CONFIG_QPELDSP) += qpeldsp.o +OBJS-$(CONFIG_QSV) += qsv.o OBJS-$(CONFIG_QSVDEC) += qsvdec.o OBJS-$(CONFIG_RANGECODER) += rangecoder.o RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o @@ -865,7 +866,7 @@ SKIPHEADERS += %_tablegen.h \ SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h SKIPHEADERS-$(CONFIG_LIBUTVIDEO) += libutvideo.h -SKIPHEADERS-$(CONFIG_QSVDEC) += qsv.h qsvdec.h +SKIPHEADERS-$(CONFIG_QSVDEC) += qsv.h qsvdec.h qsv_internal.h SKIPHEADERS-$(CONFIG_XVMC) += xvmc.h SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h SKIPHEADERS-$(CONFIG_VDA) += vda.h vda_internal.h |