ffmpeg | branch: master | Carl Eugen Hoyos <ceho...@ag.or.at> | Tue Apr 4 12:24:41 2017 +0200| [c1616b454dc0c1fd391140e5dec1da0c3228b1e1] | committer: Carl Eugen Hoyos
lsws/utils: Make gray10 and gray12 full-scale like gray8 and gray16. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c1616b454dc0c1fd391140e5dec1da0c3228b1e1 --- libswscale/utils.c | 4 ++++ libswscale/version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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, \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
