summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorLinjie Fu <linjie.fu@intel.com>2020-02-25 10:02:33 +0800
committerHaihao Xiang <haihao.xiang@intel.com>2022-01-10 14:54:36 +0800
commitc39b6e1425f041622a4e58d1c7c215c75a04a845 (patch)
treeb5e7c0cd728cf0263a7f8804b074e79c94b965c2 /libavcodec
parentabc7d1c697e0dbe463ca6632e45142ae72d139a9 (diff)
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.fu@intel.com> Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/qsvenc.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 602436da63..4e7a15f060 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -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;