[FFmpeg-cvslog] Put a space between string literals and macros.

Chris Watkins git at videolan.org
Sat Jul 18 20:46:05 CEST 2015


ffmpeg | branch: release/2.7 | Chris Watkins <watk at chromium.org> | Tue Jul  7 10:40:27 2015 -0700| [151554e1eb86404fd973dbcf888c50d2d5a51ff5] | committer: Michael Niedermayer

Put a space between string literals and macros.

When compiling libavutil/internal.h as C++11, clang warns that a space
is required between a string literal and an identifier. Put spaces
in concatenations of string literals and EXTERN_PREFIX.

Signed-off-by: Chris Watkins <watk at chromium.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 55e29ceec84aa498122576c1ae8a0fa1fab0b41e)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavutil/internal.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/internal.h b/libavutil/internal.h
index 8817ec3..859b919 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -238,8 +238,8 @@ void avpriv_request_sample(void *avc,
 #if HAVE_LIBC_MSVCRT
 #include <crtversion.h>
 #if defined(_VC_CRT_MAJOR_VERSION) && _VC_CRT_MAJOR_VERSION < 14
-#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_strtod")
-#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_snprintf")
+#pragma comment(linker, "/include:" EXTERN_PREFIX "avpriv_strtod")
+#pragma comment(linker, "/include:" EXTERN_PREFIX "avpriv_snprintf")
 #endif
 
 #define avpriv_open ff_open



More information about the ffmpeg-cvslog mailing list