diff options
| author | James Almer <jamrial@gmail.com> | 2016-09-28 15:12:29 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-09-28 15:13:10 -0300 |
| commit | 13dd5edb88c9ecfc1d01899f5b36453051e02d98 (patch) | |
| tree | e445ad1a6982fdd1c4b60c7b1e917eb21718299a /libavutil | |
| parent | d6573275a71554cef25a78e462e688f58d585423 (diff) | |
avutil/hwcontext: use CONFIG_QSV instead of CONFIG_LIBMFX for qsv
See "[FFmpeg-devel] [PATCH] hwcontext: add a QSV implementation"
Suggested-by: nablet developer <sdk@nablet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/Makefile | 4 | ||||
| -rw-r--r-- | libavutil/hwcontext.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index 7385ec260b..0fa90fea2c 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -155,7 +155,7 @@ OBJS-$(!HAVE_ATOMICS_NATIVE) += atomic.o \ OBJS-$(CONFIG_CUDA) += hwcontext_cuda.o OBJS-$(CONFIG_DXVA2) += hwcontext_dxva2.o -OBJS-$(CONFIG_LIBMFX) += hwcontext_qsv.o +OBJS-$(CONFIG_QSV) += hwcontext_qsv.o OBJS-$(CONFIG_LZO) += lzo.o OBJS-$(CONFIG_OPENCL) += opencl.o opencl_internal.o OBJS-$(CONFIG_VAAPI) += hwcontext_vaapi.o @@ -168,7 +168,7 @@ SLIBOBJS-$(HAVE_GNU_WINDRES) += avutilres.o SKIPHEADERS-$(CONFIG_CUDA) += hwcontext_cuda.h SKIPHEADERS-$(CONFIG_DXVA2) += hwcontext_dxva2.h -SKIPHEADERS-$(CONFIG_LIBMFX) += hwcontext_qsv.h +SKIPHEADERS-$(CONFIG_QSV) += hwcontext_qsv.h SKIPHEADERS-$(CONFIG_VAAPI) += hwcontext_vaapi.h SKIPHEADERS-$(CONFIG_VDPAU) += hwcontext_vdpau.h SKIPHEADERS-$(HAVE_ATOMICS_GCC) += atomic_gcc.h diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index 8af7afa5ce..be1d73e82f 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -35,7 +35,7 @@ static const HWContextType *hw_table[] = { #if CONFIG_DXVA2 &ff_hwcontext_type_dxva2, #endif -#if CONFIG_LIBMFX +#if CONFIG_QSV &ff_hwcontext_type_qsv, #endif #if CONFIG_VAAPI |