History

avfilter: rename scale.c,h to scale_eval

scale.c is too generic; scale_eval is more representative

Gyan Doshi committed 6 years ago

Commit e73688e1 parent 9f7b2b37 files · +12 −12Browse files

Unified · Split

7 files
  1. libavfilter/Makefile +5 −5
  2. libavfilter/scale_eval.c +1 −1
  3. libavfilter/scale_eval.h +2 −2
  4. libavfilter/vf_scale.c +1 −1
  5. libavfilter/vf_scale_cuda.c +1 −1
  6. libavfilter/vf_scale_npp.c +1 −1
  7. libavfilter/vf_scale_vaapi.c +1 −1
libavfilter/Makefile+5−5
@@ -359,12 +359,12 @@ OBJS-$(CONFIG_ROBERTS_OPENCL_FILTER) += vf_convolution_opencl.o opencl.o · 358 unmodified lines
359 opencl/convolution.o359 opencl/convolution.o
360OBJS-$(CONFIG_ROTATE_FILTER) += vf_rotate.o360OBJS-$(CONFIG_ROTATE_FILTER) += vf_rotate.o
361OBJS-$(CONFIG_SAB_FILTER) += vf_sab.o361OBJS-$(CONFIG_SAB_FILTER) += vf_sab.o
362OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o scale.o362OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o scale_eval.o
363OBJS-$(CONFIG_SCALE_CUDA_FILTER) += vf_scale_cuda.o vf_scale_cuda.ptx.o scale.o363OBJS-$(CONFIG_SCALE_CUDA_FILTER) += vf_scale_cuda.o vf_scale_cuda.ptx.o scale_eval.o
364OBJS-$(CONFIG_SCALE_NPP_FILTER) += vf_scale_npp.o scale.o364OBJS-$(CONFIG_SCALE_NPP_FILTER) += vf_scale_npp.o scale_eval.o
365OBJS-$(CONFIG_SCALE_QSV_FILTER) += vf_scale_qsv.o365OBJS-$(CONFIG_SCALE_QSV_FILTER) += vf_scale_qsv.o
366OBJS-$(CONFIG_SCALE_VAAPI_FILTER) += vf_scale_vaapi.o scale.o vaapi_vpp.o366OBJS-$(CONFIG_SCALE_VAAPI_FILTER) += vf_scale_vaapi.o scale_eval.o vaapi_vpp.o
367OBJS-$(CONFIG_SCALE2REF_FILTER) += vf_scale.o scale.o367OBJS-$(CONFIG_SCALE2REF_FILTER) += vf_scale.o scale_eval.o
368OBJS-$(CONFIG_SCROLL_FILTER) += vf_scroll.o368OBJS-$(CONFIG_SCROLL_FILTER) += vf_scroll.o
369OBJS-$(CONFIG_SELECT_FILTER) += f_select.o369OBJS-$(CONFIG_SELECT_FILTER) += f_select.o
370OBJS-$(CONFIG_SELECTIVECOLOR_FILTER) += vf_selectivecolor.o370OBJS-$(CONFIG_SELECTIVECOLOR_FILTER) += vf_selectivecolor.o
libavfilter/scale_eval.crenamed from libavfilter/scale.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
19 */19 */
20 20
21#include <stdint.h>21#include <stdint.h>
22#include "scale.h"22#include "scale_eval.h"
23#include "libavutil/eval.h"23#include "libavutil/eval.h"
24#include "libavutil/mathematics.h"24#include "libavutil/mathematics.h"
25#include "libavutil/pixdesc.h"25#include "libavutil/pixdesc.h"
libavfilter/scale_eval.hrenamed from libavfilter/scale.h+2−2
@@ -16,8 +16,8 @@ · 15 unmodified lines
16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17 */17 */
18 18
19#ifndef AVFILTER_SCALE_H19#ifndef AVFILTER_SCALE_EVAL_H
20#define AVFILTER_SCALE_H20#define AVFILTER_SCALE_EVAL_H
21 21
22#include "avfilter.h"22#include "avfilter.h"
23 23
libavfilter/vf_scale.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
29#include "avfilter.h"29#include "avfilter.h"
30#include "formats.h"30#include "formats.h"
31#include "internal.h"31#include "internal.h"
32#include "scale.h"32#include "scale_eval.h"
33#include "video.h"33#include "video.h"
34#include "libavutil/avstring.h"34#include "libavutil/avstring.h"
35#include "libavutil/internal.h"35#include "libavutil/internal.h"
libavfilter/vf_scale_cuda.c+1−1
@@ -35,7 +35,7 @@ · 34 unmodified lines
35#include "avfilter.h"35#include "avfilter.h"
36#include "formats.h"36#include "formats.h"
37#include "internal.h"37#include "internal.h"
38#include "scale.h"38#include "scale_eval.h"
39#include "video.h"39#include "video.h"
40 40
41static const enum AVPixelFormat supported_formats[] = {41static const enum AVPixelFormat supported_formats[] = {
libavfilter/vf_scale_npp.c+1−1
@@ -37,7 +37,7 @@ · 36 unmodified lines
37#include "avfilter.h"37#include "avfilter.h"
38#include "formats.h"38#include "formats.h"
39#include "internal.h"39#include "internal.h"
40#include "scale.h"40#include "scale_eval.h"
41#include "video.h"41#include "video.h"
42 42
43#define CHECK_CU(x) FF_CUDA_CHECK_DL(ctx, device_hwctx->internal->cuda_dl, x)43#define CHECK_CU(x) FF_CUDA_CHECK_DL(ctx, device_hwctx->internal->cuda_dl, x)
libavfilter/vf_scale_vaapi.c+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
26#include "avfilter.h"26#include "avfilter.h"
27#include "formats.h"27#include "formats.h"
28#include "internal.h"28#include "internal.h"
29#include "scale.h"29#include "scale_eval.h"
30#include "video.h"30#include "video.h"
31#include "vaapi_vpp.h"31#include "vaapi_vpp.h"
32 32

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t