diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 11:52:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 11:53:14 +0200 |
| commit | 7871eb43616776626ec9f9075b6d0a8cf73d159e (patch) | |
| tree | f9a88703414cd33e32c5f682974d8b4f96837b92 /libavcodec/qsvdec.c | |
| parent | 587980eb7a1f4b0228204aa846b72dc761e49779 (diff) | |
| parent | 66acb76bb0492b263215ca9b4d927a7be39ace02 (diff) | |
Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02'
* commit '66acb76bb0492b263215ca9b4d927a7be39ace02':
lavc: add Intel libmfx-based HEVC encoder
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/qsv.c
libavcodec/qsvenc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qsvdec.c')
| -rw-r--r-- | libavcodec/qsvdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 47709b50f4..67e8ef0ce5 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -52,7 +52,7 @@ static int qsv_init_session(AVCodecContext *avctx, QSVContext *q, mfxSession ses { if (!session) { if (!q->internal_session) { - int ret = ff_qsv_init_internal_session(avctx, &q->internal_session); + int ret = ff_qsv_init_internal_session(avctx, &q->internal_session, NULL); if (ret < 0) return ret; } |