[FFmpeg-cvslog] avutil/cuda_check: Make sure this passes make fate-source

Philip Langdale git at videolan.org
Sat Nov 17 18:19:13 EET 2018


ffmpeg | branch: master | Philip Langdale <philipl at overt.org> | Sat Nov 17 08:16:28 2018 -0800| [420ab946ace27e4b4bfb6c2be0a65a4ffd6e05a1] | committer: Philip Langdale

avutil/cuda_check: Make sure this passes make fate-source

The header guards were unnecessarily non-standard and the c file
inclusion trick means the files dont't have standard licence
headers.

Based on a patch by: Martin Vignali <martin.vignali at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=420ab946ace27e4b4bfb6c2be0a65a4ffd6e05a1
---

 libavutil/cuda_check.h | 6 +++---
 tests/ref/fate/source  | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libavutil/cuda_check.h b/libavutil/cuda_check.h
index 0d45538c2f..b8e5f65cbb 100644
--- a/libavutil/cuda_check.h
+++ b/libavutil/cuda_check.h
@@ -17,8 +17,8 @@
  */
 
 
-#ifndef FF_CUDA_CHECK_H
-#define FF_CUDA_CHECK_H
+#ifndef AVUTIL_CUDA_CHECK_H
+#define AVUTIL_CUDA_CHECK_H
 
 /**
  * Wrap a CUDA function call and print error information if it fails.
@@ -40,4 +40,4 @@ int ff_cuda_check(void *avctx,
 
 #define FF_CUDA_CHECK_DL(avclass, cudl, x) ff_cuda_check(avclass, cudl->cuGetErrorName, cudl->cuGetErrorString, (x), #x)
 
-#endif /* FF_CUDA_CHECK_H */
+#endif /* AVUTIL_CUDA_CHECK_H */
diff --git a/tests/ref/fate/source b/tests/ref/fate/source
index 4b9467aa77..b35f016127 100644
--- a/tests/ref/fate/source
+++ b/tests/ref/fate/source
@@ -1,6 +1,7 @@
 Files without standard license headers:
 compat/avisynth/windowsPorts/basicDataTypeConversions.h
 compat/avisynth/windowsPorts/windows2linux.h
+libavcodec/cuda_check.c
 libavcodec/file_open.c
 libavcodec/ilbcdata.h
 libavcodec/ilbcdec.c
@@ -9,6 +10,7 @@ libavcodec/log2_tab.c
 libavcodec/reverse.c
 libavdevice/file_open.c
 libavdevice/reverse.c
+libavfilter/cuda_check.c
 libavfilter/log2_tab.c
 libavformat/file_open.c
 libavformat/golomb_tab.c



More information about the ffmpeg-cvslog mailing list