[FFmpeg-devel] [PATCH] avcodec/qsv_enc: do not reuse enc_ctrl from previous frames

[Xiang, Haihao]

On Wed, 2021-01-06 at 06:53 +0000, Xiang, Haihao wrote:
> On Wed, 2021-01-06 at 11:12 +0800, Xu Guangxin wrote:
> > fixes #8857
> > 
> > If we do not clear the enc_ctrl, we will reuse previous frames' data like
> > FrameType.
> > ---
> >  libavcodec/qsvenc.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
> > index 2bd2a56227..94473c4eab 100644
> > --- a/libavcodec/qsvenc.c
> > +++ b/libavcodec/qsvenc.c
> > @@ -1249,6 +1249,8 @@ static void clear_unused_frames(QSVEncContext *q)
> >      while (cur) {
> >          if (cur->used && !cur->surface.Data.Locked) {
> >              free_encoder_ctrl_payloads(&cur->enc_ctrl);
> > +            //do not reuse enc_ctrl from previous frame
> > +            memset(&cur->enc_ctrl, 0, sizeof(cur->enc_ctrl));
> >              if (cur->frame->format == AV_PIX_FMT_QSV) {
> >                  av_frame_unref(cur->frame);
> >              }
> 
> LGTM

Could someone help to merge this patch ? 
https://github.com/Intel-Media-SDK/MediaSDK/issues/2776 was fixed by this patchtoo. 

Thanks
Haihao