Skip to content

Commit

Permalink
Merge pull request #1314 from Lastique/patch-1
Browse files Browse the repository at this point in the history
Update for compatibility with libx265 4.0
  • Loading branch information
farindk authored Sep 17, 2024
2 parents 12ad386 + 4d9d27e commit a659a7c
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions libheif/plugins/encoder_x265.cc
Original file line number Diff line number Diff line change
Expand Up @@ -901,11 +901,20 @@ static struct heif_error x265_encode_image(void* encoder_raw, const struct heif_

encoder->encoder = api->encoder_open(param);

#if X265_BUILD >= 212
x265_picture* out_pic = NULL;
api->encoder_encode(encoder->encoder,
&encoder->nals,
&encoder->num_nals,
pic,
&out_pic);
#else
api->encoder_encode(encoder->encoder,
&encoder->nals,
&encoder->num_nals,
pic,
NULL);
#endif

api->picture_free(pic);
api->param_free(param);
Expand Down Expand Up @@ -967,11 +976,20 @@ static struct heif_error x265_get_compressed_data(void* encoder_raw, uint8_t** d
encoder->nal_output_counter = 0;


#if X265_BUILD >= 212
x265_picture* out_pic = NULL;
int result = api->encoder_encode(encoder->encoder,
&encoder->nals,
&encoder->num_nals,
NULL,
&out_pic);
#else
int result = api->encoder_encode(encoder->encoder,
&encoder->nals,
&encoder->num_nals,
NULL,
NULL);
#endif
if (result <= 0) {
*data = nullptr;
*size = 0;
Expand Down

0 comments on commit a659a7c

Please sign in to comment.