Skip to content

Commit

Permalink
chore: scope the patch for x265 4.0 build
Browse files Browse the repository at this point in the history
upstream has reverted the x265_encoder_encode api change in https://bitbucket.org/multicoreware/x265_git/commits/78e5b703b186fe184bf91bb37df82f64059b3f61 per 4.1 release, thus the patch is no longer needed, hence reverting for now. (previous 4.0 API change commit, https://bitbucket.org/multicoreware/x265_git/commits/c69c113960834400545bc4bce2830ff51dcb86b3)

Signed-off-by: Rui Chen <[email protected]>
  • Loading branch information
chenrui333 committed Dec 29, 2024
1 parent fe65681 commit 3bf931e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/drivers/Qt/AviRecord.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ static int encode_frame( unsigned char *inBuf, int width, int height )
pic->stride[1] = width/2;
pic->stride[2] = width/2;

#ifdef MAX_SCALABLE_LAYERS
#if defined(MAX_SCALABLE_LAYERS) && (X265_BUILD >= 210) && (X265_BUILD < 213)
/* Handle API changes for scalable layers output in x265 4.0 */
x265_picture *pics[MAX_SCALABLE_LAYERS] = {NULL};
pics[0] = pic;
Expand Down Expand Up @@ -501,7 +501,7 @@ static int close(void)
/* Flush delayed frames */
while( hdl != NULL )
{
#ifdef MAX_SCALABLE_LAYERS
#if defined(MAX_SCALABLE_LAYERS) && (X265_BUILD >= 210) && (X265_BUILD < 213)
/* Handle API changes for scalable layers output in x265 4.0 */
x265_picture *pics[MAX_SCALABLE_LAYERS] = {NULL};
pics[0] = pic;
Expand Down

0 comments on commit 3bf931e

Please sign in to comment.