Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
9e1e5213
Commit
9e1e5213
authored
Feb 14, 2019
by
Timo Rothenpieler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avutil/cuda_check: fix usage of removed .c file
Why did this not break compilation?
parent
b0d8b7cb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
8 deletions
+5
-8
Makefile
libavfilter/Makefile
+5
-7
cuda_check.c
libavfilter/cuda_check.c
+0
-1
No files found.
libavfilter/Makefile
View file @
9e1e5213
...
...
@@ -340,9 +340,8 @@ OBJS-$(CONFIG_ROBERTS_OPENCL_FILTER) += vf_convolution_opencl.o opencl.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
\
cuda_check.o
OBJS-$(CONFIG_SCALE_NPP_FILTER)
+=
vf_scale_npp.o
scale.o
cuda_check.o
OBJS-$(CONFIG_SCALE_CUDA_FILTER)
+=
vf_scale_cuda.o
vf_scale_cuda.ptx.o
OBJS-$(CONFIG_SCALE_NPP_FILTER)
+=
vf_scale_npp.o
scale.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
...
...
@@ -383,8 +382,7 @@ OBJS-$(CONFIG_TBLEND_FILTER) += vf_blend.o framesync.o
OBJS-$(CONFIG_TELECINE_FILTER)
+=
vf_telecine.o
OBJS-$(CONFIG_THRESHOLD_FILTER)
+=
vf_threshold.o
framesync.o
OBJS-$(CONFIG_THUMBNAIL_FILTER)
+=
vf_thumbnail.o
OBJS-$(CONFIG_THUMBNAIL_CUDA_FILTER)
+=
vf_thumbnail_cuda.o
vf_thumbnail_cuda.ptx.o
\
cuda_check.o
OBJS-$(CONFIG_THUMBNAIL_CUDA_FILTER)
+=
vf_thumbnail_cuda.o
vf_thumbnail_cuda.ptx.o
OBJS-$(CONFIG_TILE_FILTER)
+=
vf_tile.o
OBJS-$(CONFIG_TINTERLACE_FILTER)
+=
vf_tinterlace.o
OBJS-$(CONFIG_TLUT2_FILTER)
+=
vf_lut2.o
framesync.o
...
...
@@ -394,7 +392,7 @@ OBJS-$(CONFIG_TONEMAP_OPENCL_FILTER) += vf_tonemap_opencl.o colorspace.o
opencl/tonemap.o
opencl/colorspace_common.o
OBJS-$(CONFIG_TPAD_FILTER)
+=
vf_tpad.o
OBJS-$(CONFIG_TRANSPOSE_FILTER)
+=
vf_transpose.o
OBJS-$(CONFIG_TRANSPOSE_NPP_FILTER)
+=
vf_transpose_npp.o
cuda_check.o
OBJS-$(CONFIG_TRANSPOSE_NPP_FILTER)
+=
vf_transpose_npp.o
OBJS-$(CONFIG_TRANSPOSE_OPENCL_FILTER)
+=
vf_transpose_opencl.o
opencl.o
opencl/transpose.o
OBJS-$(CONFIG_TRANSPOSE_VAAPI_FILTER)
+=
vf_transpose_vaapi.o
vaapi_vpp.o
OBJS-$(CONFIG_TRIM_FILTER)
+=
trim.o
...
...
@@ -421,7 +419,7 @@ OBJS-$(CONFIG_XBR_FILTER) += vf_xbr.o
OBJS-$(CONFIG_XSTACK_FILTER)
+=
vf_stack.o
framesync.o
OBJS-$(CONFIG_YADIF_FILTER)
+=
vf_yadif.o
yadif_common.o
OBJS-$(CONFIG_YADIF_CUDA_FILTER)
+=
vf_yadif_cuda.o
vf_yadif_cuda.ptx.o
\
yadif_common.o
cuda_check.o
yadif_common.o
OBJS-$(CONFIG_ZMQ_FILTER)
+=
f_zmq.o
OBJS-$(CONFIG_ZOOMPAN_FILTER)
+=
vf_zoompan.o
OBJS-$(CONFIG_ZSCALE_FILTER)
+=
vf_zscale.o
...
...
libavfilter/cuda_check.c
deleted
100644 → 0
View file @
b0d8b7cb
#include "libavutil/cuda_check.c"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment