RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d' 

* commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d':
  qsv: handle the semi-packed formats in map_fourcc as well

Merged-by: Mark Thompson <sw@jkqxz.net>
This commit is contained in:
Mark Thompson 2017-03-12 14:21:37 +00:00
parent 5e193daaa2 21962261c7
commit 210dd7bbb2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/qsv.c
View File

@ -110,9 +110,11 @@ int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc)
switch (format) { switch (format) {
case AV_PIX_FMT_YUV420P: case AV_PIX_FMT_YUV420P:
case AV_PIX_FMT_YUVJ420P: case AV_PIX_FMT_YUVJ420P:
case AV_PIX_FMT_NV12:
*fourcc = MFX_FOURCC_NV12; *fourcc = MFX_FOURCC_NV12;
return AV_PIX_FMT_NV12; return AV_PIX_FMT_NV12;
case AV_PIX_FMT_YUV420P10: case AV_PIX_FMT_YUV420P10:
case AV_PIX_FMT_P010:
*fourcc = MFX_FOURCC_P010; *fourcc = MFX_FOURCC_P010;
return AV_PIX_FMT_P010; return AV_PIX_FMT_P010;
default: default: