diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-26 01:20:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-26 01:20:46 +0200 |
| commit | 508b79e6c1dc40d9d96d027ed38dab3a9b9a7287 (patch) | |
| tree | bac3551d01c1d7304475ab01effbfc4bd34576a6 /libavcodec/qsvdec.c | |
| parent | bb619f41bea81e6ee9e208476a92fced4107a853 (diff) | |
| parent | 41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986 (diff) | |
| download | ffmpeg-508b79e6c1dc40d9d96d027ed38dab3a9b9a7287.tar.gz | |
Merge commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986'
* commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986':
lavc: add Intel libmfx-based HEVC decoder.
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/qsvdec.c
libavcodec/qsvdec_h2645.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/qsvdec.c')
| -rw-r--r-- | libavcodec/qsvdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 036015f751..d1261add2c 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -66,7 +66,8 @@ int ff_qsv_decode_init(AVCodecContext *avctx, QSVContext *q, AVPacket *avpkt) q->nb_ext_buffers = qsv->nb_ext_buffers; } if (!q->session) { - ret = ff_qsv_init_internal_session(avctx, &q->internal_qs, NULL); + ret = ff_qsv_init_internal_session(avctx, &q->internal_qs, + q->load_plugins); if (ret < 0) return ret; |