[FFmpeg-devel] [PATCH] Add const to static arrays where it was forgotten.

Stefano Sabatini stefasab at gmail.com
Sat Nov 5 15:34:50 CET 2011


On date Saturday 2011-11-05 15:05:50 +0100, Reimar Döffinger encoded:
> Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
> ---
>  libavfilter/af_aconvert.c   |    2 +-
>  libavfilter/asrc_aevalsrc.c |    2 +-
>  libavfilter/vf_boxblur.c    |    2 +-
>  libavfilter/vf_crop.c       |    2 +-
>  libavfilter/vf_drawtext.c   |    2 +-
>  libavfilter/vf_lut.c        |    2 +-
>  libavfilter/vf_overlay.c    |    2 +-
>  libavfilter/vf_pad.c        |    2 +-
>  libavfilter/vf_scale.c      |    2 +-
>  libavfilter/vf_select.c     |    2 +-
>  libavfilter/vf_setpts.c     |    2 +-
>  libavfilter/vf_settb.c      |    2 +-
>  12 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/libavfilter/af_aconvert.c b/libavfilter/af_aconvert.c
> index fc3dc8d..116837d 100644
> --- a/libavfilter/af_aconvert.c
> +++ b/libavfilter/af_aconvert.c
> @@ -99,7 +99,7 @@ REMATRIX_FUNC_SIG(stereo_remix_planar)
>      REGISTER_FUNC_PACKING(INCHLAYOUT, OUTCHLAYOUT, FUNC##_packed, AVFILTER_PACKED)  \
>      REGISTER_FUNC_PACKING(INCHLAYOUT, OUTCHLAYOUT, FUNC##_planar, AVFILTER_PLANAR)
>  
> -static struct RematrixFunctionInfo {
> +static const struct RematrixFunctionInfo {
>      int64_t in_chlayout, out_chlayout;
>      int planar, sfmt;
>      void (*func)();
> diff --git a/libavfilter/asrc_aevalsrc.c b/libavfilter/asrc_aevalsrc.c
> index 366e87b..6e91dd1 100644
> --- a/libavfilter/asrc_aevalsrc.c
> +++ b/libavfilter/asrc_aevalsrc.c
> @@ -31,7 +31,7 @@
>  #include "avfilter.h"
>  #include "internal.h"
>  
> -static const char *var_names[] = {
> +static const char * const var_names[] = {
>      "n",            ///< number of frame
>      "t",            ///< timestamp expressed in seconds
>      "s",            ///< sample rate
> diff --git a/libavfilter/vf_boxblur.c b/libavfilter/vf_boxblur.c
> index 8aab725..f7e16e8 100644
> --- a/libavfilter/vf_boxblur.c
> +++ b/libavfilter/vf_boxblur.c
> @@ -30,7 +30,7 @@
>  #include "libavutil/pixdesc.h"
>  #include "avfilter.h"
>  
> -static const char *var_names[] = {
> +static const char * const var_names[] = {
>      "w",
>      "h",
>      "cw",
> diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c
> index d1989a1..91ebf3e 100644
> --- a/libavfilter/vf_crop.c
> +++ b/libavfilter/vf_crop.c
> @@ -32,7 +32,7 @@
>  #include "libavutil/imgutils.h"
>  #include "libavutil/mathematics.h"
>  
> -static const char *var_names[] = {
> +static const char * const var_names[] = {
>      "in_w", "iw",   ///< width  of the input video
>      "in_h", "ih",   ///< height of the input video
>      "out_w", "ow",  ///< width  of the cropped video
> diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
> index 3bbb18b..b69aff0 100644
> --- a/libavfilter/vf_drawtext.c
> +++ b/libavfilter/vf_drawtext.c
> @@ -46,7 +46,7 @@
>  #include FT_FREETYPE_H
>  #include FT_GLYPH_H
>  
> -static const char *var_names[] = {
> +static const char * const var_names[] = {
>      "w",                      ///< width  of the input video
>      "h",                      ///< height of the input video
>      "tw", "text_w",           ///< width  of the rendered text
> diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c
> index fcc49e0..7ce19dd 100644
> --- a/libavfilter/vf_lut.c
> +++ b/libavfilter/vf_lut.c
> @@ -30,7 +30,7 @@
>  #include "avfilter.h"
>  #include "internal.h"
>  
> -static const char *var_names[] = {
> +static const char * const var_names[] = {
>      "w",        ///< width of the input video
>      "h",        ///< height of the input video
>      "val",      ///< input value for the pixel
> diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
> index 64dc4a4..5b504cf 100644
> --- a/libavfilter/vf_overlay.c
> +++ b/libavfilter/vf_overlay.c
> @@ -35,7 +35,7 @@
>  #include "internal.h"
>  #include "drawutils.h"
>  
> -static const char *var_names[] = {
> +static const char * const var_names[] = {
>      "main_w",    "W", ///< width  of the main    video
>      "main_h",    "H", ///< height of the main    video
>      "overlay_w", "w", ///< width  of the overlay video
> diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c
> index 44d1fcf..9461b7a 100644
> --- a/libavfilter/vf_pad.c
> +++ b/libavfilter/vf_pad.c
> @@ -35,7 +35,7 @@
>  #include "libavutil/mathematics.h"
>  #include "drawutils.h"
>  
> -static const char *var_names[] = {
> +static const char * const var_names[] = {
>      "in_w",   "iw",
>      "in_h",   "ih",
>      "out_w",  "ow",
> diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
> index f2c5eea..c0474f4 100644
> --- a/libavfilter/vf_scale.c
> +++ b/libavfilter/vf_scale.c
> @@ -31,7 +31,7 @@
>  #include "libavutil/avassert.h"
>  #include "libswscale/swscale.h"
>  
> -static const char *var_names[] = {
> +static const char * const var_names[] = {
>      "in_w",   "iw",
>      "in_h",   "ih",
>      "out_w",  "ow",
> diff --git a/libavfilter/vf_select.c b/libavfilter/vf_select.c
> index 5688bb0..8088b50 100644
> --- a/libavfilter/vf_select.c
> +++ b/libavfilter/vf_select.c
> @@ -27,7 +27,7 @@
>  #include "libavutil/fifo.h"
>  #include "avfilter.h"
>  
> -static const char *var_names[] = {
> +static const char * const var_names[] = {
>      "TB",                ///< timebase
>  
>      "pts",               ///< original pts in the file of the frame
> diff --git a/libavfilter/vf_setpts.c b/libavfilter/vf_setpts.c
> index e8f6e8e..89f0c3d 100644
> --- a/libavfilter/vf_setpts.c
> +++ b/libavfilter/vf_setpts.c
> @@ -30,7 +30,7 @@
>  #include "libavutil/mathematics.h"
>  #include "avfilter.h"
>  
> -static const char *var_names[] = {
> +static const char * const var_names[] = {
>      "INTERLACED",  ///< tell if the current frame is interlaced
>      "N",           ///< frame number (starting at zero)
>      "POS",         ///< original position in the file of the frame
> diff --git a/libavfilter/vf_settb.c b/libavfilter/vf_settb.c
> index 95b114a..3ecd7ec 100644
> --- a/libavfilter/vf_settb.c
> +++ b/libavfilter/vf_settb.c
> @@ -30,7 +30,7 @@
>  #include "avfilter.h"
>  #include "internal.h"
>  
> -static const char *var_names[] = {
> +static const char * const var_names[] = {
>      "AVTB",   /* default timebase 1/AV_TIME_BASE */
>      "intb",   /* input timebase */
>      NULL

LGTM, thanks.
-- 
FFmpeg = Free Free MultiPurpose Enhanced Governor


More information about the ffmpeg-devel mailing list