X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fencoder_x264.cpp;h=83367a145722b5b8f959497641d1c07804e4e64e;hb=b5637c3f0b8d530ce4ebb1c2a17b48daf45277c2;hp=ce1a957257cc96e192f24fe1ae54d078908c815e;hpb=587c29a4da1d191c1ebf2656b8ce8a497675adf5;p=x264-launcher%2Fx264-launcher.git diff --git a/src/encoder_x264.cpp b/src/encoder_x264.cpp index ce1a957..83367a1 100644 --- a/src/encoder_x264.cpp +++ b/src/encoder_x264.cpp @@ -406,7 +406,7 @@ void X264Encoder::runEncodingPass_init(QList &patterns) patterns << new QRegExp("\\[\\s*(\\d+)\\.(\\d+)%\\]\\s+(\\d+)/(\\d+)\\s(\\d+).(\\d+)\\s(\\d+).(\\d+)\\s+(\\d+):(\\d+):(\\d+)\\s+(\\d+):(\\d+):(\\d+)"); //regExpModified } -void X264Encoder::runEncodingPass_parseLine(const QString &line, QList &patterns, const int &pass, double &last_progress, double &size_estimate) +void X264Encoder::runEncodingPass_parseLine(const QString &line, QList &patterns, const unsigned int &totalFrames, const int &pass, double &last_progress, double &size_estimate) { int offset = -1; if((offset = patterns[0]->lastIndexIn(line)) >= 0)