OSDN Git Service

Compatibility fix.
authorlordmulder <mulder2@gmx.de>
Sun, 12 Feb 2012 16:35:50 +0000 (17:35 +0100)
committerlordmulder <mulder2@gmx.de>
Sun, 12 Feb 2012 16:35:50 +0000 (17:35 +0100)
src/model_options.cpp
src/version.h

index 02ac47c..e5b89bd 100644 (file)
@@ -121,6 +121,13 @@ bool OptionsModel::loadTemplate(OptionsModel *model, const QString &name)
        QSettings settings(QString("%1/templates.ini").arg(appDir), QSettings::IniFormat);
        settings.beginGroup(name);
 
+       //For backward-compatibility
+       if(settings.contains("custom_params"))
+       {
+               settings.setValue("custom_params_x264", settings.value("custom_params"));
+               settings.remove("custom_params"); settings.sync();
+       }
+
        bool complete = true;
        if(!settings.contains("rate_control_mode")) complete = false;
        if(!settings.contains("target_bitrate")) complete = false;
index 5b6d0bd..0a9b58e 100644 (file)
@@ -22,7 +22,7 @@
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 0
 #define VER_X264_PATCH 1
-#define VER_X264_BUILD 134
+#define VER_X264_BUILD 135
 
 #define VER_X264_MINIMUM_REV 2146
 #define VER_X264_CURRENT_API 120