Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 37

avidemux3.changes Changed

avidemux3.spec Changed

avidemux_2.6.19.tar.gz/avidemux/winInstaller/Change Log.html Deleted

@@ -1,22 +0,0 @@
-<html><head></head><body><h1>Changelog:</h1> 
-<li> [mingw] Better print stack trace <a href="https://github.com/mean00/avidemux2/commit/4a47dd62c35f10b6784a461ea677f5df80210446"> *;</a> </li> 
-<li> [build/mingw] Add CMAKE_EXTRA_ARG to build env <a href="https://github.com/mean00/avidemux2/commit/ce18317463c177ef9ddd20fd4c9b78ed0e3cc420"> *;</a> </li> 
-<li> [mingw] display back trace <a href="https://github.com/mean00/avidemux2/commit/ad0d6fd10c725f7f2a51fa1cb8d52dad03379f6d"> *;</a> </li> 
-<li> [Build] Fix gen log <a href="https://github.com/mean00/avidemux2/commit/d8e5e63398befaa87d24c6d2aff460ff9c8ceba6"> *;</a> </li> 
-<li> [Mp4/Demux] Mostly correct fragmented mp4 demux with video only. Not sure about audio <a href="https://github.com/mean00/avidemux2/commit/042cce53746344d3001492ef3f9285284ab7e861"> *;</a> </li> 
-<li> [mp4/Demux] Partial decoding of pts/dts (incorrect) <a href="https://github.com/mean00/avidemux2/commit/f256ca4f48c19b458b5d66987e19b54b7ff6e791"> *;</a> </li> 
-<li> [mp4/demux] Attach fragments to the track <a href="https://github.com/mean00/avidemux2/commit/8de90a9c8cc731419934768f933f8b9debad8123"> *;</a> </li> 
-<li> [mp4/fragment] Correct offset, duration and flags still not correct <a href="https://github.com/mean00/avidemux2/commit/49dced16f294098d9d8fcf5344f8345c0ed87342"> *;</a> </li> 
-<li> [MP4/Demux] Merge fragments info video <a href="https://github.com/mean00/avidemux2/commit/0aefedbd0df7d0f98c161c4c279c2043b6252964"> *;</a> </li> 
-<li> [mp4/demux] Decode more fragments info <a href="https://github.com/mean00/avidemux2/commit/67ea2fbe387887fc025b52196f97738103b6a6c6"> *;</a> </li> 
-<li> [mp4/demux] Decode a bit more mp4 fragments <a href="https://github.com/mean00/avidemux2/commit/2d1ca92b83ed17005ec5e3ba24852aab70a07d9f"> *;</a> </li> 
-<li> [Mp4/demux] Probe for sidx to detect Dash files <a href="https://github.com/mean00/avidemux2/commit/7df2e0e674b080b5b0357c8f1d4a8fe938f4b30c"> *;</a> </li> 
-<li> [mkv/vp9] Add missing space in vp9 fourcc <a href="https://github.com/mean00/avidemux2/commit/5ef460d1a081329dca64622b315a1391f81d35f2"> *;</a> </li> 
-<li> [image] Fix mmx nv12 <a href="https://github.com/mean00/avidemux2/commit/fc163e9a54eb0f3c685734c735c441a6be20d2d1"> *;</a> </li> 
-<li> [nvenc] Disable nvenc, let libavcodec do the yuv12->nv12 format conversion internally, it saves us one copy <a href="https://github.com/mean00/avidemux2/commit/bff0be82aae9d10adb2955c58ddb0ab35258fbc1"> *;</a> </li> 
-<li> [libva] Remove debug code <a href="https://github.com/mean00/avidemux2/commit/51adaa4dbdcdae7e33ec57484c4acb0d59dc024d"> *;</a> </li> 
-<li> [libVa] Remove useless plane copy <a href="https://github.com/mean00/avidemux2/commit/9e003828658bde73d3edf17089d9110a547aaac5"> *;</a> </li> 
-<li> [libva] dont reset image infos (pts...) in indirect mode <a href="https://github.com/mean00/avidemux2/commit/77acf9cf08b980e5b464068ac693381c14183b4d"> *;</a> </li> 
-<li> [coreImage] cosmetic <a href="https://github.com/mean00/avidemux2/commit/aff0288c0a62bfe109d89b3e22a66773c7e44c0e"> *;</a> </li> 
-<li> [Decoder/Libva] Cleanup, still not 100% ok <a href="https://github.com/mean00/avidemux2/commit/9ad16987240c4a9c7b378ecfa7424ced9e42b623"> *;</a> </li> 
-</body>

avidemux_2.6.19.tar.gz/avidemux/cli/CMakeLists.txt -> avidemux_2.6.20.tar.gz/avidemux/cli/CMakeLists.txt Changed

avidemux_2.6.19.tar.gz/avidemux/common/ADM_commonUI/myOwnMenu.h -> avidemux_2.6.20.tar.gz/avidemux/common/ADM_commonUI/myOwnMenu.h Changed

avidemux_2.6.19.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp -> avidemux_2.6.20.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp Changed

avidemux_2.6.19.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_vidPartial.cpp -> avidemux_2.6.20.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_vidPartial.cpp Changed

avidemux_2.6.19.tar.gz/avidemux/common/gui_main.cpp -> avidemux_2.6.20.tar.gz/avidemux/common/gui_main.cpp Changed

@@ -171,19 +171,33 @@
         int actionId = (action - ACT_SCRIPT_ENGINE_FIRST) % 3;
 
         tempEngine = getScriptEngines()[engineIndex];
-
+#ifndef _WIN64
+        std::string ext=tempEngine->defaultFileExtension();
+#endif
         switch (actionId)
         {
             case 0:
+#ifdef _WIN64
                 GUI_FileSelRead(QT_TRANSLATE_NOOP("adm","Select script to run"), RunScript);
+#else
+                GUI_FileSelReadExtension(QT_TRANSLATE_NOOP("adm","Select script to run"), ext.c_str(), RunScript);
+#endif
                 break;
 
             case 1:
+#ifdef _WIN64
                 GUI_FileSelRead(QT_TRANSLATE_NOOP("adm","Select script to debug"), DebugScript);
+#else
+                GUI_FileSelReadExtension(QT_TRANSLATE_NOOP("adm","Select script to debug"), ext.c_str(), DebugScript);
+#endif
                 break;
 
             case 2:
+#ifdef _WIN64
                 GUI_FileSelWrite(QT_TRANSLATE_NOOP("adm","Select script to save"), SaveScript);
+#else
+                GUI_FileSelWriteExtension(QT_TRANSLATE_NOOP("adm","Select script to save"), ext.c_str(), SaveScript);
+#endif
                 UI_refreshCustomMenu();
                 break;
         }

avidemux_2.6.19.tar.gz/avidemux/common/main.cpp -> avidemux_2.6.20.tar.gz/avidemux/common/main.cpp Changed

avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp -> avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp Changed

avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_jobs/src/CMakeLists.txt -> avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_jobs/src/CMakeLists.txt Changed

avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/CMakeLists.txt -> avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/CMakeLists.txt Changed

avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_about.cpp -> avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_about.cpp Changed

avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.cpp -> avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.cpp Changed

@@ -19,104 +19,180 @@
 #include "ADM_vidMisc.h"
 #include "ADM_toolkitQt.h"
 #include "ADM_coreUtils.h"
+#include <QClipboard>
 
 static const char *yesno[2]={QT_TRANSLATE_NOOP("qprops","No"),QT_TRANSLATE_NOOP("qprops","Yes")};
 
 propWindow::propWindow(QWidget *parent) : QDialog(parent)
- {
- ui.setupUi(this);
- uint8_t gmc=0, qpel=0,vop=0;
- uint32_t info=0;
- uint32_t war,har;
- uint32_t hh, mm, ss, ms;
- char text[80];
- const char *s;
- 
+{
+ ui.setupUi(this);
+ uint32_t war,har;
+ uint32_t hh, mm, ss, ms;
+ char text[80];
+ const char *s;
+
 text[0] = 0;
+ listOfValues.clear();
 if (!avifileinfo)
 return;
 
-#define FILLTEXT(a,b,c) {snprintf(text,79,b,c);ui.a->setText(text);}
-#define FILLTEXT4(a,b,c,d) {snprintf(text,79,b,c,d);ui.a->setText(text);}
-#define FILLTEXT5(a,b,c,d,e) {snprintf(text,79,b,c,d,e);ui.a->setText(text);}
+#define FILLTEXT(a,b,c) {snprintf(text,79,b,c); listOfValues.push_back(text); ui.a->setText(text);}
+#define FILLTEXT4(a,b,c,d) {snprintf(text,79,b,c,d); listOfValues.push_back(text); ui.a->setText(text);}
+#define FILLTEXT5(a,b,c,d,e) {snprintf(text,79,b,c,d,e); listOfValues.push_back(text); ui.a->setText(text);}
 #define SET_YES(a,b) ui.a->setText(yesno[b])
-#define FILLQT_TRANSLATE_NOOP(a,q) ui.q->setText(text);
- 
- 
- //------------------------------------
- 
- FILLTEXT4(labeImageSize,QT_TRANSLATE_NOOP("qprops","%" PRIu32" x %" PRIu32), avifileinfo->width,avifileinfo->height);
- FILLTEXT(labelFrameRate, QT_TRANSLATE_NOOP("qprops","%2.3f fps"), (float) avifileinfo->fps1000 / 1000.F);
- FILLTEXT(label4CC, "%s", fourCC::tostring(avifileinfo->fcc));
- uint64_t duration=video_body->getVideoDuration();
- ms2time(duration/1000,&hh,&mm,&ss,&ms);
- snprintf(text,79, QT_TRANSLATE_NOOP("qprops","%02d:%02d:%02d.%03d"), hh, mm, ss, ms);
- ui.labelVideoDuration->setText(text);
-
- war=video_body->getPARWidth();
- har=video_body->getPARHeight();
- getAspectRatioFromAR(war,har, &s);
- FILLTEXT5(LabelAspectRatio,QT_TRANSLATE_NOOP("qprops","%s (%u:%u)"), s,war,har);
- 
- uint32_t extraLen;
- uint8_t *extraData;
- video_body->getExtraHeaderData(&extraLen,&extraData);
- FILLTEXT(LabelExtraDataSize,"%02d",extraLen);
- if(extraLen)
+#define FILLQT_TRANSLATE_NOOP(a,q) listOfValues.push_back(text); ui.q->setText(text);
+
+ //------------------------------------
+
+ FILLTEXT(label4CC, "%s", fourCC::tostring(avifileinfo->fcc));
+
+ FILLTEXT4(labeImageSize,QT_TRANSLATE_NOOP("qprops","%" PRIu32" x %" PRIu32), avifileinfo->width,avifileinfo->height);
+
+ war=video_body->getPARWidth();
+ har=video_body->getPARHeight();
+ getAspectRatioFromAR(war,har, &s);
+ FILLTEXT5(LabelAspectRatio,QT_TRANSLATE_NOOP("qprops","%s (%u:%u)"), s,war,har);
+
+ FILLTEXT(labelFrameRate, QT_TRANSLATE_NOOP("qprops","%2.3f fps"), (float) avifileinfo->fps1000 / 1000.F);
+
+ uint64_t duration=video_body->getVideoDuration();
+ ms2time(duration/1000,&hh,&mm,&ss,&ms);
+ snprintf(text,79, QT_TRANSLATE_NOOP("qprops","%02d:%02d:%02d.%03d"), hh, mm, ss, ms);
+ listOfValues.push_back(text);
+ ui.labelVideoDuration->setText(text);
+
+ uint32_t extraLen;
+ uint8_t *extraData;
+ video_body->getExtraHeaderData(&extraLen,&extraData);
+ FILLTEXT(LabelExtraDataSize,"%02d",extraLen);
+
+ if(extraLen)
+ {
+ int capped=extraLen;
+ if(capped>10) capped=10;
+ QString string;
+ char smallx[10];
+ for(int i=0;i<capped;i++)
+ {
+ snprintf(smallx,4,"%02X ",extraData[i]);
+ string+=QString(smallx);
+ }
+ listOfValues.push_back(string);
+ ui.LabelExtraData->setText(string);
+ }else
+ ui.LabelExtraData->clear();
+
+ //------------------------------------
+ WAVHeader *wavinfo=NULL;
+ ADM_audioStream *st;
+ video_body->getDefaultAudioTrack(&st);
+ if(st)
+ wavinfo=st->getInfo();
+ if(wavinfo)
+ {
+ sprintf(text, "%s", getStrFromAudioCodec(wavinfo->encoding));
+ FILLQT_TRANSLATE_NOOP("qprops",labelACodec);
+
+ switch (wavinfo->channels)
 {
- int capped=extraLen;
- if(capped>10) capped=10;
- QString string;
- char smallx[10];
- for(int i=0;i<capped;i++)
- {
- snprintf(smallx,4,"%02X ",extraData[i]);
- string+=QString(smallx);
- }
- ui.LabelExtraData->setText(string);
- }else
- ui.LabelExtraData->clear();
- 
- //------------------------------------
- WAVHeader *wavinfo=NULL;
- ADM_audioStream *st;
- video_body->getDefaultAudioTrack(&st);
- if(st)
- wavinfo=st->getInfo();
- if(wavinfo)
- {
- 
- switch (wavinfo->channels)
- {
- case 1:
- sprintf(text,"%s", QT_TRANSLATE_NOOP("qprops","Mono"));
- break;
- case 2:
- sprintf(text,"%s", QT_TRANSLATE_NOOP("qprops","Stereo"));
- break;
- default:
- sprintf(text, "%d",wavinfo->channels);
- break;
- }
-
- FILLQT_TRANSLATE_NOOP("qprops",labelChannels);
- FILLTEXT(labelFrequency, QT_TRANSLATE_NOOP("qprops","%" PRIu32" Hz"), wavinfo->frequency);
- FILLTEXT4(labelBitrate, QT_TRANSLATE_NOOP("qprops","%" PRIu32" Bps / %" PRIu32" kbps"), wavinfo->byterate,wavinfo->byterate * 8 / 1000);
- 
- sprintf(text, "%s", getStrFromAudioCodec(wavinfo->encoding));
- FILLQT_TRANSLATE_NOOP("qprops",labelACodec);
- //
- duration=st->getDurationInUs();
- ms2time(duration/1000,&hh,&mm,&ss,&ms);
-
- sprintf(text, QT_TRANSLATE_NOOP("qprops","%02d:%02d:%02d.%03d"), hh, mm, ss, ms);
- FILLQT_TRANSLATE_NOOP("qprops",labelAudioDuration);
+ case 1:
+ sprintf(text,"%s", QT_TRANSLATE_NOOP("qprops","Mono"));
+ break;
+ case 2:
+ sprintf(text,"%s", QT_TRANSLATE_NOOP("qprops","Stereo"));
+ break;
+ default:
+ sprintf(text, "%d",wavinfo->channels);
+ break;
+ }
+
+ FILLQT_TRANSLATE_NOOP("qprops",labelChannels);
+
+ FILLTEXT4(labelBitrate, QT_TRANSLATE_NOOP("qprops","%" PRIu32" Bps / %" PRIu32" kbps"), wavinfo->byterate, wavinfo->byterate * 8 / 1000);
+
+ FILLTEXT(labelVBR,"%s","n/a");
+
+ FILLTEXT(labelFrequency, QT_TRANSLATE_NOOP("qprops","%" PRIu32" Hz"), wavinfo->frequency);
+
+ duration=st->getDurationInUs();
+ ms2time(duration/1000,&hh,&mm,&ss,&ms);
+ sprintf(text, QT_TRANSLATE_NOOP("qprops","%02d:%02d:%02d.%03d"), hh, mm, ss, ms);
+ FILLQT_TRANSLATE_NOOP("qprops",labelAudioDuration);
+
 // SET_YES(labelVBR,currentaudiostream->isVBR());
- } else
- {
-			 ui.groupBoxAudio->setEnabled(false);
- }
- }
+ } else
+ {
+ ui.groupBoxAudio->setEnabled(false);
+ }
+
+ connect(ui.pushButton_c2c,SIGNAL(clicked()),this,SLOT(propsCopyToClipboard()));
+}
+

avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.h -> avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.h Changed

avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/props.ui -> avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/props.ui Changed

@@ -7,20 +7,14 @@
 <x>0</x>
 <y>0</y>
 <width>291</width>
- <height>456</height>
+ <height>451</height>
 </rect>
 </property>
 <property name="windowTitle">
 <string>Properties</string>
 </property>
- <layout class="QVBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="margin">
- <number>9</number>
- </property>
- <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0" colspan="3">
 <widget class="QGroupBox" name="groupBox">
 <property name="title">
 <string>Video</string>
@@ -29,7 +23,16 @@
 <bool>false</bool>
 </property>
 <layout class="QGridLayout">
- <property name="margin">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
 <number>9</number>
 </property>
 <property name="spacing">
@@ -108,13 +111,22 @@
 </layout>
 </widget>
 </item>
- <item>
+ <item row="1" column="0" colspan="3">
 <widget class="QGroupBox" name="groupBox_2">
 <property name="title">
 <string>Extra Video Properties</string>
 </property>
 <layout class="QGridLayout">
- <property name="margin">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
 <number>9</number>
 </property>
 <property name="spacing">
@@ -123,7 +135,7 @@
 <item row="0" column="1">
 <widget class="QLabel" name="LabelExtraDataSize">
 <property name="text">
- <string> </string>
+ <string/>
 </property>
 </widget>
 </item>
@@ -137,7 +149,7 @@
 <item row="1" column="1">
 <widget class="QLabel" name="LabelExtraData">
 <property name="text">
- <string> </string>
+ <string/>
 </property>
 </widget>
 </item>
@@ -151,7 +163,7 @@
 </layout>
 </widget>
 </item>
- <item>
+ <item row="2" column="0" colspan="3">
 <widget class="QGroupBox" name="groupBoxAudio">
 <property name="title">
 <string>Audio</string>
@@ -160,7 +172,16 @@
 <bool>false</bool>
 </property>
 <layout class="QGridLayout">
- <property name="margin">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
 <number>9</number>
 </property>
 <property name="spacing">
@@ -253,31 +274,55 @@
 </layout>
 </widget>
 </item>
- <item>
- <widget class="QPushButton" name="pushButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="layoutDirection">
- <enum>Qt::RightToLeft</enum>
- </property>
- <property name="text">
- <string>OK</string>
- </property>
- <property name="default">
- <bool>true</bool>
- </property>
- </widget>
+ <item row="3" column="0" colspan="3">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QPushButton" name="pushButton_c2c">
+ <property name="text">
+ <string>Copy to Clipboard</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_ok">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="text">
+ <string>OK</string>
+ </property>
+ <property name="default">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
 </item>
 </layout>
 </widget>
 <resources/>
 <connections>
 <connection>
- <sender>pushButton</sender>
+ <sender>pushButton_ok</sender>
 <signal>clicked()</signal>
 <receiver>propsDialog</receiver>
 <slot>accept()</slot>

avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp -> avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp Changed

@@ -47,6 +47,8 @@
 #include "ADM_edScriptGenerator.h"
 #include "DIA_fileSel.h"
 #include "ADM_script2/include/ADM_script.h"
+
+#include <QMenu>
 /*******************************************************/
 #define NB_TREE 8
 #define myFg 0xFF
@@ -61,6 +63,7 @@
 /*******************************************************/
 #define zprintf(...) {}
 //#define NO_DELEGATE
+#define LABEL_SECURITY_MARGIN 6
 
 extern ADM_Composer *video_body;
 
@@ -77,7 +80,6 @@
 zprintf("Parent : %p\n",parent());
 #if !defined(NO_EVENT_FILTER)
 QListWidget *list=qobject_cast<QListWidget*>(parent());
- QAbstractItemView *view = qobject_cast<QAbstractItemView*>(parent());
 //printf("Event %d\n",event->type());
 switch(event->type())
 {
@@ -117,17 +119,28 @@
 QAbstractItemView *view = qobject_cast<QAbstractItemView*>(parent());
 QLabel *label;
 
+ int scrollbarWidth = qApp->style()->pixelMetric(QStyle::PM_ScrollBarExtent);
+ int width=qobject_cast<QWidget*>(view)->width();
+ width -= scrollbarWidth;
+ width -= LABEL_SECURITY_MARGIN;
+
 if (view->indexWidget(index) == 0)
 {
 label = new QLabel();
 label->installEventFilter(filter);
 label->setAutoFillBackground(true);
 label->setFocusPolicy(Qt::TabFocus);
+ label->setMargin(2);
+ label->setWordWrap(true);
 label->setText(index.data().toString());
 view->setIndexWidget(index, label);
 }
 
 label = (QLabel*)view->indexWidget(index);
+ // If label width exceeds the width of the viewport, labels get sometimes painted
+ // over other widgets, especially bad on Windows, where they overlay scrollbars.
+ // Set the width to a fixed value small enough to avoid horizontal scrolling.
+ label->setFixedWidth(width);
 
 if (option.state & QStyle::State_Selected)
 if (option.state & QStyle::State_HasFocus)
@@ -367,6 +380,34 @@
 displayFamily(m);
 
 }
+
+/**
+ \fn calculateListItemHeight
+ */
+int filtermainWindow::calculateListItemHeight(QListWidget *parent, QString text)
+{
+ QLabel *dummy=new QLabel();
+
+ int width=parent->frameSize().width();
+ int scrollbarWidth = qApp->style()->pixelMetric(QStyle::PM_ScrollBarExtent);
+ width -= scrollbarWidth;
+ width -= LABEL_SECURITY_MARGIN;
+ dummy->setFixedWidth(width);
+ dummy->setMargin(2);
+ dummy->setWordWrap(true);
+ dummy->setText(text);
+
+ QFont fnt=dummy->font();
+ QFontMetrics fm(fnt);
+ int height=fm.boundingRect(0, 0, width, dummy->height(), Qt::TextWordWrap | Qt::AlignLeft, text).height();
+ if(height < (fm.lineSpacing() * 2))
+ height=fm.lineSpacing() * 2;
+ height += 8; // the height might be insufficient at very small font sizes
+ delete dummy;
+ dummy=NULL;
+ return height;
+}
+
 /**
 * \fn displayFamily
 * @param family
@@ -377,7 +418,6 @@
 
 uint32_t nb=ADM_vf_getNbFiltersInCategory((VF_CATEGORY)family);
 ADM_info("Video filter Family :%u, nb %d\n",family,nb);
- QSize sz;
 availableList->clear();
 for (uint32_t i = 0; i < nb; i++)
 {
@@ -388,7 +428,7 @@
 
 QListWidgetItem *item;
 item=new QListWidgetItem(str,availableList,ALL_FILTER_BASE+i+family*100);
- item->setToolTip(desc);
+ item->setSizeHint(QSize(availableList->frameSize().width(),calculateListItemHeight(availableList,str)));
 availableList->addItem(item);
 }
 
@@ -442,10 +482,75 @@
 QString str = QString("") + name + QString(" \n") + conf + QString("");
 QListWidgetItem *item=new QListWidgetItem(str,activeList,ACTIVE_FILTER_BASE+i);
 printf("Active item :%p\n",item);
+ item->setSizeHint(QSize(item->sizeHint().width(),calculateListItemHeight(activeList,str)));
 activeList->addItem(item);
 }
 
 }
+
+/**
+ \fn activeListContextMenu
+*/
+void filtermainWindow::activeListContextMenu(const QPoint &pos)
+{
+ QMenu *cm=new QMenu();
+
+ QAction *up = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Move up")),this);
+ QAction *down = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Move down")),this);
+ QAction *configure = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Configure")),this);
+ QAction *remove = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Remove")),this);
+ QAction *partial = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Make partial")),this);
+
+ cm->addAction(up);
+ cm->addAction(down);
+ cm->addAction(configure);
+ cm->addAction(remove);
+ cm->addAction(partial);
+
+ connect(up,SIGNAL(triggered()),this,SLOT(moveUp()));
+ connect(down,SIGNAL(triggered()),this,SLOT(moveDown()));
+ connect(configure,SIGNAL(triggered()),this,SLOT(configureAction()));
+ connect(remove,SIGNAL(triggered()),this,SLOT(removeAction()));
+ connect(partial,SIGNAL(triggered()),this,SLOT(makePartial()));
+
+ updateContextMenu(cm);
+ cm->exec(activeList->viewport()->mapToGlobal(pos));
+}
+
+/**
+ \fn updateContextMenu
+ \brief Disable not applicable entries in the active filters context menu
+*/
+void filtermainWindow::updateContextMenu(QMenu *contextMenu)
+{
+ if(!nb_active_filter)
+ return;
+ if(!contextMenu->actions().size())
+ return;
+ bool canMoveUp=true;
+ bool canMoveDown=true;
+ bool canPartialize=true;
+ QListWidgetItem *item=activeList->currentItem();
+ if(!item)
+ return;
+
+ int itag=item->type();
+ ADM_assert(itag>=ACTIVE_FILTER_BASE);
+ itag -= ACTIVE_FILTER_BASE;
+ uint32_t tag=ADM_vf_getTag(itag);
+ canPartialize=ADM_vf_canBePartialized(tag);
+
+ int row=item->listWidget()->row(item);
+ if(!row)
+ canMoveUp=false;
+ if(row==nb_active_filter-1)
+ canMoveDown=false;
+
+ contextMenu->actions().at(0)->setEnabled(canMoveUp);
+ contextMenu->actions().at(1)->setEnabled(canMoveDown);
+ contextMenu->actions().at(4)->setEnabled(canPartialize);
+}
+
 /**
 */
 filtermainWindow::filtermainWindow(QWidget* parent) : QDialog(parent)
@@ -480,7 +585,7 @@
 connect(ui.buttonClose, SIGNAL(clicked(bool)), this, SLOT(accept()));
 connect(ui.pushButtonPreview, SIGNAL(clicked(bool)), this, SLOT(preview(bool)));
 
