diff options
| author | Timo Rothenpieler <timo@rothenpieler.org> | 2019-02-08 22:47:01 +0100 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2019-02-14 13:21:07 +0100 |
| commit | 15c6390139096b7e7634bf0f6aaab1cd8b3aa509 (patch) | |
| tree | eec1fdcb718d28e0a526aab37b27bdf3aac293f7 /libavcodec | |
| parent | dbfd042983eed8586d4048795c00af820f5b6b1f (diff) | |
| download | ffmpeg-15c6390139096b7e7634bf0f6aaab1cd8b3aa509.tar.gz | |
avutil/cuda_check: avoid pointlessly exporting same symbol from two libraries
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 6 | ||||
| -rw-r--r-- | libavcodec/cuda_check.c | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 21c39281e4..15c43a8a6a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -124,7 +124,7 @@ OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ motion_est.o ratecontrol.o \ mpegvideoencdsp.o OBJS-$(CONFIG_MSS34DSP) += mss34dsp.o -OBJS-$(CONFIG_NVENC) += nvenc.o cuda_check.o +OBJS-$(CONFIG_NVENC) += nvenc.o OBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o OBJS-$(CONFIG_QPELDSP) += qpeldsp.o OBJS-$(CONFIG_QSV) += qsv.o @@ -347,7 +347,7 @@ OBJS-$(CONFIG_H264_DECODER) += h264dec.o h264_cabac.o h264_cavlc.o \ h264_refs.o h264_sei.o \ h264_slice.o h264data.o OBJS-$(CONFIG_H264_AMF_ENCODER) += amfenc_h264.o -OBJS-$(CONFIG_H264_CUVID_DECODER) += cuviddec.o cuda_check.o +OBJS-$(CONFIG_H264_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_H264_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_H264_MMAL_DECODER) += mmaldec.o OBJS-$(CONFIG_H264_NVENC_ENCODER) += nvenc_h264.o @@ -856,7 +856,7 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcmenc.o adpcm_data.o # hardware accelerators OBJS-$(CONFIG_D3D11VA) += dxva2.o OBJS-$(CONFIG_DXVA2) += dxva2.o -OBJS-$(CONFIG_NVDEC) += nvdec.o cuda_check.o +OBJS-$(CONFIG_NVDEC) += nvdec.o OBJS-$(CONFIG_VAAPI) += vaapi_decode.o OBJS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.o OBJS-$(CONFIG_VDPAU) += vdpau.o diff --git a/libavcodec/cuda_check.c b/libavcodec/cuda_check.c deleted file mode 100644 index a1ebb88882..0000000000 --- a/libavcodec/cuda_check.c +++ /dev/null @@ -1 +0,0 @@ -#include "libavutil/cuda_check.c" |