diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-08 11:24:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-09 15:58:43 +0200 |
| commit | b7faa9d314f26855f8555a265a6231b291773482 (patch) | |
| tree | 3cffaf2033e983babb9dde8344ed1754d159af0f /libswscale/utils.c | |
| parent | 16df02fd2e5b43013d19eed4891a576f91ceb52e (diff) | |
| download | ffmpeg-b7faa9d314f26855f8555a265a6231b291773482.tar.gz | |
swscale/alphablend: support packed pixel formats
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libswscale/utils.c')
| -rw-r--r-- | libswscale/utils.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index d00164361b..653440e047 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -982,11 +982,11 @@ static uint16_t * alloc_gamma_tbl(double e) static enum AVPixelFormat alphaless_fmt(enum AVPixelFormat fmt) { switch(fmt) { -// case AV_PIX_FMT_ARGB: return AV_PIX_FMT_RGB24; -// case AV_PIX_FMT_RGBA: return AV_PIX_FMT_RGB24; -// case AV_PIX_FMT_ABGR: return AV_PIX_FMT_BGR24; -// case AV_PIX_FMT_BGRA: return AV_PIX_FMT_BGR24; -// case AV_PIX_FMT_YA8: return AV_PIX_FMT_GRAY8; + case AV_PIX_FMT_ARGB: return AV_PIX_FMT_RGB24; + case AV_PIX_FMT_RGBA: return AV_PIX_FMT_RGB24; + case AV_PIX_FMT_ABGR: return AV_PIX_FMT_BGR24; + case AV_PIX_FMT_BGRA: return AV_PIX_FMT_BGR24; + case AV_PIX_FMT_YA8: return AV_PIX_FMT_GRAY8; // // case AV_PIX_FMT_YUVA420P: return AV_PIX_FMT_YUV420P; // case AV_PIX_FMT_YUVA422P: return AV_PIX_FMT_YUV422P; @@ -997,13 +997,13 @@ static enum AVPixelFormat alphaless_fmt(enum AVPixelFormat fmt) case AV_PIX_FMT_GBRAP16LE: return AV_PIX_FMT_GBRP16; case AV_PIX_FMT_GBRAP16BE: return AV_PIX_FMT_GBRP16; -// case AV_PIX_FMT_RGBA64LE: return AV_PIX_FMT_RGB48; -// case AV_PIX_FMT_RGBA64BE: return AV_PIX_FMT_RGB48; -// case AV_PIX_FMT_BGRA64LE: return AV_PIX_FMT_BGR48; -// case AV_PIX_FMT_BGRA64BE: return AV_PIX_FMT_BGR48; + case AV_PIX_FMT_RGBA64LE: return AV_PIX_FMT_RGB48; + case AV_PIX_FMT_RGBA64BE: return AV_PIX_FMT_RGB48; + case AV_PIX_FMT_BGRA64LE: return AV_PIX_FMT_BGR48; + case AV_PIX_FMT_BGRA64BE: return AV_PIX_FMT_BGR48; -// case AV_PIX_FMT_YA16BE: return AV_PIX_FMT_GRAY16; -// case AV_PIX_FMT_YA16LE: return AV_PIX_FMT_GRAY16; + case AV_PIX_FMT_YA16BE: return AV_PIX_FMT_GRAY16; + case AV_PIX_FMT_YA16LE: return AV_PIX_FMT_GRAY16; // case AV_PIX_FMT_YUVA420P9BE: return AV_PIX_FMT_YUV420P9; // case AV_PIX_FMT_YUVA422P9BE: return AV_PIX_FMT_YUV422P9; |