diff options
author | James Almer <jamrial@gmail.com> | 2017-12-14 18:45:20 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-12-14 18:45:20 -0300 |
commit | 2ca3c049cd09527bafd48e50117283a6a965a1b2 (patch) | |
tree | 1be3da017a73886a2212b93fa1557ac3e29e3676 | |
parent | 0929def32765807d156860fb13af1154ce4a249a (diff) | |
parent | bddb2ce179c57db6e3c79fdc3363c165d90850b0 (diff) | |
download | ffmpeg-2ca3c049cd09527bafd48e50117283a6a965a1b2.tar.gz |
Merge commit 'bddb2ce179c57db6e3c79fdc3363c165d90850b0'
* commit 'bddb2ce179c57db6e3c79fdc3363c165d90850b0':
lavc/qsvenc: ICQ/VCM/QVBR are not avilable on Linux
Merged-by: James Almer <jamrial@gmail.com>
-rw-r--r-- | libavcodec/qsvenc.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 5cfd17446d..fae98e17b8 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -44,9 +44,16 @@ #define QSV_HAVE_LA QSV_VERSION_ATLEAST(1, 7) #define QSV_HAVE_LA_DS QSV_VERSION_ATLEAST(1, 8) #define QSV_HAVE_LA_HRD QSV_VERSION_ATLEAST(1, 11) + +#if defined(_WIN32) #define QSV_HAVE_ICQ QSV_VERSION_ATLEAST(1, 8) #define QSV_HAVE_VCM QSV_VERSION_ATLEAST(1, 8) #define QSV_HAVE_QVBR QSV_VERSION_ATLEAST(1, 11) +#else +#define QSV_HAVE_ICQ 0 +#define QSV_HAVE_VCM 0 +#define QSV_HAVE_QVBR 0 +#endif #define QSV_COMMON_OPTS \ { "async_depth", "Maximum processing parallelism", OFFSET(qsv.async_depth), AV_OPT_TYPE_INT, { .i64 = ASYNC_DEPTH_DEFAULT }, 0, INT_MAX, VE }, \ |