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
d67dbfa7
Commit
d67dbfa7
authored
Mar 06, 2014
by
Derek Buitenhuis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libx265: Support API version 9
Signed-off-by:
Derek Buitenhuis
<
derek.buitenhuis@gmail.com
>
parent
b6638210
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
configure
configure
+2
-2
libx265.c
libavcodec/libx265.c
+5
-5
No files found.
configure
View file @
d67dbfa7
...
@@ -3980,8 +3980,8 @@ enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 &
...
@@ -3980,8 +3980,8 @@ enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 &
{
check_cpp_condition x264.h
"X264_BUILD >= 118"
||
{
check_cpp_condition x264.h
"X264_BUILD >= 118"
||
die
"ERROR: libx264 version must be >= 0.118."
;
}
die
"ERROR: libx264 version must be >= 0.118."
;
}
enabled libx265
&&
require_pkg_config x265 x265.h x265_encoder_encode
&&
enabled libx265
&&
require_pkg_config x265 x265.h x265_encoder_encode
&&
{
check_cpp_condition x265.h
"X265_BUILD >=
7
"
||
{
check_cpp_condition x265.h
"X265_BUILD >=
9
"
||
die
"ERROR: libx265 version must be >=
7
."
;
}
die
"ERROR: libx265 version must be >=
9
."
;
}
enabled libxavs
&&
require libxavs xavs.h xavs_encoder_encode
-lxavs
enabled libxavs
&&
require libxavs xavs.h xavs_encoder_encode
-lxavs
enabled libxvid
&&
require libxvid xvid.h xvid_global
-lxvidcore
enabled libxvid
&&
require libxvid xvid.h xvid_global
-lxvidcore
enabled openssl
&&
{
check_lib openssl/ssl.h SSL_library_init
-lssl
-lcrypto
||
enabled openssl
&&
{
check_lib openssl/ssl.h SSL_library_init
-lssl
-lcrypto
||
...
...
libavcodec/libx265.c
View file @
d67dbfa7
...
@@ -121,11 +121,11 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
...
@@ -121,11 +121,11 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
av_reduce
(
&
sar_num
,
&
sar_den
,
av_reduce
(
&
sar_num
,
&
sar_den
,
avctx
->
sample_aspect_ratio
.
num
,
avctx
->
sample_aspect_ratio
.
num
,
avctx
->
sample_aspect_ratio
.
den
,
4096
);
avctx
->
sample_aspect_ratio
.
den
,
4096
);
ctx
->
params
->
bEnableVuiParametersPresentFlag
=
1
;
ctx
->
params
->
vui
.
bEnableVuiParametersPresentFlag
=
1
;
ctx
->
params
->
bEnableAspectRatioIdc
=
1
;
ctx
->
params
->
vui
.
bEnableAspectRatioIdc
=
1
;
ctx
->
params
->
aspectRatioIdc
=
255
;
ctx
->
params
->
vui
.
aspectRatioIdc
=
255
;
ctx
->
params
->
sarWidth
=
sar_num
;
ctx
->
params
->
vui
.
sarWidth
=
sar_num
;
ctx
->
params
->
sarHeight
=
sar_den
;
ctx
->
params
->
vui
.
sarHeight
=
sar_den
;
if
(
x265_max_bit_depth
==
8
)
if
(
x265_max_bit_depth
==
8
)
ctx
->
params
->
internalBitDepth
=
8
;
ctx
->
params
->
internalBitDepth
=
8
;
...
...
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