Fix compilation break with SVT-AV1.

diff --git a/README b/README
index 946692b05f451236871cf6bdb92cbefc210427c6..66c9d3a2e623b127dcb0cca9ff4917dd8703d441 100644 (file)
--- 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 af615d1a0ff7e47dc1a85b6fc9bab76563ddd49d..68d1fa0feee2c34d7f4a105a940e66c4ea5c47b3 100644 (file)
--- 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 371eb0d82232afff7096f7c5d29d1362697b0aed..f4af4b0c4031e918fe282c15e943c13cf36104b9 100644 (file)
--- 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;