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/qsv_internal.h | |
| 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/qsv_internal.h')
| -rw-r--r-- | libavcodec/qsv_internal.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index ae03bf3ae8..ee48a0fb9d 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -45,6 +45,10 @@ #define ASYNC_DEPTH_DEFAULT 4 // internal parallelism +#define QSV_VERSION_ATLEAST(MAJOR, MINOR) \ + (MFX_VERSION_MAJOR > (MAJOR) || \ + MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR)) + typedef struct QSVFrame { AVFrame *frame; mfxFrameSurface1 *surface; @@ -61,6 +65,7 @@ int ff_qsv_error(int mfx_err); int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id); -int ff_qsv_init_internal_session(AVCodecContext *avctx, mfxSession *session); +int ff_qsv_init_internal_session(AVCodecContext *avctx, mfxSession *session, + const char *load_plugins); #endif /* AVCODEC_QSV_INTERNAL_H */ |