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
3e4357eb
Commit
3e4357eb
authored
Jul 06, 2016
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/libx265: Support gray encoding.
Gray encoding crashes with libx265 <= 84, so check the library version.
parent
88d9c30c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
libx265.c
libavcodec/libx265.c
+12
-0
version.h
libavcodec/version.h
+1
-1
No files found.
libavcodec/libx265.c
View file @
3e4357eb
...
...
@@ -165,6 +165,15 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
case
AV_PIX_FMT_YUV444P12
:
ctx
->
params
->
internalCsp
=
X265_CSP_I444
;
break
;
case
AV_PIX_FMT_GRAY8
:
if
(
ctx
->
api
->
api_build_number
<
85
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"libx265 version is %d, must be at least 85 for gray encoding.
\n
"
,
ctx
->
api
->
api_build_number
);
return
AVERROR_INVALIDDATA
;
}
ctx
->
params
->
internalCsp
=
X265_CSP_I400
;
break
;
}
if
(
ctx
->
crf
>=
0
)
{
...
...
@@ -325,6 +334,7 @@ static const enum AVPixelFormat x265_csp_eight[] = {
AV_PIX_FMT_YUV422P
,
AV_PIX_FMT_YUV444P
,
AV_PIX_FMT_GBRP
,
AV_PIX_FMT_GRAY8
,
AV_PIX_FMT_NONE
};
...
...
@@ -337,6 +347,7 @@ static const enum AVPixelFormat x265_csp_ten[] = {
AV_PIX_FMT_YUV422P10
,
AV_PIX_FMT_YUV444P10
,
AV_PIX_FMT_GBRP10
,
AV_PIX_FMT_GRAY8
,
AV_PIX_FMT_NONE
};
...
...
@@ -353,6 +364,7 @@ static const enum AVPixelFormat x265_csp_twelve[] = {
AV_PIX_FMT_YUV422P12
,
AV_PIX_FMT_YUV444P12
,
AV_PIX_FMT_GBRP12
,
AV_PIX_FMT_GRAY8
,
AV_PIX_FMT_NONE
};
...
...
libavcodec/version.h
View file @
3e4357eb
...
...
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 48
#define LIBAVCODEC_VERSION_MICRO 10
2
#define LIBAVCODEC_VERSION_MICRO 10
3
#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