From cecd32b340ef23498d31095bfb4bb17f5877af7e Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Tue, 4 Jul 2023 20:15:11 +0200 Subject: [PATCH] Fix compilation break with SVT-AV1. --- README | 2 +- meson.build | 2 +- nageru/av1_encoder.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index 946692b..66c9d3a 100644 --- a/README +++ b/README @@ -96,7 +96,7 @@ Nageru currently needs: - Optional: SVT-AV1, for encoding high-quality video suitable for streaming to end users (higher quality than using x264, but not nearly as mature). - You will need at least version 1.0.0. + You will need at least version 1.5.0. Futatabi also needs: diff --git a/meson.build b/meson.build index af615d1..68d1fa0 100644 --- a/meson.build +++ b/meson.build @@ -26,7 +26,7 @@ qt5deps = dependency('qt5', modules: ['Core', 'Gui', 'Widgets', 'OpenGLExtension sdl2_imagedep = dependency('SDL2_image', required: false) sdl2dep = dependency('sdl2', required: false) srtdep = dependency('srt', required: false) -svtav1dep = dependency('SvtAv1Enc', required: false, version: '>=1.0.0') +svtav1dep = dependency('SvtAv1Enc', required: false, version: '>=1.5.0') sqlite3dep = dependency('sqlite3') threaddep = dependency('threads') vadrmdep = dependency('libva-drm') diff --git a/nageru/av1_encoder.cpp b/nageru/av1_encoder.cpp index 371eb0d..f4af4b0 100644 --- a/nageru/av1_encoder.cpp +++ b/nageru/av1_encoder.cpp @@ -292,8 +292,8 @@ void AV1Encoder::encode_frame(AV1Encoder::QueuedFrame qf) pic.cr_stride = global_flags.width / 2; // Likewise. pic.width = global_flags.width; pic.height = global_flags.height; - pic.origin_x = 0; - pic.origin_y = 0; + pic.org_x = 0; + pic.org_y = 0; pic.color_fmt = EB_YUV420; pic.bit_depth = global_flags.bit_depth > 8 ? EB_TEN_BIT : EB_EIGHT_BIT; -- 2.39.2