har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavc/qsvenc: add return check for ff_qsv_map_pixfmt

Browse Source 
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.fu@intel.com>
Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
This commit is contained in:
Linjie Fu 2020-02-25 10:02:33 +08:00 committed by Haihao Xiang
parent abc7d1c697
commit c39b6e1425
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/qsvenc.c
View File

@ -578,7 +578,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;
@ -681,7 +683,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;