mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

msdk: Make sure a variable is initialized when it is used

Browse source 
Previously alloc_info is initialized when both thiz->initialized
and thiz->allocation_caps are true, but only thiz->initialized is
checked when alloc_info is used.
This commit is contained in:
Xiang, Haihao 2018-11-20 15:17:44 +08:00 committed by Víctor Manuel Jáquez Leal
parent 38cf42f90f
commit 1bfd1b2bf9
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sys/msdk/gstmsdkdec.c
View file

@ -893,16 +893,17 @@ gst_msdkdec_handle_frame (GstVideoDecoder * decoder, GstVideoCodecFrame * frame)
goto done; goto done;
} }
if (thiz->initialized && thiz->allocation_caps) if (!thiz->initialized)
hard_reset = TRUE;
else if (thiz->allocation_caps) {
gst_video_info_from_caps (&alloc_info, thiz->allocation_caps); gst_video_info_from_caps (&alloc_info, thiz->allocation_caps);
/* Check whether we need complete reset for dynamic resolution change */ /* Check whether we need complete reset for dynamic resolution change */
if (!thiz->initialized || (thiz->initialized && if (thiz->param.mfx.FrameInfo.Width > GST_VIDEO_INFO_WIDTH (&alloc_info)
(thiz->param.mfx.FrameInfo.Width >
GST_VIDEO_INFO_WIDTH (&alloc_info)
|| thiz->param.mfx.FrameInfo.Height > || thiz->param.mfx.FrameInfo.Height >
GST_VIDEO_INFO_HEIGHT (&alloc_info)))) GST_VIDEO_INFO_HEIGHT (&alloc_info))
hard_reset = TRUE; hard_reset = TRUE;
}
/* if subclass requested for the force reset */ /* if subclass requested for the force reset */
if (thiz->force_reset_on_res_change) if (thiz->force_reset_on_res_change)