-
+ qobject_cast<QAbstractScrollArea*>(availableList)->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 availableList->setItemDelegate(new FilterItemDelegate(availableList));
 
 displayFamily(0);
@@ -497,26 +602,9 @@
 availableList->setContextMenuPolicy(Qt::ActionsContextMenu);
 availableList->addAction(add );
 connect(add,SIGNAL(triggered(bool )),this,SLOT(addSlot()));
- 
- 
- QAction *remove = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Remove")),this);
- QAction *configure = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Configure")),this);
- QAction *up = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Move up")),this);

avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.h -> avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.h Changed

avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp -> avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp Changed

@@ -15,7 +15,7 @@
 #include <qfiledialog.h>
 
 #include "ADM_default.h"
-
+#include "ADM_toolkitQt.h"
 
 #include "DIA_fileSel.h"
 #include "DIA_coreToolkit.h"
@@ -24,9 +24,18 @@
 #include "prefs.h"
 #include "ADM_last.h"
 
+extern QWidget *QuiMainWindows;
+
 namespace ADM_QT4_fileSel
 {
 
+QWidget *fileSelGetParent(void)
+{
+ QWidget *parent=qtLastRegisteredDialog();
+ if(!parent)
+ parent=QuiMainWindows;
+ return parent;
+}
 
 /**
 \fn GUI_FileSelWrite (const char *label, char **name, uint32_t access) 
@@ -91,7 +100,7 @@
 {
 filterFile=QString(ext)+QString(QT_TRANSLATE_NOOP("qfile"," files (*."))+QString(ext)+QString(");;")+filterFile;
 }
- fileName = QFileDialog::getSaveFileName(NULL, 
+ fileName = QFileDialog::getSaveFileName(fileSelGetParent(),
 label, // caption
 str, // folder
 filterFile, // filter
@@ -158,7 +167,7 @@
 {
 filterFile=QString(ext)+QString(QT_TRANSLATE_NOOP("qfile"," files (*."))+QString(ext)+QString(");;")+filterFile;
 }
- fileName = QFileDialog::getOpenFileName(NULL, 
+ fileName = QFileDialog::getOpenFileName(fileSelGetParent(),
 label, // caption
 str, // folder
 filterFile, // filter
@@ -225,7 +234,7 @@
 QString fileName;
 QFileDialog::Options options = 0;
 
- fileName=QFileDialog::getSaveFileName(NULL, title, source, NULL, NULL, options);
+ fileName=QFileDialog::getSaveFileName(fileSelGetParent(), title, source, NULL, NULL, options);
 
 if (!fileName.isNull())
 {
@@ -250,7 +259,7 @@
 QString fileName;
 QFileDialog::Options options = 0;
 
- fileName = QFileDialog::getOpenFileName(NULL, title, source, NULL, NULL, options);
+ fileName = QFileDialog::getOpenFileName(fileSelGetParent(), title, source, NULL, NULL, options);
 
 if (!fileName.isNull())
 {
@@ -275,8 +284,7 @@
 QString fileName;
 QFileDialog::Options options = QFileDialog::ShowDirsOnly;
 
-
- fileName = QFileDialog::getExistingDirectory(NULL, title, source, options);
+ fileName = QFileDialog::getExistingDirectory(fileSelGetParent(), title, source, options);
 
 if (!fileName.isNull())
 {

avidemux_2.6.19.tar.gz/avidemux/qt4/CMakeLists.txt -> avidemux_2.6.20.tar.gz/avidemux/qt4/CMakeLists.txt Changed

@@ -133,7 +133,9 @@
 ADD_SUBDIRECTORY(ADM_userInterfaces ./ADM_userInterfaces${QT_LIBRARY_EXTENSION})
 
 SDLify(../common/main.cpp)
-ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
+if (ADM_SUBVERSION)
+        ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
+endif (ADM_SUBVERSION)
 ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_VERSION=\"${AVIDEMUX_VERSION}\"")
 ADD_SOURCE_CFLAGS(../common/main.cpp "-DQT_FLAVOR=\"${QT_EXTENSION}\"")
 
@@ -266,5 +268,20 @@
 ADM_INSTALL_QT_INCLUDE_FOLDER("${CMAKE_CURRENT_SOURCE_DIR}/ADM_openGL/include/"  ADM_openGL)
 ADM_INSTALL_QT_INCLUDE_FOLDER("${CMAKE_CURRENT_SOURCE_DIR}/ADM_UIs/include/"  ADM_UIs)
 
+#
+IF(WIN32)
+        include(FindBourne)
+        IF(RELEASE)
+                configure_file(
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/ChangeLog.release 
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/ChangeLog.html
+                                COPYONLY)
+        ELSE(RELEASE)
+                execute_process(
+                        COMMAND ${BASH_EXECUTABLE} genlog.sh
+                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/
+                        )
+        ENDIF(RELEASE)
+ENDIF(WIN32)
 
 MESSAGE("")

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux.pro -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux.pro Changed

@@ -33,6 +33,7 @@
 ../../../avidemux_core/ADM_core/include/ADM_inttype.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_crashdump.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_files.h \ 
+../../../avidemux_core/ADM_core/include/ADM_mangle_gcc.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_byteBuffer.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_crashdump_apple.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_ptrQueue.h \ 
@@ -52,6 +53,7 @@
 ../../../avidemux_core/ADM_core/include/ADM_crashdump_other.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_dynamicLoading.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_vidMisc.h \ 
+../../../avidemux_core/ADM_core/include/ADM_mangle_vs.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_cpuCap.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_memsupport.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_misc.h \ 
@@ -85,9 +87,6 @@
 ../../../avidemux_core/ADM_coreSqlLight3/include/SysLog2.h \ 
 ../../../avidemux_core/ADM_coreSqlLight3/include/ADM_coreSqlLight3_export.h \ 
 ../../../avidemux_core/ADM_coreSqlLight3/include/Database.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/ADM_coreDxva2.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/ADM_coreDxva2_export.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/ADM_coreD3D.h \ 
 ../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpauInternal.h \ 
 ../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpau.h \ 
 ../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/include/fglrxinfo.h \ 
@@ -105,7 +104,6 @@
 ../../../avidemux_core/ADM_coreVideoCodec/include/ADM_hwAccel.h \ 
 ../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codecFFsimple.h \ 
 ../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_mmxMacros.h \ 
 ../../../avidemux_core/ADM_coreImage/include/ADM_rgb.h \ 
 ../../../avidemux_core/ADM_coreImage/include/ADM_colorspace.h \ 
 ../../../avidemux_core/ADM_coreImage/include/ADM_pp.h \ 
@@ -323,6 +321,10 @@
 ../../../avidemux/common/ADM_render/GUI_simpleRender.h \ 
 ../../../avidemux/common/ADM_render/ADM_render6_export.h \ 
 ../../../avidemux/common/ADM_render/GUI_nullRender.h \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreD3DApi.h \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreDxva2.h \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreDxva2_export.h \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreD3D.h \ 
 ../../../avidemux/common/ADM_render/GUI_libvaRender.h \ 
 ../../../avidemux/common/ADM_render/GUI_render.h \ 
 ../../../avidemux/common/ADM_render/GUI_sdlRender.h \ 
@@ -516,9 +518,10 @@
 ../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.h \ 
 ../../../avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/libva/ADM_libvaEncoder.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/png/ADM_pngEncoder.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/x264/x264_encoder.h \ 
@@ -532,7 +535,10 @@
 ../../../avidemux_plugins/ADM_videoEncoder/huff/huff_encoder.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h \ 
@@ -815,10 +821,6 @@
 ../../../avidemux_core/ADM_coreSqlLight3/src/Database.cpp \ 
 ../../../avidemux_core/ADM_coreSqlLight3/src/StderrLog.cpp \ 
 ../../../avidemux_core/ADM_coreSqlLight3/src/Query.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/src/vlc_dxva.c \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/src/ADM_coreD3D.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/src/ADM_coreDxva2.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/src/ADM_coreDxva2_ff.c \ 
 ../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpauMixer.cpp \ 
 ../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpau.cpp \ 
 ../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/src/fglrx.cpp \ 
@@ -1025,6 +1027,10 @@
 ../../../avidemux/common/ADM_render/GUI_simpleRenderStub.cpp \ 
 ../../../avidemux/common/ADM_render/GUI_simpleRender.cpp \ 
 ../../../avidemux/common/ADM_render/GUI_qtGlRender.cpp \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/src/vlc_dxva.c \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreD3D.cpp \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2.cpp \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2_ff.c \ 
 ../../../avidemux/common/ADM_render/GUI_vdpauRender.cpp \ 
 ../../../avidemux/common/ADM_render/GUI_sdlRender.cpp \ 
 ../../../avidemux/common/ADM_render/GUI_render.cpp \ 
@@ -1388,12 +1394,15 @@
 ../../../avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffDv/ffDvPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEncH264_plugin.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpegPlugin.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder.conf \ 
 ../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/libva/libvaencPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/libva/ADM_libvaEncoder.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/png/ADM_pngEncoder.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/png/pngPlugin.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp \ 
@@ -1424,8 +1433,15 @@
 ../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ffMsMp4Plugin.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEncPlugin.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.conf \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_desc.cpp \

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_ca.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_ca.ts Changed

@@ -7780,7 +7780,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation type="unfinished">PCM</translation>
 </message>
@@ -8430,7 +8430,7 @@
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="-244"/>
@@ -8711,7 +8711,7 @@
 <translation type="unfinished">Guany</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation type="unfinished">S&apos;està desant</translation>
 </message>
@@ -9069,6 +9069,26 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
 <location line="+42"/>
 <source>You cannot remove *all* the video
@@ -9707,7 +9727,7 @@
 <translation type="unfinished">S&apos;ha produït un error de memòria</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+132"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12000,59 +12020,73 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (LQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (HQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
+ <source>NVENC H.264 configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
 <source>libavcodec MPEG-4 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12070,7 +12104,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+78"/>
 <source>Saving mpeg PS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12166,7 +12200,7 @@
 <context>
 <name>fftsmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
 <source>Saving mpeg TS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12882,7 +12916,7 @@
 <context>
 <name>ivtcRemover</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
 <source>Remove IVTC dupe.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13751,7 +13785,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+425"/>
+ <location line="+426"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13851,7 +13885,7 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
 <source>Saving Mkv</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13971,7 +14005,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+79"/>
+ <location line="+81"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14407,12 +14441,12 @@
 <translation type="unfinished">Propietats</translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+6"/>
 <source>Video</source>
 <translation type="unfinished">Vídeo</translation>
 </message>

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_cs.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_cs.ts Changed

@@ -12397,7 +12397,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation type="unfinished">PCM</translation>
 </message>
@@ -13062,7 +13062,7 @@
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="-244"/>
@@ -13588,7 +13588,7 @@
 <translation type="obsolete">Tento skript již byl úspěšně vykonán.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation type="unfinished">Ukládání</translation>
 </message>
@@ -13966,6 +13966,26 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
 <location line="+42"/>
 <source>You cannot remove *all* the video
@@ -14417,7 +14437,7 @@
 <translation type="unfinished">Chyba paměti</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+132"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
@@ -16706,65 +16726,79 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+210"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+237"/>
 <source>libavcodec MPEG-4 configuration</source>
 <translation type="unfinished">Nastavení libavcodec MPEG-4</translation>
 </message>
 <message>
- <location line="-18"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="-18"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (LQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (HQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>NVENC H.264 configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
 <source>nvEnc HEVC configuration</source>
 <translation type="unfinished"></translation>
@@ -16778,7 +16812,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+78"/>
 <source>Saving mpeg PS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -16874,7 +16908,7 @@
 <context>
 <name>fftsmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
 <source>Saving mpeg TS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -17590,7 +17624,7 @@
 <context>
 <name>ivtcRemover</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
 <source>Remove IVTC dupe.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -18463,7 +18497,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+425"/>
+ <location line="+426"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -18563,7 +18597,7 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
 <source>Saving Mkv</source>
 <translation type="unfinished"></translation>
 </message>
@@ -18683,7 +18717,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+79"/>
+ <location line="+81"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -19193,12 +19227,12 @@

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_da.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_da.ts Changed

@@ -1239,6 +1239,26 @@
 <translation>Gå til tid</translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+33"/>
 <source>R_esampling (Hz):</source>
 <translation>_Gensampling (Hz):</translation>
@@ -1728,7 +1748,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation>PCM</translation>
 </message>
@@ -2140,7 +2160,7 @@
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="-244"/>
@@ -2525,7 +2545,7 @@
 <translation>Standardport som skal bruges</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-65"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-74"/>
 <source>Redo</source>
 <translation>Omgør</translation>
 </message>
@@ -2943,12 +2963,12 @@
 <translation>Hukommelsesfejl</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation>Gemmer</translation>
 </message>
 <message>
- <location line="+132"/>
+ <location line="+139"/>
 <source>Too short</source>
 <translation>For kort</translation>
 </message>
@@ -5018,59 +5038,73 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation>Lav kvalitet</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
 <translation>Høj kvalitet</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
 <translation>BluRay</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency</source>
 <translation>Lav latency</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (LQ)</source>
 <translation>Lav latency (LQ)</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (HQ)</source>
 <translation>Lav latency (HQ)</translation>
 </message>
 <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
 <translation>Forudindstilling:</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
 <translation>Bithastighed (kbps):</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
 <translation>Maks. bithastighed (kbps):</translation>
 </message>
 <message>
 <location line="+4"/>
+ <source>NVENC H.264 configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
 <source>libavcodec MPEG-4 configuration</source>
 <translation>libavcodec MPEG-4-konfiguration</translation>
 </message>
@@ -5088,7 +5122,7 @@
 <translation>[uoverensstemmelse]</translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+78"/>
 <source>Saving mpeg PS (ff)</source>
 <translation>Gemmer MPEG PS (ff)</translation>
 </message>
@@ -5192,7 +5226,7 @@
 <context>
 <name>fftsmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
 <source>Saving mpeg TS (ff)</source>
 <translation>Gemmer MPEG TS (ff)</translation>
 </message>
@@ -5867,7 +5901,7 @@
 <context>
 <name>ivtcRemover</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
 <source>Remove IVTC dupe.</source>
 <translation>Fjern IVTC-duplet.</translation>
 </message>
@@ -6418,7 +6452,7 @@
 <translation>Matroska-billeder</translation>
 </message>
 <message>
- <location line="+425"/>
+ <location line="+426"/>
 <source>Matroska clusters</source>
 <translation>Matroska-klynger</translation>
 </message>
@@ -6518,7 +6552,7 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
 <source>Saving Mkv</source>
 <translation>Gemmer MKV</translation>
 </message>
@@ -6638,7 +6672,7 @@
 <translation>Understøtter kun AAC, AC3, E-AC3 og mpegaudio til lyd</translation>
 </message>
 <message>
- <location line="+79"/>
+ <location line="+81"/>
 <source>Saving mp4</source>
 <translation>Gemmer MP4</translation>
 </message>
@@ -6963,12 +6997,12 @@
 <translation>Egenskaber</translation>
 </message>

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_de.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_de.ts Changed

@@ -7738,6 +7738,26 @@
 <translation type="unfinished">Gehe zum Zeitpunkt</translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-15"/>
 <source>R_esampling (Hz):</source>
 <translation type="unfinished">_Abtastrate (Hz):</translation>
@@ -8197,7 +8217,7 @@
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="-244"/>
@@ -8527,7 +8547,7 @@
 <translation type="unfinished">Ungültige Liste der Tonspuren</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation>Speichern</translation>
 </message>
@@ -8751,12 +8771,12 @@
 </message>
 <message>
 <location line="+15"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-77"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-86"/>
 <location line="+2"/>
 <location line="+2"/>
 <source>-</source>
@@ -9358,7 +9378,7 @@
 <translation type="unfinished">Speicherfehler</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+132"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
 <source>Too short</source>
 <translation>Video zu kurz</translation>
 </message>
@@ -10328,35 +10348,27 @@
 <context>
 <name>crop</name>
 <message>
- <source>crop</source>
- <translation type="vanished">Zuschneiden</translation>
- </message>
- <message>
- <source>crop filter</source>
- <translation type="obsolete">Bildränder wegschneiden.</translation>
- </message>
- <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
 <source>Crop</source>
- <translation type="unfinished"></translation>
+ <translation>Zuschneiden</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Crop filter</source>
- <translation type="unfinished"></translation>
+ <translation>Bildrand entfernen.</translation>
 </message>
 <message>
 <location line="+22"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
- <translation type="unfinished">Kann die Breite nicht im geforderten Maße verkleinern! Die Breite wird zurückgesetzt!
+ <translation>Die Breite kann nicht im geforderten Maße verkleinert werden. Die Breite wird zurückgesetzt!
 </translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Warning Cropping too much height ! Height reseted !
 </source>
- <translation type="unfinished">Kann die Höhe nicht im geforderten Maße verkleinern! Die Höhe wird zurückgesetzt!
+ <translation>Die Höhe kann nicht im geforderten Maße verkleinert werden. Die Höhe wird zurückgesetzt!
 </translation>
 </message>
 </context>
@@ -11638,66 +11650,80 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (LQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (HQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
+ <source>NVENC H.264 configuration</source>
+ <translation>NVENC H.264 Konfiguration</translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
 <source>libavcodec MPEG-4 configuration</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
 <source>nvEnc HEVC configuration</source>
- <translation type="unfinished"></translation>
+ <translation>NVENC HEVC Konfiguration</translation>
 </message>
 </context>
 <context>
@@ -11708,7 +11734,7 @@
 <translation type="unfinished">Inkompatible Parameter</translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+78"/>
 <source>Saving mpeg PS (ff)</source>
 <translation type="unfinished">Speichern als MPEG-PS (ff)</translation>
 </message>

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_el.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_el.ts Changed

@@ -5600,7 +5600,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation>PCM</translation>
 </message>
@@ -6150,7 +6150,7 @@
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="-242"/>
@@ -6341,7 +6341,7 @@
 <translation>Κέρδος</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation>Αποθηκεύεται</translation>
 </message>
@@ -6810,6 +6810,26 @@
 <translation>Μετάβαση στο Χρόνο</translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
 <location line="+42"/>
 <source>You cannot remove *all* the video
@@ -7497,7 +7517,7 @@
 <translation>Σφάλμα μνήμης</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+132"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
 <source>Too short</source>
 <translation>Πολύ σύντομο</translation>
 </message>
@@ -9757,59 +9777,73 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation>Χαμηλής Ποιότητας</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
 <translation>Υψηλή Ποιότητα</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
 <translation>BluRay</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency</source>
 <translation>Χαμηλή Καθυστέρηση</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (LQ)</source>
 <translation>Χαμηλή Καθυστέρηση (Χαμ.Ποιότ.)</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (HQ)</source>
 <translation>Χαμηλή Καθυστέρηση (Υψ.Ποι.)</translation>
 </message>
 <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
 <translation>Προρύθμιση:</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
 <translation>Ρυθμός Μπιτιών (χιλιομπίτιαναδευτ):</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
 <translation>Μέγιστος Ρυθμός Μπιτιών (χιλιομπίτιαναδευτ):</translation>
 </message>
 <message>
 <location line="+4"/>
+ <source>NVENC H.264 configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
 <source>libavcodec MPEG-4 configuration</source>
 <translation>libavcodec MPEG-4 ρύθμιση</translation>
 </message>
@@ -9827,7 +9861,7 @@
 <translation>[Αταίριαστα]</translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+78"/>
 <source>Saving mpeg PS (ff)</source>
 <translation>Αποθηκεύεται το mpeg PS (ff)</translation>
 </message>
@@ -9924,7 +9958,7 @@
 <context>
 <name>fftsmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
 <source>Saving mpeg TS (ff)</source>
 <translation>Αποθηκεύεται το mpeg TS (ff)</translation>
 </message>
@@ -10634,7 +10668,7 @@
 <context>
 <name>ivtcRemover</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
 <source>Remove IVTC dupe.</source>
 <translation>Απομάκρυνση του διπλότυπου IVTC.</translation>
 </message>
@@ -11391,7 +11425,7 @@
 <translation>Εικόνες Matroska</translation>
 </message>
 <message>
- <location line="+425"/>
+ <location line="+426"/>
 <source>Matroska clusters</source>
 <translation>Συστάδες Matroska</translation>
 </message>
@@ -11491,7 +11525,7 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
 <source>Saving Mkv</source>
 <translation>Αποθηκεύεται το Mkv</translation>
 </message>
@@ -11615,7 +11649,7 @@
 <translation type="vanished">Μόνο AAC, AC3, κ΄ mpegaudio υποστηρίζονται για ήχο</translation>
 </message>
 <message>
- <location line="+79"/>
+ <location line="+81"/>
 <source>Saving mp4</source>
 <translation>Αποθηκεύεται το mp4</translation>
 </message>
@@ -12020,23 +12054,23 @@
 <translation>Ιδιότητες</translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+6"/>
 <source>Video</source>
 <translation>Βίντεο</translation>
 </message>

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_en.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_en.ts Changed

@@ -1165,6 +1165,26 @@
 <translation>Go to &amp;Time</translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+33"/>
 <source>R_esampling (Hz):</source>
 <translation type="unfinished"></translation>
@@ -1752,7 +1772,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1872,7 +1892,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-80"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-89"/>
 <source>Save as BMP</source>
 <translation type="unfinished"></translation>
 </message>
@@ -1957,7 +1977,7 @@
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="+1309"/>
@@ -2910,12 +2930,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+132"/>
+ <location line="+139"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
@@ -4937,59 +4957,73 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (LQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (HQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
+ <source>NVENC H.264 configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
 <source>libavcodec MPEG-4 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5007,7 +5041,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+78"/>
 <source>Saving mpeg PS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5103,7 +5137,7 @@
 <context>
 <name>fftsmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
 <source>Saving mpeg TS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5775,7 +5809,7 @@
 <context>
 <name>ivtcRemover</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
 <source>Remove IVTC dupe.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6326,7 +6360,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+425"/>
+ <location line="+426"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6426,7 +6460,7 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
 <source>Saving Mkv</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6546,7 +6580,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+79"/>
+ <location line="+81"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6870,12 +6904,12 @@
 <translation type="unfinished"></translation>
 </message>

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_es.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_es.ts Changed

@@ -5941,7 +5941,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation type="unfinished">PCM</translation>
 </message>
@@ -6286,6 +6286,26 @@
 <translation type="unfinished">Ir a Tiempo</translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-15"/>
 <source>R_esampling (Hz):</source>
 <translation type="unfinished">R_emuestreo (Hz)</translation>
@@ -6825,7 +6845,7 @@
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="-244"/>
@@ -7203,7 +7223,7 @@
 <translation type="unfinished">Ganancia</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation type="unfinished">Guardando</translation>
 </message>
@@ -7389,7 +7409,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-52"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-61"/>
 <source>Save current settings as default</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7856,7 +7876,7 @@
 <translation type="unfinished">Error de memoria</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+132"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10085,65 +10105,79 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+210"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+237"/>
 <source>libavcodec MPEG-4 configuration</source>
 <translation type="unfinished">Configuración libavcodec MPEG-4</translation>
 </message>
 <message>
- <location line="-18"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="-18"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (LQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (HQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>NVENC H.264 configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
 <source>nvEnc HEVC configuration</source>
 <translation type="unfinished"></translation>
@@ -10157,7 +10191,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+78"/>
 <source>Saving mpeg PS (ff)</source>
 <translation type="unfinished">Guardar mpeg PS (ff)</translation>
 </message>
@@ -10253,7 +10287,7 @@
 <context>
 <name>fftsmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
 <source>Saving mpeg TS (ff)</source>
 <translation type="unfinished">Guardar mpeg TS (ff)</translation>
 </message>
@@ -10954,7 +10988,7 @@
 <context>
 <name>ivtcRemover</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
 <source>Remove IVTC dupe.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11726,7 +11760,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+425"/>
+ <location line="+426"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11833,7 +11867,7 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
 <source>Saving Mkv</source>
 <translation type="unfinished">Guardar MKV</translation>
 </message>
@@ -11953,7 +11987,7 @@

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_eu.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_eu.ts Changed

@@ -5479,7 +5479,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation>PCM</translation>
 </message>
@@ -5797,6 +5797,26 @@
 <translation>Joan Denborara</translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../common/gui_autodrive.cpp" line="+48"/>
 <source>No audio track</source>
 <translation>Audio biderik ez</translation>
@@ -6113,7 +6133,7 @@
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="-244"/>
@@ -6480,7 +6500,7 @@
 <translation type="vanished">Azken Egitasmoak</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation type="unfinished">Gordetzen</translation>
 </message>
@@ -6571,7 +6591,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-54"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-63"/>
 <source>Pr&amp;eferences</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6951,7 +6971,7 @@
 <translation type="unfinished">Oroimen akatsa</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+132"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9281,65 +9301,79 @@
 <context>
 <name>ffnvenc</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+210"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+237"/>
 <source>libavcodec MPEG-4 configuration</source>
 <translation type="unfinished">libavcodec MPEG-4 itxurapena</translation>
 </message>
 <message>
- <location line="-18"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="-18"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (LQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (HQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+4"/>
+ <source>NVENC H.264 configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
 <source>nvEnc HEVC configuration</source>
 <translation type="unfinished"></translation>
@@ -9353,7 +9387,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+78"/>
 <source>Saving mpeg PS (ff)</source>
 <translation type="unfinished">mpeg PS (ff) gordetzea</translation>
 </message>
@@ -9449,7 +9483,7 @@
 <context>
 <name>fftsmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
 <source>Saving mpeg TS (ff)</source>
 <translation type="unfinished">mpeg TS (ff) gordetzea</translation>
 </message>
@@ -10163,7 +10197,7 @@
 <context>
 <name>ivtcRemover</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
 <source>Remove IVTC dupe.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10989,7 +11023,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+425"/>
+ <location line="+426"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11096,7 +11130,7 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
 <source>Saving Mkv</source>
 <translation>Mkv gordeketa</translation>
 </message>
@@ -11216,7 +11250,7 @@

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_fr.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_fr.ts Changed

@@ -1899,6 +1899,26 @@
 <translation>Aller au temps</translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+33"/>
 <source>R_esampling (Hz):</source>
 <translation>R_eéchantillonnage (Hz):</translation>
@@ -1923,7 +1943,7 @@
 <message>
 <location line="+1"/>
 <source>PAL to Film</source>
- <translation>Film vers PAL</translation>
+ <translation>PAL vers Film</translation>
 </message>
 <message>
 <location line="+3"/>
@@ -2410,7 +2430,7 @@
 </message>
 <message>
 <location line="+15"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation></translation>
 </message>
@@ -2490,7 +2510,7 @@
 <translation>Préférences</translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-82"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-91"/>
 <location filename="../../common/gui_save.cpp" line="+125"/>
 <location line="+10"/>
 <source>Queue</source>
@@ -2527,7 +2547,7 @@
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="+147"/>
@@ -3405,12 +3425,12 @@
 <translation type="unfinished">Impossible d&apos;allouer la mémoire</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+132"/>
+ <location line="+139"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5488,59 +5508,73 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (LQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (HQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
+ <source>NVENC H.264 configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
 <source>libavcodec MPEG-4 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5558,7 +5592,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+78"/>
 <source>Saving mpeg PS (ff)</source>
 <translation type="unfinished">Sauvegarde au format PS (ff)</translation>
 </message>
@@ -5654,7 +5688,7 @@
 <context>
 <name>fftsmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
 <source>Saving mpeg TS (ff)</source>
 <translation type="unfinished">Sauvegarde au format TS (ff)</translation>
 </message>
@@ -6333,7 +6367,7 @@
 <context>
 <name>ivtcRemover</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
 <source>Remove IVTC dupe.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7137,7 +7171,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+425"/>
+ <location line="+426"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7237,7 +7271,7 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
 <source>Saving Mkv</source>
 <translation type="unfinished">Sauvegarde au format MKV (ff)</translation>
 </message>
@@ -7357,7 +7391,7 @@
 <translation type="unfinished"></translation>
 </message>

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_hu.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_hu.ts Changed

@@ -1862,6 +1862,26 @@
 <translation>Időpontra ugrás</translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-15"/>
 <source>R_esampling (Hz):</source>
 <translation>Újra-mintavételezés (Hz):</translation>
@@ -2179,7 +2199,7 @@
 </message>
 <message>
 <location line="+49"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation>PCM</translation>
 </message>
@@ -2542,7 +2562,7 @@
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="-244"/>
@@ -3000,7 +3020,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-52"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-61"/>
 <source>Save current settings as default</source>
 <translation type="unfinished"></translation>
 </message>
@@ -3375,12 +3395,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+132"/>
+ <location line="+139"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5529,59 +5549,73 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (LQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (HQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
+ <source>NVENC H.264 configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
 <source>libavcodec MPEG-4 configuration</source>
 <translation type="unfinished">libavcodec MPEG-4 beállítása</translation>
 </message>
@@ -5599,7 +5633,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+78"/>
 <source>Saving mpeg PS (ff)</source>
 <translation type="unfinished">mpeg PS (ff) mentés</translation>
 </message>
@@ -5695,7 +5729,7 @@
 <context>
 <name>fftsmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
 <source>Saving mpeg TS (ff)</source>
 <translation type="unfinished">mpeg TS (ff) mentés</translation>
 </message>
@@ -6367,7 +6401,7 @@
 <context>
 <name>ivtcRemover</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
 <source>Remove IVTC dupe.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6966,7 +7000,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+425"/>
+ <location line="+426"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -7073,7 +7107,7 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
 <source>Saving Mkv</source>
 <translation>MKv mentés</translation>
 </message>
@@ -7193,7 +7227,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+79"/>
+ <location line="+81"/>
 <source>Saving mp4</source>
 <translation type="unfinished">mp4 mentés</translation>
 </message>
@@ -7577,12 +7611,12 @@
 <translation>Tulajdonságok</translation>
 </message>

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_it.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_it.ts Changed

@@ -8428,7 +8428,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation>PCM</translation>
 </message>
@@ -8787,6 +8787,26 @@
 <translation>Vai al tempo</translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-15"/>
 <source>R_esampling (Hz):</source>
 <translation>Ricampionam_ento (Hz):</translation>
@@ -9432,7 +9452,7 @@
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="-244"/>
@@ -9584,7 +9604,7 @@
 <translation type="obsolete">Questo script è stato già eseguito con successo.</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation type="unfinished">Salvataggio in corso</translation>
 </message>
@@ -9675,7 +9695,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-52"/>
+ <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-61"/>
 <source>Save current settings as default</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10250,7 +10270,7 @@
 <translation type="unfinished">Errore di memoria</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+132"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12553,59 +12573,73 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (LQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (HQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
+ <source>NVENC H.264 configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
 <source>libavcodec MPEG-4 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12623,7 +12657,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+78"/>
 <source>Saving mpeg PS (ff)</source>
 <translation type="unfinished">Salvataggio mpeg PS (ff) in corso</translation>
 </message>
@@ -12719,7 +12753,7 @@
 <context>
 <name>fftsmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
 <source>Saving mpeg TS (ff)</source>
 <translation type="unfinished">Salvataggio mpeg TS (ff) in corso</translation>
 </message>
@@ -13435,7 +13469,7 @@
 <context>
 <name>ivtcRemover</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
 <source>Remove IVTC dupe.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14316,7 +14350,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+425"/>
+ <location line="+426"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -14416,7 +14450,7 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
 <source>Saving Mkv</source>
 <translation type="unfinished">Salvataggio Mkv in corso</translation>
 </message>
@@ -14536,7 +14570,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+79"/>
+ <location line="+81"/>
 <source>Saving mp4</source>
 <translation type="unfinished">Salvataggio mp4 in corso</translation>
 </message>

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_ja.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_ja.ts Changed

@@ -4653,7 +4653,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation type="unfinished">
 </translation>
@@ -5191,7 +5191,7 @@
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="-244"/>
@@ -5837,6 +5837,26 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
 <location line="+42"/>
 <source>You cannot remove *all* the video
@@ -6506,12 +6526,12 @@
 <translation type="unfinished">メモリエラー</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+132"/>
+ <location line="+139"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8633,59 +8653,73 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (LQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (HQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
+ <source>NVENC H.264 configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
 <source>libavcodec MPEG-4 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8703,7 +8737,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+78"/>
 <source>Saving mpeg PS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8799,7 +8833,7 @@
 <context>
 <name>fftsmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
 <source>Saving mpeg TS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9499,7 +9533,7 @@
 <context>
 <name>ivtcRemover</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
 <source>Remove IVTC dupe.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10215,7 +10249,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+425"/>
+ <location line="+426"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10315,7 +10349,7 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
 <source>Saving Mkv</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10435,7 +10469,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+79"/>
+ <location line="+81"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10835,23 +10869,23 @@
 <translation type="unfinished">プロパティ</translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+6"/>
 <source>Video</source>
 <translation type="unfinished">映像</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+31"/>

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_pl.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_pl.ts Changed

@@ -6171,7 +6171,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation type="unfinished">PCM</translation>
 </message>
@@ -6781,7 +6781,7 @@
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="-244"/>
@@ -6968,7 +6968,7 @@
 <translation type="unfinished">Normalizacja głośności</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation type="unfinished">Zapisywanie</translation>
 </message>
@@ -7366,6 +7366,26 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
 <location line="+42"/>
 <source>You cannot remove *all* the video
@@ -8034,7 +8054,7 @@
 <translation type="unfinished">Błąd alokacji pamięci</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+132"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10239,59 +10259,73 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (LQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (HQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
+ <source>NVENC H.264 configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
 <source>libavcodec MPEG-4 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10309,7 +10343,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+78"/>
 <source>Saving mpeg PS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10405,7 +10439,7 @@
 <context>
 <name>fftsmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
 <source>Saving mpeg TS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11103,7 +11137,7 @@
 <context>
 <name>ivtcRemover</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
 <source>Remove IVTC dupe.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11844,7 +11878,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+425"/>
+ <location line="+426"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11944,7 +11978,7 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
 <source>Saving Mkv</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12064,7 +12098,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+79"/>
+ <location line="+81"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12468,23 +12502,23 @@
 <translation type="unfinished">Właściwości</translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+6"/>
 <source>Video</source>
 <translation type="unfinished">Obraz</translation>
 </message>

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_pt_BR.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_pt_BR.ts Changed

@@ -1665,7 +1665,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation type="unfinished"></translation>
 </message>
@@ -2025,10 +2025,30 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="+1309"/>
@@ -2981,12 +3001,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+132"/>
+ <location line="+139"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5008,59 +5028,73 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (LQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (HQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
+ <source>NVENC H.264 configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
 <source>libavcodec MPEG-4 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5078,7 +5112,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+78"/>
 <source>Saving mpeg PS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5174,7 +5208,7 @@
 <context>
 <name>fftsmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
 <source>Saving mpeg TS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5846,7 +5880,7 @@
 <context>
 <name>ivtcRemover</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
 <source>Remove IVTC dupe.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6404,7 +6438,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+425"/>
+ <location line="+426"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6504,7 +6538,7 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
 <source>Saving Mkv</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6624,7 +6658,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+79"/>
+ <location line="+81"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -6955,12 +6989,12 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+6"/>
 <source>Video</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+15"/>
+ <location line="+24"/>
 <location line="+14"/>
 <location line="+14"/>
 <location line="+14"/>
@@ -6975,12 +7009,12 @@

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_ru.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_ru.ts Changed

@@ -3149,8 +3149,7 @@
 <message>
 <location line="+7"/>
 <source>1/1</source>
- <translation type="unfinished">
- {1/1?}</translation>
+ <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
@@ -4554,7 +4553,7 @@
 <message>
 <location line="+10"/>
 <source>_Accept non-standard audio frequency for DVD</source>
- <translation type="unfinished">Позволять нестандартную частоту звука для DVD</translation>
+ <translation type="unfinished">_Разрешать нестандартную частоту звука для DVD</translation>
 </message>
 <message>
 <location line="+1"/>
@@ -4661,17 +4660,17 @@
 <message>
 <location line="+2"/>
 <source>_Encoding priority:</source>
- <translation type="unfinished">Кодирования:</translation>
+ <translation type="unfinished">_Кодирование:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Indexing/unpacking priority:</source>
- <translation type="unfinished">Индексации/распаковки:</translation>
+ <translation type="unfinished">_Индексация/распаковка:</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>_Playback priority:</source>
- <translation type="unfinished">Воспроизведения:</translation>
+ <translation type="unfinished">_Воспроизведение:</translation>
 </message>
 <message>
 <location line="+2"/>
@@ -4681,12 +4680,12 @@
 <message>
 <location line="+7"/>
 <source>_Use alternative tag for MP3 in .mp4</source>
- <translation type="unfinished">Использовать альтернативные тэги для MP3 в .MP4</translation>
+ <translation type="unfinished">_Использовать альтернативные тэги для MP3 в .MP4</translation>
 </message>
 <message>
 <location line="+2"/>
 <source>_Default to the directory of the last read file for saving</source>
- <translation type="unfinished">_Сохранять видео в папке с последним прочитанным файлом по умолчании</translation>
+ <translation type="unfinished">_Сохранять видео в папке с последним прочитанным файлом по умолчанию</translation>
 </message>
 <message>
 <location line="+5"/>
@@ -4752,19 +4751,19 @@
 <message>
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+4"/>
 <source>_Local playback downmixing:</source>
- <translation type="unfinished">При проигрывании звук:</translation>
+ <translation type="unfinished">_Даунмиксинг звука при локальном воспроизведении:</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+38"/>
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+17"/>
 <source>_Horizontal deblocking</source>
- <translation type="unfinished">Горизонтальный деблокинг</translation>
+ <translation type="unfinished">_Горизонтальный деблокинг</translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
 <source>_Vertical deblocking</source>
- <translation type="unfinished">Вертикальный деблокинг</translation>
+ <translation type="unfinished">_Вертикальный деблокинг</translation>
 </message>
 <message>
 <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
@@ -5197,7 +5196,7 @@
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="-244"/>
@@ -5415,8 +5414,7 @@
 <message>
 <location line="+2"/>
 <source>5.1</source>
- <translation type="unfinished">
- {5.1?}</translation>
+ <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
@@ -5652,7 +5650,7 @@
 </message>
 <message>
 <location line="+15"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation type="unfinished"></translation>
 </message>
@@ -5916,6 +5914,26 @@
 <translation type="unfinished">Перейти ко времени...</translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished">Масштаб 1:4</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished">Масштаб 1:2</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished">Масштаб 1:1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished">Масштаб 2:1</translation>
+ </message>
+ <message>
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
 <location line="+42"/>
 <source>You cannot remove *all* the video
@@ -6589,12 +6607,12 @@
 <translation type="unfinished">Ошибка выделения памяти</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation type="unfinished">Сохранение</translation>
 </message>
 <message>
- <location line="+132"/>
+ <location line="+139"/>
 <source>Too short</source>
 <translation type="unfinished">Слишком коротко</translation>
 </message>
@@ -6698,8 +6716,7 @@
 <message>
 <location line="+1"/>
 <source>1:1</source>
- <translation type="unfinished">
- {1:1?}</translation>
+ <translation type="unfinished"></translation>
 </message>
 <message>
 <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
@@ -7599,25 +7616,25 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
 <source>Crop</source>
- <translation type="unfinished">Обрезка</translation>
+ <translation>Кадрирование</translation>
 </message>
 <message>
 <location line="+1"/>
 <source>Crop filter</source>
- <translation type="unfinished">Фильтр обрезки</translation>
+ <translation>Фильтр кадрирования</translation>
 </message>
 <message>
 <location line="+22"/>
 <source>Warning Cropping too much width ! Width reseted !
 </source>
- <translation type="unfinished">Предупреждение: ширина слишком сильно обрезана! Ее значение восстановлено!
+ <translation>Предупреждение: ширина слишком сильно обрезана! Ее значение восстановлено!
 </translation>
 </message>
 <message>
 <location line="+5"/>
 <source>Warning Cropping too much height ! Height reseted !
 </source>
- <translation type="unfinished">Предупреждение: высота слишком сильно обрезана! Ее значение восстановлено!
+ <translation>Предупреждение: высота слишком сильно обрезана! Ее значение восстановлено!
 </translation>
 </message>
 </context>
@@ -7626,37 +7643,37 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
 <source>Crop</source>
- <translation type="unfinished">Обрезка </translation>
+ <translation>Кадрирование</translation>
 </message>
 <message>
 <location line="+88"/>
 <source>Reset</source>
- <translation type="unfinished">Сброс</translation>
+ <translation>Сброс</translation>

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_sr.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_sr.ts Changed

@@ -4533,7 +4533,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation type="unfinished">ПЦМ</translation>
 </message>
@@ -5068,7 +5068,7 @@
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="-244"/>
@@ -5711,6 +5711,26 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
 <location line="+42"/>
 <source>You cannot remove *all* the video
@@ -6379,12 +6399,12 @@
 <translation type="unfinished">Грешка у меморији</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+132"/>
+ <location line="+139"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8497,59 +8517,73 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (LQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (HQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
+ <source>NVENC H.264 configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
 <source>libavcodec MPEG-4 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8567,7 +8601,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+78"/>
 <source>Saving mpeg PS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8663,7 +8697,7 @@
 <context>
 <name>fftsmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
 <source>Saving mpeg TS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9361,7 +9395,7 @@
 <context>
 <name>ivtcRemover</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
 <source>Remove IVTC dupe.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10071,7 +10105,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+425"/>
+ <location line="+426"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10171,7 +10205,7 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
 <source>Saving Mkv</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10291,7 +10325,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+79"/>
+ <location line="+81"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10691,23 +10725,23 @@
 <translation type="unfinished">Oсобине</translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+6"/>
 <source>Video</source>
 <translation type="unfinished">Видео</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+31"/>

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_sr@latin.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_sr@latin.ts Changed

@@ -4533,7 +4533,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation type="unfinished">PCM</translation>
 </message>
@@ -5068,7 +5068,7 @@
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="-244"/>
@@ -5711,6 +5711,26 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
 <location line="+42"/>
 <source>You cannot remove *all* the video
@@ -6379,12 +6399,12 @@
 <translation type="unfinished">Greška u memoriji</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+132"/>
+ <location line="+139"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8497,59 +8517,73 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (LQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (HQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
+ <source>NVENC H.264 configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
 <source>libavcodec MPEG-4 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8567,7 +8601,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+78"/>
 <source>Saving mpeg PS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8663,7 +8697,7 @@
 <context>
 <name>fftsmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
 <source>Saving mpeg TS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9361,7 +9395,7 @@
 <context>
 <name>ivtcRemover</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
 <source>Remove IVTC dupe.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10071,7 +10105,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+425"/>
+ <location line="+426"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10171,7 +10205,7 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
 <source>Saving Mkv</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10291,7 +10325,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+79"/>
+ <location line="+81"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10691,23 +10725,23 @@
 <translation type="unfinished">Osobine</translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+6"/>
 <source>Video</source>
 <translation type="unfinished">Video</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+31"/>

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_tr.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_tr.ts Changed

@@ -4913,7 +4913,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation type="unfinished">PCM</translation>
 </message>
@@ -5497,7 +5497,7 @@
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="-244"/>
@@ -6145,6 +6145,26 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
 <location line="+42"/>
 <source>You cannot remove *all* the video
@@ -6815,12 +6835,12 @@
 <translation type="unfinished">Hafıza hatası</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+132"/>
+ <location line="+139"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
@@ -8973,59 +8993,73 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (LQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (HQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
+ <source>NVENC H.264 configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
 <source>libavcodec MPEG-4 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9043,7 +9077,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+78"/>
 <source>Saving mpeg PS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9139,7 +9173,7 @@
 <context>
 <name>fftsmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
 <source>Saving mpeg TS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -9845,7 +9879,7 @@
 <context>
 <name>ivtcRemover</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
 <source>Remove IVTC dupe.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10569,7 +10603,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+425"/>
+ <location line="+426"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10669,7 +10703,7 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
 <source>Saving Mkv</source>
 <translation type="unfinished"></translation>
 </message>
@@ -10789,7 +10823,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+79"/>
+ <location line="+81"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11194,25 +11228,25 @@
 </translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+6"/>
 <source>Video</source>
 <translation type="unfinished">Video</translation>
 </message>
 <message>
- <location line="+22"/>
+ <location line="+31"/>

avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_zh_TW.ts -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux_zh_TW.ts Changed

@@ -6841,7 +6841,7 @@
 </message>
 <message>
 <location line="+5"/>
- <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
+ <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
 <source>PCM</source>
 <translation type="unfinished">PCM</translation>
 </message>
@@ -7480,7 +7480,7 @@
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
 <location line="+42"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
- <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
+ <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
 <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
 <location filename="../../common/gui_main.cpp" line="-244"/>
@@ -8103,6 +8103,26 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <location line="+6"/>
+ <source>Zoom 1:4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 1:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Zoom 2:1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
 <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
 <location line="+42"/>
 <source>You cannot remove *all* the video
@@ -8747,12 +8767,12 @@
 <translation type="unfinished">記憶體錯誤</translation>
 </message>
 <message>
- <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
+ <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
 <source>Saving</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+132"/>
+ <location line="+139"/>
 <source>Too short</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11005,59 +11025,73 @@
 <message>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
 <source>Low Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>High Quality</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>BluRay</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (LQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Low Latency (HQ)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+7"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
 <source>Preset:</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+1"/>
 <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
 <source>Max Bitrate (kbps):</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <location line="+4"/>
+ <source>NVENC H.264 configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
 <source>libavcodec MPEG-4 configuration</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11075,7 +11109,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+76"/>
+ <location line="+78"/>
 <source>Saving mpeg PS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11171,7 +11205,7 @@
 <context>
 <name>fftsmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
 <source>Saving mpeg TS (ff)</source>
 <translation type="unfinished"></translation>
 </message>
@@ -11887,7 +11921,7 @@
 <context>
 <name>ivtcRemover</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
 <source>Remove IVTC dupe.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12756,7 +12790,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+425"/>
+ <location line="+426"/>
 <source>Matroska clusters</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12856,7 +12890,7 @@
 <context>
 <name>mkvmuxer</name>
 <message>
- <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
+ <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
 <source>Saving Mkv</source>
 <translation type="unfinished"></translation>
 </message>
@@ -12976,7 +13010,7 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location line="+79"/>
+ <location line="+81"/>
 <source>Saving mp4</source>
 <translation type="unfinished"></translation>
 </message>
@@ -13380,12 +13414,12 @@
 <translation type="unfinished">屬性</translation>
 </message>
 <message>
- <location line="+12"/>
+ <location line="+6"/>
 <source>Video</source>
 <translation type="unfinished">視訊</translation>
 </message>
 <message>
- <location line="+15"/>
+ <location line="+24"/>

avidemux_2.6.20.tar.gz/avidemux/winInstaller/ChangeLog.release Added

@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta content="text/html; charset=UTF-8" http-equiv="content-type">
+ <style type="text/css">
+ body {
+ margin: 0;
+ height: 100%;
+ font-family: Tahoma,Helvetica,Arial,sans-serif;
+ color: #333;
+ }
+
+ #inner {
+ margin: 0% 1% 0% 1%;
+ }
+
+ h1 {
+ padding: 0.5em;
+ font-family: Helvetica,Arial,sans-serif;
+ font-size: 1.8em;
+ font-weight: bold;
+ color: #1B57B1;
+ vertical-align: middle;
+ margin: 1em;
+ }
+
+ ul li {
+ list-style: inside;
+ padding: 0.8em;
+ margin: 0.2em;
+ border: 1px solid #ddd;
+ border-radius: 0.2em;
+ font-size: 0.8em;
+ }
+
+ ul li:nth-child(odd) {
+ background-color: #fafafa;
+ }
+
+ ul li:nth-child(even) {
+ background-color: #f0f0f0;
+ }
+
+ </style>
+ <title>Avidemux Changelog</title>
+</head>
+<body>
+ <div id="inner">
+ <h1>Changes in Avidemux v2.6.19 – v2.6.20</h1>
+ <ul>
+ <li>Core: The bundled FFmpeg has been updated to version 3.0.7</li>
+ <li>Core Encoder: A crash encoding MPEG-2 with B-frames disabled has been fixed</li>
+ <li>Core Encoder: An error due to invalid decoding timestamps at the end of encoding with MPEG-2 has been fixed</li>
+ <li>Core Audio: Sound issues including audio dropouts with AAC in MPEG TS fixed</li>
+ <li>Core Audio: External AAC audio misidentified as E-AC3 fixed</li>
+ <li>MKV Demuxer: FPS calculation improved</li>
+ <li>MKV Demuxer: A crash with audio tracks using lacing extensively fixed</li>
+ <li>MKV Muxer: The FPS value is set correctly now</li>
+ <li>FLV Demuxer: File kept open preventing deletion fixed</li>
+ <li>VPX Decoder: Swapped colors fixed, support for VP9 added</li>
+ <li>macOS: Passing command line arguments to the application fixed</li>
+ <li>VDPAU: Decode MPEG-1 instead of crashing</li>
+ <li>Qt / Properties Dialog: A button to copy the data to clipboard added</li>
+ <li>Qt / Filter Manager: Dynamically disable not applicable context menu entries in the list of active filters</li>
+ <li>Qt / Filter Manager: Horizontal scrolling in the list of available filters eliminated</li>
+ <li>Qt / MPlayer eq2 Plugin: The sliders on the right becoming squeezed horizontally fixed</li>
+ <li>UI: File dialog not adding a file name extension when saving projects fixed (not in 64 bit builds for Windows yet)</li>
+ <li>i18n: Russian and German translations updated (TotalCaesar659 / eumagga0x2a)</li>
+ <li>Debug: Avidemux now prints the correct version string to the console or to the application log</li>
+ </ul>
+ </div>
+</body>
+</html>

avidemux_2.6.19.tar.gz/avidemux/winInstaller/createNsis64Qt5.sh -> avidemux_2.6.20.tar.gz/avidemux/winInstaller/createNsis64Qt5.sh Changed

avidemux_2.6.19.tar.gz/avidemux_core/ADM_core/include/ADM_ptrQueue.h -> avidemux_2.6.20.tar.gz/avidemux_core/ADM_core/include/ADM_ptrQueue.h Changed

avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioStream.h -> avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioStream.h Changed

avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioIdentify.cpp -> avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioIdentify.cpp Changed

@@ -190,16 +190,16 @@
             return false;
     };
     // Need a 2nd packet...
-    const uint8_t *second=data+syncOffset;
+    const uint8_t *second=data+syncOffset+info.frameSizeInBytes;
     int size2=bufferSize-syncOffset;
     ADM_assert(size2>0);
     ADM_info("Maybe EAC3... \n");
     // Try on 2nd packet...
     if( ADM_EAC3GetInfo(second,size2, &syncOffset,&info2))
     {
-        if((info.frequency==info2.frequency) && (info.channels==info2.channels) && (info.byterate==info2.byterate))
+        if((info.frequency==info2.frequency) && (info.channels==info2.channels) && (info.byterate==info2.byterate) && !syncOffset)
         {
-            ADM_warning("\tProbably EAC3 : Fq=%d br=%d chan=%d\n",(int)info.frequency,(int)info.byterate,(int)info.channels);
+            ADM_warning("\tProbably EAC3 : Fq=%d br=%d chan=%d, offset=%d\n",(int)info.frequency,(int)info.byterate,(int)info.channels,syncOffset);
             oinfo.encoding=WAV_EAC3;
             oinfo.channels=info.channels;
             oinfo.byterate=info.byterate; // already in bytes/sec

avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp -> avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp Changed

@@ -13,6 +13,13 @@
 #include "ADM_audioStreamConstantChunk.h"
 #include "ADM_audioCodecEnum.h"
 /**
+ *
+ */
+ ADM_audioStream::~ADM_audioStream()
+ {
+ }
+
+/**
     \fn ADM_audioStream
     \brief constructor
 */
@@ -20,7 +27,7 @@
 {
     if(header)
         wavHeader=*header;
-    else    
+    else
         memset(&wavHeader,0,sizeof(wavHeader));
     this->access=access;
     lastDts=ADM_AUDIO_NO_DTS;
@@ -30,7 +37,7 @@
     {
         if(access->canGetDuration()==true)
                 durationInUs=access->getDurationInUs();
-        else    
+        else
                 durationInUs=0;
     }
     language=ADM_UNKNOWN_LANGUAGE;
@@ -78,15 +85,22 @@
     if(!access->getPacket(buffer,size,sizeMax,&dts)) return 0;
     // We got the packet
     // Try to guess the nbSample
-    if(dts==ADM_AUDIO_NO_DTS)
+    // if it is AAC, we hardcodec 1024 samples
+
+    if(wavHeader.encoding==WAV_AAC)
     {
-        if(wavHeader.encoding==WAV_AAC) 
-            *nbSample=1024;
-        else        
+        *nbSample=1024;
+        if(dts!=ADM_AUDIO_NO_DTS)
         {
-            *nbSample=512;
-            printf("[audioStream] Cant guess nb sample, setting 512\n");
+            setDts(dts);
         }
+        *odts=dts;
+        return 1;
+    }
+    if(dts==ADM_AUDIO_NO_DTS)
+    {
+        *nbSample=512;
+        ADM_warning("[audioStream] Cant guess nb sample, setting 512\n");
         *odts=ADM_AUDIO_NO_DTS;
         return 1;
     }
@@ -138,14 +152,14 @@
 bool              ADM_audioStream::isLanguageSet(void)
 {
     const std::string lang=getLanguage();
-    if(lang.size()!=3) 
+    if(lang.size()!=3)
         return false; // hackish...
     return true;
 }
 /**
  * @param samples
  * @param fq
- * @return 
+ * @return
  */
 /**
         \fn advanceDtsByCustomSample
@@ -169,7 +183,7 @@
     switch(wavheader->encoding)
     {
         case WAV_EAC3:
-            return new ADM_audioStreamEAC3(wavheader,access);    
+            return new ADM_audioStreamEAC3(wavheader,access);
         case WAV_AC3:
             return new ADM_audioStreamAC3(wavheader,access);
         case WAV_MP2:
@@ -224,4 +238,3 @@
 }
 
 // EOF
-

avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp -> avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp Changed

@@ -25,6 +25,7 @@
 
 extern "C" {
 #include "libavformat/url.h"
+#include "ADM_audioClock.h"
 }
 
 #if 1
@@ -245,13 +246,13 @@
 
 }else
 {
- if(fourCC::check(stream->getFCC(),(uint8_t *)"MPEG1"))
+ if(fourCC::check(stream->getFCC(),(uint8_t *)"mpg1"))
 {
 c->has_b_frames=1; // No PTS=cannot handle CTS...
 c->max_b_frames=2;
 c->codec_id= AV_CODEC_ID_MPEG1VIDEO;
 }
- else if(fourCC::check(stream->getFCC(),(uint8_t *)"MPEG2"))
+ else if(fourCC::check(stream->getFCC(),(uint8_t *)"MPEG"))
 {
 c->has_b_frames=1; // No PTS=cannot handle CTS...
 c->max_b_frames=2;
@@ -391,16 +392,28 @@
 return true;
 }
 #define AUDIO_BUFFER_SIZE 48000*6*sizeof(float)
+/**
+ * \class MuxAudioPacket
+ */
 class MuxAudioPacket
 {
 public:
- MuxAudioPacket() {eof=false;dts=ADM_NO_PTS;present=false;size=0;}
+ MuxAudioPacket() {eof=false;dts=ADM_NO_PTS;present=false;size=0;clock=NULL;}
+ ~MuxAudioPacket() 
+ {
+ if(clock) 
+ {
+ delete clock;
+ clock=NULL;
+ }
+ }
 uint8_t buffer[AUDIO_BUFFER_SIZE];
 uint32_t size;
 bool eof;
 bool present;
 uint64_t dts;
 uint32_t samples;
+ audioClock *clock;
 };
 
 /**
@@ -434,6 +447,8 @@
 initUI(QT_TRANSLATE_NOOP("adm","Saving"));
 encoding->setContainer(getContainerName());
 MuxAudioPacket *audioPackets=new MuxAudioPacket[nbAStreams];
+ for(int i=0;i<nbAStreams;i++) // ugly...
+ audioPackets[i].clock=new audioClock(aStreams[i]->getInfo()->frequency);
 ADMBitstream out(bufSize);
 out.data=buffer;
 
@@ -535,6 +550,11 @@
 AVPacket pkt;
 uint64_t rescaledDts;
 rescaledDts=audioTrack->dts;
+ if(rescaledDts==ADM_NO_PTS)
+ rescaledDts=audioTrack->clock->getTimeUs(); // we assume the 1st one has a PTS/DTS..., can we ?
+ else
+ audioTrack->clock->setTimeUs(rescaledDts);
+ audioTrack->clock->advanceBySample(audioTrack->samples);
 encoding->pushAudioFrame(audioTrack->size);
 muxerRescaleAudioTime(audio,&rescaledDts,a->getInfo()->frequency);
 //printf("[FF] A: Video frame %d, audio Dts :%"PRIu64" size :%"PRIu32" nbSample : %"PRIu32" rescaled:%"PRIu64"\n",

avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_muxerUtils.cpp -> avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_muxerUtils.cpp Changed

avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp -> avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp Changed

@@ -442,7 +442,7 @@
         ADM_warning("No picture...\n");
         return false;
     }
-    aprintf("[ffMpeg4] Out Quant :%d, pic type %d keyf %d\n",out->out_quantizer,pict_type,keyframe);
+    aprintf("[ffMpeg4] Out Quant :%d, pic type %d keyf %d %p\n",out->out_quantizer,pict_type,keyframe,_context->coded_frame);
     out->len=size;
     out->flags=0;
     if(keyframe)
@@ -453,12 +453,23 @@
     // Update PTS/Dts
     if(!_context->max_b_frames)
     {
-            out->dts=out->pts=queueOfDts[0];
-            mapper.erase(mapper.begin());
-            queueOfDts.erase(queueOfDts.begin());
+            if(mapper.size())
+                mapper.erase(mapper.begin());
+            if(queueOfDts.size())
+            {
+                out->dts=out->pts=queueOfDts[0];
+                queueOfDts.erase(queueOfDts.begin());
+            }else
+            {
+                out->dts=out->pts=lastDts+ source->getInfo()->frameIncrement;
+                return false; // probably empty now
+            }
+
     } else
-    if(!getRealPtsFromInternal(_context->coded_frame->pts,&(out->dts),&(out->pts)))
-        return false;
+    {
+        if(!getRealPtsFromInternal(_context->coded_frame->pts,&(out->dts),&(out->pts)))
+                return false;
+    }
     // update lastDts
     lastDts=out->dts;

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp -> avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp Changed

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flv.h -> avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flv.h Changed

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp -> avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp Changed

@@ -22,10 +22,52 @@
 #include "ADM_audioXiphUtils.h"
 #include "ADM_vidMisc.h"
 
+typedef struct
+{
+ int durationInUs;
+ int num;
+ int den;
+}frameRateStruct;
+
+static const frameRateStruct candidateFrameRate[]=
+{
+ {41708,1001,24000}, // 23.976 fps
+ {41667,1000,24000}, // 24 fps
+ {40000,1000,25000}, // 25 fps
+ {33367,1001,30000}, // 30 NTSC
+ {20853,2000,24000}, // 24*2
+ {20854,2002,24000}, // 23976*2
+ {20000,1000,50000}, // 50
+ {16683,1001,60000}, // 60 NTSCs
+ {16667,1000,60000} // 60 fps
+};
+
+static int getStdFrameRate(int interval)
+{
+ int n=sizeof(candidateFrameRate)/sizeof(frameRateStruct);
+ int delta=1000; // 1000 us error allowed
+ int bestMatch=-1;
+ for(int i=0;i<n;i++)
+ {
+ int er=abs(interval-candidateFrameRate[i].durationInUs);
+ if(er<1000) // 10 us error
+ {
+ if(er<delta)
+ {
+ delta=er;
+ bestMatch=i;
+ }
+ }
+ }
+ ADM_info("Best match is %d\n",bestMatch);
+ return bestMatch;
+}
+
+
 /**
 \fn open
 \brief Try to open the mkv file given as parameter
- 
+
 */
 
 uint8_t mkvHeader::open(const char *name)
@@ -68,7 +110,7 @@
 /* --*/
 if(!ebml.simplefind(MKV_SEGMENT,&len,true))
 {
- printf("[MKV] Cannot find Segment\n"); 
+ printf("[MKV] Cannot find Segment\n");
 return false;
 }
 _segmentPosition=ebml.tell();
@@ -77,7 +119,7 @@
 if(ebml.find(ADM_MKV_SECONDARY,MKV_SEGMENT,MKV_SEEK_HEAD,&alen))
 {
 ADM_ebml_file seekHead( &ebml,alen);
- readSeekHead(&seekHead); 
+ readSeekHead(&seekHead);
 }
 /* Now find tracks */
 /* And analyze them */
@@ -97,7 +139,7 @@
 {
 printf("[MKV] Cluster indexing failed\n");
 return 0;
- } 
+ }
 printf("[MKV]Found %u clusters\n",_clusters.size());
 printf("[MKV] Indexing video\n");
 if(!videoIndexer(&ebml))
@@ -113,8 +155,8 @@
 updateFlagsWithCue();
 }
 _cueTime.clear();
