Commit 1bfd1b2b authored by Haihao Xiang's avatar Haihao Xiang Committed by Víctor Manuel Jáquez Leal
Browse files

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

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.
parent 38cf42f9
...@@ -893,16 +893,17 @@ gst_msdkdec_handle_frame (GstVideoDecoder * decoder, GstVideoCodecFrame * frame) ...@@ -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 > || thiz->param.mfx.FrameInfo.Height >
GST_VIDEO_INFO_WIDTH (&alloc_info) GST_VIDEO_INFO_HEIGHT (&alloc_info))
|| thiz->param.mfx.FrameInfo.Height > hard_reset = TRUE;
GST_VIDEO_INFO_HEIGHT (&alloc_info)))) }
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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment