Merge branch 'gop_fix_assert' into 'main'

vah26{4,5}enc: No need to assert i>=0 in frame_setup_from_gop()

See merge request gstreamer/gstreamer!6868
This commit is contained in:
He Junyan 2024-05-17 09:57:06 +00:00
commit 35eaafcc88
2 changed files with 2 additions and 2 deletions

View file

@ -1723,7 +1723,7 @@ gst_va_h264_enc_reconfig (GstVaBaseEnc * base)
static void
frame_setup_from_gop (GstVaH264Enc * self, GstVaH264EncFrame * frame, guint i)
{
g_assert (i >= 0 && i < 1024);
g_assert (i < 1024);
frame->type = self->gop.frame_types[i].slice_type;
frame->is_ref = self->gop.frame_types[i].is_ref;

View file

@ -2024,7 +2024,7 @@ _h265_encode_one_frame (GstVaH265Enc * self, GstVideoCodecFrame * gst_frame)
static void
frame_setup_from_gop (GstVaH265Enc * self, GstVaH265EncFrame * frame, guint i)
{
g_assert (i >= 0 && i < 1024);
g_assert (i < 1024);
frame->type = self->gop.frame_types[i].slice_type;
frame->is_ref = self->gop.frame_types[i].is_ref;