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

Showing the changes to libavfilter (7 of 7 files). Show all

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
359359 opencl/convolution.o
360360 OBJS-$(CONFIG_ROTATE_FILTER) += vf_rotate.o
361361 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
365365 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
368368 OBJS-$(CONFIG_SCROLL_FILTER) += vf_scroll.o
369369 OBJS-$(CONFIG_SELECT_FILTER) += f_select.o
370370 OBJS-$(CONFIG_SELECTIVECOLOR_FILTER) += vf_selectivecolor.o
libavfilter/scale_eval.crenamed from libavfilter/scale.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 */
2020
2121 #include <stdint.h>
22−#include "scale.h"
22+#include "scale_eval.h"
2323 #include "libavutil/eval.h"
2424 #include "libavutil/mathematics.h"
2525 #include "libavutil/pixdesc.h"
libavfilter/scale_eval.hrenamed from libavfilter/scale.h+2−2
@@ -16,8 +16,8 @@ · 15 unmodified lines
1616 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1717 */
1818
19−#ifndef AVFILTER_SCALE_H
20−#define AVFILTER_SCALE_H
19+#ifndef AVFILTER_SCALE_EVAL_H
20+#define AVFILTER_SCALE_EVAL_H
2121
2222 #include "avfilter.h"
2323
libavfilter/vf_scale.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
2929 #include "avfilter.h"
3030 #include "formats.h"
3131 #include "internal.h"
32−#include "scale.h"
32+#include "scale_eval.h"
3333 #include "video.h"
3434 #include "libavutil/avstring.h"
3535 #include "libavutil/internal.h"
libavfilter/vf_scale_cuda.c+1−1
@@ -35,7 +35,7 @@ · 34 unmodified lines
3535 #include "avfilter.h"
3636 #include "formats.h"
3737 #include "internal.h"
38−#include "scale.h"
38+#include "scale_eval.h"
3939 #include "video.h"
4040
4141 static const enum AVPixelFormat supported_formats[] = {
libavfilter/vf_scale_npp.c+1−1
@@ -37,7 +37,7 @@ · 36 unmodified lines
3737 #include "avfilter.h"
3838 #include "formats.h"
3939 #include "internal.h"
40−#include "scale.h"
40+#include "scale_eval.h"
4141 #include "video.h"
4242
4343 #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
2626 #include "avfilter.h"
2727 #include "formats.h"
2828 #include "internal.h"
29−#include "scale.h"
29+#include "scale_eval.h"
3030 #include "video.h"
3131 #include "vaapi_vpp.h"
3232

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