Skip to content
Snippets Groups Projects
Commit c0438390 authored by François Cartegnie's avatar François Cartegnie :fingers_crossed: Committed by Steve Lhomme
Browse files

codec: x265: handle 4.0 encoding API change

refs #28799

(cherry picked from commit 83e2c395)
parent 4cbeec24
No related branches found
No related tags found
1 merge request!6167[3.0] codec: x265: handle 4.0 encoding API change
Pipeline #523590 passed with stage
in 37 minutes and 23 seconds
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment