diff options
| author | Paul B Mahol <onemda@gmail.com> | 2017-08-05 14:28:45 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2017-08-07 13:09:41 +0200 |
| commit | de48710c11cebd4c50bb51ebf3cb5fd0e6a79d40 (patch) | |
| tree | 7f75be482d1e5ec17659af7dc6c82187cc12b043 /libswscale | |
| parent | ab6d89d7ee5cdb4b5e58efbf5bbc2517e39aa705 (diff) | |
libswscale: add gray9 support
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/input.c | 2 | ||||
| -rw-r--r-- | libswscale/swscale_unscaled.c | 1 | ||||
| -rw-r--r-- | libswscale/utils.c | 4 | ||||
| -rw-r--r-- | libswscale/version.h | 2 |
4 files changed, 8 insertions, 1 deletions
diff --git a/libswscale/input.c b/libswscale/input.c index 04a5190711..bb2f4933ec 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -1362,6 +1362,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUV422P16LE: case AV_PIX_FMT_YUV444P16LE: + case AV_PIX_FMT_GRAY9LE: case AV_PIX_FMT_GRAY10LE: case AV_PIX_FMT_GRAY12LE: case AV_PIX_FMT_GRAY16LE: @@ -1400,6 +1401,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUV422P16BE: case AV_PIX_FMT_YUV444P16BE: + case AV_PIX_FMT_GRAY9BE: case AV_PIX_FMT_GRAY10BE: case AV_PIX_FMT_GRAY12BE: case AV_PIX_FMT_GRAY16BE: diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index ba3d688a26..3b1b3667ce 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1796,6 +1796,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_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_GRAY16) || diff --git a/libswscale/utils.c b/libswscale/utils.c index 17c996734a..b75510d206 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -131,6 +131,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_RGB0] = { 1, 1 }, [AV_PIX_FMT_0BGR] = { 1, 1 }, [AV_PIX_FMT_BGR0] = { 1, 1 }, + [AV_PIX_FMT_GRAY9BE] = { 1, 1 }, + [AV_PIX_FMT_GRAY9LE] = { 1, 1 }, [AV_PIX_FMT_GRAY10BE] = { 1, 1 }, [AV_PIX_FMT_GRAY10LE] = { 1, 1 }, [AV_PIX_FMT_GRAY12BE] = { 1, 1 }, @@ -1016,6 +1018,8 @@ static int handle_jpeg(enum AVPixelFormat *format) return 1; case AV_PIX_FMT_GRAY8: case AV_PIX_FMT_YA8: + case AV_PIX_FMT_GRAY9LE: + case AV_PIX_FMT_GRAY9BE: case AV_PIX_FMT_GRAY10LE: case AV_PIX_FMT_GRAY10BE: case AV_PIX_FMT_GRAY12LE: diff --git a/libswscale/version.h b/libswscale/version.h index dcdc85bc74..8dff77e48a 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -28,7 +28,7 @@ #define LIBSWSCALE_VERSION_MAJOR 4 #define LIBSWSCALE_VERSION_MINOR 7 -#define LIBSWSCALE_VERSION_MICRO 101 +#define LIBSWSCALE_VERSION_MICRO 102 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ LIBSWSCALE_VERSION_MINOR, \ |