Release Nageru 1.7.5.

[nageru] / main.cpp

diff --git a/main.cpp b/main.cpp
index 1c7e5da1e6bb6be70d2f5aeda8da98b5cbcb3342..c1a52c0489a6d7b4e9054da338635290846cf1cb 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -56,22 +56,24 @@ int main(int argc, char *argv[])
 
        parse_flags(PROGRAM_NAGERU, argc, argv);
 
-       if (global_flags.va_display.empty()) {
-               // The user didn't specify a VA-API display. See if the default works,
-               // and if not, let's try to help the user by seeing if there's any
-               // that would work automatically.
+       if (global_flags.va_display.empty() && !global_flags.x264_video_to_disk) {
+               // The user didn't specify a VA-API display, but we need one.
+               // See if the default works, and if not, let's try to help
+               // the user by seeing if there's any that would work automatically.
                global_flags.va_display = QuickSyncEncoder::get_usable_va_display();
        }
 
-       if (global_flags.va_display.empty() ||
-           global_flags.va_display[0] != '/') {
+       if ((global_flags.va_display.empty() ||
+            global_flags.va_display[0] != '/') && !global_flags.x264_video_to_disk) {
                // We normally use EGL for zerocopy, but if we use VA against DRM
                // instead of against X11, we turn it off, and then don't need EGL.
                setenv("QT_XCB_GL_INTEGRATION", "xcb_egl", 0);
                using_egl = true;
        }
        setlinebuf(stdout);
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100)
        av_register_all();
+#endif
 
        QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true);
 
@@ -98,7 +100,7 @@ int main(int argc, char *argv[])
        }
 
        MainWindow mainWindow;
-       mainWindow.resize(QSize(1500, 850));
+       mainWindow.resize(QSize(1500, 910));
        mainWindow.show();
 
        app.installEventFilter(&mainWindow);  // For white balance color picking.