Muldersoft/Simple-x264-Launcher
Muldersoft/Simple-x264-Launcher
1
0
Fork 0
Code Releases 1 Activity

Added more supported input formats for NVEncC encoder.

Browse Source
This commit is contained in:
LoRd_MuldeR 2019-10-05 22:34:50 +02:00
parent b235200318
commit bb459092e6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/encoder_nvencc.cpp
View File

@ -66,7 +66,7 @@ static const unsigned int VERSION_NVENCC_MINIMUM_VER = 449;
} \ } \
while(0) while(0)
#define NVENCC_UPDATE_PROGRESS_NOPROG(X) do \ #define NVENCC_UPDATE_PROGRESS_OLD(X) do \
{ \ { \
bool ok = false; \ bool ok = false; \
unsigned int progressFrames = (X)->cap(1).toUInt(&ok); \ unsigned int progressFrames = (X)->cap(1).toUInt(&ok); \
@ -170,7 +170,9 @@ public:
{ {
switch(format) switch(format)
{ {
case MediaInfo::FILETYPE_AVISYNTH:
case MediaInfo::FILETYPE_YUV4MPEG2: case MediaInfo::FILETYPE_YUV4MPEG2:
case MediaInfo::FILETYPE_UNKNOWN:
return true; return true;
default: default:
return false; return false;
@ -412,7 +414,7 @@ void NVEncEncoder::runEncodingPass_parseLine(const QString &line, const QList<QR
} }
else if ((offset = patterns[1]->lastIndexIn(line)) >= 0) else if ((offset = patterns[1]->lastIndexIn(line)) >= 0)
{ {
NVENCC_UPDATE_PROGRESS_NOPROG(patterns[1]); NVENCC_UPDATE_PROGRESS_OLD(patterns[1]);
} }
else if ((offset = patterns[2]->lastIndexIn(line)) >= 0) else if ((offset = patterns[2]->lastIndexIn(line)) >= 0)
{ {

2
src/version.h
View File

@ -26,7 +26,7 @@
#define VER_X264_MAJOR 2 #define VER_X264_MAJOR 2
#define VER_X264_MINOR 9 #define VER_X264_MINOR 9
#define VER_X264_PATCH 4 #define VER_X264_PATCH 4
#define VER_X264_BUILD 1192 #define VER_X264_BUILD 1194
#define VER_X264_PORTABLE_EDITION (0) #define VER_X264_PORTABLE_EDITION (0)