- 
- 
+
+
 _parser=new ADM_ebml_file();
 ADM_assert(_parser->open(name));
 _filename=ADM_strdup(name);
@@ -123,12 +165,12 @@
 for(int i=0;i<1+_nbAudioTrack;i++)
 ADM_info("Track %" PRIu32" has an index size of %d entries\n",i,_tracks[i].index.size());
 
- 
+
 if(isVC1Compatible(_videostream.fccHandler))
 {
 int nb=_tracks[0].index.size();
 mkvTrak *vid=_tracks;
- 
+
 ADM_warning("Deleting timestamps. For VC1, they are often wrong\n");
 for(int i=1;i<nb-1;i++)
 vid->index[i].Pts=ADM_NO_PTS;
@@ -138,8 +180,8 @@
 uint32_t ptsdtsdelta, mindelta;
 bool hasBframe;
 ComputeDeltaAndCheckBFrames(&mindelta, &ptsdtsdelta,&hasBframe);
- 
- 
+
+
 int last=_tracks[0].index.size();
 uint64_t increment=_tracks[0]._defaultFrameDuration;
 uint64_t lastDts=0;
@@ -197,7 +239,7 @@
 printf("[MKV] Video Track duration for %u ms\n",duration32);
 // Useless.....
 
- 
+
 
 for(int i=0;i<_nbAudioTrack;i++)
 {
@@ -237,11 +279,82 @@
 return true;
 }
 /**
+ \fn checkDeviation
+ \brief returns the # of errors when forcing timestamp to be num/den (interval in us)
+ num=1000
+ den=24000 for a 24 fps
+
+
+*/
+int mkvHeader::checkDeviation(int num, int den)
+{
+ mkvTrak *track=_tracks;
+ int nb=track->index.size();
+ int first=0;
+ double dHalf=(500000.*(double)num)/((double)den);
+ int half=dHalf-1; // half interval in us
+ int good=0,bad=0;
+ while( track->index[first].Pts==ADM_NO_PTS && first<nb) first++; // we should have some at least
+ uint64_t zero= track->index[first].Pts;
+ ADM_info("Num=%d Den=%d half=%d zero=%d first=%d\n",num,den,half,(int)zero,first);
+ for(int i=first+1;i<nb;i++)
+ {
+ uint64_t pts=track->index[i].Pts;
+ if(pts<zero) continue;
+ pts-=zero;
+ double dmultiple=(pts+half);
+ dmultiple*=den;
+ dmultiple/=(1000000.*(double)num);
+ uint64_t multiple=(uint64_t)dmultiple;
+ int64_t reconstructed=(multiple*1000000*num)/den;
+ int64_t deviation=pts-reconstructed;
+ //printf("frame %d multiple = %d, deviation=%d\n",i,(int)multiple,(int)deviation);
+ if(deviation>2000)
+ bad++;
+ else
+ good++;
+ }
+ ADM_info("Den=%d Num=%d Good = %d, bad=%d\n",den,num,good,bad);
+ return bad ;
+}
+/**
+ \fn checkDeviation
+ \brief Bypass the 1ms accuracy by making sure all the frames are in the form PTS=offset + N*frameInterval
+*/
+bool mkvHeader::enforceFixedFrameRate(int num, int den)
+{
+ mkvTrak *track=_tracks;
+ int nb=track->index.size();
+ double dHalf=(500000.*(double)num)/((double)den);
+ int half=dHalf-1; // half interval in us
+ int first=0;
+ int bad=0;
+ int good=0;
+ while( track->index[first].Pts==ADM_NO_PTS && first<nb) first++; // we should have some at least
+ uint64_t zero= track->index[first].Pts;
+ ADM_info("Num=%d Den=%d half=%d zero=%d first=%d\n",num,den,half,(int)zero,first);
+ for(int i=first+1;i<nb;i++)
+ {
+ uint64_t pts=track->index[i].Pts;
+ if(pts<zero) continue;
+ pts-=zero;
+ double dmultiple=(pts+half);
+ dmultiple*=den;
+ dmultiple/=(1000000.*(double)num);
+ uint64_t multiple=(uint64_t)dmultiple;
+ int64_t reconstructed=(multiple*1000000*num)/den+zero;
+ //printf("frame %d multiple = %d, pts=%d, reconstructed=%d,delta = %d\n",i,(int)multiple,(int)pts,(int)reconstructed,(int)(pts-reconstructed));
+ track->index[i].Pts=reconstructed;
+ }
+ return true;
+}

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.h -> avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.h Changed

@@ -3,7 +3,7 @@
                              -------------------
 
     Matroska demuxer
-    
+
     copyright            : (C) 2008 by mean
     email                : fixounet@free.fr
  ***************************************************************************/
@@ -71,7 +71,7 @@
   uint32_t  nbPackets; // number of blocks (used for audio)
   uint32_t  nbFrames;  // number of distinct frames
   uint32_t  length;    // Number o;f bytes seen
-  
+
   /* Used for both */
   uint8_t    *extraData;
   uint32_t   extraDataLen;
@@ -85,7 +85,7 @@
   std::string language;
 };
 
