diff mbox series

[FFmpeg-devel] Silence an ugly clang warning

Message ID CAB0OVGoVefboVu2cXipPyHJLR_9r-Qp7U8wsgX2E_a4XwCX5LQ@mail.gmail.com
State Accepted
Headers show
Series [FFmpeg-devel] Silence an ugly clang warning | expand

Checks

Context Check Description
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Carl Eugen Hoyos Jan. 6, 2020, 3:21 p.m. UTC 
Hi!

Attached patch fixes several warnings when compiling with clang.

Please comment, Carl Eugen

Comments

Paul B Mahol Jan. 6, 2020, 6:42 p.m. UTC | #1 
LGTM

On 1/6/20, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
> Hi!
>
> Attached patch fixes several warnings when compiling with clang.
>
> Please comment, Carl Eugen
>
Paul B Mahol Jan. 6, 2020, 6:42 p.m. UTC | #2 
LGTM

On 1/6/20, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
> Hi!
>
> Attached patch fixes several warnings when compiling with clang.
>
> Please comment, Carl Eugen
>
Carl Eugen Hoyos Jan. 6, 2020, 9:59 p.m. UTC | #3 
Am Mo., 6. Jan. 2020 um 19:42 Uhr schrieb Paul B Mahol <onemda@gmail.com>:
>
> LGTM

Patch applied.

Thank you, Carl Eugen
diff mbox series

Patch

From fa987cd315d432146e48f7d07832ff153eacb4bd Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Date: Mon, 6 Jan 2020 16:16:18 +0100
Subject: [PATCH] Silence "string-plus-int" warning shown by clang.

libswscale/utils.c:89:42: warning: adding 'unsigned long' to a string does not append to the string [-Wstring-plus-int]
---
 libavcodec/utils.c         | 2 +-
 libavdevice/avdevice.c     | 2 +-
 libavfilter/avfilter.c     | 2 +-
 libavformat/utils.c        | 2 +-
 libavutil/utils.c          | 2 +-
 libpostproc/postprocess.c  | 2 +-
 libswresample/swresample.c | 2 +-
 libswscale/utils.c         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index c935e07538..fd5565a5e8 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1444,7 +1444,7 @@  const char *avcodec_configuration(void)
 const char *avcodec_license(void)
 {
 #define LICENSE_PREFIX "libavcodec license: "
-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+    return &LICENSE_PREFIX FFMPEG_LICENSE[sizeof(LICENSE_PREFIX) - 1];
 }
 
 int av_get_exact_bits_per_sample(enum AVCodecID codec_id)
diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c
index 72e1b67887..3d03d89f04 100644
--- a/libavdevice/avdevice.c
+++ b/libavdevice/avdevice.c
@@ -75,7 +75,7 @@  const char * avdevice_configuration(void)
 const char * avdevice_license(void)
 {
 #define LICENSE_PREFIX "libavdevice license: "
-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+    return &LICENSE_PREFIX FFMPEG_LICENSE[sizeof(LICENSE_PREFIX) - 1];
 }
 
 static void *device_next(void *prev, int output,
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index baafd029e9..394811916d 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -88,7 +88,7 @@  const char *avfilter_configuration(void)
 const char *avfilter_license(void)
 {
 #define LICENSE_PREFIX "libavfilter license: "
-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+    return &LICENSE_PREFIX FFMPEG_LICENSE[sizeof(LICENSE_PREFIX) - 1];
 }
 
 void ff_command_queue_pop(AVFilterContext *filter)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index b472762dd1..2470a6ac0e 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -77,7 +77,7 @@  const char *avformat_configuration(void)
 const char *avformat_license(void)
 {
 #define LICENSE_PREFIX "libavformat license: "
-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+    return &LICENSE_PREFIX FFMPEG_LICENSE[sizeof(LICENSE_PREFIX) - 1];
 }
 
 int ff_lock_avformat(void)
diff --git a/libavutil/utils.c b/libavutil/utils.c
index 230081ea47..c1cd452eee 100644
--- a/libavutil/utils.c
+++ b/libavutil/utils.c
@@ -70,7 +70,7 @@  const char *avutil_configuration(void)
 const char *avutil_license(void)
 {
 #define LICENSE_PREFIX "libavutil license: "
-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+    return &LICENSE_PREFIX FFMPEG_LICENSE[sizeof(LICENSE_PREFIX) - 1];
 }
 
 const char *av_get_media_type_string(enum AVMediaType media_type)
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index 1fef8747c0..e16ef259ce 100644
--- a/libpostproc/postprocess.c
+++ b/libpostproc/postprocess.c
@@ -108,7 +108,7 @@  const char *postproc_configuration(void)
 const char *postproc_license(void)
 {
 #define LICENSE_PREFIX "libpostproc license: "
-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+    return &LICENSE_PREFIX FFMPEG_LICENSE[sizeof(LICENSE_PREFIX) - 1];
 }
 
 #define GET_MODE_BUFFER_SIZE 500
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 1ac5ef9a30..a7bb69dd4f 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -46,7 +46,7 @@  const char *swresample_configuration(void)
 const char *swresample_license(void)
 {
 #define LICENSE_PREFIX "libswresample license: "
-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+    return &LICENSE_PREFIX FFMPEG_LICENSE[sizeof(LICENSE_PREFIX) - 1];
 }
 
 int swr_set_channel_mapping(struct SwrContext *s, const int *channel_map){
diff --git a/libswscale/utils.c b/libswscale/utils.c
index c915cf0fca..b2c08a5983 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -86,7 +86,7 @@  const char *swscale_configuration(void)
 const char *swscale_license(void)
 {
 #define LICENSE_PREFIX "libswscale license: "
-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+    return &LICENSE_PREFIX FFMPEG_LICENSE[sizeof(LICENSE_PREFIX) - 1];
 }
 
 typedef struct FormatEntry {
-- 
2.23.0