avfilter: rename scale.c,h to scale_eval

scale.c is too generic; scale_eval is more representative
pull/333/head
Gyan Doshi 5 years ago
parent 9f7b2b37e3
commit e73688eff4
  1. 10
      libavfilter/Makefile
  2. 2
      libavfilter/scale_eval.c
  3. 4
      libavfilter/scale_eval.h
  4. 2
      libavfilter/vf_scale.c
  5. 2
      libavfilter/vf_scale_cuda.c
  6. 2
      libavfilter/vf_scale_npp.c
  7. 2
      libavfilter/vf_scale_vaapi.c

@ -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

@ -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"

@ -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"

@ -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"

@ -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[] = {

@ -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)

@ -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"

Loading…
Cancel
Save