OSDN Git Service

Fixed CQ and CRF mode being mixed up.
authorlordmulder <mulder2@gmx.de>
Tue, 24 May 2016 18:03:25 +0000 (20:03 +0200)
committerlordmulder <mulder2@gmx.de>
Tue, 24 May 2016 18:03:25 +0000 (20:03 +0200)
src/encoder_x264.cpp
src/encoder_x265.cpp
src/version.h

index 770a2cd..8cf4875 100644 (file)
@@ -312,12 +312,12 @@ void X264Encoder::buildCommandLine(QStringList &cmdLine, const bool &usePipe, co
        switch(m_options->rcMode())
        {
        case 0:
-               cmdLine << "--qp" << QString::number(qRound(m_options->quantizer()));
-               break;
-       case 1:
                crf_frc = modf(m_options->quantizer(), &crf_int);
                cmdLine << "--crf" << QString("%1.%2").arg(QString::number(qRound(crf_int)), QString::number(qRound(crf_frc * 10.0)));
                break;
+       case 1:
+               cmdLine << "--qp" << QString::number(qRound(m_options->quantizer()));
+               break;
        case 2:
        case 3:
                cmdLine << "--bitrate" << QString::number(m_options->bitrate());
index 17c584d..99eb230 100644 (file)
@@ -303,12 +303,12 @@ void X265Encoder::buildCommandLine(QStringList &cmdLine, const bool &usePipe, co
        switch(m_options->rcMode())
        {
        case 0:
-               cmdLine << "--qp" << QString::number(qRound(m_options->quantizer()));
-               break;
-       case 1:
                crf_frc = modf(m_options->quantizer(), &crf_int);
                cmdLine << "--crf" << QString("%1.%2").arg(QString::number(qRound(crf_int)), QString::number(qRound(crf_frc * 10.0)));
                break;
+       case 1:
+               cmdLine << "--qp" << QString::number(qRound(m_options->quantizer()));
+               break;
        case 2:
        case 3:
                cmdLine << "--bitrate" << QString::number(m_options->bitrate());
index 794d2b3..3ce96bf 100644 (file)
@@ -26,7 +26,7 @@
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 7
 #define VER_X264_PATCH 0
-#define VER_X264_BUILD 1031
+#define VER_X264_BUILD 1032
 
 #define VER_X264_PORTABLE_EDITION (0)