diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 15:19:43 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 15:19:43 +0100 |
| commit | 1bc6cdf2fcbd3caea7b78d0a617c6e338606d756 (patch) | |
| tree | 9b0050a5d72d12d67b1fb82ffcc1a2a2effea7e9 /libavcodec/qsv.c | |
| parent | e122a725fbe9bc5c1bb6047d6be8e0f504d660b9 (diff) | |
| parent | 536bb17e9659c5ed7576a218d4085cdd6d5742fa (diff) | |
| download | ffmpeg-1bc6cdf2fcbd3caea7b78d0a617c6e338606d756.tar.gz | |
Merge commit '536bb17e9659c5ed7576a218d4085cdd6d5742fa'
* commit '536bb17e9659c5ed7576a218d4085cdd6d5742fa':
qsvdec: make ff_qsv_map_pixfmt() return a MFX fourcc as well
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/qsv.c')
| -rw-r--r-- | libavcodec/qsv.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index efd7cea019..041daa51c3 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -105,6 +105,18 @@ int ff_qsv_error(int mfx_err) } } +int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc) +{ + switch (format) { + case AV_PIX_FMT_YUV420P: + case AV_PIX_FMT_YUVJ420P: + *fourcc = MFX_FOURCC_NV12; + return AV_PIX_FMT_NV12; + default: + return AVERROR(ENOSYS); + } +} + static int qsv_load_plugins(mfxSession session, const char *load_plugins, void *logctx) { |