scale.c is too generic; scale_eval is more representative
Unified · Split
| @@ -359,12 +359,12 @@ OBJS-$(CONFIG_ROBERTS_OPENCL_FILTER) += vf_convolution_opencl.o opencl.o · 358 unmodified lines | ||
| 359 | 359 | opencl/convolution.o |
| 360 | 360 | OBJS-$(CONFIG_ROTATE_FILTER) += vf_rotate.o |
| 361 | 361 | OBJS-$(CONFIG_SAB_FILTER) += vf_sab.o |
| 362 | −OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o scale.o | |
| 363 | −OBJS-$(CONFIG_SCALE_CUDA_FILTER) += vf_scale_cuda.o vf_scale_cuda.ptx.o scale.o | |
| 364 | −OBJS-$(CONFIG_SCALE_NPP_FILTER) += vf_scale_npp.o scale.o | |
| 362 | +OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o scale_eval.o | |
| 363 | +OBJS-$(CONFIG_SCALE_CUDA_FILTER) += vf_scale_cuda.o vf_scale_cuda.ptx.o scale_eval.o | |
| 364 | +OBJS-$(CONFIG_SCALE_NPP_FILTER) += vf_scale_npp.o scale_eval.o | |
| 365 | 365 | OBJS-$(CONFIG_SCALE_QSV_FILTER) += vf_scale_qsv.o |
| 366 | −OBJS-$(CONFIG_SCALE_VAAPI_FILTER) += vf_scale_vaapi.o scale.o vaapi_vpp.o | |
| 367 | −OBJS-$(CONFIG_SCALE2REF_FILTER) += vf_scale.o scale.o | |
| 366 | +OBJS-$(CONFIG_SCALE_VAAPI_FILTER) += vf_scale_vaapi.o scale_eval.o vaapi_vpp.o | |
| 367 | +OBJS-$(CONFIG_SCALE2REF_FILTER) += vf_scale.o scale_eval.o | |
| 368 | 368 | OBJS-$(CONFIG_SCROLL_FILTER) += vf_scroll.o |
| 369 | 369 | OBJS-$(CONFIG_SELECT_FILTER) += f_select.o |
| 370 | 370 | OBJS-$(CONFIG_SELECTIVECOLOR_FILTER) += vf_selectivecolor.o |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | 21 | #include <stdint.h> |
| 22 | −#include "scale.h" | |
| 22 | +#include "scale_eval.h" | |
| 23 | 23 | #include "libavutil/eval.h" |
| 24 | 24 | #include "libavutil/mathematics.h" |
| 25 | 25 | #include "libavutil/pixdesc.h" |
| @@ -16,8 +16,8 @@ · 15 unmodified lines | ||
| 16 | 16 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 17 | 17 | */ |
| 18 | 18 | |
| 19 | −#ifndef AVFILTER_SCALE_H | |
| 20 | −#define AVFILTER_SCALE_H | |
| 19 | +#ifndef AVFILTER_SCALE_EVAL_H | |
| 20 | +#define AVFILTER_SCALE_EVAL_H | |
| 21 | 21 | |
| 22 | 22 | #include "avfilter.h" |
| 23 | 23 | |
| @@ -29,7 +29,7 @@ · 28 unmodified lines | ||
| 29 | 29 | #include "avfilter.h" |
| 30 | 30 | #include "formats.h" |
| 31 | 31 | #include "internal.h" |
| 32 | −#include "scale.h" | |
| 32 | +#include "scale_eval.h" | |
| 33 | 33 | #include "video.h" |
| 34 | 34 | #include "libavutil/avstring.h" |
| 35 | 35 | #include "libavutil/internal.h" |
| @@ -35,7 +35,7 @@ · 34 unmodified lines | ||
| 35 | 35 | #include "avfilter.h" |
| 36 | 36 | #include "formats.h" |
| 37 | 37 | #include "internal.h" |
| 38 | −#include "scale.h" | |
| 38 | +#include "scale_eval.h" | |
| 39 | 39 | #include "video.h" |
| 40 | 40 | |
| 41 | 41 | static const enum AVPixelFormat supported_formats[] = { |
| @@ -37,7 +37,7 @@ · 36 unmodified lines | ||
| 37 | 37 | #include "avfilter.h" |
| 38 | 38 | #include "formats.h" |
| 39 | 39 | #include "internal.h" |
| 40 | −#include "scale.h" | |
| 40 | +#include "scale_eval.h" | |
| 41 | 41 | #include "video.h" |
| 42 | 42 | |
| 43 | 43 | #define CHECK_CU(x) FF_CUDA_CHECK_DL(ctx, device_hwctx->internal->cuda_dl, x) |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include "avfilter.h" |
| 27 | 27 | #include "formats.h" |
| 28 | 28 | #include "internal.h" |
| 29 | −#include "scale.h" | |
| 29 | +#include "scale_eval.h" | |
| 30 | 30 | #include "video.h" |
| 31 | 31 | #include "vaapi_vpp.h" |
| 32 | 32 | |