Re: [FFmpeg-devel] [PATCH 1/2] lavfi/qsvpp: fix after 85c938fa28

2022-02-08 Thread Eoff, Ullysses A
> -Original Message-
> From: ffmpeg-devel  On Behalf Of Anton 
> Khirnov
> Sent: Tuesday, February 8, 2022 10:27 AM
> To: ffmpeg-devel@ffmpeg.org
> Subject: [FFmpeg-devel] [PATCH 1/2] lavfi/qsvpp: fix after 85c938fa28
> 
> ---
>  libavfilter/qsvvpp.c | 10 +-
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c
> index 35769dfd60..954f882637 100644
> --- a/libavfilter/qsvvpp.c
> +++ b/libavfilter/qsvvpp.c
> @@ -796,7 +796,7 @@ int ff_qsvvpp_filter_frame(QSVVPPContext *s, AVFilterLink 
> *inlink, AVFrame *picr
>  AVFilterLink *outlink = ctx->outputs[0];
>  QSVAsyncFrame aframe;
>  mfxSyncPoint  sync;
> -QSVFrame *in_frame, *out_frame, *tmp;
> +QSVFrame *in_frame, *out_frame;
>  int   ret, filter_ret;
> 
>  while (s->eof && av_fifo_read(s->async_fifo, , 1) >= 0) {
> @@ -857,15 +857,15 @@ int ff_qsvvpp_filter_frame(QSVVPPContext *s, 
> AVFilterLink *inlink, AVFrame *picr
>  ret = MFXVideoCORE_SyncOperation(s->session, aframe.sync, 
> 1000);
>  } while (ret == MFX_WRN_IN_EXECUTION);
> 
> -filter_ret = s->filter_frame(outlink, tmp->frame);
> +filter_ret = s->filter_frame(outlink, aframe.frame->frame);
>  if (filter_ret < 0) {
> -av_frame_free(>frame);
> +av_frame_free(>frame);
>  return filter_ret;
>  }
> 
> -tmp->queued--;
> +aframe.frame->queued--;
>  s->got_frame = 1;
> -tmp->frame = NULL;
> +aframe.frame->frame = NULL;
>  }
>  } while(ret == MFX_ERR_MORE_SURFACE);
> 
> --
> 2.34.1
> 

Fixes https://trac.ffmpeg.org/ticket/9629 for me.
LGTM

> ___
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".


[FFmpeg-devel] [PATCH 1/2] lavfi/qsvpp: fix after 85c938fa28

2022-02-08 Thread Anton Khirnov
---
 libavfilter/qsvvpp.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c
index 35769dfd60..954f882637 100644
--- a/libavfilter/qsvvpp.c
+++ b/libavfilter/qsvvpp.c
@@ -796,7 +796,7 @@ int ff_qsvvpp_filter_frame(QSVVPPContext *s, AVFilterLink 
*inlink, AVFrame *picr
 AVFilterLink *outlink = ctx->outputs[0];
 QSVAsyncFrame aframe;
 mfxSyncPoint  sync;
-QSVFrame *in_frame, *out_frame, *tmp;
+QSVFrame *in_frame, *out_frame;
 int   ret, filter_ret;
 
 while (s->eof && av_fifo_read(s->async_fifo, , 1) >= 0) {
@@ -857,15 +857,15 @@ int ff_qsvvpp_filter_frame(QSVVPPContext *s, AVFilterLink 
*inlink, AVFrame *picr
 ret = MFXVideoCORE_SyncOperation(s->session, aframe.sync, 
1000);
 } while (ret == MFX_WRN_IN_EXECUTION);
 
-filter_ret = s->filter_frame(outlink, tmp->frame);
+filter_ret = s->filter_frame(outlink, aframe.frame->frame);
 if (filter_ret < 0) {
-av_frame_free(>frame);
+av_frame_free(>frame);
 return filter_ret;
 }
 
-tmp->queued--;
+aframe.frame->queued--;
 s->got_frame = 1;
-tmp->frame = NULL;
+aframe.frame->frame = NULL;
 }
 } while(ret == MFX_ERR_MORE_SURFACE);
 
-- 
2.34.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".