virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Silence "string-plus-int" warning shown by clang.

Browse Source 
libswscale/utils.c:89:42: warning: adding 'unsigned long' to a string does not append to the string [-Wstring-plus-int]
This commit is contained in:
Carl Eugen Hoyos 2020-01-06 16:16:18 +01:00
parent e21ba176c9
commit 96fab29e96
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/utils.c
View File

@ -1444,7 +1444,7 @@ const char *avcodec_configuration(void)
const char *avcodec_license(void) const char *avcodec_license(void)
{ {
#define LICENSE_PREFIX "libavcodec license: " #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) int av_get_exact_bits_per_sample(enum AVCodecID codec_id)

2
libavdevice/avdevice.c
View File

@ -75,7 +75,7 @@ const char * avdevice_configuration(void)
const char * avdevice_license(void) const char * avdevice_license(void)
{ {
#define LICENSE_PREFIX "libavdevice license: " #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, static void *device_next(void *prev, int output,

2
libavfilter/avfilter.c
View File

@ -88,7 +88,7 @@ const char *avfilter_configuration(void)
const char *avfilter_license(void) const char *avfilter_license(void)
{ {
#define LICENSE_PREFIX "libavfilter license: " #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) void ff_command_queue_pop(AVFilterContext *filter)

2
libavformat/utils.c
View File

@ -77,7 +77,7 @@ const char *avformat_configuration(void)
const char *avformat_license(void) const char *avformat_license(void)
{ {
#define LICENSE_PREFIX "libavformat license: " #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) int ff_lock_avformat(void)

2
libavutil/utils.c
View File

@ -70,7 +70,7 @@ const char *avutil_configuration(void)
const char *avutil_license(void) const char *avutil_license(void)
{ {
#define LICENSE_PREFIX "libavutil license: " #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) const char *av_get_media_type_string(enum AVMediaType media_type)

2
libpostproc/postprocess.c
View File

@ -108,7 +108,7 @@ const char *postproc_configuration(void)
const char *postproc_license(void) const char *postproc_license(void)
{ {
#define LICENSE_PREFIX "libpostproc license: " #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 #define GET_MODE_BUFFER_SIZE 500

2
libswresample/swresample.c
View File

@ -46,7 +46,7 @@ const char *swresample_configuration(void)
const char *swresample_license(void) const char *swresample_license(void)
{ {
#define LICENSE_PREFIX "libswresample license: " #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){ int swr_set_channel_mapping(struct SwrContext *s, const int *channel_map){

2
libswscale/utils.c
View File

@ -86,7 +86,7 @@ const char *swscale_configuration(void)
const char *swscale_license(void) const char *swscale_license(void)
{ {
#define LICENSE_PREFIX "libswscale license: " #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 { typedef struct FormatEntry {