[vlc-devel] [PATCH] opengl: don't expose gl_subpicture_chromas in header file

[Zhao Zhili]

On 2018年05月03日 16:05, Zhao Zhili wrote:
> ---
>   modules/video_output/opengl/vout_helper.c | 5 +++++
>   modules/video_output/opengl/vout_helper.h | 5 -----
>   2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
> index f4a8e4f..bbd156b 100644
> --- a/modules/video_output/opengl/vout_helper.c
> +++ b/modules/video_output/opengl/vout_helper.c
> @@ -171,6 +171,11 @@ struct vout_display_opengl_t {
>       float f_sar;
>   };
>   
> +static const vlc_fourcc_t gl_subpicture_chromas[] = {
> +    VLC_CODEC_RGBA,
> +    0
> +};
> +
>   static const GLfloat identity[] = {
>       1.0f, 0.0f, 0.0f, 0.0f,
>       0.0f, 1.0f, 0.0f, 0.0f,
> diff --git a/modules/video_output/opengl/vout_helper.h b/modules/video_output/opengl/vout_helper.h
> index bc76ad9..01c7976 100644
> --- a/modules/video_output/opengl/vout_helper.h
> +++ b/modules/video_output/opengl/vout_helper.h
> @@ -205,11 +205,6 @@ static const char * const dither_text[] = {
>       add_module("glconv", "glconv", NULL, GLCONV_TEXT, GLCONV_LONGTEXT) \
>       add_glopts_placebo ()
>   
> -static const vlc_fourcc_t gl_subpicture_chromas[] = {
> -    VLC_CODEC_RGBA,
> -    0
> -};
> -
>   typedef struct vout_display_opengl_t vout_display_opengl_t;
>   
>   vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,

I think other static variables should be moved to .c too, so they don't 
show up in three compilation units. Look forward to more opinions.