[FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: fix an array declaration

[FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: fix an array declaration

[Anton Khirnov]

map_func is supposed to be an array of const pointer to function
returning int, not an array of pointer to function returning const int.

Reported-By: Martin Storsjö
---
 fftools/ffmpeg_mux_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index 6458414b5f..c2630dd893 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -1648,7 +1648,7 @@ read_fail:
 
 static int create_streams(Muxer *mux, const OptionsContext *o)
 {
-    static const int (*map_func[])(Muxer *mux, const OptionsContext *o) = {
+    static int (* const map_func[])(Muxer *mux, const OptionsContext *o) = {
         [AVMEDIA_TYPE_VIDEO]    = map_auto_video,
         [AVMEDIA_TYPE_AUDIO]    = map_auto_audio,
         [AVMEDIA_TYPE_SUBTITLE] = map_auto_subtitle,
-- 
2.40.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: fix an array declaration

[Rémi Denis-Courmont]

Le sunnuntaina 16. heinäkuuta 2023, 11.29.34 EEST Anton Khirnov a écrit :
> map_func is supposed to be an array of const pointer to function
> returning int, not an array of pointer to function returning const int.
> 
> Reported-By: Martin Storsjö
> ---
>  fftools/ffmpeg_mux_init.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
> index 6458414b5f..c2630dd893 100644
> --- a/fftools/ffmpeg_mux_init.c
> +++ b/fftools/ffmpeg_mux_init.c
> @@ -1648,7 +1648,7 @@ read_fail:
> 
>  static int create_streams(Muxer *mux, const OptionsContext *o)
>  {
> -    static const int (*map_func[])(Muxer *mux, const OptionsContext *o) = {
> +    static int (* const map_func[])(Muxer *mux, const OptionsContext *o) =
> { [AVMEDIA_TYPE_VIDEO]    = map_auto_video,
>          [AVMEDIA_TYPE_AUDIO]    = map_auto_audio,
>          [AVMEDIA_TYPE_SUBTITLE] = map_auto_subtitle,

LGTM

-- 
Rémi Denis-Courmont
http://www.remlab.net/



_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".