Re: [FFmpeg-devel] [PATCH 1/3] lavc/qsvenc: fix check to avoid segfault

[Xiang, Haihao]

On Tue, 2022-10-18 at 12:59 +0800, haihao.xi...@intel.com wrote:
> From: Haihao Xiang 
> 
> Signed-off-by: Haihao Xiang 
> ---
>  libavcodec/qsvenc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
> index 15e6936a65..19fe6e59a2 100644
> --- a/libavcodec/qsvenc.c
> +++ b/libavcodec/qsvenc.c
> @@ -2093,8 +2093,8 @@ static int encode_frame(AVCodecContext *avctx,
> QSVEncContext *q,
>  pkt.bs->ExtParam = enc_buf;
>  }
>  
> -if (q->set_encode_ctrl_cb) {
> -q->set_encode_ctrl_cb(avctx, frame, _frame->enc_ctrl);
> +if (q->set_encode_ctrl_cb && enc_ctrl) {
> +q->set_encode_ctrl_cb(avctx, frame, enc_ctrl);
>  }
>  
>  if ((avctx->codec_id == AV_CODEC_ID_H264 ||

Will apply this patchset. 

-Haihao

___
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/3] lavc/qsvenc: fix check to avoid segfault

[haihao . xiang-at-intel . com]

From: Haihao Xiang 

Signed-off-by: Haihao Xiang 
---
 libavcodec/qsvenc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 15e6936a65..19fe6e59a2 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -2093,8 +2093,8 @@ static int encode_frame(AVCodecContext *avctx, 
QSVEncContext *q,
 pkt.bs->ExtParam = enc_buf;
 }
 
-if (q->set_encode_ctrl_cb) {
-q->set_encode_ctrl_cb(avctx, frame, _frame->enc_ctrl);
+if (q->set_encode_ctrl_cb && enc_ctrl) {
+q->set_encode_ctrl_cb(avctx, frame, enc_ctrl);
 }
 
 if ((avctx->codec_id == AV_CODEC_ID_H264 ||
-- 
2.25.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".