summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGyan Doshi <ffmpeg@gyani.pro>2019-12-08 16:42:36 +0530
committerGyan Doshi <ffmpeg@gyani.pro>2019-12-10 12:55:48 +0530
commite73688eff43727eb79eb344a4def49540d463902 (patch)
tree5348aedda4fdf885a08e60f1ff33b65b2316b6cc
parent9f7b2b37e3c6a1844cf1536bccf6123720fb30e6 (diff)
avfilter: rename scale.c,h to scale_eval
scale.c is too generic; scale_eval is more representative
-rw-r--r--libavfilter/Makefile10
-rw-r--r--libavfilter/scale_eval.c (renamed from libavfilter/scale.c)2
-rw-r--r--libavfilter/scale_eval.h (renamed from libavfilter/scale.h)4
-rw-r--r--libavfilter/vf_scale.c2
-rw-r--r--libavfilter/vf_scale_cuda.c2
-rw-r--r--libavfilter/vf_scale_npp.c2
-rw-r--r--libavfilter/vf_scale_vaapi.c2
7 files changed, 12 insertions, 12 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 52f3616b2f..446c802b98 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -359,12 +359,12 @@ OBJS-$(CONFIG_ROBERTS_OPENCL_FILTER) += vf_convolution_opencl.o opencl.o
opencl/convolution.o
OBJS-$(CONFIG_ROTATE_FILTER) += vf_rotate.o
OBJS-$(CONFIG_SAB_FILTER) += vf_sab.o
-OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o scale.o
-OBJS-$(CONFIG_SCALE_CUDA_FILTER) += vf_scale_cuda.o vf_scale_cuda.ptx.o scale.o
-OBJS-$(CONFIG_SCALE_NPP_FILTER) += vf_scale_npp.o scale.o
+OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o scale_eval.o
+OBJS-$(CONFIG_SCALE_CUDA_FILTER) += vf_scale_cuda.o vf_scale_cuda.ptx.o scale_eval.o
+OBJS-$(CONFIG_SCALE_NPP_FILTER) += vf_scale_npp.o scale_eval.o
OBJS-$(CONFIG_SCALE_QSV_FILTER) += vf_scale_qsv.o
-OBJS-$(CONFIG_SCALE_VAAPI_FILTER) += vf_scale_vaapi.o scale.o vaapi_vpp.o
-OBJS-$(CONFIG_SCALE2REF_FILTER) += vf_scale.o scale.o
+OBJS-$(CONFIG_SCALE_VAAPI_FILTER) += vf_scale_vaapi.o scale_eval.o vaapi_vpp.o
+OBJS-$(CONFIG_SCALE2REF_FILTER) += vf_scale.o scale_eval.o
OBJS-$(CONFIG_SCROLL_FILTER) += vf_scroll.o
OBJS-$(CONFIG_SELECT_FILTER) += f_select.o
OBJS-$(CONFIG_SELECTIVECOLOR_FILTER) += vf_selectivecolor.o
diff --git a/libavfilter/scale.c b/libavfilter/scale_eval.c
index 4f00c5c72e..a3439a95e0 100644
--- a/libavfilter/scale.c
+++ b/libavfilter/scale_eval.c
@@ -19,7 +19,7 @@
*/
#include <stdint.h>
-#include "scale.h"
+#include "scale_eval.h"
#include "libavutil/eval.h"
#include "libavutil/mathematics.h"
#include "libavutil/pixdesc.h"
diff --git a/libavfilter/scale.h b/libavfilter/scale_eval.h
index 6e1c8a1f4c..fceb023fec 100644
--- a/libavfilter/scale.h
+++ b/libavfilter/scale_eval.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVFILTER_SCALE_H
-#define AVFILTER_SCALE_H
+#ifndef AVFILTER_SCALE_EVAL_H
+#define AVFILTER_SCALE_EVAL_H
#include "avfilter.h"
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index b7f541be1f..8620d1c44e 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -29,7 +29,7 @@
#include "avfilter.h"
#include "formats.h"
#include "internal.h"
-#include "scale.h"
+#include "scale_eval.h"
#include "video.h"
#include "libavutil/avstring.h"
#include "libavutil/internal.h"
diff --git a/libavfilter/vf_scale_cuda.c b/libavfilter/vf_scale_cuda.c
index cca68dd835..1ffb73f831 100644
--- a/libavfilter/vf_scale_cuda.c
+++ b/libavfilter/vf_scale_cuda.c
@@ -35,7 +35,7 @@
#include "avfilter.h"
#include "formats.h"
#include "internal.h"
-#include "scale.h"
+#include "scale_eval.h"
#include "video.h"
static const enum AVPixelFormat supported_formats[] = {
diff --git a/libavfilter/vf_scale_npp.c b/libavfilter/vf_scale_npp.c
index 09c3d51727..502ecfda94 100644
--- a/libavfilter/vf_scale_npp.c
+++ b/libavfilter/vf_scale_npp.c
@@ -37,7 +37,7 @@
#include "avfilter.h"
#include "formats.h"
#include "internal.h"
-#include "scale.h"
+#include "scale_eval.h"
#include "video.h"
#define CHECK_CU(x) FF_CUDA_CHECK_DL(ctx, device_hwctx->internal->cuda_dl, x)
diff --git a/libavfilter/vf_scale_vaapi.c b/libavfilter/vf_scale_vaapi.c
index 88642cbe73..8298a013da 100644
--- a/libavfilter/vf_scale_vaapi.c
+++ b/libavfilter/vf_scale_vaapi.c
@@ -26,7 +26,7 @@
#include "avfilter.h"
#include "formats.h"
#include "internal.h"
-#include "scale.h"
+#include "scale_eval.h"
#include "video.h"
#include "vaapi_vpp.h"