Commit 81f25a10 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

lavc/libx264: Support monochrome encoding.

parent a66e7430
...@@ -161,6 +161,8 @@ static int avfmt2_num_planes(int avfmt) ...@@ -161,6 +161,8 @@ static int avfmt2_num_planes(int avfmt)
case AV_PIX_FMT_BGR0: case AV_PIX_FMT_BGR0:
case AV_PIX_FMT_BGR24: case AV_PIX_FMT_BGR24:
case AV_PIX_FMT_RGB24: case AV_PIX_FMT_RGB24:
case AV_PIX_FMT_GRAY8:
case AV_PIX_FMT_GRAY10:
return 1; return 1;
default: default:
...@@ -442,6 +444,10 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt) ...@@ -442,6 +444,10 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt)
case AV_PIX_FMT_NV20: return X264_CSP_NV16; case AV_PIX_FMT_NV20: return X264_CSP_NV16;
#ifdef X264_CSP_NV21 #ifdef X264_CSP_NV21
case AV_PIX_FMT_NV21: return 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 #endif
}; };
return 0; return 0;
...@@ -885,6 +891,10 @@ static const enum AVPixelFormat pix_fmts_all[] = { ...@@ -885,6 +891,10 @@ static const enum AVPixelFormat pix_fmts_all[] = {
AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV422P10,
AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV444P10,
AV_PIX_FMT_NV20, AV_PIX_FMT_NV20,
#ifdef X264_CSP_I400
AV_PIX_FMT_GRAY8,
AV_PIX_FMT_GRAY10,
#endif
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}; };
#if CONFIG_LIBX264RGB_ENCODER #if CONFIG_LIBX264RGB_ENCODER
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 22 #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, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment