| Message ID | 20221018045925.258081-1-haihao.xiang@intel.com |
|---|---|
| State | Accepted |
| Commit | 76965fa41177658444c334ebbe0ae11eafd8c796 |
| Headers | show |
| Series | [FFmpeg-devel,1/3] lavc/qsvenc: fix check to avoid segfault | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
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
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 ||