diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2017-04-04 12:24:41 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2017-04-12 23:00:04 +0200 |
| commit | c1616b454dc0c1fd391140e5dec1da0c3228b1e1 (patch) | |
| tree | 38625e96f61e89a62694a220133c02dad33aca38 /libswscale | |
| parent | d89ac691c9cf9b5bc0912c5e2c8ba7747e23cf5e (diff) | |
| download | ffmpeg-c1616b454dc0c1fd391140e5dec1da0c3228b1e1.tar.gz | |
lsws/utils: Make gray10 and gray12 full-scale like gray8 and gray16.
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/utils.c | 4 | ||||
| -rw-r--r-- | libswscale/version.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index 4c9b53bbeb..17c996734a 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1016,6 +1016,10 @@ static int handle_jpeg(enum AVPixelFormat *format) return 1; case AV_PIX_FMT_GRAY8: case AV_PIX_FMT_YA8: + case AV_PIX_FMT_GRAY10LE: + case AV_PIX_FMT_GRAY10BE: + case AV_PIX_FMT_GRAY12LE: + case AV_PIX_FMT_GRAY12BE: case AV_PIX_FMT_GRAY16LE: case AV_PIX_FMT_GRAY16BE: case AV_PIX_FMT_YA16BE: diff --git a/libswscale/version.h b/libswscale/version.h index 259ae7af63..dcdc85bc74 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 100 +#define LIBSWSCALE_VERSION_MICRO 101 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ LIBSWSCALE_VERSION_MINOR, \ |