Merge pull request #774 from chenrui333/revert-766-fix-x265-4.0

chore: scope the patch for x265 4.0 build
TASEmulators · Jan 3, 2025 · 71ba361 · 71ba361
2 parents fe65681 + 3bf931e
commit 71ba361
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/drivers/Qt/AviRecord.cpp b/src/drivers/Qt/AviRecord.cpp
@@ -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;
@@ -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;