virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

libavcodec/qsvdec.c: the ff_get_format() missed at refactoring has been restored

Browse Source 
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Ivan Uskov
2015-08-06 09:14:59 -04:00
committed by Michael Niedermayer
parent 9d1d7b367e
commit fffae8e605
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/qsvdec.c
View File

@@ -54,6 +54,9 @@ int ff_qsv_decode_init(AVCodecContext *avctx, QSVContext *q, AVPacket *avpkt)
mfxVideoParam param = { { 0 } }; mfxVideoParam param = { { 0 } };
mfxBitstream bs = { { { 0 } } }; mfxBitstream bs = { { { 0 } } };
int ret; int ret;
enum AVPixelFormat pix_fmts[3] = { AV_PIX_FMT_QSV,
AV_PIX_FMT_NV12,
AV_PIX_FMT_NONE };
q->iopattern = MFX_IOPATTERN_OUT_SYSTEM_MEMORY; q->iopattern = MFX_IOPATTERN_OUT_SYSTEM_MEMORY;
if (!q->session) { if (!q->session) {
@@ -120,7 +123,11 @@ int ff_qsv_decode_init(AVCodecContext *avctx, QSVContext *q, AVPacket *avpkt)
return ff_qsv_error(ret); return ff_qsv_error(ret);
} }
avctx->pix_fmt = AV_PIX_FMT_NV12; ret = ff_get_format(avctx, pix_fmts);
if (ret < 0)
return ret;
avctx->pix_fmt = ret;
avctx->profile = param.mfx.CodecProfile; avctx->profile = param.mfx.CodecProfile;
avctx->level = param.mfx.CodecLevel; avctx->level = param.mfx.CodecLevel;
avctx->coded_width = param.mfx.FrameInfo.Width; avctx->coded_width = param.mfx.FrameInfo.Width;