From: "Xiang, Haihao" <haihao.xiang-at-intel.com@ffmpeg.org>
To: "ffmpeg-devel@ffmpeg.org" <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH 1/3] lavc/qsvenc: fix check to avoid segfault
Date: Mon, 24 Oct 2022 06:16:12 +0000
Message-ID: <c391468d494af22c967dc9cfefb0140a391c0d7c.camel@intel.com> (raw)
In-Reply-To: <20221018045925.258081-1-haihao.xiang@intel.com>
On Tue, 2022-10-18 at 12:59 +0800, haihao.xiang@intel.com wrote:
> From: Haihao Xiang <haihao.xiang@intel.com>
>
> Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
> ---
> 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, &qsv_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-request@ffmpeg.org with subject "unsubscribe".
prev parent reply other threads:[~2022-10-24 6:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-18 4:59 haihao.xiang-at-intel.com
2022-10-18 4:59 ` [FFmpeg-devel] [PATCH 2/3] lavc/qsvenc: enlarge the maximum number of ExtParam buffers on mfxEncodeCtrl haihao.xiang-at-intel.com
2022-10-18 4:59 ` [FFmpeg-devel] [PATCH 3/3] lavc/qsvenc_hevc: accept HDR metadata if have haihao.xiang-at-intel.com
2022-10-24 6:16 ` Xiang, Haihao [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c391468d494af22c967dc9cfefb0140a391c0d7c.camel@intel.com \
--to=haihao.xiang-at-intel.com@ffmpeg.org \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git