summaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2018-05-03 22:19:38 +0200
committerPaul B Mahol <onemda@gmail.com>2018-05-05 21:35:31 +0200
commitb9dd058f7a9df0119ad1cb7a0b115fbfa77d7cf4 (patch)
treebf5c3516a36144b0ff3d09cce5b3f852aa00221d /libswscale
parentaef93c6aa57234c21cec527e8cd368acb96f7d2f (diff)
downloadffmpeg-streaming-b9dd058f7a9df0119ad1cb7a0b115fbfa77d7cf4.zip
ffmpeg-streaming-b9dd058f7a9df0119ad1cb7a0b115fbfa77d7cf4.tar.gz
swscale: add gray14 support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/input.c2
-rw-r--r--libswscale/swscale_unscaled.c1
-rw-r--r--libswscale/utils.c4
3 files changed, 7 insertions, 0 deletions
diff --git a/libswscale/input.c b/libswscale/input.c
index bb2f493..3fd3a5d 100644
--- a/libswscale/input.c
+++ b/libswscale/input.c
@@ -1365,6 +1365,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
case AV_PIX_FMT_GRAY9LE:
case AV_PIX_FMT_GRAY10LE:
case AV_PIX_FMT_GRAY12LE:
+ case AV_PIX_FMT_GRAY14LE:
case AV_PIX_FMT_GRAY16LE:
case AV_PIX_FMT_P016LE:
@@ -1404,6 +1405,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
case AV_PIX_FMT_GRAY9BE:
case AV_PIX_FMT_GRAY10BE:
case AV_PIX_FMT_GRAY12BE:
+ case AV_PIX_FMT_GRAY14BE:
case AV_PIX_FMT_GRAY16BE:
case AV_PIX_FMT_P016BE:
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 13f9cd8..6480070 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -1852,6 +1852,7 @@ void ff_get_unscaled_swscale(SwsContext *c)
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GRAY9) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GRAY10) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GRAY12) ||
+ IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GRAY14) ||
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_AYUV64) ||
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 98a6b99..61b4718 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -137,6 +137,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = {
[AV_PIX_FMT_GRAY10LE] = { 1, 1 },
[AV_PIX_FMT_GRAY12BE] = { 1, 1 },
[AV_PIX_FMT_GRAY12LE] = { 1, 1 },
+ [AV_PIX_FMT_GRAY14BE] = { 1, 1 },
+ [AV_PIX_FMT_GRAY14LE] = { 1, 1 },
[AV_PIX_FMT_GRAY16BE] = { 1, 1 },
[AV_PIX_FMT_GRAY16LE] = { 1, 1 },
[AV_PIX_FMT_YUV440P] = { 1, 1 },
@@ -1024,6 +1026,8 @@ static int handle_jpeg(enum AVPixelFormat *format)
case AV_PIX_FMT_GRAY10BE:
case AV_PIX_FMT_GRAY12LE:
case AV_PIX_FMT_GRAY12BE:
+ case AV_PIX_FMT_GRAY14LE:
+ case AV_PIX_FMT_GRAY14BE:
case AV_PIX_FMT_GRAY16LE:
case AV_PIX_FMT_GRAY16BE:
case AV_PIX_FMT_YA16BE:
OpenPOWER on IntegriCloud