diff options
| author | Mark Thompson <sw@jkqxz.net> | 2017-03-12 14:21:37 +0000 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2017-03-12 14:21:37 +0000 |
| commit | 210dd7bbb2c0e4013fd8519d3b20e3032f0beb18 (patch) | |
| tree | 0240f990dfbbca22c7537bbbd1be4fe1ba3220cf /libavcodec/qsv.c | |
| parent | 5e193daaa28d2fca34ad21d11d58f0b135388246 (diff) | |
| parent | 21962261c74aed4df00ae8348a5e2d1ecb67c52d (diff) | |
| download | ffmpeg-210dd7bbb2c0e4013fd8519d3b20e3032f0beb18.tar.gz | |
Merge commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d'
* commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d':
qsv: handle the semi-packed formats in map_fourcc as well
Merged-by: Mark Thompson <sw@jkqxz.net>
Diffstat (limited to 'libavcodec/qsv.c')
| -rw-r--r-- | libavcodec/qsv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index aac6ce6d30..028a496ead 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -110,9 +110,11 @@ int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc) switch (format) { case AV_PIX_FMT_YUV420P: case AV_PIX_FMT_YUVJ420P: + case AV_PIX_FMT_NV12: *fourcc = MFX_FOURCC_NV12; return AV_PIX_FMT_NV12; case AV_PIX_FMT_YUV420P10: + case AV_PIX_FMT_P010: *fourcc = MFX_FOURCC_P010; return AV_PIX_FMT_P010; default: |