Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
81f25a10
Commit
81f25a10
authored
Aug 07, 2018
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/libx264: Support monochrome encoding.
parent
a66e7430
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
libx264.c
libavcodec/libx264.c
+10
-0
version.h
libavcodec/version.h
+1
-1
No files found.
libavcodec/libx264.c
View file @
81f25a10
...
...
@@ -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:
...
...
@@ -442,6 +444,10 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt)
case
AV_PIX_FMT_NV20
:
return
X264_CSP_NV16
;
#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
...
...
libavcodec/version.h
View file @
81f25a10
...
...
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 22
#define LIBAVCODEC_VERSION_MICRO 10
0
#define LIBAVCODEC_VERSION_MICRO 10
1
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment