Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
429
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
c0438390
Commit
c0438390
authored
4 months ago
by
François Cartegnie
Committed by
Steve Lhomme
4 months ago
Browse files
Options
Downloads
Patches
Plain Diff
codec: x265: handle 4.0 encoding API change
refs
#28799
(cherry picked from commit
83e2c395
)
parent
4cbeec24
No related branches found
Branches containing commit
No related tags found
1 merge request
!6167
[3.0] codec: x265: handle 4.0 encoding API change
Pipeline
#523590
passed with stage
Stage:
in 37 minutes and 23 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/codec/x265.c
+10
-0
10 additions, 0 deletions
modules/codec/x265.c
with
10 additions
and
0 deletions
modules/codec/x265.c
+
10
−
0
View file @
c0438390
...
...
@@ -74,6 +74,11 @@ static block_t *Encode(encoder_t *p_enc, picture_t *p_pict)
x265_picture
pic
;
x265_picture_init
(
&
p_sys
->
param
,
&
pic
);
#ifdef MAX_SCALABLE_LAYERS
/* Handle API changes for scalable layers output in x265 4.0 */
x265_picture
*
pics
[
MAX_SCALABLE_LAYERS
]
=
{
NULL
};
pics
[
0
]
=
&
pic
;
#endif
if
(
likely
(
p_pict
))
{
pic
.
pts
=
p_pict
->
date
;
...
...
@@ -92,8 +97,13 @@ static block_t *Encode(encoder_t *p_enc, picture_t *p_pict)
x265_nal
*
nal
;
uint32_t
i_nal
=
0
;
#ifdef MAX_SCALABLE_LAYERS
x265_encoder_encode
(
p_sys
->
h
,
&
nal
,
&
i_nal
,
likely
(
p_pict
)
?
&
pic
:
NULL
,
pics
);
#else
x265_encoder_encode
(
p_sys
->
h
,
&
nal
,
&
i_nal
,
likely
(
p_pict
)
?
&
pic
:
NULL
,
&
pic
);
#endif
if
(
!
i_nal
)
return
NULL
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment