diff options
| author | Clément Bœsch <u@pkh.me> | 2017-04-01 11:17:24 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-04-01 11:21:02 +0200 |
| commit | e06b8b07d5996bbc56226f01faba6b6495dbaa12 (patch) | |
| tree | 7ce5080221afced8dd82407a8804c05f53cc58d1 /libavcodec/qsv.c | |
| parent | fa0a6ce34d00673c5a6efaf243308a21daa5f8b3 (diff) | |
| parent | e0b164576f7467b7b1127c18175e215dc1df011f (diff) | |
Merge commit 'e0b164576f7467b7b1127c18175e215dc1df011f'
* commit 'e0b164576f7467b7b1127c18175e215dc1df011f':
qsv: Add VP8 decoder
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/qsv.c')
| -rw-r--r-- | libavcodec/qsv.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 57ccbe9ee4..dfc1536c73 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -34,6 +34,10 @@ #include "avcodec.h" #include "qsv_internal.h" +#if QSV_VERSION_ATLEAST(1, 12) +#include "mfx/mfxvp8.h" +#endif + int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id) { switch (codec_id) { @@ -48,6 +52,10 @@ int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id) return MFX_CODEC_MPEG2; case AV_CODEC_ID_VC1: return MFX_CODEC_VC1; +#if QSV_VERSION_ATLEAST(1, 12) + case AV_CODEC_ID_VP8: + return MFX_CODEC_VP8; +#endif default: break; } |