diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-03-13 07:55:53 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-27 21:56:36 +0100 |
| commit | b04d009b0e1a34b717f3d3bbf407aef0c742aff1 (patch) | |
| tree | 9a928a89edc2ade51ae1946ec3ebe9f726e69b74 /libavcodec | |
| parent | 1188119624e42c1b2ce5be6137d2e6c6f4f03328 (diff) | |
| download | ffmpeg-b04d009b0e1a34b717f3d3bbf407aef0c742aff1.tar.gz | |
qsv: rename to qsvdec
This is to avoid conflicts with the upcoming QSV encoding support.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 6 | ||||
| -rw-r--r-- | libavcodec/qsvdec.c (renamed from libavcodec/qsv.c) | 2 | ||||
| -rw-r--r-- | libavcodec/qsvdec.h (renamed from libavcodec/qsv_internal.h) | 6 | ||||
| -rw-r--r-- | libavcodec/qsvdec_h264.c (renamed from libavcodec/qsv_h264.c) | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 71ebdb841f..eafc86a868 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -80,7 +80,7 @@ OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ mpegvideoencdsp.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 OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes) @@ -222,7 +222,7 @@ OBJS-$(CONFIG_H264_DECODER) += h264.o h264_cabac.o h264_cavlc.o \ h264_direct.o h264_loopfilter.o \ h264_mb.o h264_picture.o h264_ps.o \ h264_refs.o h264_sei.o h264_slice.o -OBJS-$(CONFIG_H264_QSV_DECODER) += qsv_h264.o +OBJS-$(CONFIG_H264_QSV_DECODER) += qsvdec_h264.o OBJS-$(CONFIG_HEVC_DECODER) += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \ hevc_cabac.o hevc_refs.o hevcpred.o \ hevcdsp.o hevc_filter.o @@ -719,7 +719,7 @@ SKIPHEADERS += %_tablegen.h \ SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h -SKIPHEADERS-$(CONFIG_QSV) += qsv.h qsv_internal.h +SKIPHEADERS-$(CONFIG_QSVDEC) += qsv.h qsvdec.h SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h SKIPHEADERS-$(CONFIG_VDA) += vda.h vda_internal.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h diff --git a/libavcodec/qsv.c b/libavcodec/qsvdec.c index eef0604647..03e31c5bc1 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsvdec.c @@ -34,7 +34,7 @@ #include "avcodec.h" #include "internal.h" -#include "qsv_internal.h" +#include "qsvdec.h" int ff_qsv_error(int mfx_err) { diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsvdec.h index 8ab149a797..d12fde2856 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsvdec.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_QSV_INTERNAL_H -#define AVCODEC_QSV_INTERNAL_H +#ifndef AVCODEC_QSVDEC_H +#define AVCODEC_QSVDEC_H #include <stdint.h> #include <sys/types.h> @@ -83,4 +83,4 @@ int ff_qsv_decode(AVCodecContext *s, QSVContext *q, int ff_qsv_close(QSVContext *q); -#endif /* AVCODEC_QSV_INTERNAL_H */ +#endif /* AVCODEC_QSVDEC_H */ diff --git a/libavcodec/qsv_h264.c b/libavcodec/qsvdec_h264.c index a482e9c326..958ce70f9d 100644 --- a/libavcodec/qsv_h264.c +++ b/libavcodec/qsvdec_h264.c @@ -33,7 +33,7 @@ #include "avcodec.h" #include "internal.h" -#include "qsv_internal.h" +#include "qsvdec.h" #include "qsv.h" typedef struct QSVH264Context { |