ffmpeg | branch: master | Carl Eugen Hoyos <ceffm...@gmail.com> | Tue Aug 7 20:41:02 2018 +0200| [81f25a105136bc404df63bf8386e90492ef84944] | committer: Carl Eugen Hoyos
lavc/libx264: Support monochrome encoding. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=81f25a105136bc404df63bf8386e90492ef84944 --- libavcodec/libx264.c | 10 ++++++++++ libavcodec/version.h | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 12379ff763..54e6703d73 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -161,6 +161,8 @@ static int avfmt2_num_planes(int avfmt) case AV_PIX_FMT_BGR0: case AV_PIX_FMT_BGR24: case AV_PIX_FMT_RGB24: + case AV_PIX_FMT_GRAY8: + case AV_PIX_FMT_GRAY10: return 1; default: @@ -443,6 +445,10 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt) #ifdef X264_CSP_NV21 case AV_PIX_FMT_NV21: return X264_CSP_NV21; #endif +#ifdef X264_CSP_I400 + case AV_PIX_FMT_GRAY8: + case AV_PIX_FMT_GRAY10: return X264_CSP_I400; +#endif }; return 0; } @@ -885,6 +891,10 @@ static const enum AVPixelFormat pix_fmts_all[] = { AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_NV20, +#ifdef X264_CSP_I400 + AV_PIX_FMT_GRAY8, + AV_PIX_FMT_GRAY10, +#endif AV_PIX_FMT_NONE }; #if CONFIG_LIBX264RGB_ENCODER diff --git a/libavcodec/version.h b/libavcodec/version.h index 3f0d98efdf..907c6fb111 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 22 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
