OSDN Git Service
(root)
/
x264-launcher
/
x264-launcher.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b235200
)
Added more supported input formats for NVEncC encoder.
v2.94
author
lordmulder
<mulder2@gmx.de>
Sat, 5 Oct 2019 20:34:50 +0000
(22:34 +0200)
committer
lordmulder
<mulder2@gmx.de>
Sat, 5 Oct 2019 20:34:50 +0000
(22:34 +0200)
src/encoder_nvencc.cpp
patch
|
blob
|
history
src/version.h
patch
|
blob
|
history
diff --git
a/src/encoder_nvencc.cpp
b/src/encoder_nvencc.cpp
index
b2c182d
..
302482c
100644
(file)
--- a/
src/encoder_nvencc.cpp
+++ b/
src/encoder_nvencc.cpp
@@
-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; \
unsigned int progressFrames = (X)->cap(1).toUInt(&ok); \
{ \
bool ok = false; \
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;
default:
return false;
return true;
default:
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)
{
diff --git
a/src/version.h
b/src/version.h
index
f5653d0
..
a06bdde
100644
(file)
--- a/
src/version.h
+++ b/
src/version.h
@@
-26,7
+26,7
@@
#define VER_X264_MAJOR 2
#define VER_X264_MINOR 9
#define VER_X264_PATCH 4
#define VER_X264_MAJOR 2
#define VER_X264_MINOR 9
#define VER_X264_PATCH 4
-#define VER_X264_BUILD 119
2
+#define VER_X264_BUILD 119
4
#define VER_X264_PORTABLE_EDITION (0)
#define VER_X264_PORTABLE_EDITION (0)