[FFmpeg-cvslog] ffmpeg_filter: fix pointer to local outside scope

[Reimar Döffinger]

On 27.04.2014, at 05:45, git at videolan.org (Michael Niedermayer) wrote:

> ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 27 03:45:12 2014 +0200| [09b16619d33ddf93005060d0782f28a1c1cbb7f6] | committer: Michael Niedermayer
> 
> ffmpeg_filter: fix pointer to local outside scope
> 
> Fixes CID1206652
> Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> 
>> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09b16619d33ddf93005060d0782f28a1c1cbb7f6
> ---
> 
> ffmpeg_filter.c |    9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
> index 9d945fc..582c661 100644
> --- a/ffmpeg_filter.c
> +++ b/ffmpeg_filter.c
> @@ -44,12 +44,15 @@ enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodec *codec, enum AVPixelFo
>         const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(target);
>         int has_alpha = desc ? desc->nb_components % 2 == 0 : 0;
>         enum AVPixelFormat best= AV_PIX_FMT_NONE;
> +        const enum AVPixelFormat mjpeg_formats[] = { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_NONE };
> +        const enum AVPixelFormat ljpeg_formats[] = { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUV420P,
> +                                                     AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_BGRA, AV_PIX_FMT_NONE };

Wouldn't "static const" be possible and better (some stupid compilers make stack copies otherwise for example).