avfilter: rename scale.c,h to scale_eval

scale.c is too generic; scale_eval is more representative

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 52f3616b2fdb351262c695d22a7dc249109b1ccf..446c802b9889541c90aa1f9b940cf5026f345669 100644 (file)
--- 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
similarity index 99%
rename from libavfilter/scale.c
rename to libavfilter/scale_eval.c
index 4f00c5c72e0268309dc7fb21df6e44689623af1d..a3439a95e03afbc8d7f14c0376fc8bfe4a3b679e 100644 (file)
--- 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
similarity index 96%
rename from libavfilter/scale.h
rename to libavfilter/scale_eval.h
index 6e1c8a1f4ce9d090e4d97bc74cc3fd6c9903890c..fceb023fece31076e6feb36167bb17365c635941 100644 (file)
--- 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 b7f541be1f28e213a57b585ceae02076d668cc2d..8620d1c44ebbbeef4e69e9116c81cbd417952583 100644 (file)
--- 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 cca68dd835794f05a05d7426c500b02cdf912527..1ffb73f83182bf225b698feb37880a9557683ab9 100644 (file)
--- 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 09c3d51727ab6b7fd37dd88fb15af670439cd903..502ecfda94609b1352757b01e133ba916502c882 100644 (file)
--- 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 88642cbe738fa66c5c4889aee370ea1c54d148e5..8298a013da43a881a4473ac8e018ebe9d6a83e8a 100644 (file)
--- 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"