-#define MKV_MAX_LACES 31 // ?
+#define MKV_MAX_LACES 101 // ?
 /**
     \class mkvAccess
     \brief Matroska audio demuxer
@@ -129,7 +129,7 @@
                 virtual uint64_t  getDurationInUs(void);
                                     /// Go to a given time
                 virtual bool      goToTime(uint64_t timeUs);
-                                    /// Grab extra data                
+                                    /// Grab extra data
                 virtual bool      getPacket(uint8_t *buffer, uint32_t *size, uint32_t maxSize,uint64_t *dts);
                 virtual bool      getExtraData(uint32_t *l, uint8_t **d);
 };
@@ -183,12 +183,14 @@
     uint8_t                 rescaleTrack(mkvTrak *track,uint32_t durationMs);
 
     bool                    delayTrack(int index,mkvTrak *track, uint64_t value);
-    
+
     bool                    ComputeDeltaAndCheckBFrames(uint32_t *minDeltaX, uint32_t *maxDeltaX, bool *bFramePresent);
     bool                    updateFlagsWithCue(void); // in case we can trust it, update KEY_FRAME_FLAGS
     bool                    dumpVideoIndex(int maxIndex);
-    bool                    goBeforeAtomAtPosition(ADM_ebml_file *parser, uint64_t position,uint64_t &outputLen, 
+    bool                    goBeforeAtomAtPosition(ADM_ebml_file *parser, uint64_t position,uint64_t &outputLen,
                                                 MKV_ELEM_ID searchedId,const char *txt);
+    int                     checkDeviation(int num, int den);
+    bool                    enforceFixedFrameRate(int num, int den);
   public:
 
 
@@ -239,5 +241,3 @@
         int     readBufferSize;
 };
 #endif
-
-

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp -> avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp Changed

@@ -46,7 +46,7 @@
 
 parser->seek(0);
 DIA_workingBase *work=createWorking(QT_TRANSLATE_NOOP("matroskademuxer","Matroska Images"));
- 
+
 readBufferSize=200*1024;
 readBuffer=new uint8_t[readBufferSize];
 //************
@@ -159,8 +159,8 @@
 return 1;
 }
 /**
- * 
- * @return 
+ *
+ * @return
 */
 static int mkvFindStartCode(uint8_t *& start, uint8_t *end)
 {
@@ -185,7 +185,7 @@
 if(isH264Compatible(fcc)) return true;
 if(isMpeg12Compatible(fcc)) return true;
 return false;
- 
+
 }
 
 /**
@@ -204,8 +204,9 @@
 ix.flags=0;
 ix.Dts=timecodeMS*_timeBase;
 ix.Pts=timecodeMS*_timeBase;
+ //printf("Track=%d, timecode=%d timeBase=%d, Pts=%d\n",track,(int)timecodeMS,(int)_timeBase,ix.Pts);
 uint32_t rpt=_tracks[0].headerRepeatSize;
- 
+
 // expand buffer if needed
 if(size>readBufferSize)
 {
@@ -220,12 +221,12 @@
 // since frame type is unreliable for mkv, we scan each frame
 // For the 2 most common cases : mp4 & h264.
 // Hackish, we already read the 3 bytes header
- // But they are already taken into account in the size part 
+ // But they are already taken into account in the size part
 if(!track && canRederiveFrameType(_videostream.fccHandler)) // Track 0 is video
 {
 if( isMpeg4Compatible(_videostream.fccHandler))
 {
- 
+
 if(rpt)
 memcpy(readBuffer,_tracks[0].headerRepeat,rpt);
 parser->readBin(readBuffer+rpt,size-3);
@@ -236,13 +237,13 @@
 vops[0].type=AVI_KEY_FRAME;
 ADM_searchVop(readBuffer,readBuffer+rpt+size-3,&nb,vops, &timeinc);
 ix.flags=vops[0].type;
- 
+
 }else
 if(isH264Compatible(_videostream.fccHandler))
 {
- 
+
 uint32_t flags=AVI_KEY_FRAME;
- 
+
 if(rpt)
 memcpy(readBuffer,_tracks[0].headerRepeat,rpt);
 parser->readBin(readBuffer+rpt,size-3);
@@ -256,9 +257,9 @@
 
 }/*else if(isH265Compatible(_videostream.fccHandler))
 {
- 
+
 uint32_t flags=AVI_KEY_FRAME;
- 
+
 if(rpt)
 memcpy(readBuffer,_tracks[0].headerRepeat,rpt);
 parser->readBin(readBuffer+rpt,size-3);
@@ -282,7 +283,7 @@
 while(begin<end)
 {
 int code=mkvFindStartCode(begin,end);
- if(code==-1) 
+ if(code==-1)
 {
 ADM_warning("[Mpg2InMkv]No startcode found\n");
 break;
@@ -303,9 +304,9 @@
 }
 break;
 }
- 
- } 
- 
+
+ }
+
 }else if(isVC1Compatible(_videostream.fccHandler))
 {
 if(rpt)
@@ -351,8 +352,8 @@
 ADM_MKV_TYPE type;
 const char *ss;
 uint64_t time;
- 
- 
+
+
 
 if(!goBeforeAtomAtPosition(parser, _cuePosition,vlen, MKV_CUES,"MKV_CUES"))
 {
@@ -417,7 +418,7 @@
 }
 }
 aprintf("Track %" PRIx64" segmentPos=%" PRIx64" Cluster Position 0x%" PRIx64" Cue position 0x%" PRIx64" Absolute=%" PRIx64" time %" PRIu64"\n",
- tid,_segmentPosition,cluster_position,cue_position,cue_position+cluster_position+_segmentPosition,time); 
+ tid,_segmentPosition,cluster_position,cue_position,cue_position+cluster_position+_segmentPosition,time);
 
 if(!searchTrackFromTid(tid)) //only keep video i.e. track zero
 {
@@ -435,7 +436,7 @@
 ADM_info("[MKV] No Cue found\n");
 return false;
 }
- 
+
 }
 /**
 \fn indexClusters
@@ -469,7 +470,7 @@
 vlen=fileSize-pos;
 }
 ADM_ebml_file segment(parser,vlen);
- 
+
 DIA_workingBase *work=createWorking(QT_TRANSLATE_NOOP("matroskademuxer","Matroska clusters"));
 while(segment.simplefind(MKV_CLUSTER,&alen,0))
 {
@@ -522,13 +523,13 @@
 * length
 * Actual image <= We point here
 * Typically the difference is ~ 16 bytes, so we accept anything between 0 and32
- * @return 
+ * @return
 */
 bool mkvHeader::updateFlagsWithCue(void)
 {
 int nbImages=_tracks[0].index.size();
 int nbCues=_cueTime.size();
- 
+
 int lastImage=0;
 ADM_info("Updating Flags with Cue\n");
 for(int curCue=0;curCue<nbCues;curCue++)
@@ -536,7 +537,7 @@
 uint64_t tim=_cueTime[curCue];
 for(int curImage=lastImage;curImage<nbImages;curImage++)
 {
- uint64_t thisTime=_tracks[0].index[curImage].Pts/_timeBase; 
+ uint64_t thisTime=_tracks[0].index[curImage].Pts/_timeBase;
 if( tim== thisTime)
 {
 // match!
@@ -548,12 +549,12 @@
 }
 }
 ADM_info("Updating Flags with Cue done\n");
- return true; 
+ return true;
 }
 /**
- * 
+ *
 * @param mx
- * @return 
+ * @return
 */
 bool mkvHeader::dumpVideoIndex(int mx)
 {

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp -> avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp Changed

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp -> avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp Changed

@@ -37,8 +37,20 @@
     vpx_codec_dec_cfg_t cfg;
     vpx_codec_flags_t flags=0; //VPX_CODEC_USE_POSTPROC
     vpx_codec_ctx_t *instance=new vpx_codec_ctx_t;
-    const struct vpx_codec_iface *iface = &vpx_codec_vp8_dx_algo;
-    
+    const struct vpx_codec_iface *iface;
+    if(fcc==MKFCC('V','P','8',' '))
+    {
+        iface = &vpx_codec_vp8_dx_algo;
+    }else if(fcc==MKFCC('V','P','9',' '))
+    {
+        iface = &vpx_codec_vp9_dx_algo;
+    }else
+    {
+        ADM_warning("Unsupported FCC\n");
+        delete instance;
+        return;
+    }
+
     memset(instance,0,sizeof(*instance));
     memset(&cfg,0,sizeof(cfg));
     cfg.threads=1;
@@ -93,11 +105,11 @@
             if(r)
             {
                     r->_planes[0]=img->planes[0];
-                    r->_planes[1]=img->planes[1];
-                    r->_planes[2]=img->planes[2];
+                    r->_planes[1]=img->planes[2];
+                    r->_planes[2]=img->planes[1];
                     r->_planeStride[0]=img->stride[0];
-                    r->_planeStride[1]=img->stride[1];
-                    r->_planeStride[2]=img->stride[2];
+                    r->_planeStride[1]=img->stride[2];
+                    r->_planeStride[2]=img->stride[1];
                     r->_colorspace=ADM_COLOR_YV12;
                     r->Pts=in->demuxerPts;
                     r->flags=in->flags;

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoDecoder/vpx/vpxPlugin.cpp -> avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoDecoder/vpx/vpxPlugin.cpp Changed

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui -> avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui Changed

avidemux_2.6.19.tar.gz/cmake/admCPackRpm.cmake -> avidemux_2.6.20.tar.gz/cmake/admCPackRpm.cmake Changed

avidemux_2.6.19.tar.gz/cmake/admCheckQt5.cmake -> avidemux_2.6.20.tar.gz/cmake/admCheckQt5.cmake Changed

@@ -7,14 +7,13 @@
         MESSAGE(STATUS "Checking for Qt 5*")
         MESSAGE(STATUS "******************")
         IF(CROSS)
-                MESSAGE(STATUS "Cross compiling override for QT5")
-                IF(TYPE2_CROSS_SETUP)
-                        SET(CROSS5 ${CROSS}/qt5/lib/cmake)
-                ELSE(TYPE2_CROSS_SETUP)
-                        SET(CROSS5 /usr/lib/x86_64-linux-gnu/cmake/)
-                ENDIF(TYPE2_CROSS_SETUP)
-                SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets)
-                SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets)
+                SET(CROSS5 ${QT_HOME}/lib/cmake)
+                MESSAGE(STATUS "Cross compiling override for QT5 : ${CROSS5}")
+                SET(CMAKE_MODULE_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_MODULE_PATH} )
+                SET(CMAKE_PREFIX_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_PREFIX_PATH} )
+                SET(CROSS5 ${QT_HOME}/lib64/cmake) # Mingw64
+                SET(CMAKE_MODULE_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_MODULE_PATH} )
+                SET(CMAKE_PREFIX_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_PREFIX_PATH} )
                 MESSAGE(STATUS "Search path ${CMAKE_MODULE_PATH}")
                 FIND_PACKAGE(Qt5Core)    
                 FIND_PACKAGE(Qt5Widgets)

avidemux_2.6.19.tar.gz/cmake/avidemuxVersion.cmake -> avidemux_2.6.20.tar.gz/cmake/avidemuxVersion.cmake Changed

avidemux_2.6.19.tar.gz/cmake/osx/Avidemux2.6 -> avidemux_2.6.20.tar.gz/cmake/osx/Avidemux2.6 Changed