mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-12 01:03:16 +00:00
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:
parent
b8f1542dcb
commit
f70c397456
1 changed files with 4 additions and 2 deletions
|
@ -227,6 +227,8 @@ static int vaapi_encode_mjpeg_init_picture_params(AVCodecContext *avctx,
|
|||
JPEGRawScanHeader *sh = &priv->scan.header;
|
||||
VAEncPictureParameterBufferJPEG *vpic = pic->codec_picture_params;
|
||||
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;
|
||||
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);
|
||||
av_assert0(desc);
|
||||
if (desc->flags & AV_PIX_FMT_FLAG_RGB)
|
||||
components = (uint8_t[3]) { 'R', 'G', 'B' };
|
||||
components = components_rgb;
|
||||
else
|
||||
components = (uint8_t[3]) { 1, 2, 3 };
|
||||
components = components_yuv;
|
||||
|
||||
// Frame header.
|
||||
|
||||
|
|
Loading…
Reference in a new issue