> -----Original Message----- > From: ffmpeg-devel <ffmpeg-devel-boun...@ffmpeg.org> On Behalf Of Linjie > Fu > Sent: Tuesday, February 25, 2020 10:03 > To: ffmpeg-devel@ffmpeg.org > Cc: Fu, Linjie <linjie...@intel.com> > Subject: [FFmpeg-devel] [PATCH] lavc/qsvenc: add return check for > ff_qsv_map_pixfmt > > Return an error directly if pixfmt is not supported for encoding, otherwise > it may be hidden until query/check in MSDK. > > Signed-off-by: Linjie Fu <linjie...@intel.com> > --- > libavcodec/qsvenc.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c > index 571a711..40ff17c 100644 > --- a/libavcodec/qsvenc.c > +++ b/libavcodec/qsvenc.c > @@ -436,7 +436,9 @@ static int init_video_param_jpeg(AVCodecContext > *avctx, QSVEncContext *q) > if (!desc) > return AVERROR_BUG; > > - ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC); > + ret = ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC); > + if (ret < 0) > + return AVERROR_BUG; > > q->param.mfx.FrameInfo.CropX = 0; > q->param.mfx.FrameInfo.CropY = 0; > @@ -537,7 +539,9 @@ static int init_video_param(AVCodecContext *avctx, > QSVEncContext *q) > if (!desc) > return AVERROR_BUG; > > - ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC); > + ret = ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC); > + if (ret < 0) > + return AVERROR_BUG; > > q->param.mfx.FrameInfo.CropX = 0; > q->param.mfx.FrameInfo.CropY = 0; > -- > 2.7.4
LGTM, and I will apply it if no objection. Thanks 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".
