diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2016-11-03 18:10:03 +0300 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2016-11-08 00:42:00 +0300 |
| commit | ab839054e662d3227e1f795ba1dfd01fe1cf305c (patch) | |
| tree | 9c2b042e2ab72015383d5fc28c6901bcd99e36e9 /libswscale | |
| parent | 7471352f1915813cda725ce624607d84b5a3a61c (diff) | |
swscale: Add GRAY12
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/input.c | 2 | ||||
| -rw-r--r-- | libswscale/swscale_internal.h | 2 | ||||
| -rw-r--r-- | libswscale/swscale_unscaled.c | 1 | ||||
| -rw-r--r-- | libswscale/utils.c | 2 |
4 files changed, 7 insertions, 0 deletions
diff --git a/libswscale/input.c b/libswscale/input.c index 9f2ef72894..d8560a1f2b 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -1120,6 +1120,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUV420P16LE: case AV_PIX_FMT_YUV422P16LE: case AV_PIX_FMT_YUV444P16LE: + case AV_PIX_FMT_GRAY12LE: case AV_PIX_FMT_GRAY16LE: c->lumToYV12 = bswap16Y_c; break; @@ -1148,6 +1149,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUV420P16BE: case AV_PIX_FMT_YUV422P16BE: case AV_PIX_FMT_YUV444P16BE: + case AV_PIX_FMT_GRAY12BE: case AV_PIX_FMT_GRAY16BE: c->lumToYV12 = bswap16Y_c; break; diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index abcdb9f41b..e7a6eedd22 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -603,6 +603,8 @@ static av_always_inline int isRGB(enum AVPixelFormat pix_fmt) #define isGray(x) \ ((x) == AV_PIX_FMT_GRAY8 || \ (x) == AV_PIX_FMT_YA8 || \ + (x) == AV_PIX_FMT_GRAY12BE || \ + (x) == AV_PIX_FMT_GRAY12LE || \ (x) == AV_PIX_FMT_GRAY16BE || \ (x) == AV_PIX_FMT_GRAY16LE || \ (x) == AV_PIX_FMT_YA16BE || \ diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 24c65ccd22..d3863bba10 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1097,6 +1097,7 @@ void ff_get_unscaled_swscale(SwsContext *c) IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGR555) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGR565) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGRA64) || + IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GRAY12) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GRAY16) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YA16) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRAP12)|| diff --git a/libswscale/utils.c b/libswscale/utils.c index 1c3bbb3305..6034b70465 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -107,6 +107,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_RGBA] = { 1, 1 }, [AV_PIX_FMT_ABGR] = { 1, 1 }, [AV_PIX_FMT_BGRA] = { 1, 1 }, + [AV_PIX_FMT_GRAY12BE] = { 1, 1 }, + [AV_PIX_FMT_GRAY12LE] = { 1, 1 }, [AV_PIX_FMT_GRAY16BE] = { 1, 1 }, [AV_PIX_FMT_GRAY16LE] = { 1, 1 }, [AV_PIX_FMT_YUV440P] = { 1, 1 }, |