RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vaapi_encode_mjpeg: fix bad component id bug 

The compound literals assigned to "components"
only exist within the scope of the if/else
block (thanks Mark Thompson for the better
explanation).

Thus, after this if/else block, "components"
ends up pointing to an arbitrary/undefined
array.  With some compilers and depending on
optimization settings, these arbitrary values
may end up being the same value (i.e. 0 with
GNU GCC 9.x).  Unfortunately, the GNU GCC
compiler, at least, never prints any warnings
about this.

This patch fixes this issue by assigning the
constant arrays to local variables at function
scope and then pointing "components" to those
as necessary.

Fixes #7915

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
This commit is contained in:
U. Artie Eoff 2019-06-07 14:45:33 -07:00 committed by Mark Thompson
parent b8f1542dcb
commit f70c397456
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/vaapi_encode_mjpeg.c
View File

@ -227,6 +227,8 @@ static int vaapi_encode_mjpeg_init_picture_params(AVCodecContext *avctx,
JPEGRawScanHeader *sh = &priv->scan.header; JPEGRawScanHeader *sh = &priv->scan.header;
VAEncPictureParameterBufferJPEG *vpic = pic->codec_picture_params; VAEncPictureParameterBufferJPEG *vpic = pic->codec_picture_params;
const AVPixFmtDescriptor *desc; const AVPixFmtDescriptor *desc;
const uint8_t components_rgb[3] = { 'R', 'G', 'B' };
const uint8_t components_yuv[3] = { 1, 2, 3 };
const uint8_t *components; const uint8_t *components;
int t, i, quant_scale, len; int t, i, quant_scale, len;
@ -235,9 +237,9 @@ static int vaapi_encode_mjpeg_init_picture_params(AVCodecContext *avctx,
desc = av_pix_fmt_desc_get(priv->common.input_frames->sw_format); desc = av_pix_fmt_desc_get(priv->common.input_frames->sw_format);
av_assert0(desc); av_assert0(desc);
if (desc->flags & AV_PIX_FMT_FLAG_RGB) if (desc->flags & AV_PIX_FMT_FLAG_RGB)
components = (uint8_t[3]) { 'R', 'G', 'B' }; components = components_rgb;
else else
components = (uint8_t[3]) { 1, 2, 3 }; components = components_yuv;
// Frame header. // Frame header.