Skip to content

Commit

Permalink
Unbreak X265_BUILD >= 213
Browse files Browse the repository at this point in the history
Signed-off-by: nyanmisaka <[email protected]>
  • Loading branch information
nyanmisaka committed Oct 7, 2024
1 parent 0f60a00 commit 9c31b00
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions debian/patches/0069-add-fixes-x265-build-from-upstream.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Index: FFmpeg/libavcodec/libx265.c
libx265Context *ctx = avctx->priv_data;
x265_picture x265pic;
- x265_picture x265pic_out = { 0 };
+#if X265_BUILD >= 210
+#if (X265_BUILD >= 210) && (X265_BUILD < 213)
+ x265_picture x265pic_layers_out[MAX_SCALABLE_LAYERS];
+ x265_picture* x265pic_lyrptr_out[MAX_SCALABLE_LAYERS];
+#else
Expand All @@ -21,7 +21,7 @@ Index: FFmpeg/libavcodec/libx265.c
}
}

+#if X265_BUILD >= 210
+#if (X265_BUILD >= 210) && (X265_BUILD < 213)
+ for (i = 0; i < MAX_SCALABLE_LAYERS; i++)
+ x265pic_lyrptr_out[i] = &x265pic_layers_out[i];
+
Expand All @@ -41,7 +41,7 @@ Index: FFmpeg/libavcodec/libx265.c

- pkt->pts = x265pic_out.pts;
- pkt->dts = x265pic_out.dts;
+#if X265_BUILD >= 210
+#if (X265_BUILD >= 210) && (X265_BUILD < 213)
+ x265pic_out = x265pic_lyrptr_out[0];
+#else
+ x265pic_out = &x265pic_solo_out;
Expand Down

0 comments on commit 9c31b00

Please sign in to comment.