Changes of Revision 37

avidemux3.changes Changed
x
 
1
@@ -1,4 +1,15 @@
2
 -------------------------------------------------------------------
3
+Sun Apr 30 11:40:23 UTC 2017 - joerg.lorenzen@ki.tng.de
4
+
5
+- Update to version 2.6.20
6
+  + Audio : AAC in mpegTS fix
7
+  + Audio : external AAC import fix
8
+  + MKV : try to better guess original timestamp
9
+  + i18n : Russian and German translation update
10
+    (TotalCaesar659 / euma)
11
+  + UI : Filter UI fix
12
+
13
+-------------------------------------------------------------------
14
 Thu Mar 30 11:07:43 UTC 2017 - joerg.lorenzen@ki.tng.de
15
 
16
 - Update to version 2.6.19
17
avidemux3.spec Changed
10
 
1
@@ -30,7 +30,7 @@
2
 
3
 Name:           avidemux3
4
 Summary:        Graphical video editing and transcoding tool
5
-Version:        2.6.19
6
+Version:        2.6.20
7
 Release:        1
8
 Url:            http://avidemux.sourceforge.net/
9
 Source0:        avidemux_%{version}.tar.gz
10
avidemux_2.6.19.tar.gz/avidemux/winInstaller/Change Log.html Deleted
24
 
1
@@ -1,22 +0,0 @@
2
-<html><head></head><body><h1>Changelog:</h1><br>
3
-<li> [mingw] Better print stack trace <a href="https://github.com/mean00/avidemux2/commit/4a47dd62c35f10b6784a461ea677f5df80210446"> *;</a> </li> 
4
-<li> [build/mingw] Add CMAKE_EXTRA_ARG to build env <a href="https://github.com/mean00/avidemux2/commit/ce18317463c177ef9ddd20fd4c9b78ed0e3cc420"> *;</a> </li> 
5
-<li> [mingw] display back trace <a href="https://github.com/mean00/avidemux2/commit/ad0d6fd10c725f7f2a51fa1cb8d52dad03379f6d"> *;</a> </li> 
6
-<li> [Build] Fix gen log <a href="https://github.com/mean00/avidemux2/commit/d8e5e63398befaa87d24c6d2aff460ff9c8ceba6"> *;</a> </li> 
7
-<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> 
8
-<li> [mp4/Demux] Partial decoding of pts/dts (incorrect) <a href="https://github.com/mean00/avidemux2/commit/f256ca4f48c19b458b5d66987e19b54b7ff6e791"> *;</a> </li> 
9
-<li> [mp4/demux] Attach fragments to the track <a href="https://github.com/mean00/avidemux2/commit/8de90a9c8cc731419934768f933f8b9debad8123"> *;</a> </li> 
10
-<li> [mp4/fragment] Correct offset, duration and flags still not correct <a href="https://github.com/mean00/avidemux2/commit/49dced16f294098d9d8fcf5344f8345c0ed87342"> *;</a> </li> 
11
-<li> [MP4/Demux] Merge fragments info video <a href="https://github.com/mean00/avidemux2/commit/0aefedbd0df7d0f98c161c4c279c2043b6252964"> *;</a> </li> 
12
-<li> [mp4/demux] Decode more fragments info <a href="https://github.com/mean00/avidemux2/commit/67ea2fbe387887fc025b52196f97738103b6a6c6"> *;</a> </li> 
13
-<li> [mp4/demux] Decode a bit more mp4 fragments <a href="https://github.com/mean00/avidemux2/commit/2d1ca92b83ed17005ec5e3ba24852aab70a07d9f"> *;</a> </li> 
14
-<li> [Mp4/demux] Probe for sidx to detect Dash files <a href="https://github.com/mean00/avidemux2/commit/7df2e0e674b080b5b0357c8f1d4a8fe938f4b30c"> *;</a> </li> 
15
-<li> [mkv/vp9] Add missing space in vp9 fourcc <a href="https://github.com/mean00/avidemux2/commit/5ef460d1a081329dca64622b315a1391f81d35f2"> *;</a> </li> 
16
-<li> [image] Fix mmx nv12 <a href="https://github.com/mean00/avidemux2/commit/fc163e9a54eb0f3c685734c735c441a6be20d2d1"> *;</a> </li> 
17
-<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> 
18
-<li> [libva] Remove debug code <a href="https://github.com/mean00/avidemux2/commit/51adaa4dbdcdae7e33ec57484c4acb0d59dc024d"> *;</a> </li> 
19
-<li> [libVa] Remove useless plane copy <a href="https://github.com/mean00/avidemux2/commit/9e003828658bde73d3edf17089d9110a547aaac5"> *;</a> </li> 
20
-<li> [libva] dont reset image infos (pts...) in indirect mode <a href="https://github.com/mean00/avidemux2/commit/77acf9cf08b980e5b464068ac693381c14183b4d"> *;</a> </li> 
21
-<li> [coreImage] cosmetic <a href="https://github.com/mean00/avidemux2/commit/aff0288c0a62bfe109d89b3e22a66773c7e44c0e"> *;</a> </li> 
22
-<li> [Decoder/Libva] Cleanup, still not 100% ok <a href="https://github.com/mean00/avidemux2/commit/9ad16987240c4a9c7b378ecfa7424ced9e42b623"> *;</a> </li> 
23
-</body>
24
avidemux_2.6.19.tar.gz/avidemux/cli/CMakeLists.txt -> avidemux_2.6.20.tar.gz/avidemux/cli/CMakeLists.txt Changed
14
 
1
@@ -62,8 +62,10 @@
2
 ADD_SUBDIRECTORY(ADM_userInterfaces ./ADM_userInterfacesCli)
3
 
4
 SDLify(../common/main.cpp)
5
-ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
6
-ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_VERSION='\"${AVIDEMUX_VERSION}\"'")
7
+if (ADM_SUBVERSION)
8
+        ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
9
+endif (ADM_SUBVERSION)
10
+ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_VERSION=\"${AVIDEMUX_VERSION}\"")
11
 
12
 ###########################################
13
 # Version Info
14
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
16
 
1
@@ -122,10 +122,10 @@
2
 std::vector<MenuEntry> myMenuGo(_myMenuGo, _myMenuGo + sizeof(_myMenuGo) / sizeof(_myMenuGo[0]));
3
 
4
 static const MenuEntry _myMenuView[] = {
5
-            {MENU_ACTION,"Zoom 1:4",      NULL,ACT_ZOOM_1_4 ,NULL,"4"},
6
-            {MENU_ACTION,"Zoom 1:2",      NULL,ACT_ZOOM_1_2 ,NULL,"3"},
7
-            {MENU_ACTION,"Zoom 1:1",      NULL,ACT_ZOOM_1_1 ,NULL,"2"},
8
-            {MENU_ACTION,"Zoom 2:1",      NULL,ACT_ZOOM_2_1 ,NULL,"1"},
9
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 1:4"),      NULL,ACT_ZOOM_1_4 ,NULL,"4"},
10
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 1:2"),      NULL,ACT_ZOOM_1_2 ,NULL,"3"},
11
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 1:1"),      NULL,ACT_ZOOM_1_1 ,NULL,"2"},
12
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 2:1"),      NULL,ACT_ZOOM_2_1 ,NULL,"1"},
13
         };
14
 
15
 std::vector<MenuEntry> myMenuView(_myMenuView, _myMenuView + sizeof(_myMenuView) / sizeof(_myMenuView[0]));
16
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
9
 
1
@@ -301,6 +301,7 @@
2
             case AV_CODEC_ID_VC1:
3
                   name="vc1";
4
                   break;
5
+            case AV_CODEC_ID_MPEG1VIDEO:
6
             case AV_CODEC_ID_MPEG2VIDEO:
7
                   name="mpegvideo";
8
                   break;
9
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
13
 
1
@@ -271,8 +271,9 @@
2
 */
3
 const char *partialFilter::getConfiguration(void)
4
 {
5
-  sprintf(description,"Partial : %s -- ",ADM_us2plain(configuration.startBlack*1000));
6
-  strcat(description,ADM_us2plain(configuration.endBlack*1000));
7
+  sprintf(description,"Partial : %s -- ",ADM_us2plain((uint64_t)(configuration.startBlack)*1000));
8
+  strcat(description,ADM_us2plain((uint64_t)(configuration.endBlack)*1000));
9
+  strcat(description," ");
10
   strcat(description,sonFilter->getConfiguration());
11
   return description;
12
 }
13
avidemux_2.6.19.tar.gz/avidemux/common/gui_main.cpp -> avidemux_2.6.20.tar.gz/avidemux/common/gui_main.cpp Changed
36
 
1
@@ -171,19 +171,33 @@
2
         int actionId = (action - ACT_SCRIPT_ENGINE_FIRST) % 3;
3
 
4
         tempEngine = getScriptEngines()[engineIndex];
5
-
6
+#ifndef _WIN64
7
+        std::string ext=tempEngine->defaultFileExtension();
8
+#endif
9
         switch (actionId)
10
         {
11
             case 0:
12
+#ifdef _WIN64
13
                 GUI_FileSelRead(QT_TRANSLATE_NOOP("adm","Select script to run"), RunScript);
14
+#else
15
+                GUI_FileSelReadExtension(QT_TRANSLATE_NOOP("adm","Select script to run"), ext.c_str(), RunScript);
16
+#endif
17
                 break;
18
 
19
             case 1:
20
+#ifdef _WIN64
21
                 GUI_FileSelRead(QT_TRANSLATE_NOOP("adm","Select script to debug"), DebugScript);
22
+#else
23
+                GUI_FileSelReadExtension(QT_TRANSLATE_NOOP("adm","Select script to debug"), ext.c_str(), DebugScript);
24
+#endif
25
                 break;
26
 
27
             case 2:
28
+#ifdef _WIN64
29
                 GUI_FileSelWrite(QT_TRANSLATE_NOOP("adm","Select script to save"), SaveScript);
30
+#else
31
+                GUI_FileSelWriteExtension(QT_TRANSLATE_NOOP("adm","Select script to save"), ext.c_str(), SaveScript);
32
+#endif
33
                 UI_refreshCustomMenu();
34
                 break;
35
         }
36
avidemux_2.6.19.tar.gz/avidemux/common/main.cpp -> avidemux_2.6.20.tar.gz/avidemux/common/main.cpp Changed
11
 
1
@@ -177,7 +177,8 @@
2
 int startAvidemux(int argc, char *argv[])
3
 {
4
 
5
-#define MKSTRING(x) #x
6
+#define STR(x) #x
7
+#define MKSTRING(x) STR(x)
8
     printf("*************************\n");
9
     printf("  Avidemux v%s", MKSTRING(ADM_VERSION));
10
 
11
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
17
 
1
@@ -46,11 +46,12 @@
2
 
3
     installSigHandler();
4
 
5
-    
6
+#define STR(x) #x
7
+#define MKSTRING(x) STR(x)
8
+
9
     printf("*************************\n");
10
-    printf("  Avidemux v" VERSION);
11
+    printf("  Avidemux v%s", MKSTRING(ADM_VERSION));
12
 #if defined(ADM_SUBVERSION)
13
-#define MKSTRING(x) #x
14
      printf(" (%s)", MKSTRING(ADM_SUBVERSION));
15
 #endif
16
     printf("\n*************************\n");
17
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
13
 
1
@@ -45,7 +45,10 @@
2
 include(admCoreIncludes)
3
 include_directories("${PTHREAD_INCLUDE_DIR}")
4
 ADD_EXECUTABLE(avidemux3_jobs_${QT_EXTENSION} ${ADM_JOB_SRCS})
5
-ADD_SOURCE_CFLAGS(ADM_jobs.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
6
+ADD_SOURCE_CFLAGS(ADM_jobs.cpp "-DADM_VERSION=\"${AVIDEMUX_VERSION}\"")
7
+if (ADM_SUBVERSION)
8
+        ADD_SOURCE_CFLAGS(ADM_jobs.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
9
+endif (ADM_SUBVERSION)
10
 
11
 ###########################################
12
 TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreSocket6)
13
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
13
 
1
@@ -40,7 +40,10 @@
2
         Q_audioTracks.cpp
3
 )
4
 
5
-ADD_DEFINITIONS(-DADM_SUBVERSION=\"${ADM_SUBVERSION}\" -DADM_VERSION=\"${AVIDEMUX_VERSION}\")
6
+if (ADM_SUBVERSION)
7
+        ADD_DEFINITIONS(-DADM_SUBVERSION=\"${ADM_SUBVERSION}\")
8
+endif (ADM_SUBVERSION)
9
+ADD_DEFINITIONS(-DADM_VERSION=\"${AVIDEMUX_VERSION}\")
10
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
11
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/avidemux/ADM_UIs/ADM_QT4/include")
12
 include_directories("${CMAKE_SOURCE_DIR}/../common/ADM_script2/include")
13
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
19
 
1
@@ -32,14 +32,9 @@
2
 
3
    char subversion[128]={0};
4
 #if defined(ADM_SUBVERSION)
5
-        int l=strlen(ADM_SUBVERSION);
6
-        if(l>1)
7
-        {
8
-                sprintf(subversion,"%s <br><small>(%s-fflibs %s)</small>", ADM_VERSION, ADM_SUBVERSION,ADM_FFMPEG_VERSION);
9
-        }else
10
-        {
11
-                sprintf(subversion,"%s - Release",ADM_VERSION);
12
-        }
13
+        sprintf(subversion,"%s <br><small>(%s-fflibs %s)</small>", ADM_VERSION, ADM_SUBVERSION, ADM_FFMPEG_VERSION);
14
+#else
15
+        sprintf(subversion,"%s - Release",ADM_VERSION);
16
 #endif
17
         QString  sv(subversion);
18
         ui.versionLabel->setTextFormat(Qt::RichText);
19
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
201
 
1
@@ -19,104 +19,180 @@
2
 #include "ADM_vidMisc.h"
3
 #include "ADM_toolkitQt.h"
4
 #include "ADM_coreUtils.h"
5
+#include <QClipboard>
6
 
7
 static const char *yesno[2]={QT_TRANSLATE_NOOP("qprops","No"),QT_TRANSLATE_NOOP("qprops","Yes")};
8
 
9
 propWindow::propWindow(QWidget *parent) : QDialog(parent)
10
- {
11
-     ui.setupUi(this);
12
-     uint8_t gmc=0, qpel=0,vop=0;
13
- uint32_t info=0;
14
- uint32_t war,har;
15
- uint32_t hh, mm, ss, ms;
16
- char text[80];
17
- const char *s;
18
-  
19
+{
20
+    ui.setupUi(this);
21
+    uint32_t war,har;
22
+    uint32_t hh, mm, ss, ms;
23
+    char text[80];
24
+    const char *s;
25
+
26
     text[0] = 0;
27
+    listOfValues.clear();
28
     if (!avifileinfo)
29
         return;
30
 
31
-#define FILLTEXT(a,b,c) {snprintf(text,79,b,c);ui.a->setText(text);}
32
-#define FILLTEXT4(a,b,c,d) {snprintf(text,79,b,c,d);ui.a->setText(text);}
33
-#define FILLTEXT5(a,b,c,d,e) {snprintf(text,79,b,c,d,e);ui.a->setText(text);}
34
+#define FILLTEXT(a,b,c) {snprintf(text,79,b,c); listOfValues.push_back(text); ui.a->setText(text);}
35
+#define FILLTEXT4(a,b,c,d) {snprintf(text,79,b,c,d); listOfValues.push_back(text); ui.a->setText(text);}
36
+#define FILLTEXT5(a,b,c,d,e) {snprintf(text,79,b,c,d,e); listOfValues.push_back(text); ui.a->setText(text);}
37
 #define SET_YES(a,b) ui.a->setText(yesno[b])
38
-#define FILLQT_TRANSLATE_NOOP(a,q) ui.q->setText(text);
39
-        
40
-    
41
-        //------------------------------------
42
-    
43
-        FILLTEXT4(labeImageSize,QT_TRANSLATE_NOOP("qprops","%" PRIu32" x %" PRIu32), avifileinfo->width,avifileinfo->height);
44
-        FILLTEXT(labelFrameRate, QT_TRANSLATE_NOOP("qprops","%2.3f fps"), (float) avifileinfo->fps1000 / 1000.F);
45
-        FILLTEXT(label4CC, "%s",      fourCC::tostring(avifileinfo->fcc));
46
-        uint64_t duration=video_body->getVideoDuration();
47
-        ms2time(duration/1000,&hh,&mm,&ss,&ms);
48
-        snprintf(text,79, QT_TRANSLATE_NOOP("qprops","%02d:%02d:%02d.%03d"), hh, mm, ss, ms);
49
-        ui.labelVideoDuration->setText(text);
50
-
51
-        war=video_body->getPARWidth();
52
-        har=video_body->getPARHeight();
53
-        getAspectRatioFromAR(war,har, &s);
54
-        FILLTEXT5(LabelAspectRatio,QT_TRANSLATE_NOOP("qprops","%s (%u:%u)"), s,war,har);
55
-        
56
-        uint32_t extraLen;
57
-        uint8_t *extraData;
58
-        video_body->getExtraHeaderData(&extraLen,&extraData);
59
-        FILLTEXT(LabelExtraDataSize,"%02d",extraLen);
60
-        if(extraLen)
61
+#define FILLQT_TRANSLATE_NOOP(a,q) listOfValues.push_back(text); ui.q->setText(text);
62
+
63
+    //------------------------------------
64
+
65
+    FILLTEXT(label4CC, "%s", fourCC::tostring(avifileinfo->fcc));
66
+
67
+    FILLTEXT4(labeImageSize,QT_TRANSLATE_NOOP("qprops","%" PRIu32" x %" PRIu32), avifileinfo->width,avifileinfo->height);
68
+
69
+    war=video_body->getPARWidth();
70
+    har=video_body->getPARHeight();
71
+    getAspectRatioFromAR(war,har, &s);
72
+    FILLTEXT5(LabelAspectRatio,QT_TRANSLATE_NOOP("qprops","%s (%u:%u)"), s,war,har);
73
+
74
+    FILLTEXT(labelFrameRate, QT_TRANSLATE_NOOP("qprops","%2.3f fps"), (float) avifileinfo->fps1000 / 1000.F);
75
+
76
+    uint64_t duration=video_body->getVideoDuration();
77
+    ms2time(duration/1000,&hh,&mm,&ss,&ms);
78
+    snprintf(text,79, QT_TRANSLATE_NOOP("qprops","%02d:%02d:%02d.%03d"), hh, mm, ss, ms);
79
+    listOfValues.push_back(text);
80
+    ui.labelVideoDuration->setText(text);
81
+
82
+    uint32_t extraLen;
83
+    uint8_t *extraData;
84
+    video_body->getExtraHeaderData(&extraLen,&extraData);
85
+    FILLTEXT(LabelExtraDataSize,"%02d",extraLen);
86
+
87
+    if(extraLen)
88
+    {
89
+        int capped=extraLen;
90
+        if(capped>10) capped=10;
91
+        QString string;
92
+        char smallx[10];
93
+        for(int i=0;i<capped;i++)
94
+        {
95
+            snprintf(smallx,4,"%02X ",extraData[i]);
96
+            string+=QString(smallx);
97
+        }
98
+        listOfValues.push_back(string);
99
+        ui.LabelExtraData->setText(string);
100
+    }else
101
+        ui.LabelExtraData->clear();
102
+
103
+    //------------------------------------
104
+    WAVHeader *wavinfo=NULL;
105
+    ADM_audioStream *st;
106
+    video_body->getDefaultAudioTrack(&st);
107
+    if(st)
108
+        wavinfo=st->getInfo();
109
+    if(wavinfo)
110
+    {
111
+        sprintf(text, "%s", getStrFromAudioCodec(wavinfo->encoding));
112
+        FILLQT_TRANSLATE_NOOP("qprops",labelACodec);
113
+
114
+        switch (wavinfo->channels)
115
         {
116
-            int capped=extraLen;
117
-            if(capped>10) capped=10;
118
-            QString string;
119
-            char    smallx[10];
120
-            for(int i=0;i<capped;i++)
121
-            {
122
-                snprintf(smallx,4,"%02X ",extraData[i]);
123
-                string+=QString(smallx);
124
-            }
125
-            ui.LabelExtraData->setText(string);
126
-        }else
127
-            ui.LabelExtraData->clear();
128
-        
129
-        //------------------------------------
130
-         WAVHeader *wavinfo=NULL;
131
-         ADM_audioStream *st;
132
-         video_body->getDefaultAudioTrack(&st);
133
-         if(st)
134
-            wavinfo=st->getInfo();
135
-          if(wavinfo)
136
-          {
137
-              
138
-              switch (wavinfo->channels)
139
-                {
140
-                case 1:
141
-                    sprintf(text,"%s", QT_TRANSLATE_NOOP("qprops","Mono"));
142
-                    break;
143
-                case 2:
144
-                    sprintf(text,"%s", QT_TRANSLATE_NOOP("qprops","Stereo"));
145
-                    break;
146
-                default:
147
-                    sprintf(text, "%d",wavinfo->channels);
148
-                    break;
149
-                }
150
-
151
-                FILLQT_TRANSLATE_NOOP("qprops",labelChannels);
152
-                FILLTEXT(labelFrequency, QT_TRANSLATE_NOOP("qprops","%" PRIu32" Hz"), wavinfo->frequency);
153
-                FILLTEXT4(labelBitrate, QT_TRANSLATE_NOOP("qprops","%" PRIu32" Bps / %" PRIu32" kbps"), wavinfo->byterate,wavinfo->byterate * 8 / 1000);
154
-                
155
-                sprintf(text, "%s", getStrFromAudioCodec(wavinfo->encoding));
156
-                FILLQT_TRANSLATE_NOOP("qprops",labelACodec);
157
-                //
158
-                duration=st->getDurationInUs();
159
-                ms2time(duration/1000,&hh,&mm,&ss,&ms);
160
-
161
-                sprintf(text, QT_TRANSLATE_NOOP("qprops","%02d:%02d:%02d.%03d"), hh, mm, ss, ms);
162
-                FILLQT_TRANSLATE_NOOP("qprops",labelAudioDuration);
163
+            case 1:
164
+                sprintf(text,"%s", QT_TRANSLATE_NOOP("qprops","Mono"));
165
+                break;
166
+            case 2:
167
+                sprintf(text,"%s", QT_TRANSLATE_NOOP("qprops","Stereo"));
168
+                break;
169
+            default:
170
+                sprintf(text, "%d",wavinfo->channels);
171
+                break;
172
+        }
173
+
174
+        FILLQT_TRANSLATE_NOOP("qprops",labelChannels);
175
+
176
+        FILLTEXT4(labelBitrate, QT_TRANSLATE_NOOP("qprops","%" PRIu32" Bps / %" PRIu32" kbps"), wavinfo->byterate, wavinfo->byterate * 8 / 1000);
177
+
178
+        FILLTEXT(labelVBR,"%s","n/a");
179
+
180
+        FILLTEXT(labelFrequency, QT_TRANSLATE_NOOP("qprops","%" PRIu32" Hz"), wavinfo->frequency);
181
+
182
+        duration=st->getDurationInUs();
183
+        ms2time(duration/1000,&hh,&mm,&ss,&ms);
184
+        sprintf(text, QT_TRANSLATE_NOOP("qprops","%02d:%02d:%02d.%03d"), hh, mm, ss, ms);
185
+        FILLQT_TRANSLATE_NOOP("qprops",labelAudioDuration);
186
+
187
 //                SET_YES(labelVBR,currentaudiostream->isVBR());
188
-        } else
189
-          {
190
-             ui.groupBoxAudio->setEnabled(false);
191
-          }
192
- }
193
+    } else
194
+    {
195
+        ui.groupBoxAudio->setEnabled(false);
196
+    }
197
+
198
+    connect(ui.pushButton_c2c,SIGNAL(clicked()),this,SLOT(propsCopyToClipboard()));
199
+}
200
+
201
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
24
 
1
@@ -1,14 +1,19 @@
2
 #ifndef Q_props_h
3
 #define Q_props_h
4
 
5
+#include <vector>
6
 #include "ui_props.h"
7
 
8
 class propWindow : public QDialog
9
 {
10
-   Q_OBJECT
11
+    Q_OBJECT
12
 
13
 public:
14
-   propWindow(QWidget *parent);
15
-   Ui_propsDialog ui;
16
+    propWindow(QWidget *parent);
17
+    Ui_propsDialog ui;
18
+private:
19
+    std::vector <QString> listOfValues;
20
+public slots:
21
+    void propsCopyToClipboard(void);
22
 };
23
 #endif // Q_props_h
24
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
188
 
1
@@ -7,20 +7,14 @@
2
     <x>0</x>
3
     <y>0</y>
4
     <width>291</width>
5
-    <height>456</height>
6
+    <height>451</height>
7
    </rect>
8
   </property>
9
   <property name="windowTitle">
10
    <string>Properties</string>
11
   </property>
12
-  <layout class="QVBoxLayout">
13
-   <property name="spacing">
14
-    <number>6</number>
15
-   </property>
16
-   <property name="margin">
17
-    <number>9</number>
18
-   </property>
19
-   <item>
20
+  <layout class="QGridLayout" name="gridLayout">
21
+   <item row="0" column="0" colspan="3">
22
     <widget class="QGroupBox" name="groupBox">
23
      <property name="title">
24
       <string>Video</string>
25
@@ -29,7 +23,16 @@
26
       <bool>false</bool>
27
      </property>
28
      <layout class="QGridLayout">
29
-      <property name="margin">
30
+      <property name="leftMargin">
31
+       <number>9</number>
32
+      </property>
33
+      <property name="topMargin">
34
+       <number>9</number>
35
+      </property>
36
+      <property name="rightMargin">
37
+       <number>9</number>
38
+      </property>
39
+      <property name="bottomMargin">
40
        <number>9</number>
41
       </property>
42
       <property name="spacing">
43
@@ -108,13 +111,22 @@
44
      </layout>
45
     </widget>
46
    </item>
47
-   <item>
48
+   <item row="1" column="0" colspan="3">
49
     <widget class="QGroupBox" name="groupBox_2">
50
      <property name="title">
51
       <string>Extra Video Properties</string>
52
      </property>
53
      <layout class="QGridLayout">
54
-      <property name="margin">
55
+      <property name="leftMargin">
56
+       <number>9</number>
57
+      </property>
58
+      <property name="topMargin">
59
+       <number>9</number>
60
+      </property>
61
+      <property name="rightMargin">
62
+       <number>9</number>
63
+      </property>
64
+      <property name="bottomMargin">
65
        <number>9</number>
66
       </property>
67
       <property name="spacing">
68
@@ -123,7 +135,7 @@
69
       <item row="0" column="1">
70
        <widget class="QLabel" name="LabelExtraDataSize">
71
         <property name="text">
72
-         <string> </string>
73
+         <string/>
74
         </property>
75
        </widget>
76
       </item>
77
@@ -137,7 +149,7 @@
78
       <item row="1" column="1">
79
        <widget class="QLabel" name="LabelExtraData">
80
         <property name="text">
81
-         <string> </string>
82
+         <string/>
83
         </property>
84
        </widget>
85
       </item>
86
@@ -151,7 +163,7 @@
87
      </layout>
88
     </widget>
89
    </item>
90
-   <item>
91
+   <item row="2" column="0" colspan="3">
92
     <widget class="QGroupBox" name="groupBoxAudio">
93
      <property name="title">
94
       <string>Audio</string>
95
@@ -160,7 +172,16 @@
96
       <bool>false</bool>
97
      </property>
98
      <layout class="QGridLayout">
99
-      <property name="margin">
100
+      <property name="leftMargin">
101
+       <number>9</number>
102
+      </property>
103
+      <property name="topMargin">
104
+       <number>9</number>
105
+      </property>
106
+      <property name="rightMargin">
107
+       <number>9</number>
108
+      </property>
109
+      <property name="bottomMargin">
110
        <number>9</number>
111
       </property>
112
       <property name="spacing">
113
@@ -253,31 +274,55 @@
114
      </layout>
115
     </widget>
116
    </item>
117
-   <item>
118
-    <widget class="QPushButton" name="pushButton">
119
-     <property name="sizePolicy">
120
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
121
-       <horstretch>0</horstretch>
122
-       <verstretch>0</verstretch>
123
-      </sizepolicy>
124
-     </property>
125
-     <property name="layoutDirection">
126
-      <enum>Qt::RightToLeft</enum>
127
-     </property>
128
-     <property name="text">
129
-      <string>OK</string>
130
-     </property>
131
-     <property name="default">
132
-      <bool>true</bool>
133
-     </property>
134
-    </widget>
135
+   <item row="3" column="0" colspan="3">
136
+    <layout class="QHBoxLayout" name="horizontalLayout">
137
+     <item>
138
+      <widget class="QPushButton" name="pushButton_c2c">
139
+       <property name="text">
140
+        <string>Copy to Clipboard</string>
141
+       </property>
142
+      </widget>
143
+     </item>
144
+     <item>
145
+      <spacer name="horizontalSpacer">
146
+       <property name="orientation">
147
+        <enum>Qt::Horizontal</enum>
148
+       </property>
149
+       <property name="sizeHint" stdset="0">
150
+        <size>
151
+         <width>40</width>
152
+         <height>20</height>
153
+        </size>
154
+       </property>
155
+      </spacer>
156
+     </item>
157
+     <item>
158
+      <widget class="QPushButton" name="pushButton_ok">
159
+       <property name="sizePolicy">
160
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
161
+         <horstretch>0</horstretch>
162
+         <verstretch>0</verstretch>
163
+        </sizepolicy>
164
+       </property>
165
+       <property name="layoutDirection">
166
+        <enum>Qt::RightToLeft</enum>
167
+       </property>
168
+       <property name="text">
169
+        <string>OK</string>
170
+       </property>
171
+       <property name="default">
172
+        <bool>true</bool>
173
+       </property>
174
+      </widget>
175
+     </item>
176
+    </layout>
177
    </item>
178
   </layout>
179
  </widget>
180
  <resources/>
181
  <connections>
182
   <connection>
183
-   <sender>pushButton</sender>
184
+   <sender>pushButton_ok</sender>
185
    <signal>clicked()</signal>
186
    <receiver>propsDialog</receiver>
187
    <slot>accept()</slot>
188
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
201
 
1
@@ -47,6 +47,8 @@
2
 #include "ADM_edScriptGenerator.h"
3
 #include "DIA_fileSel.h"
4
 #include "ADM_script2/include/ADM_script.h"
5
+
6
+#include <QMenu>
7
 /*******************************************************/
8
 #define NB_TREE 8
9
 #define myFg 0xFF
10
@@ -61,6 +63,7 @@
11
 /*******************************************************/
12
 #define zprintf(...) {}
13
 //#define NO_DELEGATE
14
+#define LABEL_SECURITY_MARGIN 6
15
 
16
 extern ADM_Composer *video_body;
17
 
18
@@ -77,7 +80,6 @@
19
     zprintf("Parent : %p\n",parent());
20
 #if !defined(NO_EVENT_FILTER)
21
     QListWidget *list=qobject_cast<QListWidget*>(parent());
22
-    QAbstractItemView *view = qobject_cast<QAbstractItemView*>(parent());
23
     //printf("Event %d\n",event->type());
24
     switch(event->type())
25
     {
26
@@ -117,17 +119,28 @@
27
     QAbstractItemView *view = qobject_cast<QAbstractItemView*>(parent());
28
     QLabel *label;
29
 
30
+    int scrollbarWidth = qApp->style()->pixelMetric(QStyle::PM_ScrollBarExtent);
31
+    int width=qobject_cast<QWidget*>(view)->width();
32
+    width -= scrollbarWidth;
33
+    width -= LABEL_SECURITY_MARGIN;
34
+
35
     if (view->indexWidget(index) == 0)
36
     {
37
             label = new QLabel();
38
             label->installEventFilter(filter);
39
             label->setAutoFillBackground(true);
40
             label->setFocusPolicy(Qt::TabFocus);
41
+            label->setMargin(2);
42
+            label->setWordWrap(true);
43
             label->setText(index.data().toString());
44
             view->setIndexWidget(index, label);
45
     }
46
 
47
     label = (QLabel*)view->indexWidget(index);
48
+    // If label width exceeds the width of the viewport, labels get sometimes painted
49
+    // over other widgets, especially bad on Windows, where they overlay scrollbars.
50
+    // Set the width to a fixed value small enough to avoid horizontal scrolling.
51
+    label->setFixedWidth(width);
52
 
53
     if (option.state & QStyle::State_Selected)
54
             if (option.state & QStyle::State_HasFocus)
55
@@ -367,6 +380,34 @@
56
             displayFamily(m);
57
 
58
 }
59
+
60
+/**
61
+    \fn calculateListItemHeight
62
+ */
63
+int filtermainWindow::calculateListItemHeight(QListWidget *parent, QString text)
64
+{
65
+    QLabel *dummy=new QLabel();
66
+
67
+    int width=parent->frameSize().width();
68
+    int scrollbarWidth = qApp->style()->pixelMetric(QStyle::PM_ScrollBarExtent);
69
+    width -= scrollbarWidth;
70
+    width -= LABEL_SECURITY_MARGIN;
71
+    dummy->setFixedWidth(width);
72
+    dummy->setMargin(2);
73
+    dummy->setWordWrap(true);
74
+    dummy->setText(text);
75
+
76
+    QFont fnt=dummy->font();
77
+    QFontMetrics fm(fnt);
78
+    int height=fm.boundingRect(0, 0, width, dummy->height(), Qt::TextWordWrap | Qt::AlignLeft, text).height();
79
+    if(height < (fm.lineSpacing() * 2))
80
+        height=fm.lineSpacing() * 2;
81
+    height += 8; // the height might be insufficient at very small font sizes
82
+    delete dummy;
83
+    dummy=NULL;
84
+    return height;
85
+}
86
+
87
 /**
88
  * \fn displayFamily
89
  * @param family
90
@@ -377,7 +418,6 @@
91
 
92
   uint32_t nb=ADM_vf_getNbFiltersInCategory((VF_CATEGORY)family);
93
   ADM_info("Video filter Family :%u, nb %d\n",family,nb);
94
-  QSize sz;
95
   availableList->clear();
96
   for (uint32_t i = 0; i < nb; i++)
97
     {
98
@@ -388,7 +428,7 @@
99
 
100
           QListWidgetItem *item;
101
           item=new QListWidgetItem(str,availableList,ALL_FILTER_BASE+i+family*100);
102
-          item->setToolTip(desc);
103
+          item->setSizeHint(QSize(availableList->frameSize().width(),calculateListItemHeight(availableList,str)));
104
           availableList->addItem(item);
105
      }
106
 
107
@@ -442,10 +482,75 @@
108
         QString str = QString("<b>") + name + QString("</b><br>\n<small>") + conf + QString("</small>");
109
         QListWidgetItem *item=new QListWidgetItem(str,activeList,ACTIVE_FILTER_BASE+i);
110
         printf("Active item :%p\n",item);
111
+        item->setSizeHint(QSize(item->sizeHint().width(),calculateListItemHeight(activeList,str)));
112
         activeList->addItem(item);
113
     }
114
 
115
 }
116
+
117
+/**
118
+    \fn activeListContextMenu
119
+*/
120
+void filtermainWindow::activeListContextMenu(const QPoint &pos)
121
+{
122
+    QMenu *cm=new QMenu();
123
+
124
+    QAction *up = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Move up")),this);
125
+    QAction *down = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Move down")),this);
126
+    QAction *configure = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Configure")),this);
127
+    QAction *remove = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Remove")),this);
128
+    QAction *partial = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Make partial")),this);
129
+
130
+    cm->addAction(up);
131
+    cm->addAction(down);
132
+    cm->addAction(configure);
133
+    cm->addAction(remove);
134
+    cm->addAction(partial);
135
+
136
+    connect(up,SIGNAL(triggered()),this,SLOT(moveUp()));
137
+    connect(down,SIGNAL(triggered()),this,SLOT(moveDown()));
138
+    connect(configure,SIGNAL(triggered()),this,SLOT(configureAction()));
139
+    connect(remove,SIGNAL(triggered()),this,SLOT(removeAction()));
140
+    connect(partial,SIGNAL(triggered()),this,SLOT(makePartial()));
141
+
142
+    updateContextMenu(cm);
143
+    cm->exec(activeList->viewport()->mapToGlobal(pos));
144
+}
145
+
146
+/**
147
+    \fn updateContextMenu
148
+    \brief Disable not applicable entries in the active filters context menu
149
+*/
150
+void filtermainWindow::updateContextMenu(QMenu *contextMenu)
151
+{
152
+    if(!nb_active_filter)
153
+        return;
154
+    if(!contextMenu->actions().size())
155
+        return;
156
+    bool canMoveUp=true;
157
+    bool canMoveDown=true;
158
+    bool canPartialize=true;
159
+    QListWidgetItem *item=activeList->currentItem();
160
+    if(!item)
161
+        return;
162
+
163
+    int itag=item->type();
164
+    ADM_assert(itag>=ACTIVE_FILTER_BASE);
165
+    itag -= ACTIVE_FILTER_BASE;
166
+    uint32_t tag=ADM_vf_getTag(itag);
167
+    canPartialize=ADM_vf_canBePartialized(tag);
168
+
169
+    int row=item->listWidget()->row(item);
170
+    if(!row)
171
+        canMoveUp=false;
172
+    if(row==nb_active_filter-1)
173
+        canMoveDown=false;
174
+
175
+    contextMenu->actions().at(0)->setEnabled(canMoveUp);
176
+    contextMenu->actions().at(1)->setEnabled(canMoveDown);
177
+    contextMenu->actions().at(4)->setEnabled(canPartialize);
178
+}
179
+
180
   /**
181
   */
182
 filtermainWindow::filtermainWindow(QWidget* parent) : QDialog(parent)
183
@@ -480,7 +585,7 @@
184
     connect(ui.buttonClose, SIGNAL(clicked(bool)), this, SLOT(accept()));
185
     connect(ui.pushButtonPreview, SIGNAL(clicked(bool)), this, SLOT(preview(bool)));
186
 
187
-
188
+    qobject_cast<QAbstractScrollArea*>(availableList)->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
189
     availableList->setItemDelegate(new FilterItemDelegate(availableList));
190
 
191
     displayFamily(0);
192
@@ -497,26 +602,9 @@
193
     availableList->setContextMenuPolicy(Qt::ActionsContextMenu);
194
     availableList->addAction(add );
195
     connect(add,SIGNAL(triggered(bool )),this,SLOT(addSlot()));
196
-    
197
-    
198
-    QAction *remove = new  QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Remove")),this);
199
-    QAction *configure = new  QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Configure")),this);
200
-    QAction *up = new  QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Move up")),this);
201
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
17
 
1
@@ -95,6 +95,7 @@
2
     void addSlot(void);
3
     void removeAction(void);
4
     void configureAction(void);
5
+    void activeListContextMenu(const QPoint &pos);
6
     // Move filters around
7
     void indexesMoved(const QModelIndexList & indexes);
8
 protected:
9
@@ -103,5 +104,7 @@
10
     void setSelected(int sel);
11
     void displayFamily(uint32_t family);
12
     void setupFilters(void);
13
+    void updateContextMenu(QMenu *contextMenu);
14
+    int  calculateListItemHeight(QListWidget *parent, QString text);
15
 };
16
 
17
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
75
 
1
@@ -15,7 +15,7 @@
2
 #include <qfiledialog.h>
3
 
4
 #include "ADM_default.h"
5
-
6
+#include "ADM_toolkitQt.h"
7
 
8
 #include "DIA_fileSel.h"
9
 #include "DIA_coreToolkit.h"
10
@@ -24,9 +24,18 @@
11
 #include "prefs.h"
12
 #include "ADM_last.h"
13
 
14
+extern QWidget *QuiMainWindows;
15
+
16
 namespace ADM_QT4_fileSel
17
 {
18
 
19
+QWidget *fileSelGetParent(void)
20
+{
21
+    QWidget *parent=qtLastRegisteredDialog();
22
+    if(!parent)
23
+        parent=QuiMainWindows;
24
+    return parent;
25
+}
26
 
27
 /**
28
           \fn GUI_FileSelWrite (const char *label, char **name, uint32_t access) 
29
@@ -91,7 +100,7 @@
30
     {
31
         filterFile=QString(ext)+QString(QT_TRANSLATE_NOOP("qfile"," files (*."))+QString(ext)+QString(");;")+filterFile;
32
     }
33
-    fileName = QFileDialog::getSaveFileName(NULL, 
34
+    fileName = QFileDialog::getSaveFileName(fileSelGetParent(),
35
                     label,  // caption
36
                     str,    // folder
37
                     filterFile,   // filter
38
@@ -158,7 +167,7 @@
39
         {
40
             filterFile=QString(ext)+QString(QT_TRANSLATE_NOOP("qfile"," files (*."))+QString(ext)+QString(");;")+filterFile;
41
         }
42
-        fileName = QFileDialog::getOpenFileName(NULL, 
43
+        fileName = QFileDialog::getOpenFileName(fileSelGetParent(),
44
                                 label,  // caption
45
                                 str,    // folder
46
                                 filterFile,   // filter
47
@@ -225,7 +234,7 @@
48
         QString fileName;
49
         QFileDialog::Options options = 0;
50
 
51
-        fileName=QFileDialog::getSaveFileName(NULL, title, source, NULL, NULL, options);
52
+        fileName=QFileDialog::getSaveFileName(fileSelGetParent(), title, source, NULL, NULL, options);
53
 
54
         if (!fileName.isNull())
55
         {
56
@@ -250,7 +259,7 @@
57
         QString fileName;
58
         QFileDialog::Options options = 0;
59
 
60
-        fileName = QFileDialog::getOpenFileName(NULL, title, source, NULL, NULL, options);
61
+        fileName = QFileDialog::getOpenFileName(fileSelGetParent(), title, source, NULL, NULL, options);
62
 
63
         if (!fileName.isNull())
64
         {
65
@@ -275,8 +284,7 @@
66
         QString fileName;
67
         QFileDialog::Options options = QFileDialog::ShowDirsOnly;
68
 
69
-
70
-        fileName = QFileDialog::getExistingDirectory(NULL, title, source, options);
71
+        fileName = QFileDialog::getExistingDirectory(fileSelGetParent(), title, source, options);
72
 
73
         if (!fileName.isNull())
74
         {
75
avidemux_2.6.19.tar.gz/avidemux/qt4/CMakeLists.txt -> avidemux_2.6.20.tar.gz/avidemux/qt4/CMakeLists.txt Changed
33
 
1
@@ -133,7 +133,9 @@
2
 ADD_SUBDIRECTORY(ADM_userInterfaces ./ADM_userInterfaces${QT_LIBRARY_EXTENSION})
3
 
4
 SDLify(../common/main.cpp)
5
-ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
6
+if (ADM_SUBVERSION)
7
+        ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
8
+endif (ADM_SUBVERSION)
9
 ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_VERSION=\"${AVIDEMUX_VERSION}\"")
10
 ADD_SOURCE_CFLAGS(../common/main.cpp "-DQT_FLAVOR=\"${QT_EXTENSION}\"")
11
 
12
@@ -266,5 +268,20 @@
13
 ADM_INSTALL_QT_INCLUDE_FOLDER("${CMAKE_CURRENT_SOURCE_DIR}/ADM_openGL/include/"  ADM_openGL)
14
 ADM_INSTALL_QT_INCLUDE_FOLDER("${CMAKE_CURRENT_SOURCE_DIR}/ADM_UIs/include/"  ADM_UIs)
15
 
16
+#
17
+IF(WIN32)
18
+        include(FindBourne)
19
+        IF(RELEASE)
20
+                configure_file(
21
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/ChangeLog.release 
22
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/ChangeLog.html
23
+                                COPYONLY)
24
+        ELSE(RELEASE)
25
+                execute_process(
26
+                        COMMAND ${BASH_EXECUTABLE} genlog.sh
27
+                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/
28
+                        )
29
+        ENDIF(RELEASE)
30
+ENDIF(WIN32)
31
 
32
 MESSAGE("")
33
avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux.pro -> avidemux_2.6.20.tar.gz/avidemux/qt4/i18n/avidemux.pro Changed
125
 
1
@@ -33,6 +33,7 @@
2
 ../../../avidemux_core/ADM_core/include/ADM_inttype.h \ 
3
 ../../../avidemux_core/ADM_core/include/ADM_crashdump.h \ 
4
 ../../../avidemux_core/ADM_core/include/ADM_files.h \ 
5
+../../../avidemux_core/ADM_core/include/ADM_mangle_gcc.h \ 
6
 ../../../avidemux_core/ADM_core/include/ADM_byteBuffer.h \ 
7
 ../../../avidemux_core/ADM_core/include/ADM_crashdump_apple.h \ 
8
 ../../../avidemux_core/ADM_core/include/ADM_ptrQueue.h \ 
9
@@ -52,6 +53,7 @@
10
 ../../../avidemux_core/ADM_core/include/ADM_crashdump_other.h \ 
11
 ../../../avidemux_core/ADM_core/include/ADM_dynamicLoading.h \ 
12
 ../../../avidemux_core/ADM_core/include/ADM_vidMisc.h \ 
13
+../../../avidemux_core/ADM_core/include/ADM_mangle_vs.h \ 
14
 ../../../avidemux_core/ADM_core/include/ADM_cpuCap.h \ 
15
 ../../../avidemux_core/ADM_core/include/ADM_memsupport.h \ 
16
 ../../../avidemux_core/ADM_core/include/ADM_misc.h \ 
17
@@ -85,9 +87,6 @@
18
 ../../../avidemux_core/ADM_coreSqlLight3/include/SysLog2.h \ 
19
 ../../../avidemux_core/ADM_coreSqlLight3/include/ADM_coreSqlLight3_export.h \ 
20
 ../../../avidemux_core/ADM_coreSqlLight3/include/Database.h \ 
21
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/ADM_coreDxva2.h \ 
22
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/ADM_coreDxva2_export.h \ 
23
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/ADM_coreD3D.h \ 
24
 ../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpauInternal.h \ 
25
 ../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpau.h \ 
26
 ../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/include/fglrxinfo.h \ 
27
@@ -105,7 +104,6 @@
28
 ../../../avidemux_core/ADM_coreVideoCodec/include/ADM_hwAccel.h \ 
29
 ../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codecFFsimple.h \ 
30
 ../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h \ 
31
-../../../avidemux_core/ADM_coreImage/include/ADM_mmxMacros.h \ 
32
 ../../../avidemux_core/ADM_coreImage/include/ADM_rgb.h \ 
33
 ../../../avidemux_core/ADM_coreImage/include/ADM_colorspace.h \ 
34
 ../../../avidemux_core/ADM_coreImage/include/ADM_pp.h \ 
35
@@ -323,6 +321,10 @@
36
 ../../../avidemux/common/ADM_render/GUI_simpleRender.h \ 
37
 ../../../avidemux/common/ADM_render/ADM_render6_export.h \ 
38
 ../../../avidemux/common/ADM_render/GUI_nullRender.h \ 
39
+../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreD3DApi.h \ 
40
+../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreDxva2.h \ 
41
+../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreDxva2_export.h \ 
42
+../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreD3D.h \ 
43
 ../../../avidemux/common/ADM_render/GUI_libvaRender.h \ 
44
 ../../../avidemux/common/ADM_render/GUI_render.h \ 
45
 ../../../avidemux/common/ADM_render/GUI_sdlRender.h \ 
46
@@ -516,9 +518,10 @@
47
 ../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.h \ 
48
 ../../../avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.h \ 
49
 ../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.h \ 
50
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.h \ 
51
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.h \ 
52
 ../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder.h \ 
53
 ../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.h \ 
54
-../../../avidemux_plugins/ADM_videoEncoder/libva/ADM_libvaEncoder.h \ 
55
 ../../../avidemux_plugins/ADM_videoEncoder/png/ADM_pngEncoder.h \ 
56
 ../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.h \ 
57
 ../../../avidemux_plugins/ADM_videoEncoder/x264/x264_encoder.h \ 
58
@@ -532,7 +535,10 @@
59
 ../../../avidemux_plugins/ADM_videoEncoder/huff/huff_encoder.h \ 
60
 ../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder.h \ 
61
 ../../../avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.h \ 
62
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder.h \ 
63
 ../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.h \ 
64
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.h \ 
65
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc.h \ 
66
 ../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.h \ 
67
 ../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.h \ 
68
 ../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h \ 
69
@@ -815,10 +821,6 @@
70
 ../../../avidemux_core/ADM_coreSqlLight3/src/Database.cpp \ 
71
 ../../../avidemux_core/ADM_coreSqlLight3/src/StderrLog.cpp \ 
72
 ../../../avidemux_core/ADM_coreSqlLight3/src/Query.cpp \ 
73
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/src/vlc_dxva.c \ 
74
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/src/ADM_coreD3D.cpp \ 
75
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/src/ADM_coreDxva2.cpp \ 
76
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/src/ADM_coreDxva2_ff.c \ 
77
 ../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpauMixer.cpp \ 
78
 ../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpau.cpp \ 
79
 ../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/src/fglrx.cpp \ 
80
@@ -1025,6 +1027,10 @@
81
 ../../../avidemux/common/ADM_render/GUI_simpleRenderStub.cpp \ 
82
 ../../../avidemux/common/ADM_render/GUI_simpleRender.cpp \ 
83
 ../../../avidemux/common/ADM_render/GUI_qtGlRender.cpp \ 
84
+../../../avidemux/common/ADM_render/ADM_coreDxva2/src/vlc_dxva.c \ 
85
+../../../avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreD3D.cpp \ 
86
+../../../avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2.cpp \ 
87
+../../../avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2_ff.c \ 
88
 ../../../avidemux/common/ADM_render/GUI_vdpauRender.cpp \ 
89
 ../../../avidemux/common/ADM_render/GUI_sdlRender.cpp \ 
90
 ../../../avidemux/common/ADM_render/GUI_render.cpp \ 
91
@@ -1388,12 +1394,15 @@
92
 ../../../avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp \ 
93
 ../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp \ 
94
 ../../../avidemux_plugins/ADM_videoEncoder/ffDv/ffDvPlugin.cpp \ 
95
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.conf \ 
96
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264_desc.cpp \ 
97
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264_json.cpp \ 
98
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp \ 
99
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEncH264_plugin.cpp \ 
100
 ../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpegPlugin.cpp \ 
101
 ../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder_desc.cpp \ 
102
 ../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder.conf \ 
103
 ../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp \ 
104
-../../../avidemux_plugins/ADM_videoEncoder/libva/libvaencPlugin.cpp \ 
105
-../../../avidemux_plugins/ADM_videoEncoder/libva/ADM_libvaEncoder.cpp \ 
106
 ../../../avidemux_plugins/ADM_videoEncoder/png/ADM_pngEncoder.cpp \ 
107
 ../../../avidemux_plugins/ADM_videoEncoder/png/pngPlugin.cpp \ 
108
 ../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp \ 
109
@@ -1424,8 +1433,15 @@
110
 ../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder_desc.cpp \ 
111
 ../../../avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp \ 
112
 ../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp \ 
113
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp \ 
114
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder.cpp \ 
115
 ../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ffMsMp4Plugin.cpp \ 
116
 ../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp \ 
117
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc_desc.cpp \ 
118
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc_json.cpp \ 
119
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc.conf \ 
120
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp \ 
121
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEncPlugin.cpp \ 
122
 ../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp \ 
123
 ../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.conf \ 
124
 ../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_desc.cpp \ 
125
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
201
 
1
@@ -7780,7 +7780,7 @@
2
     </message>
3
     <message>
4
         <location line="+5"/>
5
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
6
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
7
         <source>PCM</source>
8
         <translation type="unfinished">PCM</translation>
9
     </message>
10
@@ -8430,7 +8430,7 @@
11
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
12
         <location line="+42"/>
13
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
14
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
15
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
16
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
17
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
18
         <location filename="../../common/gui_main.cpp" line="-244"/>
19
@@ -8711,7 +8711,7 @@
20
         <translation type="unfinished">Guany</translation>
21
     </message>
22
     <message>
23
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
24
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
25
         <source>Saving</source>
26
         <translation type="unfinished">S&apos;està desant</translation>
27
     </message>
28
@@ -9069,6 +9069,26 @@
29
         <translation type="unfinished"></translation>
30
     </message>
31
     <message>
32
+        <location line="+6"/>
33
+        <source>Zoom 1:4</source>
34
+        <translation type="unfinished"></translation>
35
+    </message>
36
+    <message>
37
+        <location line="+1"/>
38
+        <source>Zoom 1:2</source>
39
+        <translation type="unfinished"></translation>
40
+    </message>
41
+    <message>
42
+        <location line="+1"/>
43
+        <source>Zoom 1:1</source>
44
+        <translation type="unfinished"></translation>
45
+    </message>
46
+    <message>
47
+        <location line="+1"/>
48
+        <source>Zoom 2:1</source>
49
+        <translation type="unfinished"></translation>
50
+    </message>
51
+    <message>
52
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
53
         <location line="+42"/>
54
         <source>You cannot remove *all* the video
55
@@ -9707,7 +9727,7 @@
56
         <translation type="unfinished">S&apos;ha produït un error de memòria</translation>
57
     </message>
58
     <message>
59
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+132"/>
60
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
61
         <source>Too short</source>
62
         <translation type="unfinished"></translation>
63
     </message>
64
@@ -12000,59 +12020,73 @@
65
     <message>
66
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
67
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
68
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
69
         <source>Low Quality</source>
70
         <translation type="unfinished"></translation>
71
     </message>
72
     <message>
73
         <location line="+1"/>
74
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
75
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
76
         <source>High Quality</source>
77
         <translation type="unfinished"></translation>
78
     </message>
79
     <message>
80
         <location line="+1"/>
81
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
82
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
83
         <source>BluRay</source>
84
         <translation type="unfinished"></translation>
85
     </message>
86
     <message>
87
         <location line="+1"/>
88
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
89
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
90
         <source>Low Latency</source>
91
         <translation type="unfinished"></translation>
92
     </message>
93
     <message>
94
         <location line="+1"/>
95
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
96
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
97
         <source>Low Latency (LQ)</source>
98
         <translation type="unfinished"></translation>
99
     </message>
100
     <message>
101
         <location line="+1"/>
102
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
103
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
104
         <source>Low Latency (HQ)</source>
105
         <translation type="unfinished"></translation>
106
     </message>
107
     <message>
108
         <location line="+7"/>
109
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
110
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
111
         <source>Preset:</source>
112
         <translation type="unfinished"></translation>
113
     </message>
114
     <message>
115
         <location line="+1"/>
116
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
117
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
118
         <source>Bitrate (kbps):</source>
119
         <translation type="unfinished"></translation>
120
     </message>
121
     <message>
122
         <location line="+1"/>
123
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
124
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
125
         <source>Max Bitrate (kbps):</source>
126
         <translation type="unfinished"></translation>
127
     </message>
128
     <message>
129
         <location line="+4"/>
130
+        <source>NVENC H.264 configuration</source>
131
+        <translation type="unfinished"></translation>
132
+    </message>
133
+    <message>
134
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
135
         <source>libavcodec MPEG-4 configuration</source>
136
         <translation type="unfinished"></translation>
137
     </message>
138
@@ -12070,7 +12104,7 @@
139
         <translation type="unfinished"></translation>
140
     </message>
141
     <message>
142
-        <location line="+76"/>
143
+        <location line="+78"/>
144
         <source>Saving mpeg PS (ff)</source>
145
         <translation type="unfinished"></translation>
146
     </message>
147
@@ -12166,7 +12200,7 @@
148
 <context>
149
     <name>fftsmuxer</name>
150
     <message>
151
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
152
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
153
         <source>Saving mpeg TS (ff)</source>
154
         <translation type="unfinished"></translation>
155
     </message>
156
@@ -12882,7 +12916,7 @@
157
 <context>
158
     <name>ivtcRemover</name>
159
     <message>
160
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
161
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
162
         <source>Remove IVTC dupe.</source>
163
         <translation type="unfinished"></translation>
164
     </message>
165
@@ -13751,7 +13785,7 @@
166
         <translation type="unfinished"></translation>
167
     </message>
168
     <message>
169
-        <location line="+425"/>
170
+        <location line="+426"/>
171
         <source>Matroska clusters</source>
172
         <translation type="unfinished"></translation>
173
     </message>
174
@@ -13851,7 +13885,7 @@
175
 <context>
176
     <name>mkvmuxer</name>
177
     <message>
178
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
179
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
180
         <source>Saving Mkv</source>
181
         <translation type="unfinished"></translation>
182
     </message>
183
@@ -13971,7 +14005,7 @@
184
         <translation type="unfinished"></translation>
185
     </message>
186
     <message>
187
-        <location line="+79"/>
188
+        <location line="+81"/>
189
         <source>Saving mp4</source>
190
         <translation type="unfinished"></translation>
191
     </message>
192
@@ -14407,12 +14441,12 @@
193
         <translation type="unfinished">Propietats</translation>
194
     </message>
195
     <message>
196
-        <location line="+12"/>
197
+        <location line="+6"/>
198
         <source>Video</source>
199
         <translation type="unfinished">Vídeo</translation>
200
     </message>
201
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
201
 
1
@@ -12397,7 +12397,7 @@
2
     </message>
3
     <message>
4
         <location line="+5"/>
5
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
6
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
7
         <source>PCM</source>
8
         <translation type="unfinished">PCM</translation>
9
     </message>
10
@@ -13062,7 +13062,7 @@
11
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
12
         <location line="+42"/>
13
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
14
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
15
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
16
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
17
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
18
         <location filename="../../common/gui_main.cpp" line="-244"/>
19
@@ -13588,7 +13588,7 @@
20
         <translation type="obsolete">Tento skript již byl úspěšně vykonán.</translation>
21
     </message>
22
     <message>
23
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
24
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
25
         <source>Saving</source>
26
         <translation type="unfinished">Ukládání</translation>
27
     </message>
28
@@ -13966,6 +13966,26 @@
29
         <translation type="unfinished"></translation>
30
     </message>
31
     <message>
32
+        <location line="+6"/>
33
+        <source>Zoom 1:4</source>
34
+        <translation type="unfinished"></translation>
35
+    </message>
36
+    <message>
37
+        <location line="+1"/>
38
+        <source>Zoom 1:2</source>
39
+        <translation type="unfinished"></translation>
40
+    </message>
41
+    <message>
42
+        <location line="+1"/>
43
+        <source>Zoom 1:1</source>
44
+        <translation type="unfinished"></translation>
45
+    </message>
46
+    <message>
47
+        <location line="+1"/>
48
+        <source>Zoom 2:1</source>
49
+        <translation type="unfinished"></translation>
50
+    </message>
51
+    <message>
52
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
53
         <location line="+42"/>
54
         <source>You cannot remove *all* the video
55
@@ -14417,7 +14437,7 @@
56
         <translation type="unfinished">Chyba paměti</translation>
57
     </message>
58
     <message>
59
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+132"/>
60
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
61
         <source>Too short</source>
62
         <translation type="unfinished"></translation>
63
     </message>
64
@@ -16706,65 +16726,79 @@
65
 <context>
66
     <name>ffnvenc</name>
67
     <message>
68
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+210"/>
69
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+237"/>
70
         <source>libavcodec MPEG-4 configuration</source>
71
         <translation type="unfinished">Nastavení libavcodec MPEG-4</translation>
72
     </message>
73
     <message>
74
-        <location line="-18"/>
75
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
76
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
77
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="-18"/>
78
         <source>Low Quality</source>
79
         <translation type="unfinished"></translation>
80
     </message>
81
     <message>
82
         <location line="+1"/>
83
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
84
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
85
         <source>High Quality</source>
86
         <translation type="unfinished"></translation>
87
     </message>
88
     <message>
89
         <location line="+1"/>
90
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
91
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
92
         <source>BluRay</source>
93
         <translation type="unfinished"></translation>
94
     </message>
95
     <message>
96
         <location line="+1"/>
97
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
98
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
99
         <source>Low Latency</source>
100
         <translation type="unfinished"></translation>
101
     </message>
102
     <message>
103
         <location line="+1"/>
104
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
105
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
106
         <source>Low Latency (LQ)</source>
107
         <translation type="unfinished"></translation>
108
     </message>
109
     <message>
110
         <location line="+1"/>
111
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
112
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
113
         <source>Low Latency (HQ)</source>
114
         <translation type="unfinished"></translation>
115
     </message>
116
     <message>
117
         <location line="+7"/>
118
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
119
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
120
         <source>Preset:</source>
121
         <translation type="unfinished"></translation>
122
     </message>
123
     <message>
124
         <location line="+1"/>
125
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
126
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
127
         <source>Bitrate (kbps):</source>
128
         <translation type="unfinished"></translation>
129
     </message>
130
     <message>
131
         <location line="+1"/>
132
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
133
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
134
         <source>Max Bitrate (kbps):</source>
135
         <translation type="unfinished"></translation>
136
     </message>
137
     <message>
138
+        <location line="+4"/>
139
+        <source>NVENC H.264 configuration</source>
140
+        <translation type="unfinished"></translation>
141
+    </message>
142
+    <message>
143
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
144
         <source>nvEnc HEVC  configuration</source>
145
         <translation type="unfinished"></translation>
146
@@ -16778,7 +16812,7 @@
147
         <translation type="unfinished"></translation>
148
     </message>
149
     <message>
150
-        <location line="+76"/>
151
+        <location line="+78"/>
152
         <source>Saving mpeg PS (ff)</source>
153
         <translation type="unfinished"></translation>
154
     </message>
155
@@ -16874,7 +16908,7 @@
156
 <context>
157
     <name>fftsmuxer</name>
158
     <message>
159
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
160
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
161
         <source>Saving mpeg TS (ff)</source>
162
         <translation type="unfinished"></translation>
163
     </message>
164
@@ -17590,7 +17624,7 @@
165
 <context>
166
     <name>ivtcRemover</name>
167
     <message>
168
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
169
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
170
         <source>Remove IVTC dupe.</source>
171
         <translation type="unfinished"></translation>
172
     </message>
173
@@ -18463,7 +18497,7 @@
174
         <translation type="unfinished"></translation>
175
     </message>
176
     <message>
177
-        <location line="+425"/>
178
+        <location line="+426"/>
179
         <source>Matroska clusters</source>
180
         <translation type="unfinished"></translation>
181
     </message>
182
@@ -18563,7 +18597,7 @@
183
 <context>
184
     <name>mkvmuxer</name>
185
     <message>
186
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
187
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
188
         <source>Saving Mkv</source>
189
         <translation type="unfinished"></translation>
190
     </message>
191
@@ -18683,7 +18717,7 @@
192
         <translation type="unfinished"></translation>
193
     </message>
194
     <message>
195
-        <location line="+79"/>
196
+        <location line="+81"/>
197
         <source>Saving mp4</source>
198
         <translation type="unfinished"></translation>
199
     </message>
200
@@ -19193,12 +19227,12 @@
201
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
201
 
1
@@ -1239,6 +1239,26 @@
2
         <translation>Gå til tid</translation>
3
     </message>
4
     <message>
5
+        <location line="+6"/>
6
+        <source>Zoom 1:4</source>
7
+        <translation type="unfinished"></translation>
8
+    </message>
9
+    <message>
10
+        <location line="+1"/>
11
+        <source>Zoom 1:2</source>
12
+        <translation type="unfinished"></translation>
13
+    </message>
14
+    <message>
15
+        <location line="+1"/>
16
+        <source>Zoom 1:1</source>
17
+        <translation type="unfinished"></translation>
18
+    </message>
19
+    <message>
20
+        <location line="+1"/>
21
+        <source>Zoom 2:1</source>
22
+        <translation type="unfinished"></translation>
23
+    </message>
24
+    <message>
25
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+33"/>
26
         <source>R_esampling (Hz):</source>
27
         <translation>_Gensampling (Hz):</translation>
28
@@ -1728,7 +1748,7 @@
29
     </message>
30
     <message>
31
         <location line="+5"/>
32
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
33
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
34
         <source>PCM</source>
35
         <translation>PCM</translation>
36
     </message>
37
@@ -2140,7 +2160,7 @@
38
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
39
         <location line="+42"/>
40
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
41
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
42
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
43
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
44
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
45
         <location filename="../../common/gui_main.cpp" line="-244"/>
46
@@ -2525,7 +2545,7 @@
47
         <translation>Standardport som skal bruges</translation>
48
     </message>
49
     <message>
50
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-65"/>
51
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-74"/>
52
         <source>Redo</source>
53
         <translation>Omgør</translation>
54
     </message>
55
@@ -2943,12 +2963,12 @@
56
         <translation>Hukommelsesfejl</translation>
57
     </message>
58
     <message>
59
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
60
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
61
         <source>Saving</source>
62
         <translation>Gemmer</translation>
63
     </message>
64
     <message>
65
-        <location line="+132"/>
66
+        <location line="+139"/>
67
         <source>Too short</source>
68
         <translation>For kort</translation>
69
     </message>
70
@@ -5018,59 +5038,73 @@
71
     <message>
72
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
73
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
74
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
75
         <source>Low Quality</source>
76
         <translation>Lav kvalitet</translation>
77
     </message>
78
     <message>
79
         <location line="+1"/>
80
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
81
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
82
         <source>High Quality</source>
83
         <translation>Høj kvalitet</translation>
84
     </message>
85
     <message>
86
         <location line="+1"/>
87
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
88
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
89
         <source>BluRay</source>
90
         <translation>BluRay</translation>
91
     </message>
92
     <message>
93
         <location line="+1"/>
94
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
95
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
96
         <source>Low Latency</source>
97
         <translation>Lav latency</translation>
98
     </message>
99
     <message>
100
         <location line="+1"/>
101
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
102
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
103
         <source>Low Latency (LQ)</source>
104
         <translation>Lav latency (LQ)</translation>
105
     </message>
106
     <message>
107
         <location line="+1"/>
108
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
109
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
110
         <source>Low Latency (HQ)</source>
111
         <translation>Lav latency (HQ)</translation>
112
     </message>
113
     <message>
114
         <location line="+7"/>
115
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
116
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
117
         <source>Preset:</source>
118
         <translation>Forudindstilling:</translation>
119
     </message>
120
     <message>
121
         <location line="+1"/>
122
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
123
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
124
         <source>Bitrate (kbps):</source>
125
         <translation>Bithastighed (kbps):</translation>
126
     </message>
127
     <message>
128
         <location line="+1"/>
129
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
130
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
131
         <source>Max Bitrate (kbps):</source>
132
         <translation>Maks. bithastighed (kbps):</translation>
133
     </message>
134
     <message>
135
         <location line="+4"/>
136
+        <source>NVENC H.264 configuration</source>
137
+        <translation type="unfinished"></translation>
138
+    </message>
139
+    <message>
140
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
141
         <source>libavcodec MPEG-4 configuration</source>
142
         <translation>libavcodec MPEG-4-konfiguration</translation>
143
     </message>
144
@@ -5088,7 +5122,7 @@
145
         <translation>[uoverensstemmelse]</translation>
146
     </message>
147
     <message>
148
-        <location line="+76"/>
149
+        <location line="+78"/>
150
         <source>Saving mpeg PS (ff)</source>
151
         <translation>Gemmer MPEG PS (ff)</translation>
152
     </message>
153
@@ -5192,7 +5226,7 @@
154
 <context>
155
     <name>fftsmuxer</name>
156
     <message>
157
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
158
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
159
         <source>Saving mpeg TS (ff)</source>
160
         <translation>Gemmer MPEG TS (ff)</translation>
161
     </message>
162
@@ -5867,7 +5901,7 @@
163
 <context>
164
     <name>ivtcRemover</name>
165
     <message>
166
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
167
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
168
         <source>Remove IVTC dupe.</source>
169
         <translation>Fjern IVTC-duplet.</translation>
170
     </message>
171
@@ -6418,7 +6452,7 @@
172
         <translation>Matroska-billeder</translation>
173
     </message>
174
     <message>
175
-        <location line="+425"/>
176
+        <location line="+426"/>
177
         <source>Matroska clusters</source>
178
         <translation>Matroska-klynger</translation>
179
     </message>
180
@@ -6518,7 +6552,7 @@
181
 <context>
182
     <name>mkvmuxer</name>
183
     <message>
184
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
185
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
186
         <source>Saving Mkv</source>
187
         <translation>Gemmer MKV</translation>
188
     </message>
189
@@ -6638,7 +6672,7 @@
190
         <translation>Understøtter kun AAC, AC3, E-AC3 og mpegaudio til lyd</translation>
191
     </message>
192
     <message>
193
-        <location line="+79"/>
194
+        <location line="+81"/>
195
         <source>Saving mp4</source>
196
         <translation>Gemmer MP4</translation>
197
     </message>
198
@@ -6963,12 +6997,12 @@
199
         <translation>Egenskaber</translation>
200
     </message>
201
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
201
 
1
@@ -7738,6 +7738,26 @@
2
         <translation type="unfinished">Gehe zum Zeitpunkt</translation>
3
     </message>
4
     <message>
5
+        <location line="+6"/>
6
+        <source>Zoom 1:4</source>
7
+        <translation type="unfinished"></translation>
8
+    </message>
9
+    <message>
10
+        <location line="+1"/>
11
+        <source>Zoom 1:2</source>
12
+        <translation type="unfinished"></translation>
13
+    </message>
14
+    <message>
15
+        <location line="+1"/>
16
+        <source>Zoom 1:1</source>
17
+        <translation type="unfinished"></translation>
18
+    </message>
19
+    <message>
20
+        <location line="+1"/>
21
+        <source>Zoom 2:1</source>
22
+        <translation type="unfinished"></translation>
23
+    </message>
24
+    <message>
25
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-15"/>
26
         <source>R_esampling (Hz):</source>
27
         <translation type="unfinished">_Abtastrate (Hz):</translation>
28
@@ -8197,7 +8217,7 @@
29
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
30
         <location line="+42"/>
31
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
32
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
33
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
34
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
35
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
36
         <location filename="../../common/gui_main.cpp" line="-244"/>
37
@@ -8527,7 +8547,7 @@
38
         <translation type="unfinished">Ungültige Liste der Tonspuren</translation>
39
     </message>
40
     <message>
41
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
42
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
43
         <source>Saving</source>
44
         <translation>Speichern</translation>
45
     </message>
46
@@ -8751,12 +8771,12 @@
47
     </message>
48
     <message>
49
         <location line="+15"/>
50
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
51
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
52
         <source>PCM</source>
53
         <translation type="unfinished"></translation>
54
     </message>
55
     <message>
56
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-77"/>
57
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-86"/>
58
         <location line="+2"/>
59
         <location line="+2"/>
60
         <source>-</source>
61
@@ -9358,7 +9378,7 @@
62
         <translation type="unfinished">Speicherfehler</translation>
63
     </message>
64
     <message>
65
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+132"/>
66
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
67
         <source>Too short</source>
68
         <translation>Video zu kurz</translation>
69
     </message>
70
@@ -10328,35 +10348,27 @@
71
 <context>
72
     <name>crop</name>
73
     <message>
74
-        <source>crop</source>
75
-        <translation type="vanished">Zuschneiden</translation>
76
-    </message>
77
-    <message>
78
-        <source>crop filter</source>
79
-        <translation type="obsolete">Bildränder wegschneiden.</translation>
80
-    </message>
81
-    <message>
82
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
83
         <source>Crop</source>
84
-        <translation type="unfinished"></translation>
85
+        <translation>Zuschneiden</translation>
86
     </message>
87
     <message>
88
         <location line="+1"/>
89
         <source>Crop filter</source>
90
-        <translation type="unfinished"></translation>
91
+        <translation>Bildrand entfernen.</translation>
92
     </message>
93
     <message>
94
         <location line="+22"/>
95
         <source>Warning Cropping too much width ! Width reseted !
96
 </source>
97
-        <translation type="unfinished">Kann die Breite nicht im geforderten Maße verkleinern! Die Breite wird zurückgesetzt!
98
+        <translation>Die Breite kann nicht im geforderten Maße verkleinert werden. Die Breite wird zurückgesetzt!
99
 </translation>
100
     </message>
101
     <message>
102
         <location line="+5"/>
103
         <source>Warning Cropping too much height ! Height reseted !
104
 </source>
105
-        <translation type="unfinished">Kann die Höhe nicht im geforderten Maße verkleinern! Die Höhe wird zurückgesetzt!
106
+        <translation>Die Höhe kann nicht im geforderten Maße verkleinert werden. Die Höhe wird zurückgesetzt!
107
 </translation>
108
     </message>
109
 </context>
110
@@ -11638,66 +11650,80 @@
111
     <message>
112
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
113
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
114
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
115
         <source>Low Quality</source>
116
         <translation type="unfinished"></translation>
117
     </message>
118
     <message>
119
         <location line="+1"/>
120
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
121
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
122
         <source>High Quality</source>
123
         <translation type="unfinished"></translation>
124
     </message>
125
     <message>
126
         <location line="+1"/>
127
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
128
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
129
         <source>BluRay</source>
130
         <translation type="unfinished"></translation>
131
     </message>
132
     <message>
133
         <location line="+1"/>
134
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
135
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
136
         <source>Low Latency</source>
137
         <translation type="unfinished"></translation>
138
     </message>
139
     <message>
140
         <location line="+1"/>
141
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
142
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
143
         <source>Low Latency (LQ)</source>
144
         <translation type="unfinished"></translation>
145
     </message>
146
     <message>
147
         <location line="+1"/>
148
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
149
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
150
         <source>Low Latency (HQ)</source>
151
         <translation type="unfinished"></translation>
152
     </message>
153
     <message>
154
         <location line="+7"/>
155
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
156
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
157
         <source>Preset:</source>
158
         <translation type="unfinished"></translation>
159
     </message>
160
     <message>
161
         <location line="+1"/>
162
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
163
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
164
         <source>Bitrate (kbps):</source>
165
         <translation type="unfinished"></translation>
166
     </message>
167
     <message>
168
         <location line="+1"/>
169
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
170
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
171
         <source>Max Bitrate (kbps):</source>
172
         <translation type="unfinished"></translation>
173
     </message>
174
     <message>
175
         <location line="+4"/>
176
+        <source>NVENC H.264 configuration</source>
177
+        <translation>NVENC H.264 Konfiguration</translation>
178
+    </message>
179
+    <message>
180
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
181
         <source>libavcodec MPEG-4 configuration</source>
182
         <translation type="unfinished"></translation>
183
     </message>
184
     <message>
185
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
186
         <source>nvEnc HEVC  configuration</source>
187
-        <translation type="unfinished"></translation>
188
+        <translation>NVENC HEVC Konfiguration</translation>
189
     </message>
190
 </context>
191
 <context>
192
@@ -11708,7 +11734,7 @@
193
         <translation type="unfinished">Inkompatible Parameter</translation>
194
     </message>
195
     <message>
196
-        <location line="+76"/>
197
+        <location line="+78"/>
198
         <source>Saving mpeg PS (ff)</source>
199
         <translation type="unfinished">Speichern als MPEG-PS (ff)</translation>
200
     </message>
201
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
201
 
1
@@ -5600,7 +5600,7 @@
2
     </message>
3
     <message>
4
         <location line="+5"/>
5
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
6
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
7
         <source>PCM</source>
8
         <translation>PCM</translation>
9
     </message>
10
@@ -6150,7 +6150,7 @@
11
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
12
         <location line="+42"/>
13
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
14
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
15
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
16
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
17
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
18
         <location filename="../../common/gui_main.cpp" line="-242"/>
19
@@ -6341,7 +6341,7 @@
20
         <translation>Κέρδος</translation>
21
     </message>
22
     <message>
23
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
24
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
25
         <source>Saving</source>
26
         <translation>Αποθηκεύεται</translation>
27
     </message>
28
@@ -6810,6 +6810,26 @@
29
         <translation>Μετάβαση στο Χρόνο</translation>
30
     </message>
31
     <message>
32
+        <location line="+6"/>
33
+        <source>Zoom 1:4</source>
34
+        <translation type="unfinished"></translation>
35
+    </message>
36
+    <message>
37
+        <location line="+1"/>
38
+        <source>Zoom 1:2</source>
39
+        <translation type="unfinished"></translation>
40
+    </message>
41
+    <message>
42
+        <location line="+1"/>
43
+        <source>Zoom 1:1</source>
44
+        <translation type="unfinished"></translation>
45
+    </message>
46
+    <message>
47
+        <location line="+1"/>
48
+        <source>Zoom 2:1</source>
49
+        <translation type="unfinished"></translation>
50
+    </message>
51
+    <message>
52
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
53
         <location line="+42"/>
54
         <source>You cannot remove *all* the video
55
@@ -7497,7 +7517,7 @@
56
         <translation>Σφάλμα μνήμης</translation>
57
     </message>
58
     <message>
59
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+132"/>
60
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
61
         <source>Too short</source>
62
         <translation>Πολύ σύντομο</translation>
63
     </message>
64
@@ -9757,59 +9777,73 @@
65
     <message>
66
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
67
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
68
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
69
         <source>Low Quality</source>
70
         <translation>Χαμηλής Ποιότητας</translation>
71
     </message>
72
     <message>
73
         <location line="+1"/>
74
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
75
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
76
         <source>High Quality</source>
77
         <translation>Υψηλή Ποιότητα</translation>
78
     </message>
79
     <message>
80
         <location line="+1"/>
81
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
82
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
83
         <source>BluRay</source>
84
         <translation>BluRay</translation>
85
     </message>
86
     <message>
87
         <location line="+1"/>
88
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
89
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
90
         <source>Low Latency</source>
91
         <translation>Χαμηλή Καθυστέρηση</translation>
92
     </message>
93
     <message>
94
         <location line="+1"/>
95
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
96
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
97
         <source>Low Latency (LQ)</source>
98
         <translation>Χαμηλή Καθυστέρηση (Χαμ.Ποιότ.)</translation>
99
     </message>
100
     <message>
101
         <location line="+1"/>
102
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
103
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
104
         <source>Low Latency (HQ)</source>
105
         <translation>Χαμηλή Καθυστέρηση (Υψ.Ποι.)</translation>
106
     </message>
107
     <message>
108
         <location line="+7"/>
109
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
110
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
111
         <source>Preset:</source>
112
         <translation>Προρύθμιση:</translation>
113
     </message>
114
     <message>
115
         <location line="+1"/>
116
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
117
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
118
         <source>Bitrate (kbps):</source>
119
         <translation>Ρυθμός Μπιτιών (χιλιομπίτιαναδευτ):</translation>
120
     </message>
121
     <message>
122
         <location line="+1"/>
123
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
124
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
125
         <source>Max Bitrate (kbps):</source>
126
         <translation>Μέγιστος Ρυθμός Μπιτιών (χιλιομπίτιαναδευτ):</translation>
127
     </message>
128
     <message>
129
         <location line="+4"/>
130
+        <source>NVENC H.264 configuration</source>
131
+        <translation type="unfinished"></translation>
132
+    </message>
133
+    <message>
134
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
135
         <source>libavcodec MPEG-4 configuration</source>
136
         <translation>libavcodec MPEG-4 ρύθμιση</translation>
137
     </message>
138
@@ -9827,7 +9861,7 @@
139
         <translation>[Αταίριαστα]</translation>
140
     </message>
141
     <message>
142
-        <location line="+76"/>
143
+        <location line="+78"/>
144
         <source>Saving mpeg PS (ff)</source>
145
         <translation>Αποθηκεύεται το mpeg PS (ff)</translation>
146
     </message>
147
@@ -9924,7 +9958,7 @@
148
 <context>
149
     <name>fftsmuxer</name>
150
     <message>
151
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
152
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
153
         <source>Saving mpeg TS (ff)</source>
154
         <translation>Αποθηκεύεται το mpeg TS (ff)</translation>
155
     </message>
156
@@ -10634,7 +10668,7 @@
157
 <context>
158
     <name>ivtcRemover</name>
159
     <message>
160
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
161
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
162
         <source>Remove IVTC dupe.</source>
163
         <translation>Απομάκρυνση του διπλότυπου IVTC.</translation>
164
     </message>
165
@@ -11391,7 +11425,7 @@
166
         <translation>Εικόνες Matroska</translation>
167
     </message>
168
     <message>
169
-        <location line="+425"/>
170
+        <location line="+426"/>
171
         <source>Matroska clusters</source>
172
         <translation>Συστάδες Matroska</translation>
173
     </message>
174
@@ -11491,7 +11525,7 @@
175
 <context>
176
     <name>mkvmuxer</name>
177
     <message>
178
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
179
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
180
         <source>Saving Mkv</source>
181
         <translation>Αποθηκεύεται το Mkv</translation>
182
     </message>
183
@@ -11615,7 +11649,7 @@
184
         <translation type="vanished">Μόνο AAC, AC3, κ΄ mpegaudio υποστηρίζονται για ήχο</translation>
185
     </message>
186
     <message>
187
-        <location line="+79"/>
188
+        <location line="+81"/>
189
         <source>Saving mp4</source>
190
         <translation>Αποθηκεύεται το mp4</translation>
191
     </message>
192
@@ -12020,23 +12054,23 @@
193
         <translation>Ιδιότητες</translation>
194
     </message>
195
     <message>
196
-        <location line="+12"/>
197
+        <location line="+6"/>
198
         <source>Video</source>
199
         <translation>Βίντεο</translation>
200
     </message>
201
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
201
 
1
@@ -1165,6 +1165,26 @@
2
         <translation>Go to &amp;Time</translation>
3
     </message>
4
     <message>
5
+        <location line="+6"/>
6
+        <source>Zoom 1:4</source>
7
+        <translation type="unfinished"></translation>
8
+    </message>
9
+    <message>
10
+        <location line="+1"/>
11
+        <source>Zoom 1:2</source>
12
+        <translation type="unfinished"></translation>
13
+    </message>
14
+    <message>
15
+        <location line="+1"/>
16
+        <source>Zoom 1:1</source>
17
+        <translation type="unfinished"></translation>
18
+    </message>
19
+    <message>
20
+        <location line="+1"/>
21
+        <source>Zoom 2:1</source>
22
+        <translation type="unfinished"></translation>
23
+    </message>
24
+    <message>
25
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+33"/>
26
         <source>R_esampling (Hz):</source>
27
         <translation type="unfinished"></translation>
28
@@ -1752,7 +1772,7 @@
29
     </message>
30
     <message>
31
         <location line="+5"/>
32
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
33
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
34
         <source>PCM</source>
35
         <translation type="unfinished"></translation>
36
     </message>
37
@@ -1872,7 +1892,7 @@
38
         <translation type="unfinished"></translation>
39
     </message>
40
     <message>
41
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-80"/>
42
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-89"/>
43
         <source>Save as BMP</source>
44
         <translation type="unfinished"></translation>
45
     </message>
46
@@ -1957,7 +1977,7 @@
47
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
48
         <location line="+42"/>
49
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
50
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
51
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
52
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
53
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
54
         <location filename="../../common/gui_main.cpp" line="+1309"/>
55
@@ -2910,12 +2930,12 @@
56
         <translation type="unfinished"></translation>
57
     </message>
58
     <message>
59
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
60
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
61
         <source>Saving</source>
62
         <translation type="unfinished"></translation>
63
     </message>
64
     <message>
65
-        <location line="+132"/>
66
+        <location line="+139"/>
67
         <source>Too short</source>
68
         <translation type="unfinished"></translation>
69
     </message>
70
@@ -4937,59 +4957,73 @@
71
     <message>
72
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
73
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
74
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
75
         <source>Low Quality</source>
76
         <translation type="unfinished"></translation>
77
     </message>
78
     <message>
79
         <location line="+1"/>
80
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
81
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
82
         <source>High Quality</source>
83
         <translation type="unfinished"></translation>
84
     </message>
85
     <message>
86
         <location line="+1"/>
87
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
88
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
89
         <source>BluRay</source>
90
         <translation type="unfinished"></translation>
91
     </message>
92
     <message>
93
         <location line="+1"/>
94
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
95
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
96
         <source>Low Latency</source>
97
         <translation type="unfinished"></translation>
98
     </message>
99
     <message>
100
         <location line="+1"/>
101
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
102
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
103
         <source>Low Latency (LQ)</source>
104
         <translation type="unfinished"></translation>
105
     </message>
106
     <message>
107
         <location line="+1"/>
108
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
109
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
110
         <source>Low Latency (HQ)</source>
111
         <translation type="unfinished"></translation>
112
     </message>
113
     <message>
114
         <location line="+7"/>
115
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
116
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
117
         <source>Preset:</source>
118
         <translation type="unfinished"></translation>
119
     </message>
120
     <message>
121
         <location line="+1"/>
122
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
123
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
124
         <source>Bitrate (kbps):</source>
125
         <translation type="unfinished"></translation>
126
     </message>
127
     <message>
128
         <location line="+1"/>
129
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
130
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
131
         <source>Max Bitrate (kbps):</source>
132
         <translation type="unfinished"></translation>
133
     </message>
134
     <message>
135
         <location line="+4"/>
136
+        <source>NVENC H.264 configuration</source>
137
+        <translation type="unfinished"></translation>
138
+    </message>
139
+    <message>
140
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
141
         <source>libavcodec MPEG-4 configuration</source>
142
         <translation type="unfinished"></translation>
143
     </message>
144
@@ -5007,7 +5041,7 @@
145
         <translation type="unfinished"></translation>
146
     </message>
147
     <message>
148
-        <location line="+76"/>
149
+        <location line="+78"/>
150
         <source>Saving mpeg PS (ff)</source>
151
         <translation type="unfinished"></translation>
152
     </message>
153
@@ -5103,7 +5137,7 @@
154
 <context>
155
     <name>fftsmuxer</name>
156
     <message>
157
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
158
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
159
         <source>Saving mpeg TS (ff)</source>
160
         <translation type="unfinished"></translation>
161
     </message>
162
@@ -5775,7 +5809,7 @@
163
 <context>
164
     <name>ivtcRemover</name>
165
     <message>
166
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
167
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
168
         <source>Remove IVTC dupe.</source>
169
         <translation type="unfinished"></translation>
170
     </message>
171
@@ -6326,7 +6360,7 @@
172
         <translation type="unfinished"></translation>
173
     </message>
174
     <message>
175
-        <location line="+425"/>
176
+        <location line="+426"/>
177
         <source>Matroska clusters</source>
178
         <translation type="unfinished"></translation>
179
     </message>
180
@@ -6426,7 +6460,7 @@
181
 <context>
182
     <name>mkvmuxer</name>
183
     <message>
184
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
185
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
186
         <source>Saving Mkv</source>
187
         <translation type="unfinished"></translation>
188
     </message>
189
@@ -6546,7 +6580,7 @@
190
         <translation type="unfinished"></translation>
191
     </message>
192
     <message>
193
-        <location line="+79"/>
194
+        <location line="+81"/>
195
         <source>Saving mp4</source>
196
         <translation type="unfinished"></translation>
197
     </message>
198
@@ -6870,12 +6904,12 @@
199
         <translation type="unfinished"></translation>
200
     </message>
201
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
201
 
1
@@ -5941,7 +5941,7 @@
2
     </message>
3
     <message>
4
         <location line="+5"/>
5
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
6
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
7
         <source>PCM</source>
8
         <translation type="unfinished">PCM</translation>
9
     </message>
10
@@ -6286,6 +6286,26 @@
11
         <translation type="unfinished">Ir a Tiempo</translation>
12
     </message>
13
     <message>
14
+        <location line="+6"/>
15
+        <source>Zoom 1:4</source>
16
+        <translation type="unfinished"></translation>
17
+    </message>
18
+    <message>
19
+        <location line="+1"/>
20
+        <source>Zoom 1:2</source>
21
+        <translation type="unfinished"></translation>
22
+    </message>
23
+    <message>
24
+        <location line="+1"/>
25
+        <source>Zoom 1:1</source>
26
+        <translation type="unfinished"></translation>
27
+    </message>
28
+    <message>
29
+        <location line="+1"/>
30
+        <source>Zoom 2:1</source>
31
+        <translation type="unfinished"></translation>
32
+    </message>
33
+    <message>
34
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-15"/>
35
         <source>R_esampling (Hz):</source>
36
         <translation type="unfinished">R_emuestreo (Hz)</translation>
37
@@ -6825,7 +6845,7 @@
38
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
39
         <location line="+42"/>
40
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
41
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
42
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
43
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
44
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
45
         <location filename="../../common/gui_main.cpp" line="-244"/>
46
@@ -7203,7 +7223,7 @@
47
         <translation type="unfinished">Ganancia</translation>
48
     </message>
49
     <message>
50
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
51
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
52
         <source>Saving</source>
53
         <translation type="unfinished">Guardando</translation>
54
     </message>
55
@@ -7389,7 +7409,7 @@
56
         <translation type="unfinished"></translation>
57
     </message>
58
     <message>
59
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-52"/>
60
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-61"/>
61
         <source>Save current settings as default</source>
62
         <translation type="unfinished"></translation>
63
     </message>
64
@@ -7856,7 +7876,7 @@
65
         <translation type="unfinished">Error de memoria</translation>
66
     </message>
67
     <message>
68
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+132"/>
69
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
70
         <source>Too short</source>
71
         <translation type="unfinished"></translation>
72
     </message>
73
@@ -10085,65 +10105,79 @@
74
 <context>
75
     <name>ffnvenc</name>
76
     <message>
77
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+210"/>
78
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+237"/>
79
         <source>libavcodec MPEG-4 configuration</source>
80
         <translation type="unfinished">Configuración libavcodec MPEG-4</translation>
81
     </message>
82
     <message>
83
-        <location line="-18"/>
84
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
85
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
86
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="-18"/>
87
         <source>Low Quality</source>
88
         <translation type="unfinished"></translation>
89
     </message>
90
     <message>
91
         <location line="+1"/>
92
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
93
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
94
         <source>High Quality</source>
95
         <translation type="unfinished"></translation>
96
     </message>
97
     <message>
98
         <location line="+1"/>
99
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
100
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
101
         <source>BluRay</source>
102
         <translation type="unfinished"></translation>
103
     </message>
104
     <message>
105
         <location line="+1"/>
106
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
107
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
108
         <source>Low Latency</source>
109
         <translation type="unfinished"></translation>
110
     </message>
111
     <message>
112
         <location line="+1"/>
113
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
114
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
115
         <source>Low Latency (LQ)</source>
116
         <translation type="unfinished"></translation>
117
     </message>
118
     <message>
119
         <location line="+1"/>
120
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
121
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
122
         <source>Low Latency (HQ)</source>
123
         <translation type="unfinished"></translation>
124
     </message>
125
     <message>
126
         <location line="+7"/>
127
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
128
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
129
         <source>Preset:</source>
130
         <translation type="unfinished"></translation>
131
     </message>
132
     <message>
133
         <location line="+1"/>
134
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
135
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
136
         <source>Bitrate (kbps):</source>
137
         <translation type="unfinished"></translation>
138
     </message>
139
     <message>
140
         <location line="+1"/>
141
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
142
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
143
         <source>Max Bitrate (kbps):</source>
144
         <translation type="unfinished"></translation>
145
     </message>
146
     <message>
147
+        <location line="+4"/>
148
+        <source>NVENC H.264 configuration</source>
149
+        <translation type="unfinished"></translation>
150
+    </message>
151
+    <message>
152
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
153
         <source>nvEnc HEVC  configuration</source>
154
         <translation type="unfinished"></translation>
155
@@ -10157,7 +10191,7 @@
156
         <translation type="unfinished"></translation>
157
     </message>
158
     <message>
159
-        <location line="+76"/>
160
+        <location line="+78"/>
161
         <source>Saving mpeg PS (ff)</source>
162
         <translation type="unfinished">Guardar mpeg PS (ff)</translation>
163
     </message>
164
@@ -10253,7 +10287,7 @@
165
 <context>
166
     <name>fftsmuxer</name>
167
     <message>
168
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
169
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
170
         <source>Saving mpeg TS (ff)</source>
171
         <translation type="unfinished">Guardar mpeg TS (ff)</translation>
172
     </message>
173
@@ -10954,7 +10988,7 @@
174
 <context>
175
     <name>ivtcRemover</name>
176
     <message>
177
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
178
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
179
         <source>Remove IVTC dupe.</source>
180
         <translation type="unfinished"></translation>
181
     </message>
182
@@ -11726,7 +11760,7 @@
183
         <translation type="unfinished"></translation>
184
     </message>
185
     <message>
186
-        <location line="+425"/>
187
+        <location line="+426"/>
188
         <source>Matroska clusters</source>
189
         <translation type="unfinished"></translation>
190
     </message>
191
@@ -11833,7 +11867,7 @@
192
 <context>
193
     <name>mkvmuxer</name>
194
     <message>
195
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
196
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
197
         <source>Saving Mkv</source>
198
         <translation type="unfinished">Guardar MKV</translation>
199
     </message>
200
@@ -11953,7 +11987,7 @@
201
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
201
 
1
@@ -5479,7 +5479,7 @@
2
     </message>
3
     <message>
4
         <location line="+5"/>
5
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
6
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
7
         <source>PCM</source>
8
         <translation>PCM</translation>
9
     </message>
10
@@ -5797,6 +5797,26 @@
11
         <translation>Joan Denborara</translation>
12
     </message>
13
     <message>
14
+        <location line="+6"/>
15
+        <source>Zoom 1:4</source>
16
+        <translation type="unfinished"></translation>
17
+    </message>
18
+    <message>
19
+        <location line="+1"/>
20
+        <source>Zoom 1:2</source>
21
+        <translation type="unfinished"></translation>
22
+    </message>
23
+    <message>
24
+        <location line="+1"/>
25
+        <source>Zoom 1:1</source>
26
+        <translation type="unfinished"></translation>
27
+    </message>
28
+    <message>
29
+        <location line="+1"/>
30
+        <source>Zoom 2:1</source>
31
+        <translation type="unfinished"></translation>
32
+    </message>
33
+    <message>
34
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
35
         <source>No audio track</source>
36
         <translation>Audio biderik ez</translation>
37
@@ -6113,7 +6133,7 @@
38
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
39
         <location line="+42"/>
40
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
41
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
42
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
43
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
44
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
45
         <location filename="../../common/gui_main.cpp" line="-244"/>
46
@@ -6480,7 +6500,7 @@
47
         <translation type="vanished">Azken Egitasmoak</translation>
48
     </message>
49
     <message>
50
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
51
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
52
         <source>Saving</source>
53
         <translation type="unfinished">Gordetzen</translation>
54
     </message>
55
@@ -6571,7 +6591,7 @@
56
         <translation type="unfinished"></translation>
57
     </message>
58
     <message>
59
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-54"/>
60
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-63"/>
61
         <source>Pr&amp;eferences</source>
62
         <translation type="unfinished"></translation>
63
     </message>
64
@@ -6951,7 +6971,7 @@
65
         <translation type="unfinished">Oroimen akatsa</translation>
66
     </message>
67
     <message>
68
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+132"/>
69
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
70
         <source>Too short</source>
71
         <translation type="unfinished"></translation>
72
     </message>
73
@@ -9281,65 +9301,79 @@
74
 <context>
75
     <name>ffnvenc</name>
76
     <message>
77
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+210"/>
78
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+237"/>
79
         <source>libavcodec MPEG-4 configuration</source>
80
         <translation type="unfinished">libavcodec MPEG-4 itxurapena</translation>
81
     </message>
82
     <message>
83
-        <location line="-18"/>
84
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
85
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
86
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="-18"/>
87
         <source>Low Quality</source>
88
         <translation type="unfinished"></translation>
89
     </message>
90
     <message>
91
         <location line="+1"/>
92
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
93
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
94
         <source>High Quality</source>
95
         <translation type="unfinished"></translation>
96
     </message>
97
     <message>
98
         <location line="+1"/>
99
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
100
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
101
         <source>BluRay</source>
102
         <translation type="unfinished"></translation>
103
     </message>
104
     <message>
105
         <location line="+1"/>
106
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
107
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
108
         <source>Low Latency</source>
109
         <translation type="unfinished"></translation>
110
     </message>
111
     <message>
112
         <location line="+1"/>
113
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
114
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
115
         <source>Low Latency (LQ)</source>
116
         <translation type="unfinished"></translation>
117
     </message>
118
     <message>
119
         <location line="+1"/>
120
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
121
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
122
         <source>Low Latency (HQ)</source>
123
         <translation type="unfinished"></translation>
124
     </message>
125
     <message>
126
         <location line="+7"/>
127
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
128
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
129
         <source>Preset:</source>
130
         <translation type="unfinished"></translation>
131
     </message>
132
     <message>
133
         <location line="+1"/>
134
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
135
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
136
         <source>Bitrate (kbps):</source>
137
         <translation type="unfinished"></translation>
138
     </message>
139
     <message>
140
         <location line="+1"/>
141
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
142
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
143
         <source>Max Bitrate (kbps):</source>
144
         <translation type="unfinished"></translation>
145
     </message>
146
     <message>
147
+        <location line="+4"/>
148
+        <source>NVENC H.264 configuration</source>
149
+        <translation type="unfinished"></translation>
150
+    </message>
151
+    <message>
152
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
153
         <source>nvEnc HEVC  configuration</source>
154
         <translation type="unfinished"></translation>
155
@@ -9353,7 +9387,7 @@
156
         <translation type="unfinished"></translation>
157
     </message>
158
     <message>
159
-        <location line="+76"/>
160
+        <location line="+78"/>
161
         <source>Saving mpeg PS (ff)</source>
162
         <translation type="unfinished">mpeg PS (ff) gordetzea</translation>
163
     </message>
164
@@ -9449,7 +9483,7 @@
165
 <context>
166
     <name>fftsmuxer</name>
167
     <message>
168
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
169
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
170
         <source>Saving mpeg TS (ff)</source>
171
         <translation type="unfinished">mpeg TS (ff) gordetzea</translation>
172
     </message>
173
@@ -10163,7 +10197,7 @@
174
 <context>
175
     <name>ivtcRemover</name>
176
     <message>
177
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
178
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
179
         <source>Remove IVTC dupe.</source>
180
         <translation type="unfinished"></translation>
181
     </message>
182
@@ -10989,7 +11023,7 @@
183
         <translation type="unfinished"></translation>
184
     </message>
185
     <message>
186
-        <location line="+425"/>
187
+        <location line="+426"/>
188
         <source>Matroska clusters</source>
189
         <translation type="unfinished"></translation>
190
     </message>
191
@@ -11096,7 +11130,7 @@
192
 <context>
193
     <name>mkvmuxer</name>
194
     <message>
195
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
196
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
197
         <source>Saving Mkv</source>
198
         <translation>Mkv gordeketa</translation>
199
     </message>
200
@@ -11216,7 +11250,7 @@
201
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
201
 
1
@@ -1899,6 +1899,26 @@
2
         <translation>Aller au temps</translation>
3
     </message>
4
     <message>
5
+        <location line="+6"/>
6
+        <source>Zoom 1:4</source>
7
+        <translation type="unfinished"></translation>
8
+    </message>
9
+    <message>
10
+        <location line="+1"/>
11
+        <source>Zoom 1:2</source>
12
+        <translation type="unfinished"></translation>
13
+    </message>
14
+    <message>
15
+        <location line="+1"/>
16
+        <source>Zoom 1:1</source>
17
+        <translation type="unfinished"></translation>
18
+    </message>
19
+    <message>
20
+        <location line="+1"/>
21
+        <source>Zoom 2:1</source>
22
+        <translation type="unfinished"></translation>
23
+    </message>
24
+    <message>
25
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+33"/>
26
         <source>R_esampling (Hz):</source>
27
         <translation>R_eéchantillonnage (Hz):</translation>
28
@@ -1923,7 +1943,7 @@
29
     <message>
30
         <location line="+1"/>
31
         <source>PAL to Film</source>
32
-        <translation>Film vers PAL</translation>
33
+        <translation>PAL vers Film</translation>
34
     </message>
35
     <message>
36
         <location line="+3"/>
37
@@ -2410,7 +2430,7 @@
38
     </message>
39
     <message>
40
         <location line="+15"/>
41
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
42
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
43
         <source>PCM</source>
44
         <translation></translation>
45
     </message>
46
@@ -2490,7 +2510,7 @@
47
         <translation>Préférences</translation>
48
     </message>
49
     <message>
50
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-82"/>
51
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-91"/>
52
         <location filename="../../common/gui_save.cpp" line="+125"/>
53
         <location line="+10"/>
54
         <source>Queue</source>
55
@@ -2527,7 +2547,7 @@
56
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
57
         <location line="+42"/>
58
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
59
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
60
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
61
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
62
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
63
         <location filename="../../common/gui_main.cpp" line="+147"/>
64
@@ -3405,12 +3425,12 @@
65
         <translation type="unfinished">Impossible d&apos;allouer la mémoire</translation>
66
     </message>
67
     <message>
68
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
69
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
70
         <source>Saving</source>
71
         <translation type="unfinished"></translation>
72
     </message>
73
     <message>
74
-        <location line="+132"/>
75
+        <location line="+139"/>
76
         <source>Too short</source>
77
         <translation type="unfinished"></translation>
78
     </message>
79
@@ -5488,59 +5508,73 @@
80
     <message>
81
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
82
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
83
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
84
         <source>Low Quality</source>
85
         <translation type="unfinished"></translation>
86
     </message>
87
     <message>
88
         <location line="+1"/>
89
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
90
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
91
         <source>High Quality</source>
92
         <translation type="unfinished"></translation>
93
     </message>
94
     <message>
95
         <location line="+1"/>
96
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
97
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
98
         <source>BluRay</source>
99
         <translation type="unfinished"></translation>
100
     </message>
101
     <message>
102
         <location line="+1"/>
103
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
104
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
105
         <source>Low Latency</source>
106
         <translation type="unfinished"></translation>
107
     </message>
108
     <message>
109
         <location line="+1"/>
110
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
111
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
112
         <source>Low Latency (LQ)</source>
113
         <translation type="unfinished"></translation>
114
     </message>
115
     <message>
116
         <location line="+1"/>
117
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
118
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
119
         <source>Low Latency (HQ)</source>
120
         <translation type="unfinished"></translation>
121
     </message>
122
     <message>
123
         <location line="+7"/>
124
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
125
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
126
         <source>Preset:</source>
127
         <translation type="unfinished"></translation>
128
     </message>
129
     <message>
130
         <location line="+1"/>
131
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
132
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
133
         <source>Bitrate (kbps):</source>
134
         <translation type="unfinished"></translation>
135
     </message>
136
     <message>
137
         <location line="+1"/>
138
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
139
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
140
         <source>Max Bitrate (kbps):</source>
141
         <translation type="unfinished"></translation>
142
     </message>
143
     <message>
144
         <location line="+4"/>
145
+        <source>NVENC H.264 configuration</source>
146
+        <translation type="unfinished"></translation>
147
+    </message>
148
+    <message>
149
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
150
         <source>libavcodec MPEG-4 configuration</source>
151
         <translation type="unfinished"></translation>
152
     </message>
153
@@ -5558,7 +5592,7 @@
154
         <translation type="unfinished"></translation>
155
     </message>
156
     <message>
157
-        <location line="+76"/>
158
+        <location line="+78"/>
159
         <source>Saving mpeg PS (ff)</source>
160
         <translation type="unfinished">Sauvegarde au format PS (ff)</translation>
161
     </message>
162
@@ -5654,7 +5688,7 @@
163
 <context>
164
     <name>fftsmuxer</name>
165
     <message>
166
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
167
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
168
         <source>Saving mpeg TS (ff)</source>
169
         <translation type="unfinished">Sauvegarde au format TS (ff)</translation>
170
     </message>
171
@@ -6333,7 +6367,7 @@
172
 <context>
173
     <name>ivtcRemover</name>
174
     <message>
175
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
176
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
177
         <source>Remove IVTC dupe.</source>
178
         <translation type="unfinished"></translation>
179
     </message>
180
@@ -7137,7 +7171,7 @@
181
         <translation type="unfinished"></translation>
182
     </message>
183
     <message>
184
-        <location line="+425"/>
185
+        <location line="+426"/>
186
         <source>Matroska clusters</source>
187
         <translation type="unfinished"></translation>
188
     </message>
189
@@ -7237,7 +7271,7 @@
190
 <context>
191
     <name>mkvmuxer</name>
192
     <message>
193
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
194
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
195
         <source>Saving Mkv</source>
196
         <translation type="unfinished">Sauvegarde au format MKV (ff)</translation>
197
     </message>
198
@@ -7357,7 +7391,7 @@
199
         <translation type="unfinished"></translation>
200
     </message>
201
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
201
 
1
@@ -1862,6 +1862,26 @@
2
         <translation>Időpontra ugrás</translation>
3
     </message>
4
     <message>
5
+        <location line="+6"/>
6
+        <source>Zoom 1:4</source>
7
+        <translation type="unfinished"></translation>
8
+    </message>
9
+    <message>
10
+        <location line="+1"/>
11
+        <source>Zoom 1:2</source>
12
+        <translation type="unfinished"></translation>
13
+    </message>
14
+    <message>
15
+        <location line="+1"/>
16
+        <source>Zoom 1:1</source>
17
+        <translation type="unfinished"></translation>
18
+    </message>
19
+    <message>
20
+        <location line="+1"/>
21
+        <source>Zoom 2:1</source>
22
+        <translation type="unfinished"></translation>
23
+    </message>
24
+    <message>
25
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-15"/>
26
         <source>R_esampling (Hz):</source>
27
         <translation>Újra-mintavételezés (Hz):</translation>
28
@@ -2179,7 +2199,7 @@
29
     </message>
30
     <message>
31
         <location line="+49"/>
32
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
33
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
34
         <source>PCM</source>
35
         <translation>PCM</translation>
36
     </message>
37
@@ -2542,7 +2562,7 @@
38
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
39
         <location line="+42"/>
40
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
41
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
42
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
43
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
44
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
45
         <location filename="../../common/gui_main.cpp" line="-244"/>
46
@@ -3000,7 +3020,7 @@
47
         <translation type="unfinished"></translation>
48
     </message>
49
     <message>
50
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-52"/>
51
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-61"/>
52
         <source>Save current settings as default</source>
53
         <translation type="unfinished"></translation>
54
     </message>
55
@@ -3375,12 +3395,12 @@
56
         <translation type="unfinished"></translation>
57
     </message>
58
     <message>
59
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
60
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
61
         <source>Saving</source>
62
         <translation type="unfinished"></translation>
63
     </message>
64
     <message>
65
-        <location line="+132"/>
66
+        <location line="+139"/>
67
         <source>Too short</source>
68
         <translation type="unfinished"></translation>
69
     </message>
70
@@ -5529,59 +5549,73 @@
71
     <message>
72
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
73
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
74
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
75
         <source>Low Quality</source>
76
         <translation type="unfinished"></translation>
77
     </message>
78
     <message>
79
         <location line="+1"/>
80
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
81
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
82
         <source>High Quality</source>
83
         <translation type="unfinished"></translation>
84
     </message>
85
     <message>
86
         <location line="+1"/>
87
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
88
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
89
         <source>BluRay</source>
90
         <translation type="unfinished"></translation>
91
     </message>
92
     <message>
93
         <location line="+1"/>
94
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
95
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
96
         <source>Low Latency</source>
97
         <translation type="unfinished"></translation>
98
     </message>
99
     <message>
100
         <location line="+1"/>
101
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
102
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
103
         <source>Low Latency (LQ)</source>
104
         <translation type="unfinished"></translation>
105
     </message>
106
     <message>
107
         <location line="+1"/>
108
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
109
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
110
         <source>Low Latency (HQ)</source>
111
         <translation type="unfinished"></translation>
112
     </message>
113
     <message>
114
         <location line="+7"/>
115
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
116
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
117
         <source>Preset:</source>
118
         <translation type="unfinished"></translation>
119
     </message>
120
     <message>
121
         <location line="+1"/>
122
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
123
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
124
         <source>Bitrate (kbps):</source>
125
         <translation type="unfinished"></translation>
126
     </message>
127
     <message>
128
         <location line="+1"/>
129
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
130
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
131
         <source>Max Bitrate (kbps):</source>
132
         <translation type="unfinished"></translation>
133
     </message>
134
     <message>
135
         <location line="+4"/>
136
+        <source>NVENC H.264 configuration</source>
137
+        <translation type="unfinished"></translation>
138
+    </message>
139
+    <message>
140
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
141
         <source>libavcodec MPEG-4 configuration</source>
142
         <translation type="unfinished">libavcodec MPEG-4 beállítása</translation>
143
     </message>
144
@@ -5599,7 +5633,7 @@
145
         <translation type="unfinished"></translation>
146
     </message>
147
     <message>
148
-        <location line="+76"/>
149
+        <location line="+78"/>
150
         <source>Saving mpeg PS (ff)</source>
151
         <translation type="unfinished">mpeg PS (ff) mentés</translation>
152
     </message>
153
@@ -5695,7 +5729,7 @@
154
 <context>
155
     <name>fftsmuxer</name>
156
     <message>
157
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
158
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
159
         <source>Saving mpeg TS (ff)</source>
160
         <translation type="unfinished">mpeg TS (ff) mentés</translation>
161
     </message>
162
@@ -6367,7 +6401,7 @@
163
 <context>
164
     <name>ivtcRemover</name>
165
     <message>
166
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
167
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
168
         <source>Remove IVTC dupe.</source>
169
         <translation type="unfinished"></translation>
170
     </message>
171
@@ -6966,7 +7000,7 @@
172
         <translation type="unfinished"></translation>
173
     </message>
174
     <message>
175
-        <location line="+425"/>
176
+        <location line="+426"/>
177
         <source>Matroska clusters</source>
178
         <translation type="unfinished"></translation>
179
     </message>
180
@@ -7073,7 +7107,7 @@
181
 <context>
182
     <name>mkvmuxer</name>
183
     <message>
184
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
185
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
186
         <source>Saving Mkv</source>
187
         <translation>MKv mentés</translation>
188
     </message>
189
@@ -7193,7 +7227,7 @@
190
         <translation type="unfinished"></translation>
191
     </message>
192
     <message>
193
-        <location line="+79"/>
194
+        <location line="+81"/>
195
         <source>Saving mp4</source>
196
         <translation type="unfinished">mp4 mentés</translation>
197
     </message>
198
@@ -7577,12 +7611,12 @@
199
         <translation>Tulajdonságok</translation>
200
     </message>
201
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
201
 
1
@@ -8428,7 +8428,7 @@
2
     </message>
3
     <message>
4
         <location line="+5"/>
5
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
6
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
7
         <source>PCM</source>
8
         <translation>PCM</translation>
9
     </message>
10
@@ -8787,6 +8787,26 @@
11
         <translation>Vai al tempo</translation>
12
     </message>
13
     <message>
14
+        <location line="+6"/>
15
+        <source>Zoom 1:4</source>
16
+        <translation type="unfinished"></translation>
17
+    </message>
18
+    <message>
19
+        <location line="+1"/>
20
+        <source>Zoom 1:2</source>
21
+        <translation type="unfinished"></translation>
22
+    </message>
23
+    <message>
24
+        <location line="+1"/>
25
+        <source>Zoom 1:1</source>
26
+        <translation type="unfinished"></translation>
27
+    </message>
28
+    <message>
29
+        <location line="+1"/>
30
+        <source>Zoom 2:1</source>
31
+        <translation type="unfinished"></translation>
32
+    </message>
33
+    <message>
34
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-15"/>
35
         <source>R_esampling (Hz):</source>
36
         <translation>Ricampionam_ento (Hz):</translation>
37
@@ -9432,7 +9452,7 @@
38
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
39
         <location line="+42"/>
40
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
41
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
42
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
43
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
44
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
45
         <location filename="../../common/gui_main.cpp" line="-244"/>
46
@@ -9584,7 +9604,7 @@
47
         <translation type="obsolete">Questo script è stato già eseguito con successo.</translation>
48
     </message>
49
     <message>
50
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
51
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
52
         <source>Saving</source>
53
         <translation type="unfinished">Salvataggio in corso</translation>
54
     </message>
55
@@ -9675,7 +9695,7 @@
56
         <translation type="unfinished"></translation>
57
     </message>
58
     <message>
59
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-52"/>
60
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-61"/>
61
         <source>Save current settings as default</source>
62
         <translation type="unfinished"></translation>
63
     </message>
64
@@ -10250,7 +10270,7 @@
65
         <translation type="unfinished">Errore di memoria</translation>
66
     </message>
67
     <message>
68
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+132"/>
69
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
70
         <source>Too short</source>
71
         <translation type="unfinished"></translation>
72
     </message>
73
@@ -12553,59 +12573,73 @@
74
     <message>
75
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
76
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
77
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
78
         <source>Low Quality</source>
79
         <translation type="unfinished"></translation>
80
     </message>
81
     <message>
82
         <location line="+1"/>
83
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
84
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
85
         <source>High Quality</source>
86
         <translation type="unfinished"></translation>
87
     </message>
88
     <message>
89
         <location line="+1"/>
90
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
91
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
92
         <source>BluRay</source>
93
         <translation type="unfinished"></translation>
94
     </message>
95
     <message>
96
         <location line="+1"/>
97
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
98
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
99
         <source>Low Latency</source>
100
         <translation type="unfinished"></translation>
101
     </message>
102
     <message>
103
         <location line="+1"/>
104
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
105
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
106
         <source>Low Latency (LQ)</source>
107
         <translation type="unfinished"></translation>
108
     </message>
109
     <message>
110
         <location line="+1"/>
111
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
112
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
113
         <source>Low Latency (HQ)</source>
114
         <translation type="unfinished"></translation>
115
     </message>
116
     <message>
117
         <location line="+7"/>
118
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
119
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
120
         <source>Preset:</source>
121
         <translation type="unfinished"></translation>
122
     </message>
123
     <message>
124
         <location line="+1"/>
125
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
126
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
127
         <source>Bitrate (kbps):</source>
128
         <translation type="unfinished"></translation>
129
     </message>
130
     <message>
131
         <location line="+1"/>
132
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
133
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
134
         <source>Max Bitrate (kbps):</source>
135
         <translation type="unfinished"></translation>
136
     </message>
137
     <message>
138
         <location line="+4"/>
139
+        <source>NVENC H.264 configuration</source>
140
+        <translation type="unfinished"></translation>
141
+    </message>
142
+    <message>
143
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
144
         <source>libavcodec MPEG-4 configuration</source>
145
         <translation type="unfinished"></translation>
146
     </message>
147
@@ -12623,7 +12657,7 @@
148
         <translation type="unfinished"></translation>
149
     </message>
150
     <message>
151
-        <location line="+76"/>
152
+        <location line="+78"/>
153
         <source>Saving mpeg PS (ff)</source>
154
         <translation type="unfinished">Salvataggio mpeg PS (ff) in corso</translation>
155
     </message>
156
@@ -12719,7 +12753,7 @@
157
 <context>
158
     <name>fftsmuxer</name>
159
     <message>
160
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
161
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
162
         <source>Saving mpeg TS (ff)</source>
163
         <translation type="unfinished">Salvataggio mpeg TS (ff) in corso</translation>
164
     </message>
165
@@ -13435,7 +13469,7 @@
166
 <context>
167
     <name>ivtcRemover</name>
168
     <message>
169
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
170
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
171
         <source>Remove IVTC dupe.</source>
172
         <translation type="unfinished"></translation>
173
     </message>
174
@@ -14316,7 +14350,7 @@
175
         <translation type="unfinished"></translation>
176
     </message>
177
     <message>
178
-        <location line="+425"/>
179
+        <location line="+426"/>
180
         <source>Matroska clusters</source>
181
         <translation type="unfinished"></translation>
182
     </message>
183
@@ -14416,7 +14450,7 @@
184
 <context>
185
     <name>mkvmuxer</name>
186
     <message>
187
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
188
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
189
         <source>Saving Mkv</source>
190
         <translation type="unfinished">Salvataggio Mkv in corso</translation>
191
     </message>
192
@@ -14536,7 +14570,7 @@
193
         <translation type="unfinished"></translation>
194
     </message>
195
     <message>
196
-        <location line="+79"/>
197
+        <location line="+81"/>
198
         <source>Saving mp4</source>
199
         <translation type="unfinished">Salvataggio mp4 in corso</translation>
200
     </message>
201
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
201
 
1
@@ -4653,7 +4653,7 @@
2
     </message>
3
     <message>
4
         <location line="+5"/>
5
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
6
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
7
         <source>PCM</source>
8
         <translation type="unfinished">
9
             </translation>
10
@@ -5191,7 +5191,7 @@
11
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
12
         <location line="+42"/>
13
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
14
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
15
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
16
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
17
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
18
         <location filename="../../common/gui_main.cpp" line="-244"/>
19
@@ -5837,6 +5837,26 @@
20
         <translation type="unfinished"></translation>
21
     </message>
22
     <message>
23
+        <location line="+6"/>
24
+        <source>Zoom 1:4</source>
25
+        <translation type="unfinished"></translation>
26
+    </message>
27
+    <message>
28
+        <location line="+1"/>
29
+        <source>Zoom 1:2</source>
30
+        <translation type="unfinished"></translation>
31
+    </message>
32
+    <message>
33
+        <location line="+1"/>
34
+        <source>Zoom 1:1</source>
35
+        <translation type="unfinished"></translation>
36
+    </message>
37
+    <message>
38
+        <location line="+1"/>
39
+        <source>Zoom 2:1</source>
40
+        <translation type="unfinished"></translation>
41
+    </message>
42
+    <message>
43
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
44
         <location line="+42"/>
45
         <source>You cannot remove *all* the video
46
@@ -6506,12 +6526,12 @@
47
         <translation type="unfinished">メモリエラー</translation>
48
     </message>
49
     <message>
50
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
51
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
52
         <source>Saving</source>
53
         <translation type="unfinished"></translation>
54
     </message>
55
     <message>
56
-        <location line="+132"/>
57
+        <location line="+139"/>
58
         <source>Too short</source>
59
         <translation type="unfinished"></translation>
60
     </message>
61
@@ -8633,59 +8653,73 @@
62
     <message>
63
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
64
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
65
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
66
         <source>Low Quality</source>
67
         <translation type="unfinished"></translation>
68
     </message>
69
     <message>
70
         <location line="+1"/>
71
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
72
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
73
         <source>High Quality</source>
74
         <translation type="unfinished"></translation>
75
     </message>
76
     <message>
77
         <location line="+1"/>
78
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
79
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
80
         <source>BluRay</source>
81
         <translation type="unfinished"></translation>
82
     </message>
83
     <message>
84
         <location line="+1"/>
85
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
86
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
87
         <source>Low Latency</source>
88
         <translation type="unfinished"></translation>
89
     </message>
90
     <message>
91
         <location line="+1"/>
92
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
93
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
94
         <source>Low Latency (LQ)</source>
95
         <translation type="unfinished"></translation>
96
     </message>
97
     <message>
98
         <location line="+1"/>
99
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
100
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
101
         <source>Low Latency (HQ)</source>
102
         <translation type="unfinished"></translation>
103
     </message>
104
     <message>
105
         <location line="+7"/>
106
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
107
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
108
         <source>Preset:</source>
109
         <translation type="unfinished"></translation>
110
     </message>
111
     <message>
112
         <location line="+1"/>
113
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
114
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
115
         <source>Bitrate (kbps):</source>
116
         <translation type="unfinished"></translation>
117
     </message>
118
     <message>
119
         <location line="+1"/>
120
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
121
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
122
         <source>Max Bitrate (kbps):</source>
123
         <translation type="unfinished"></translation>
124
     </message>
125
     <message>
126
         <location line="+4"/>
127
+        <source>NVENC H.264 configuration</source>
128
+        <translation type="unfinished"></translation>
129
+    </message>
130
+    <message>
131
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
132
         <source>libavcodec MPEG-4 configuration</source>
133
         <translation type="unfinished"></translation>
134
     </message>
135
@@ -8703,7 +8737,7 @@
136
         <translation type="unfinished"></translation>
137
     </message>
138
     <message>
139
-        <location line="+76"/>
140
+        <location line="+78"/>
141
         <source>Saving mpeg PS (ff)</source>
142
         <translation type="unfinished"></translation>
143
     </message>
144
@@ -8799,7 +8833,7 @@
145
 <context>
146
     <name>fftsmuxer</name>
147
     <message>
148
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
149
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
150
         <source>Saving mpeg TS (ff)</source>
151
         <translation type="unfinished"></translation>
152
     </message>
153
@@ -9499,7 +9533,7 @@
154
 <context>
155
     <name>ivtcRemover</name>
156
     <message>
157
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
158
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
159
         <source>Remove IVTC dupe.</source>
160
         <translation type="unfinished"></translation>
161
     </message>
162
@@ -10215,7 +10249,7 @@
163
         <translation type="unfinished"></translation>
164
     </message>
165
     <message>
166
-        <location line="+425"/>
167
+        <location line="+426"/>
168
         <source>Matroska clusters</source>
169
         <translation type="unfinished"></translation>
170
     </message>
171
@@ -10315,7 +10349,7 @@
172
 <context>
173
     <name>mkvmuxer</name>
174
     <message>
175
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
176
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
177
         <source>Saving Mkv</source>
178
         <translation type="unfinished"></translation>
179
     </message>
180
@@ -10435,7 +10469,7 @@
181
         <translation type="unfinished"></translation>
182
     </message>
183
     <message>
184
-        <location line="+79"/>
185
+        <location line="+81"/>
186
         <source>Saving mp4</source>
187
         <translation type="unfinished"></translation>
188
     </message>
189
@@ -10835,23 +10869,23 @@
190
         <translation type="unfinished">プロパティ</translation>
191
     </message>
192
     <message>
193
-        <location line="+12"/>
194
+        <location line="+6"/>
195
         <source>Video</source>
196
         <translation type="unfinished">映像</translation>
197
     </message>
198
     <message>
199
-        <location line="+22"/>
200
+        <location line="+31"/>
201
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
201
 
1
@@ -6171,7 +6171,7 @@
2
     </message>
3
     <message>
4
         <location line="+5"/>
5
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
6
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
7
         <source>PCM</source>
8
         <translation type="unfinished">PCM</translation>
9
     </message>
10
@@ -6781,7 +6781,7 @@
11
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
12
         <location line="+42"/>
13
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
14
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
15
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
16
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
17
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
18
         <location filename="../../common/gui_main.cpp" line="-244"/>
19
@@ -6968,7 +6968,7 @@
20
         <translation type="unfinished">Normalizacja głośności</translation>
21
     </message>
22
     <message>
23
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
24
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
25
         <source>Saving</source>
26
         <translation type="unfinished">Zapisywanie</translation>
27
     </message>
28
@@ -7366,6 +7366,26 @@
29
         <translation type="unfinished"></translation>
30
     </message>
31
     <message>
32
+        <location line="+6"/>
33
+        <source>Zoom 1:4</source>
34
+        <translation type="unfinished"></translation>
35
+    </message>
36
+    <message>
37
+        <location line="+1"/>
38
+        <source>Zoom 1:2</source>
39
+        <translation type="unfinished"></translation>
40
+    </message>
41
+    <message>
42
+        <location line="+1"/>
43
+        <source>Zoom 1:1</source>
44
+        <translation type="unfinished"></translation>
45
+    </message>
46
+    <message>
47
+        <location line="+1"/>
48
+        <source>Zoom 2:1</source>
49
+        <translation type="unfinished"></translation>
50
+    </message>
51
+    <message>
52
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
53
         <location line="+42"/>
54
         <source>You cannot remove *all* the video
55
@@ -8034,7 +8054,7 @@
56
         <translation type="unfinished">Błąd alokacji pamięci</translation>
57
     </message>
58
     <message>
59
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+132"/>
60
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
61
         <source>Too short</source>
62
         <translation type="unfinished"></translation>
63
     </message>
64
@@ -10239,59 +10259,73 @@
65
     <message>
66
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
67
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
68
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
69
         <source>Low Quality</source>
70
         <translation type="unfinished"></translation>
71
     </message>
72
     <message>
73
         <location line="+1"/>
74
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
75
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
76
         <source>High Quality</source>
77
         <translation type="unfinished"></translation>
78
     </message>
79
     <message>
80
         <location line="+1"/>
81
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
82
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
83
         <source>BluRay</source>
84
         <translation type="unfinished"></translation>
85
     </message>
86
     <message>
87
         <location line="+1"/>
88
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
89
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
90
         <source>Low Latency</source>
91
         <translation type="unfinished"></translation>
92
     </message>
93
     <message>
94
         <location line="+1"/>
95
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
96
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
97
         <source>Low Latency (LQ)</source>
98
         <translation type="unfinished"></translation>
99
     </message>
100
     <message>
101
         <location line="+1"/>
102
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
103
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
104
         <source>Low Latency (HQ)</source>
105
         <translation type="unfinished"></translation>
106
     </message>
107
     <message>
108
         <location line="+7"/>
109
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
110
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
111
         <source>Preset:</source>
112
         <translation type="unfinished"></translation>
113
     </message>
114
     <message>
115
         <location line="+1"/>
116
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
117
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
118
         <source>Bitrate (kbps):</source>
119
         <translation type="unfinished"></translation>
120
     </message>
121
     <message>
122
         <location line="+1"/>
123
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
124
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
125
         <source>Max Bitrate (kbps):</source>
126
         <translation type="unfinished"></translation>
127
     </message>
128
     <message>
129
         <location line="+4"/>
130
+        <source>NVENC H.264 configuration</source>
131
+        <translation type="unfinished"></translation>
132
+    </message>
133
+    <message>
134
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
135
         <source>libavcodec MPEG-4 configuration</source>
136
         <translation type="unfinished"></translation>
137
     </message>
138
@@ -10309,7 +10343,7 @@
139
         <translation type="unfinished"></translation>
140
     </message>
141
     <message>
142
-        <location line="+76"/>
143
+        <location line="+78"/>
144
         <source>Saving mpeg PS (ff)</source>
145
         <translation type="unfinished"></translation>
146
     </message>
147
@@ -10405,7 +10439,7 @@
148
 <context>
149
     <name>fftsmuxer</name>
150
     <message>
151
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
152
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
153
         <source>Saving mpeg TS (ff)</source>
154
         <translation type="unfinished"></translation>
155
     </message>
156
@@ -11103,7 +11137,7 @@
157
 <context>
158
     <name>ivtcRemover</name>
159
     <message>
160
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
161
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
162
         <source>Remove IVTC dupe.</source>
163
         <translation type="unfinished"></translation>
164
     </message>
165
@@ -11844,7 +11878,7 @@
166
         <translation type="unfinished"></translation>
167
     </message>
168
     <message>
169
-        <location line="+425"/>
170
+        <location line="+426"/>
171
         <source>Matroska clusters</source>
172
         <translation type="unfinished"></translation>
173
     </message>
174
@@ -11944,7 +11978,7 @@
175
 <context>
176
     <name>mkvmuxer</name>
177
     <message>
178
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
179
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
180
         <source>Saving Mkv</source>
181
         <translation type="unfinished"></translation>
182
     </message>
183
@@ -12064,7 +12098,7 @@
184
         <translation type="unfinished"></translation>
185
     </message>
186
     <message>
187
-        <location line="+79"/>
188
+        <location line="+81"/>
189
         <source>Saving mp4</source>
190
         <translation type="unfinished"></translation>
191
     </message>
192
@@ -12468,23 +12502,23 @@
193
         <translation type="unfinished">Właściwości</translation>
194
     </message>
195
     <message>
196
-        <location line="+12"/>
197
+        <location line="+6"/>
198
         <source>Video</source>
199
         <translation type="unfinished">Obraz</translation>
200
     </message>
201
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
201
 
1
@@ -1665,7 +1665,7 @@
2
     </message>
3
     <message>
4
         <location line="+5"/>
5
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
6
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
7
         <source>PCM</source>
8
         <translation type="unfinished"></translation>
9
     </message>
10
@@ -2025,10 +2025,30 @@
11
         <translation type="unfinished"></translation>
12
     </message>
13
     <message>
14
+        <location line="+6"/>
15
+        <source>Zoom 1:4</source>
16
+        <translation type="unfinished"></translation>
17
+    </message>
18
+    <message>
19
+        <location line="+1"/>
20
+        <source>Zoom 1:2</source>
21
+        <translation type="unfinished"></translation>
22
+    </message>
23
+    <message>
24
+        <location line="+1"/>
25
+        <source>Zoom 1:1</source>
26
+        <translation type="unfinished"></translation>
27
+    </message>
28
+    <message>
29
+        <location line="+1"/>
30
+        <source>Zoom 2:1</source>
31
+        <translation type="unfinished"></translation>
32
+    </message>
33
+    <message>
34
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
35
         <location line="+42"/>
36
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
37
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
38
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
39
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
40
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
41
         <location filename="../../common/gui_main.cpp" line="+1309"/>
42
@@ -2981,12 +3001,12 @@
43
         <translation type="unfinished"></translation>
44
     </message>
45
     <message>
46
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
47
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
48
         <source>Saving</source>
49
         <translation type="unfinished"></translation>
50
     </message>
51
     <message>
52
-        <location line="+132"/>
53
+        <location line="+139"/>
54
         <source>Too short</source>
55
         <translation type="unfinished"></translation>
56
     </message>
57
@@ -5008,59 +5028,73 @@
58
     <message>
59
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
60
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
61
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
62
         <source>Low Quality</source>
63
         <translation type="unfinished"></translation>
64
     </message>
65
     <message>
66
         <location line="+1"/>
67
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
68
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
69
         <source>High Quality</source>
70
         <translation type="unfinished"></translation>
71
     </message>
72
     <message>
73
         <location line="+1"/>
74
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
75
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
76
         <source>BluRay</source>
77
         <translation type="unfinished"></translation>
78
     </message>
79
     <message>
80
         <location line="+1"/>
81
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
82
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
83
         <source>Low Latency</source>
84
         <translation type="unfinished"></translation>
85
     </message>
86
     <message>
87
         <location line="+1"/>
88
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
89
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
90
         <source>Low Latency (LQ)</source>
91
         <translation type="unfinished"></translation>
92
     </message>
93
     <message>
94
         <location line="+1"/>
95
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
96
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
97
         <source>Low Latency (HQ)</source>
98
         <translation type="unfinished"></translation>
99
     </message>
100
     <message>
101
         <location line="+7"/>
102
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
103
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
104
         <source>Preset:</source>
105
         <translation type="unfinished"></translation>
106
     </message>
107
     <message>
108
         <location line="+1"/>
109
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
110
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
111
         <source>Bitrate (kbps):</source>
112
         <translation type="unfinished"></translation>
113
     </message>
114
     <message>
115
         <location line="+1"/>
116
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
117
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
118
         <source>Max Bitrate (kbps):</source>
119
         <translation type="unfinished"></translation>
120
     </message>
121
     <message>
122
         <location line="+4"/>
123
+        <source>NVENC H.264 configuration</source>
124
+        <translation type="unfinished"></translation>
125
+    </message>
126
+    <message>
127
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
128
         <source>libavcodec MPEG-4 configuration</source>
129
         <translation type="unfinished"></translation>
130
     </message>
131
@@ -5078,7 +5112,7 @@
132
         <translation type="unfinished"></translation>
133
     </message>
134
     <message>
135
-        <location line="+76"/>
136
+        <location line="+78"/>
137
         <source>Saving mpeg PS (ff)</source>
138
         <translation type="unfinished"></translation>
139
     </message>
140
@@ -5174,7 +5208,7 @@
141
 <context>
142
     <name>fftsmuxer</name>
143
     <message>
144
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
145
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
146
         <source>Saving mpeg TS (ff)</source>
147
         <translation type="unfinished"></translation>
148
     </message>
149
@@ -5846,7 +5880,7 @@
150
 <context>
151
     <name>ivtcRemover</name>
152
     <message>
153
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
154
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
155
         <source>Remove IVTC dupe.</source>
156
         <translation type="unfinished"></translation>
157
     </message>
158
@@ -6404,7 +6438,7 @@
159
         <translation type="unfinished"></translation>
160
     </message>
161
     <message>
162
-        <location line="+425"/>
163
+        <location line="+426"/>
164
         <source>Matroska clusters</source>
165
         <translation type="unfinished"></translation>
166
     </message>
167
@@ -6504,7 +6538,7 @@
168
 <context>
169
     <name>mkvmuxer</name>
170
     <message>
171
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
172
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
173
         <source>Saving Mkv</source>
174
         <translation type="unfinished"></translation>
175
     </message>
176
@@ -6624,7 +6658,7 @@
177
         <translation type="unfinished"></translation>
178
     </message>
179
     <message>
180
-        <location line="+79"/>
181
+        <location line="+81"/>
182
         <source>Saving mp4</source>
183
         <translation type="unfinished"></translation>
184
     </message>
185
@@ -6955,12 +6989,12 @@
186
         <translation type="unfinished"></translation>
187
     </message>
188
     <message>
189
-        <location line="+12"/>
190
+        <location line="+6"/>
191
         <source>Video</source>
192
         <translation type="unfinished"></translation>
193
     </message>
194
     <message>
195
-        <location line="+15"/>
196
+        <location line="+24"/>
197
         <location line="+14"/>
198
         <location line="+14"/>
199
         <location line="+14"/>
200
@@ -6975,12 +7009,12 @@
201
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
201
 
1
@@ -3149,8 +3149,7 @@
2
     <message>
3
         <location line="+7"/>
4
         <source>1/1</source>
5
-        <translation type="unfinished">
6
-             {1/1?}</translation>
7
+        <translation type="unfinished"></translation>
8
     </message>
9
     <message>
10
         <location line="+7"/>
11
@@ -4554,7 +4553,7 @@
12
     <message>
13
         <location line="+10"/>
14
         <source>_Accept non-standard audio frequency for DVD</source>
15
-        <translation type="unfinished">Позволять нестандартную частоту звука для DVD</translation>
16
+        <translation type="unfinished">_Разрешать нестандартную частоту звука для DVD</translation>
17
     </message>
18
     <message>
19
         <location line="+1"/>
20
@@ -4661,17 +4660,17 @@
21
     <message>
22
         <location line="+2"/>
23
         <source>_Encoding priority:</source>
24
-        <translation type="unfinished">Кодирования:</translation>
25
+        <translation type="unfinished">_Кодирование:</translation>
26
     </message>
27
     <message>
28
         <location line="+1"/>
29
         <source>_Indexing/unpacking priority:</source>
30
-        <translation type="unfinished">Индексации/распаковки:</translation>
31
+        <translation type="unfinished">_Индексация/распаковка:</translation>
32
     </message>
33
     <message>
34
         <location line="+1"/>
35
         <source>_Playback priority:</source>
36
-        <translation type="unfinished">Воспроизведения:</translation>
37
+        <translation type="unfinished">_Воспроизведение:</translation>
38
     </message>
39
     <message>
40
         <location line="+2"/>
41
@@ -4681,12 +4680,12 @@
42
     <message>
43
         <location line="+7"/>
44
         <source>_Use alternative tag for MP3 in .mp4</source>
45
-        <translation type="unfinished">Использовать альтернативные тэги для MP3 в .MP4</translation>
46
+        <translation type="unfinished">_Использовать альтернативные тэги для MP3 в .MP4</translation>
47
     </message>
48
     <message>
49
         <location line="+2"/>
50
         <source>_Default to the directory of the last read file for saving</source>
51
-        <translation type="unfinished">_Сохранять видео в папке с последним прочитанным файлом по умолчании</translation>
52
+        <translation type="unfinished">_Сохранять видео в папке с последним прочитанным файлом по умолчанию</translation>
53
     </message>
54
     <message>
55
         <location line="+5"/>
56
@@ -4752,19 +4751,19 @@
57
     <message>
58
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+4"/>
59
         <source>_Local playback downmixing:</source>
60
-        <translation type="unfinished">При проигрывании звук:</translation>
61
+        <translation type="unfinished">_Даунмиксинг звука при локальном воспроизведении:</translation>
62
     </message>
63
     <message>
64
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+38"/>
65
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+17"/>
66
         <source>_Horizontal deblocking</source>
67
-        <translation type="unfinished">Горизонтальный деблокинг</translation>
68
+        <translation type="unfinished">_Горизонтальный деблокинг</translation>
69
     </message>
70
     <message>
71
         <location line="+1"/>
72
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
73
         <source>_Vertical deblocking</source>
74
-        <translation type="unfinished">Вертикальный деблокинг</translation>
75
+        <translation type="unfinished">_Вертикальный деблокинг</translation>
76
     </message>
77
     <message>
78
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
79
@@ -5197,7 +5196,7 @@
80
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
81
         <location line="+42"/>
82
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
83
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
84
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
85
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
86
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
87
         <location filename="../../common/gui_main.cpp" line="-244"/>
88
@@ -5415,8 +5414,7 @@
89
     <message>
90
         <location line="+2"/>
91
         <source>5.1</source>
92
-        <translation type="unfinished">
93
-             {5.1?}</translation>
94
+        <translation type="unfinished"></translation>
95
     </message>
96
     <message>
97
         <location line="+1"/>
98
@@ -5652,7 +5650,7 @@
99
     </message>
100
     <message>
101
         <location line="+15"/>
102
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
103
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
104
         <source>PCM</source>
105
         <translation type="unfinished"></translation>
106
     </message>
107
@@ -5916,6 +5914,26 @@
108
         <translation type="unfinished">Перейти ко времени...</translation>
109
     </message>
110
     <message>
111
+        <location line="+6"/>
112
+        <source>Zoom 1:4</source>
113
+        <translation type="unfinished">Масштаб 1:4</translation>
114
+    </message>
115
+    <message>
116
+        <location line="+1"/>
117
+        <source>Zoom 1:2</source>
118
+        <translation type="unfinished">Масштаб 1:2</translation>
119
+    </message>
120
+    <message>
121
+        <location line="+1"/>
122
+        <source>Zoom 1:1</source>
123
+        <translation type="unfinished">Масштаб 1:1</translation>
124
+    </message>
125
+    <message>
126
+        <location line="+1"/>
127
+        <source>Zoom 2:1</source>
128
+        <translation type="unfinished">Масштаб 2:1</translation>
129
+    </message>
130
+    <message>
131
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
132
         <location line="+42"/>
133
         <source>You cannot remove *all* the video
134
@@ -6589,12 +6607,12 @@
135
         <translation type="unfinished">Ошибка выделения памяти</translation>
136
     </message>
137
     <message>
138
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
139
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
140
         <source>Saving</source>
141
         <translation type="unfinished">Сохранение</translation>
142
     </message>
143
     <message>
144
-        <location line="+132"/>
145
+        <location line="+139"/>
146
         <source>Too short</source>
147
         <translation type="unfinished">Слишком коротко</translation>
148
     </message>
149
@@ -6698,8 +6716,7 @@
150
     <message>
151
         <location line="+1"/>
152
         <source>1:1</source>
153
-        <translation type="unfinished">
154
-             {1:1?}</translation>
155
+        <translation type="unfinished"></translation>
156
     </message>
157
     <message>
158
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
159
@@ -7599,25 +7616,25 @@
160
     <message>
161
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
162
         <source>Crop</source>
163
-        <translation type="unfinished">Обрезка</translation>
164
+        <translation>Кадрирование</translation>
165
     </message>
166
     <message>
167
         <location line="+1"/>
168
         <source>Crop filter</source>
169
-        <translation type="unfinished">Фильтр обрезки</translation>
170
+        <translation>Фильтр кадрирования</translation>
171
     </message>
172
     <message>
173
         <location line="+22"/>
174
         <source>Warning Cropping too much width ! Width reseted !
175
 </source>
176
-        <translation type="unfinished">Предупреждение: ширина слишком сильно обрезана! Ее значение восстановлено!
177
+        <translation>Предупреждение: ширина слишком сильно обрезана! Ее значение восстановлено!
178
 </translation>
179
     </message>
180
     <message>
181
         <location line="+5"/>
182
         <source>Warning Cropping too much height ! Height reseted !
183
 </source>
184
-        <translation type="unfinished">Предупреждение: высота слишком сильно обрезана! Ее значение восстановлено!
185
+        <translation>Предупреждение: высота слишком сильно обрезана! Ее значение восстановлено!
186
 </translation>
187
     </message>
188
 </context>
189
@@ -7626,37 +7643,37 @@
190
     <message>
191
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
192
         <source>Crop</source>
193
-        <translation type="unfinished">Обрезка   </translation>
194
+        <translation>Кадрирование</translation>
195
     </message>
196
     <message>
197
         <location line="+88"/>
198
         <source>Reset</source>
199
-        <translation type="unfinished">Сброс</translation>
200
+        <translation>Сброс</translation>
201
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
201
 
1
@@ -4533,7 +4533,7 @@
2
     </message>
3
     <message>
4
         <location line="+5"/>
5
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
6
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
7
         <source>PCM</source>
8
         <translation type="unfinished">ПЦМ</translation>
9
     </message>
10
@@ -5068,7 +5068,7 @@
11
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
12
         <location line="+42"/>
13
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
14
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
15
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
16
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
17
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
18
         <location filename="../../common/gui_main.cpp" line="-244"/>
19
@@ -5711,6 +5711,26 @@
20
         <translation type="unfinished"></translation>
21
     </message>
22
     <message>
23
+        <location line="+6"/>
24
+        <source>Zoom 1:4</source>
25
+        <translation type="unfinished"></translation>
26
+    </message>
27
+    <message>
28
+        <location line="+1"/>
29
+        <source>Zoom 1:2</source>
30
+        <translation type="unfinished"></translation>
31
+    </message>
32
+    <message>
33
+        <location line="+1"/>
34
+        <source>Zoom 1:1</source>
35
+        <translation type="unfinished"></translation>
36
+    </message>
37
+    <message>
38
+        <location line="+1"/>
39
+        <source>Zoom 2:1</source>
40
+        <translation type="unfinished"></translation>
41
+    </message>
42
+    <message>
43
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
44
         <location line="+42"/>
45
         <source>You cannot remove *all* the video
46
@@ -6379,12 +6399,12 @@
47
         <translation type="unfinished">Грешка у меморији</translation>
48
     </message>
49
     <message>
50
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
51
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
52
         <source>Saving</source>
53
         <translation type="unfinished"></translation>
54
     </message>
55
     <message>
56
-        <location line="+132"/>
57
+        <location line="+139"/>
58
         <source>Too short</source>
59
         <translation type="unfinished"></translation>
60
     </message>
61
@@ -8497,59 +8517,73 @@
62
     <message>
63
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
64
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
65
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
66
         <source>Low Quality</source>
67
         <translation type="unfinished"></translation>
68
     </message>
69
     <message>
70
         <location line="+1"/>
71
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
72
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
73
         <source>High Quality</source>
74
         <translation type="unfinished"></translation>
75
     </message>
76
     <message>
77
         <location line="+1"/>
78
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
79
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
80
         <source>BluRay</source>
81
         <translation type="unfinished"></translation>
82
     </message>
83
     <message>
84
         <location line="+1"/>
85
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
86
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
87
         <source>Low Latency</source>
88
         <translation type="unfinished"></translation>
89
     </message>
90
     <message>
91
         <location line="+1"/>
92
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
93
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
94
         <source>Low Latency (LQ)</source>
95
         <translation type="unfinished"></translation>
96
     </message>
97
     <message>
98
         <location line="+1"/>
99
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
100
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
101
         <source>Low Latency (HQ)</source>
102
         <translation type="unfinished"></translation>
103
     </message>
104
     <message>
105
         <location line="+7"/>
106
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
107
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
108
         <source>Preset:</source>
109
         <translation type="unfinished"></translation>
110
     </message>
111
     <message>
112
         <location line="+1"/>
113
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
114
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
115
         <source>Bitrate (kbps):</source>
116
         <translation type="unfinished"></translation>
117
     </message>
118
     <message>
119
         <location line="+1"/>
120
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
121
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
122
         <source>Max Bitrate (kbps):</source>
123
         <translation type="unfinished"></translation>
124
     </message>
125
     <message>
126
         <location line="+4"/>
127
+        <source>NVENC H.264 configuration</source>
128
+        <translation type="unfinished"></translation>
129
+    </message>
130
+    <message>
131
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
132
         <source>libavcodec MPEG-4 configuration</source>
133
         <translation type="unfinished"></translation>
134
     </message>
135
@@ -8567,7 +8601,7 @@
136
         <translation type="unfinished"></translation>
137
     </message>
138
     <message>
139
-        <location line="+76"/>
140
+        <location line="+78"/>
141
         <source>Saving mpeg PS (ff)</source>
142
         <translation type="unfinished"></translation>
143
     </message>
144
@@ -8663,7 +8697,7 @@
145
 <context>
146
     <name>fftsmuxer</name>
147
     <message>
148
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
149
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
150
         <source>Saving mpeg TS (ff)</source>
151
         <translation type="unfinished"></translation>
152
     </message>
153
@@ -9361,7 +9395,7 @@
154
 <context>
155
     <name>ivtcRemover</name>
156
     <message>
157
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
158
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
159
         <source>Remove IVTC dupe.</source>
160
         <translation type="unfinished"></translation>
161
     </message>
162
@@ -10071,7 +10105,7 @@
163
         <translation type="unfinished"></translation>
164
     </message>
165
     <message>
166
-        <location line="+425"/>
167
+        <location line="+426"/>
168
         <source>Matroska clusters</source>
169
         <translation type="unfinished"></translation>
170
     </message>
171
@@ -10171,7 +10205,7 @@
172
 <context>
173
     <name>mkvmuxer</name>
174
     <message>
175
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
176
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
177
         <source>Saving Mkv</source>
178
         <translation type="unfinished"></translation>
179
     </message>
180
@@ -10291,7 +10325,7 @@
181
         <translation type="unfinished"></translation>
182
     </message>
183
     <message>
184
-        <location line="+79"/>
185
+        <location line="+81"/>
186
         <source>Saving mp4</source>
187
         <translation type="unfinished"></translation>
188
     </message>
189
@@ -10691,23 +10725,23 @@
190
         <translation type="unfinished">Oсобине</translation>
191
     </message>
192
     <message>
193
-        <location line="+12"/>
194
+        <location line="+6"/>
195
         <source>Video</source>
196
         <translation type="unfinished">Видео</translation>
197
     </message>
198
     <message>
199
-        <location line="+22"/>
200
+        <location line="+31"/>
201
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
201
 
1
@@ -4533,7 +4533,7 @@
2
     </message>
3
     <message>
4
         <location line="+5"/>
5
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
6
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
7
         <source>PCM</source>
8
         <translation type="unfinished">PCM</translation>
9
     </message>
10
@@ -5068,7 +5068,7 @@
11
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
12
         <location line="+42"/>
13
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
14
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
15
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
16
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
17
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
18
         <location filename="../../common/gui_main.cpp" line="-244"/>
19
@@ -5711,6 +5711,26 @@
20
         <translation type="unfinished"></translation>
21
     </message>
22
     <message>
23
+        <location line="+6"/>
24
+        <source>Zoom 1:4</source>
25
+        <translation type="unfinished"></translation>
26
+    </message>
27
+    <message>
28
+        <location line="+1"/>
29
+        <source>Zoom 1:2</source>
30
+        <translation type="unfinished"></translation>
31
+    </message>
32
+    <message>
33
+        <location line="+1"/>
34
+        <source>Zoom 1:1</source>
35
+        <translation type="unfinished"></translation>
36
+    </message>
37
+    <message>
38
+        <location line="+1"/>
39
+        <source>Zoom 2:1</source>
40
+        <translation type="unfinished"></translation>
41
+    </message>
42
+    <message>
43
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
44
         <location line="+42"/>
45
         <source>You cannot remove *all* the video
46
@@ -6379,12 +6399,12 @@
47
         <translation type="unfinished">Greška u memoriji</translation>
48
     </message>
49
     <message>
50
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
51
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
52
         <source>Saving</source>
53
         <translation type="unfinished"></translation>
54
     </message>
55
     <message>
56
-        <location line="+132"/>
57
+        <location line="+139"/>
58
         <source>Too short</source>
59
         <translation type="unfinished"></translation>
60
     </message>
61
@@ -8497,59 +8517,73 @@
62
     <message>
63
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
64
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
65
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
66
         <source>Low Quality</source>
67
         <translation type="unfinished"></translation>
68
     </message>
69
     <message>
70
         <location line="+1"/>
71
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
72
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
73
         <source>High Quality</source>
74
         <translation type="unfinished"></translation>
75
     </message>
76
     <message>
77
         <location line="+1"/>
78
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
79
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
80
         <source>BluRay</source>
81
         <translation type="unfinished"></translation>
82
     </message>
83
     <message>
84
         <location line="+1"/>
85
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
86
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
87
         <source>Low Latency</source>
88
         <translation type="unfinished"></translation>
89
     </message>
90
     <message>
91
         <location line="+1"/>
92
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
93
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
94
         <source>Low Latency (LQ)</source>
95
         <translation type="unfinished"></translation>
96
     </message>
97
     <message>
98
         <location line="+1"/>
99
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
100
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
101
         <source>Low Latency (HQ)</source>
102
         <translation type="unfinished"></translation>
103
     </message>
104
     <message>
105
         <location line="+7"/>
106
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
107
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
108
         <source>Preset:</source>
109
         <translation type="unfinished"></translation>
110
     </message>
111
     <message>
112
         <location line="+1"/>
113
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
114
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
115
         <source>Bitrate (kbps):</source>
116
         <translation type="unfinished"></translation>
117
     </message>
118
     <message>
119
         <location line="+1"/>
120
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
121
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
122
         <source>Max Bitrate (kbps):</source>
123
         <translation type="unfinished"></translation>
124
     </message>
125
     <message>
126
         <location line="+4"/>
127
+        <source>NVENC H.264 configuration</source>
128
+        <translation type="unfinished"></translation>
129
+    </message>
130
+    <message>
131
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
132
         <source>libavcodec MPEG-4 configuration</source>
133
         <translation type="unfinished"></translation>
134
     </message>
135
@@ -8567,7 +8601,7 @@
136
         <translation type="unfinished"></translation>
137
     </message>
138
     <message>
139
-        <location line="+76"/>
140
+        <location line="+78"/>
141
         <source>Saving mpeg PS (ff)</source>
142
         <translation type="unfinished"></translation>
143
     </message>
144
@@ -8663,7 +8697,7 @@
145
 <context>
146
     <name>fftsmuxer</name>
147
     <message>
148
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
149
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
150
         <source>Saving mpeg TS (ff)</source>
151
         <translation type="unfinished"></translation>
152
     </message>
153
@@ -9361,7 +9395,7 @@
154
 <context>
155
     <name>ivtcRemover</name>
156
     <message>
157
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
158
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
159
         <source>Remove IVTC dupe.</source>
160
         <translation type="unfinished"></translation>
161
     </message>
162
@@ -10071,7 +10105,7 @@
163
         <translation type="unfinished"></translation>
164
     </message>
165
     <message>
166
-        <location line="+425"/>
167
+        <location line="+426"/>
168
         <source>Matroska clusters</source>
169
         <translation type="unfinished"></translation>
170
     </message>
171
@@ -10171,7 +10205,7 @@
172
 <context>
173
     <name>mkvmuxer</name>
174
     <message>
175
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
176
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
177
         <source>Saving Mkv</source>
178
         <translation type="unfinished"></translation>
179
     </message>
180
@@ -10291,7 +10325,7 @@
181
         <translation type="unfinished"></translation>
182
     </message>
183
     <message>
184
-        <location line="+79"/>
185
+        <location line="+81"/>
186
         <source>Saving mp4</source>
187
         <translation type="unfinished"></translation>
188
     </message>
189
@@ -10691,23 +10725,23 @@
190
         <translation type="unfinished">Osobine</translation>
191
     </message>
192
     <message>
193
-        <location line="+12"/>
194
+        <location line="+6"/>
195
         <source>Video</source>
196
         <translation type="unfinished">Video</translation>
197
     </message>
198
     <message>
199
-        <location line="+22"/>
200
+        <location line="+31"/>
201
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
201
 
1
@@ -4913,7 +4913,7 @@
2
     </message>
3
     <message>
4
         <location line="+5"/>
5
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
6
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
7
         <source>PCM</source>
8
         <translation type="unfinished">PCM</translation>
9
     </message>
10
@@ -5497,7 +5497,7 @@
11
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
12
         <location line="+42"/>
13
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
14
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
15
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
16
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
17
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
18
         <location filename="../../common/gui_main.cpp" line="-244"/>
19
@@ -6145,6 +6145,26 @@
20
         <translation type="unfinished"></translation>
21
     </message>
22
     <message>
23
+        <location line="+6"/>
24
+        <source>Zoom 1:4</source>
25
+        <translation type="unfinished"></translation>
26
+    </message>
27
+    <message>
28
+        <location line="+1"/>
29
+        <source>Zoom 1:2</source>
30
+        <translation type="unfinished"></translation>
31
+    </message>
32
+    <message>
33
+        <location line="+1"/>
34
+        <source>Zoom 1:1</source>
35
+        <translation type="unfinished"></translation>
36
+    </message>
37
+    <message>
38
+        <location line="+1"/>
39
+        <source>Zoom 2:1</source>
40
+        <translation type="unfinished"></translation>
41
+    </message>
42
+    <message>
43
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
44
         <location line="+42"/>
45
         <source>You cannot remove *all* the video
46
@@ -6815,12 +6835,12 @@
47
         <translation type="unfinished">Hafıza hatası</translation>
48
     </message>
49
     <message>
50
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
51
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
52
         <source>Saving</source>
53
         <translation type="unfinished"></translation>
54
     </message>
55
     <message>
56
-        <location line="+132"/>
57
+        <location line="+139"/>
58
         <source>Too short</source>
59
         <translation type="unfinished"></translation>
60
     </message>
61
@@ -8973,59 +8993,73 @@
62
     <message>
63
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
64
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
65
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
66
         <source>Low Quality</source>
67
         <translation type="unfinished"></translation>
68
     </message>
69
     <message>
70
         <location line="+1"/>
71
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
72
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
73
         <source>High Quality</source>
74
         <translation type="unfinished"></translation>
75
     </message>
76
     <message>
77
         <location line="+1"/>
78
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
79
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
80
         <source>BluRay</source>
81
         <translation type="unfinished"></translation>
82
     </message>
83
     <message>
84
         <location line="+1"/>
85
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
86
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
87
         <source>Low Latency</source>
88
         <translation type="unfinished"></translation>
89
     </message>
90
     <message>
91
         <location line="+1"/>
92
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
93
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
94
         <source>Low Latency (LQ)</source>
95
         <translation type="unfinished"></translation>
96
     </message>
97
     <message>
98
         <location line="+1"/>
99
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
100
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
101
         <source>Low Latency (HQ)</source>
102
         <translation type="unfinished"></translation>
103
     </message>
104
     <message>
105
         <location line="+7"/>
106
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
107
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
108
         <source>Preset:</source>
109
         <translation type="unfinished"></translation>
110
     </message>
111
     <message>
112
         <location line="+1"/>
113
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
114
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
115
         <source>Bitrate (kbps):</source>
116
         <translation type="unfinished"></translation>
117
     </message>
118
     <message>
119
         <location line="+1"/>
120
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
121
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
122
         <source>Max Bitrate (kbps):</source>
123
         <translation type="unfinished"></translation>
124
     </message>
125
     <message>
126
         <location line="+4"/>
127
+        <source>NVENC H.264 configuration</source>
128
+        <translation type="unfinished"></translation>
129
+    </message>
130
+    <message>
131
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
132
         <source>libavcodec MPEG-4 configuration</source>
133
         <translation type="unfinished"></translation>
134
     </message>
135
@@ -9043,7 +9077,7 @@
136
         <translation type="unfinished"></translation>
137
     </message>
138
     <message>
139
-        <location line="+76"/>
140
+        <location line="+78"/>
141
         <source>Saving mpeg PS (ff)</source>
142
         <translation type="unfinished"></translation>
143
     </message>
144
@@ -9139,7 +9173,7 @@
145
 <context>
146
     <name>fftsmuxer</name>
147
     <message>
148
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
149
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
150
         <source>Saving mpeg TS (ff)</source>
151
         <translation type="unfinished"></translation>
152
     </message>
153
@@ -9845,7 +9879,7 @@
154
 <context>
155
     <name>ivtcRemover</name>
156
     <message>
157
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
158
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
159
         <source>Remove IVTC dupe.</source>
160
         <translation type="unfinished"></translation>
161
     </message>
162
@@ -10569,7 +10603,7 @@
163
         <translation type="unfinished"></translation>
164
     </message>
165
     <message>
166
-        <location line="+425"/>
167
+        <location line="+426"/>
168
         <source>Matroska clusters</source>
169
         <translation type="unfinished"></translation>
170
     </message>
171
@@ -10669,7 +10703,7 @@
172
 <context>
173
     <name>mkvmuxer</name>
174
     <message>
175
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
176
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
177
         <source>Saving Mkv</source>
178
         <translation type="unfinished"></translation>
179
     </message>
180
@@ -10789,7 +10823,7 @@
181
         <translation type="unfinished"></translation>
182
     </message>
183
     <message>
184
-        <location line="+79"/>
185
+        <location line="+81"/>
186
         <source>Saving mp4</source>
187
         <translation type="unfinished"></translation>
188
     </message>
189
@@ -11194,25 +11228,25 @@
190
             </translation>
191
     </message>
192
     <message>
193
-        <location line="+12"/>
194
+        <location line="+6"/>
195
         <source>Video</source>
196
         <translation type="unfinished">Video</translation>
197
     </message>
198
     <message>
199
-        <location line="+22"/>
200
+        <location line="+31"/>
201
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
201
 
1
@@ -6841,7 +6841,7 @@
2
     </message>
3
     <message>
4
         <location line="+5"/>
5
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+202"/>
6
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
7
         <source>PCM</source>
8
         <translation type="unfinished">PCM</translation>
9
     </message>
10
@@ -7480,7 +7480,7 @@
11
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
12
         <location line="+42"/>
13
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
14
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+135"/>
15
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
16
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
17
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
18
         <location filename="../../common/gui_main.cpp" line="-244"/>
19
@@ -8103,6 +8103,26 @@
20
         <translation type="unfinished"></translation>
21
     </message>
22
     <message>
23
+        <location line="+6"/>
24
+        <source>Zoom 1:4</source>
25
+        <translation type="unfinished"></translation>
26
+    </message>
27
+    <message>
28
+        <location line="+1"/>
29
+        <source>Zoom 1:2</source>
30
+        <translation type="unfinished"></translation>
31
+    </message>
32
+    <message>
33
+        <location line="+1"/>
34
+        <source>Zoom 1:1</source>
35
+        <translation type="unfinished"></translation>
36
+    </message>
37
+    <message>
38
+        <location line="+1"/>
39
+        <source>Zoom 2:1</source>
40
+        <translation type="unfinished"></translation>
41
+    </message>
42
+    <message>
43
         <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-42"/>
44
         <location line="+42"/>
45
         <source>You cannot remove *all* the video
46
@@ -8747,12 +8767,12 @@
47
         <translation type="unfinished">記憶體錯誤</translation>
48
     </message>
49
     <message>
50
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+434"/>
51
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
52
         <source>Saving</source>
53
         <translation type="unfinished"></translation>
54
     </message>
55
     <message>
56
-        <location line="+132"/>
57
+        <location line="+139"/>
58
         <source>Too short</source>
59
         <translation type="unfinished"></translation>
60
     </message>
61
@@ -11005,59 +11025,73 @@
62
     <message>
63
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
64
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
65
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
66
         <source>Low Quality</source>
67
         <translation type="unfinished"></translation>
68
     </message>
69
     <message>
70
         <location line="+1"/>
71
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
72
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
73
         <source>High Quality</source>
74
         <translation type="unfinished"></translation>
75
     </message>
76
     <message>
77
         <location line="+1"/>
78
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
79
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
80
         <source>BluRay</source>
81
         <translation type="unfinished"></translation>
82
     </message>
83
     <message>
84
         <location line="+1"/>
85
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
86
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
87
         <source>Low Latency</source>
88
         <translation type="unfinished"></translation>
89
     </message>
90
     <message>
91
         <location line="+1"/>
92
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
93
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
94
         <source>Low Latency (LQ)</source>
95
         <translation type="unfinished"></translation>
96
     </message>
97
     <message>
98
         <location line="+1"/>
99
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
100
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
101
         <source>Low Latency (HQ)</source>
102
         <translation type="unfinished"></translation>
103
     </message>
104
     <message>
105
         <location line="+7"/>
106
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
107
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
108
         <source>Preset:</source>
109
         <translation type="unfinished"></translation>
110
     </message>
111
     <message>
112
         <location line="+1"/>
113
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
114
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
115
         <source>Bitrate (kbps):</source>
116
         <translation type="unfinished"></translation>
117
     </message>
118
     <message>
119
         <location line="+1"/>
120
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
121
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
122
         <source>Max Bitrate (kbps):</source>
123
         <translation type="unfinished"></translation>
124
     </message>
125
     <message>
126
         <location line="+4"/>
127
+        <source>NVENC H.264 configuration</source>
128
+        <translation type="unfinished"></translation>
129
+    </message>
130
+    <message>
131
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
132
         <source>libavcodec MPEG-4 configuration</source>
133
         <translation type="unfinished"></translation>
134
     </message>
135
@@ -11075,7 +11109,7 @@
136
         <translation type="unfinished"></translation>
137
     </message>
138
     <message>
139
-        <location line="+76"/>
140
+        <location line="+78"/>
141
         <source>Saving mpeg PS (ff)</source>
142
         <translation type="unfinished"></translation>
143
     </message>
144
@@ -11171,7 +11205,7 @@
145
 <context>
146
     <name>fftsmuxer</name>
147
     <message>
148
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
149
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
150
         <source>Saving mpeg TS (ff)</source>
151
         <translation type="unfinished"></translation>
152
     </message>
153
@@ -11887,7 +11921,7 @@
154
 <context>
155
     <name>ivtcRemover</name>
156
     <message>
157
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+81"/>
158
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
159
         <source>Remove IVTC dupe.</source>
160
         <translation type="unfinished"></translation>
161
     </message>
162
@@ -12756,7 +12790,7 @@
163
         <translation type="unfinished"></translation>
164
     </message>
165
     <message>
166
-        <location line="+425"/>
167
+        <location line="+426"/>
168
         <source>Matroska clusters</source>
169
         <translation type="unfinished"></translation>
170
     </message>
171
@@ -12856,7 +12890,7 @@
172
 <context>
173
     <name>mkvmuxer</name>
174
     <message>
175
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
176
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
177
         <source>Saving Mkv</source>
178
         <translation type="unfinished"></translation>
179
     </message>
180
@@ -12976,7 +13010,7 @@
181
         <translation type="unfinished"></translation>
182
     </message>
183
     <message>
184
-        <location line="+79"/>
185
+        <location line="+81"/>
186
         <source>Saving mp4</source>
187
         <translation type="unfinished"></translation>
188
     </message>
189
@@ -13380,12 +13414,12 @@
190
         <translation type="unfinished">屬性</translation>
191
     </message>
192
     <message>
193
-        <location line="+12"/>
194
+        <location line="+6"/>
195
         <source>Video</source>
196
         <translation type="unfinished">視訊</translation>
197
     </message>
198
     <message>
199
-        <location line="+15"/>
200
+        <location line="+24"/>
201
avidemux_2.6.20.tar.gz/avidemux/winInstaller/ChangeLog.release Added
75
 
1
@@ -0,0 +1,73 @@
2
+<!DOCTYPE html>
3
+<html>
4
+<head>
5
+    <meta content="text/html; charset=UTF-8" http-equiv="content-type">
6
+    <style type="text/css">
7
+        body {
8
+            margin: 0;
9
+            height: 100%;
10
+            font-family: Tahoma,Helvetica,Arial,sans-serif;
11
+            color: #333;
12
+        }
13
+
14
+        #inner {
15
+            margin: 0% 1% 0% 1%;
16
+        }
17
+
18
+        h1 {
19
+            padding: 0.5em;
20
+            font-family: Helvetica,Arial,sans-serif;
21
+            font-size: 1.8em;
22
+            font-weight: bold;
23
+            color: #1B57B1;
24
+            vertical-align: middle;
25
+            margin: 1em;
26
+        }
27
+
28
+        ul li {
29
+            list-style: inside;
30
+            padding: 0.8em;
31
+            margin: 0.2em;
32
+            border: 1px solid #ddd;
33
+            border-radius: 0.2em;
34
+            font-size: 0.8em;
35
+        }
36
+
37
+        ul li:nth-child(odd) {
38
+            background-color: #fafafa;
39
+        }
40
+
41
+        ul li:nth-child(even) {
42
+            background-color: #f0f0f0;
43
+        }
44
+
45
+    </style>
46
+    <title>Avidemux Changelog</title>
47
+</head>
48
+<body>
49
+    <div id="inner">
50
+        <h1>Changes in Avidemux v2.6.19 – v2.6.20</h1>
51
+        <ul>
52
+            <li><strong>Core:</strong> The bundled FFmpeg has been updated to version 3.0.7</li>
53
+            <li><strong>Core Encoder:</strong> A crash encoding MPEG-2 with B-frames disabled has been fixed</li>
54
+            <li><strong>Core Encoder:</strong> An error due to invalid decoding timestamps at the end of encoding with MPEG-2 has been fixed</li>
55
+            <li><strong>Core Audio:</strong> Sound issues including audio dropouts with AAC in MPEG TS fixed</li>
56
+            <li><strong>Core Audio:</strong> External AAC audio misidentified as E-AC3 fixed</li>
57
+            <li><strong>MKV Demuxer:</strong> FPS calculation improved</li>
58
+            <li><strong>MKV Demuxer:</strong> A crash with audio tracks using lacing extensively fixed</li>
59
+            <li><strong>MKV Muxer:</strong> The FPS value is set correctly now</li>
60
+            <li><strong>FLV Demuxer:</strong> File kept open preventing deletion fixed</li>
61
+            <li><strong>VPX Decoder:</strong> Swapped colors fixed, support for VP9 added</li>
62
+            <li><strong>macOS:</strong> Passing command line arguments to the application fixed</li>
63
+            <li><strong>VDPAU:</strong> Decode MPEG-1 instead of crashing</li>
64
+            <li><strong>Qt / Properties Dialog:</strong> A button to copy the data to clipboard added</li>
65
+            <li><strong>Qt / Filter Manager:</strong> Dynamically disable not applicable context menu entries in the list of active filters</li>
66
+            <li><strong>Qt / Filter Manager:</strong> Horizontal scrolling in the list of available filters eliminated</li>
67
+            <li><strong>Qt / MPlayer eq2 Plugin:</strong> The sliders on the right becoming squeezed horizontally fixed</li>
68
+            <li><strong>UI:</strong> File dialog not adding a file name extension when saving projects fixed (not in 64 bit builds for Windows yet)</li>
69
+            <li><strong>i18n:</strong> Russian and German translations updated (TotalCaesar659 / eumagga0x2a)</li>
70
+            <li><strong>Debug:</strong> Avidemux now prints the correct version string to the console or to the application log</li>
71
+        </ul>
72
+    </div>
73
+</body>
74
+</html>
75
avidemux_2.6.19.tar.gz/avidemux/winInstaller/createNsis64Qt5.sh -> avidemux_2.6.20.tar.gz/avidemux/winInstaller/createNsis64Qt5.sh Changed
9
 
1
@@ -1,7 +1,6 @@
2
 #!/bin/bash
3
 mkdir -p install
4
 rm -f install/*
5
-sh genlog.sh
6
 echo "#* Preparing 7z svn build *#*"
7
 echo "** Getting svn revision **"
8
 #cp /mingw/bin/iconv.dll /mingw/Release/
9
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
24
 
1
@@ -78,11 +78,18 @@
2
     bool pushBack(T *data)
3
     {
4
         queueElem *elem=new queueElem;
5
-        elem->next=head;
6
+        elem->next=NULL;
7
         elem->data=data;
8
-        if(!head) tail=elem;
9
-        head=elem;
10
-        return 1;
11
+
12
+        if(tail)
13
+        {
14
+            tail->next=elem;
15
+            tail=elem;
16
+        }else
17
+        {
18
+            head=tail=elem;
19
+        }
20
+        return true;
21
     }
22
     T *pop()
23
     {
24
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
10
 
1
@@ -98,7 +98,7 @@
2
         public:
3
 /// Default constructor
4
                        ADM_audioStream(WAVHeader *header,ADM_audioAccess *access);
5
-              virtual  ~ADM_audioStream() {}
6
+              virtual  ~ADM_audioStream() ;
7
 /// Returns wavheader
8
 virtual                 WAVHeader                *getInfo(void) {return &wavHeader;}
9
 ///  Get a packet
10
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
21
 
1
@@ -190,16 +190,16 @@
2
             return false;
3
     };
4
     // Need a 2nd packet...
5
-    const uint8_t *second=data+syncOffset;
6
+    const uint8_t *second=data+syncOffset+info.frameSizeInBytes;
7
     int size2=bufferSize-syncOffset;
8
     ADM_assert(size2>0);
9
     ADM_info("Maybe EAC3... \n");
10
     // Try on 2nd packet...
11
     if( ADM_EAC3GetInfo(second,size2, &syncOffset,&info2))
12
     {
13
-        if((info.frequency==info2.frequency) && (info.channels==info2.channels) && (info.byterate==info2.byterate))
14
+        if((info.frequency==info2.frequency) && (info.channels==info2.channels) && (info.byterate==info2.byterate) && !syncOffset)
15
         {
16
-            ADM_warning("\tProbably EAC3 : Fq=%d br=%d chan=%d\n",(int)info.frequency,(int)info.byterate,(int)info.channels);
17
+            ADM_warning("\tProbably EAC3 : Fq=%d br=%d chan=%d, offset=%d\n",(int)info.frequency,(int)info.byterate,(int)info.channels,syncOffset);
18
             oinfo.encoding=WAV_EAC3;
19
             oinfo.channels=info.channels;
20
             oinfo.byterate=info.byterate; // already in bytes/sec
21
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
93
 
1
@@ -13,6 +13,13 @@
2
 #include "ADM_audioStreamConstantChunk.h"
3
 #include "ADM_audioCodecEnum.h"
4
 /**
5
+ *
6
+ */
7
+ ADM_audioStream::~ADM_audioStream()
8
+ {
9
+ }
10
+
11
+/**
12
     \fn ADM_audioStream
13
     \brief constructor
14
 */
15
@@ -20,7 +27,7 @@
16
 {
17
     if(header)
18
         wavHeader=*header;
19
-    else    
20
+    else
21
         memset(&wavHeader,0,sizeof(wavHeader));
22
     this->access=access;
23
     lastDts=ADM_AUDIO_NO_DTS;
24
@@ -30,7 +37,7 @@
25
     {
26
         if(access->canGetDuration()==true)
27
                 durationInUs=access->getDurationInUs();
28
-        else    
29
+        else
30
                 durationInUs=0;
31
     }
32
     language=ADM_UNKNOWN_LANGUAGE;
33
@@ -78,15 +85,22 @@
34
     if(!access->getPacket(buffer,size,sizeMax,&dts)) return 0;
35
     // We got the packet
36
     // Try to guess the nbSample
37
-    if(dts==ADM_AUDIO_NO_DTS)
38
+    // if it is AAC, we hardcodec 1024 samples
39
+
40
+    if(wavHeader.encoding==WAV_AAC)
41
     {
42
-        if(wavHeader.encoding==WAV_AAC) 
43
-            *nbSample=1024;
44
-        else        
45
+        *nbSample=1024;
46
+        if(dts!=ADM_AUDIO_NO_DTS)
47
         {
48
-            *nbSample=512;
49
-            printf("[audioStream] Cant guess nb sample, setting 512\n");
50
+            setDts(dts);
51
         }
52
+        *odts=dts;
53
+        return 1;
54
+    }
55
+    if(dts==ADM_AUDIO_NO_DTS)
56
+    {
57
+        *nbSample=512;
58
+        ADM_warning("[audioStream] Cant guess nb sample, setting 512\n");
59
         *odts=ADM_AUDIO_NO_DTS;
60
         return 1;
61
     }
62
@@ -138,14 +152,14 @@
63
 bool              ADM_audioStream::isLanguageSet(void)
64
 {
65
     const std::string lang=getLanguage();
66
-    if(lang.size()!=3) 
67
+    if(lang.size()!=3)
68
         return false; // hackish...
69
     return true;
70
 }
71
 /**
72
  * @param samples
73
  * @param fq
74
- * @return 
75
+ * @return
76
  */
77
 /**
78
         \fn advanceDtsByCustomSample
79
@@ -169,7 +183,7 @@
80
     switch(wavheader->encoding)
81
     {
82
         case WAV_EAC3:
83
-            return new ADM_audioStreamEAC3(wavheader,access);    
84
+            return new ADM_audioStreamEAC3(wavheader,access);
85
         case WAV_AC3:
86
             return new ADM_audioStreamAC3(wavheader,access);
87
         case WAV_MP2:
88
@@ -224,4 +238,3 @@
89
 }
90
 
91
 // EOF
92
-
93
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
76
 
1
@@ -25,6 +25,7 @@
2
 
3
 extern "C" {
4
 #include "libavformat/url.h"
5
+#include "ADM_audioClock.h"
6
 }
7
 
8
 #if 1
9
@@ -245,13 +246,13 @@
10
 
11
                                         }else
12
                                         {
13
-                                            if(fourCC::check(stream->getFCC(),(uint8_t *)"MPEG1"))
14
+                                            if(fourCC::check(stream->getFCC(),(uint8_t *)"mpg1"))
15
                                             {
16
                                                 c->has_b_frames=1; // No PTS=cannot handle CTS...
17
                                                 c->max_b_frames=2;
18
                                                 c->codec_id= AV_CODEC_ID_MPEG1VIDEO;
19
                                             }
20
-                                            else if(fourCC::check(stream->getFCC(),(uint8_t *)"MPEG2"))
21
+                                            else if(fourCC::check(stream->getFCC(),(uint8_t *)"MPEG"))
22
                                             {
23
                                                 c->has_b_frames=1; // No PTS=cannot handle CTS...
24
                                                 c->max_b_frames=2;
25
@@ -391,16 +392,28 @@
26
         return true;
27
 }
28
 #define AUDIO_BUFFER_SIZE 48000*6*sizeof(float)
29
+/**
30
+ * \class MuxAudioPacket
31
+ */
32
 class MuxAudioPacket
33
 {
34
 public:
35
-    MuxAudioPacket() {eof=false;dts=ADM_NO_PTS;present=false;size=0;}
36
+    MuxAudioPacket() {eof=false;dts=ADM_NO_PTS;present=false;size=0;clock=NULL;}
37
+    ~MuxAudioPacket() 
38
+    {
39
+        if(clock) 
40
+        {
41
+            delete clock;
42
+            clock=NULL;
43
+        }
44
+    }
45
     uint8_t     buffer[AUDIO_BUFFER_SIZE];
46
     uint32_t    size;
47
     bool        eof;
48
     bool        present;
49
     uint64_t    dts;
50
     uint32_t    samples;
51
+    audioClock  *clock;
52
 };
53
 
54
 /**
55
@@ -434,6 +447,8 @@
56
     initUI(QT_TRANSLATE_NOOP("adm","Saving"));
57
     encoding->setContainer(getContainerName());
58
     MuxAudioPacket *audioPackets=new MuxAudioPacket[nbAStreams];
59
+    for(int i=0;i<nbAStreams;i++) // ugly...
60
+            audioPackets[i].clock=new audioClock(aStreams[i]->getInfo()->frequency);
61
     ADMBitstream out(bufSize);
62
     out.data=buffer;
63
 
64
@@ -535,6 +550,11 @@
65
                     AVPacket pkt;
66
                     uint64_t rescaledDts;
67
                     rescaledDts=audioTrack->dts;
68
+                    if(rescaledDts==ADM_NO_PTS)
69
+                        rescaledDts=audioTrack->clock->getTimeUs(); // we assume the 1st one has a PTS/DTS..., can we ?
70
+                    else
71
+                        audioTrack->clock->setTimeUs(rescaledDts);
72
+                    audioTrack->clock->advanceBySample(audioTrack->samples);
73
                     encoding->pushAudioFrame(audioTrack->size);
74
                     muxerRescaleAudioTime(audio,&rescaledDts,a->getInfo()->frequency);
75
                    //printf("[FF] A: Video frame  %d, audio Dts :%"PRIu64" size :%"PRIu32" nbSample : %"PRIu32" rescaled:%"PRIu64"\n",
76
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
10
 
1
@@ -44,7 +44,7 @@
2
     rational->num=1000;
3
     rational->den=fps1000;
4
     }
5
-    printf("[MP3] TimeBase for video %d/%d\n",rational->num,rational->den);
6
+    ADM_info(" TimeBase for video %d/%d\n",rational->num,rational->den);
7
 }
8
 /**
9
         \fn rescaleLavPts
10
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
39
 
1
@@ -442,7 +442,7 @@
2
         ADM_warning("No picture...\n");
3
         return false;
4
     }
5
-    aprintf("[ffMpeg4] Out Quant :%d, pic type %d keyf %d\n",out->out_quantizer,pict_type,keyframe);
6
+    aprintf("[ffMpeg4] Out Quant :%d, pic type %d keyf %d %p\n",out->out_quantizer,pict_type,keyframe,_context->coded_frame);
7
     out->len=size;
8
     out->flags=0;
9
     if(keyframe)
10
@@ -453,12 +453,23 @@
11
     // Update PTS/Dts
12
     if(!_context->max_b_frames)
13
     {
14
-            out->dts=out->pts=queueOfDts[0];
15
-            mapper.erase(mapper.begin());
16
-            queueOfDts.erase(queueOfDts.begin());
17
+            if(mapper.size())
18
+                mapper.erase(mapper.begin());
19
+            if(queueOfDts.size())
20
+            {
21
+                out->dts=out->pts=queueOfDts[0];
22
+                queueOfDts.erase(queueOfDts.begin());
23
+            }else
24
+            {
25
+                out->dts=out->pts=lastDts+ source->getInfo()->frameIncrement;
26
+                return false; // probably empty now
27
+            }
28
+
29
     } else
30
-    if(!getRealPtsFromInternal(_context->coded_frame->pts,&(out->dts),&(out->pts)))
31
-        return false;
32
+    {
33
+        if(!getRealPtsFromInternal(_context->coded_frame->pts,&(out->dts),&(out->pts)))
34
+                return false;
35
+    }
36
     // update lastDts
37
     lastDts=out->dts;
38
 
39
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
45
 
1
@@ -582,13 +582,13 @@
2
     // audio track
3
     if(_isaudiopresent)
4
     {
5
-        ADM_flvAccess *access=new ADM_flvAccess(name,audioTrack);
6
-        _audioStream=ADM_audioCreateStream(&wavHeader,access);
7
+        _access=new ADM_flvAccess(name,audioTrack);
8
+        _audioStream=ADM_audioCreateStream(&wavHeader,_access);
9
     }
10
     else
11
     {
12
         _audioStream = NULL;
13
-       access=NULL;
14
+       _access=NULL;
15
     }
16
 
17
   printf("[FLV]FLV successfully read\n");
18
@@ -827,7 +827,7 @@
19
   }
20
   if(_fd) fclose(_fd);
21
   if(_audioStream) delete _audioStream;
22
-  if(access) delete access;
23
+  if(_access) delete _access;
24
   
25
   
26
   _fd=NULL;
27
@@ -835,7 +835,7 @@
28
   videoTrack=NULL;
29
   audioTrack=NULL;
30
   _audioStream=NULL;
31
-  access=NULL;
32
+  _access=NULL;
33
   return 1;
34
 }
35
 /**
36
@@ -851,7 +851,7 @@
37
     videoTrack=NULL;
38
     audioTrack=NULL;
39
     _audioStream=NULL;
40
-    access=NULL;
41
+    _access=NULL;
42
     memset(&wavHeader,0,sizeof(wavHeader));
43
     metaWidth=0;
44
     metaHeight=0;
45
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
10
 
1
@@ -100,7 +100,7 @@
2
     flvTrak                 *audioTrack;
3
     WAVHeader               wavHeader;
4
     ADM_audioStream         *_audioStream;
5
-    ADM_flvAccess           *access;
6
+    ADM_flvAccess           *_access;
7
     /* */
8
     uint32_t            metaWidth,metaHeight,metaFps1000,videoCodec;
9
     uint32_t            metaFrameWidth,metaFrameHeight;
10
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
201
 
1
@@ -22,10 +22,52 @@
2
 #include "ADM_audioXiphUtils.h"
3
 #include "ADM_vidMisc.h"
4
 
5
+typedef struct
6
+{
7
+    int durationInUs;
8
+    int num;
9
+    int den;
10
+}frameRateStruct;
11
+
12
+static const frameRateStruct candidateFrameRate[]=
13
+{
14
+   {41708,1001,24000}, // 23.976 fps
15
+   {41667,1000,24000}, // 24 fps
16
+   {40000,1000,25000}, // 25 fps
17
+   {33367,1001,30000}, // 30 NTSC
18
+   {20853,2000,24000}, // 24*2
19
+   {20854,2002,24000}, // 23976*2
20
+   {20000,1000,50000}, // 50
21
+   {16683,1001,60000}, // 60 NTSCs
22
+   {16667,1000,60000} // 60 fps
23
+};
24
+
25
+static int getStdFrameRate(int interval)
26
+{
27
+  int n=sizeof(candidateFrameRate)/sizeof(frameRateStruct);
28
+  int delta=1000; // 1000 us error allowed
29
+  int bestMatch=-1;
30
+  for(int i=0;i<n;i++)
31
+  {
32
+      int er=abs(interval-candidateFrameRate[i].durationInUs);
33
+      if(er<1000) // 10 us error
34
+      {
35
+        if(er<delta)
36
+        {
37
+          delta=er;
38
+          bestMatch=i;
39
+        }
40
+      }
41
+  }
42
+  ADM_info("Best match is %d\n",bestMatch);
43
+  return bestMatch;
44
+}
45
+
46
+
47
 /**
48
     \fn open
49
     \brief Try to open the mkv file given as parameter
50
-    
51
+
52
 */
53
 
54
 uint8_t mkvHeader::open(const char *name)
55
@@ -68,7 +110,7 @@
56
   /* --*/
57
   if(!ebml.simplefind(MKV_SEGMENT,&len,true))
58
   {
59
-      printf("[MKV] Cannot find Segment\n");      
60
+      printf("[MKV] Cannot find Segment\n");
61
       return false;
62
   }
63
   _segmentPosition=ebml.tell();
64
@@ -77,7 +119,7 @@
65
   if(ebml.find(ADM_MKV_SECONDARY,MKV_SEGMENT,MKV_SEEK_HEAD,&alen))
66
   {
67
        ADM_ebml_file seekHead( &ebml,alen);
68
-       readSeekHead(&seekHead);       
69
+       readSeekHead(&seekHead);
70
   }
71
   /* Now find tracks */
72
   /* And analyze them */
73
@@ -97,7 +139,7 @@
74
   {
75
     printf("[MKV] Cluster indexing failed\n");
76
     return 0;
77
-  }  
78
+  }
79
   printf("[MKV]Found %u clusters\n",_clusters.size());
80
   printf("[MKV] Indexing video\n");
81
     if(!videoIndexer(&ebml))
82
@@ -113,8 +155,8 @@
83
         updateFlagsWithCue();
84
     }
85
     _cueTime.clear();
86
-  
87
-  
88
+
89
+
90
   _parser=new ADM_ebml_file();
91
   ADM_assert(_parser->open(name));
92
   _filename=ADM_strdup(name);
93
@@ -123,12 +165,12 @@
94
     for(int i=0;i<1+_nbAudioTrack;i++)
95
         ADM_info("Track %" PRIu32" has an index size of %d entries\n",i,_tracks[i].index.size());
96
 
97
-  
98
+
99
   if(isVC1Compatible(_videostream.fccHandler))
100
   {
101
       int       nb=_tracks[0].index.size();
102
       mkvTrak   *vid=_tracks;
103
-      
104
+
105
       ADM_warning("Deleting  timestamps. For VC1, they are often wrong\n");
106
       for(int i=1;i<nb-1;i++)
107
           vid->index[i].Pts=ADM_NO_PTS;
108
@@ -138,8 +180,8 @@
109
     uint32_t ptsdtsdelta, mindelta;
110
     bool hasBframe;
111
   ComputeDeltaAndCheckBFrames(&mindelta, &ptsdtsdelta,&hasBframe);
112
-  
113
-  
114
+
115
+
116
   int last=_tracks[0].index.size();
117
   uint64_t increment=_tracks[0]._defaultFrameDuration;
118
   uint64_t lastDts=0;
119
@@ -197,7 +239,7 @@
120
           printf("[MKV] Video Track duration for %u ms\n",duration32);
121
           // Useless.....
122
 
123
-        
124
+
125
 
126
           for(int i=0;i<_nbAudioTrack;i++)
127
           {
128
@@ -237,11 +279,82 @@
129
     return true;
130
 }
131
 /**
132
+    \fn checkDeviation
133
+    \brief returns the # of errors when forcing timestamp to be num/den (interval in us)
134
+      num=1000
135
+      den=24000 for a 24 fps
136
+
137
+
138
+*/
139
+int  mkvHeader::checkDeviation(int num, int den)
140
+{
141
+  mkvTrak *track=_tracks;
142
+  int nb=track->index.size();
143
+  int first=0;
144
+  double dHalf=(500000.*(double)num)/((double)den);
145
+  int half=dHalf-1; // half interval in us
146
+  int good=0,bad=0;
147
+  while(  track->index[first].Pts==ADM_NO_PTS && first<nb) first++; // we should have some at least
148
+  uint64_t zero= track->index[first].Pts;
149
+  ADM_info("Num=%d Den=%d half=%d zero=%d first=%d\n",num,den,half,(int)zero,first);
150
+  for(int i=first+1;i<nb;i++)
151
+  {
152
+    uint64_t pts=track->index[i].Pts;
153
+    if(pts<zero) continue;
154
+    pts-=zero;
155
+    double dmultiple=(pts+half);
156
+    dmultiple*=den;
157
+    dmultiple/=(1000000.*(double)num);
158
+    uint64_t multiple=(uint64_t)dmultiple;
159
+    int64_t reconstructed=(multiple*1000000*num)/den;
160
+    int64_t deviation=pts-reconstructed;
161
+    //printf("frame %d multiple = %d, deviation=%d\n",i,(int)multiple,(int)deviation);
162
+    if(deviation>2000)
163
+        bad++;
164
+    else
165
+        good++;
166
+  }
167
+  ADM_info("Den=%d Num=%d Good = %d, bad=%d\n",den,num,good,bad);
168
+  return bad  ;
169
+}
170
+/**
171
+    \fn checkDeviation
172
+    \brief Bypass the 1ms accuracy by making sure all the frames are in the form PTS=offset + N*frameInterval
173
+*/
174
+bool mkvHeader::enforceFixedFrameRate(int num, int den)
175
+{
176
+  mkvTrak *track=_tracks;
177
+  int nb=track->index.size();
178
+  double dHalf=(500000.*(double)num)/((double)den);
179
+  int half=dHalf-1; // half interval in us
180
+  int first=0;
181
+  int bad=0;
182
+  int good=0;
183
+  while(  track->index[first].Pts==ADM_NO_PTS && first<nb) first++; // we should have some at least
184
+  uint64_t zero= track->index[first].Pts;
185
+  ADM_info("Num=%d Den=%d half=%d zero=%d first=%d\n",num,den,half,(int)zero,first);
186
+  for(int i=first+1;i<nb;i++)
187
+  {
188
+    uint64_t pts=track->index[i].Pts;
189
+    if(pts<zero) continue;
190
+    pts-=zero;
191
+    double dmultiple=(pts+half);
192
+    dmultiple*=den;
193
+    dmultiple/=(1000000.*(double)num);
194
+    uint64_t multiple=(uint64_t)dmultiple;
195
+    int64_t reconstructed=(multiple*1000000*num)/den+zero;
196
+    //printf("frame %d multiple = %d, pts=%d, reconstructed=%d,delta = %d\n",i,(int)multiple,(int)pts,(int)reconstructed,(int)(pts-reconstructed));
197
+    track->index[i].Pts=reconstructed;
198
+  }
199
+  return true;
200
+}
201
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
60
 
1
@@ -3,7 +3,7 @@
2
                              -------------------
3
 
4
     Matroska demuxer
5
-    
6
+
7
     copyright            : (C) 2008 by mean
8
     email                : fixounet@free.fr
9
  ***************************************************************************/
10
@@ -71,7 +71,7 @@
11
   uint32_t  nbPackets; // number of blocks (used for audio)
12
   uint32_t  nbFrames;  // number of distinct frames
13
   uint32_t  length;    // Number o;f bytes seen
14
-  
15
+
16
   /* Used for both */
17
   uint8_t    *extraData;
18
   uint32_t   extraDataLen;
19
@@ -85,7 +85,7 @@
20
   std::string language;
21
 };
22
 
23
-#define MKV_MAX_LACES 31 // ?
24
+#define MKV_MAX_LACES 101 // ?
25
 /**
26
     \class mkvAccess
27
     \brief Matroska audio demuxer
28
@@ -129,7 +129,7 @@
29
                 virtual uint64_t  getDurationInUs(void);
30
                                     /// Go to a given time
31
                 virtual bool      goToTime(uint64_t timeUs);
32
-                                    /// Grab extra data                
33
+                                    /// Grab extra data
34
                 virtual bool      getPacket(uint8_t *buffer, uint32_t *size, uint32_t maxSize,uint64_t *dts);
35
                 virtual bool      getExtraData(uint32_t *l, uint8_t **d);
36
 };
37
@@ -183,12 +183,14 @@
38
     uint8_t                 rescaleTrack(mkvTrak *track,uint32_t durationMs);
39
 
40
     bool                    delayTrack(int index,mkvTrak *track, uint64_t value);
41
-    
42
+
43
     bool                    ComputeDeltaAndCheckBFrames(uint32_t *minDeltaX, uint32_t *maxDeltaX, bool *bFramePresent);
44
     bool                    updateFlagsWithCue(void); // in case we can trust it, update KEY_FRAME_FLAGS
45
     bool                    dumpVideoIndex(int maxIndex);
46
-    bool                    goBeforeAtomAtPosition(ADM_ebml_file *parser, uint64_t position,uint64_t &outputLen, 
47
+    bool                    goBeforeAtomAtPosition(ADM_ebml_file *parser, uint64_t position,uint64_t &outputLen,
48
                                                 MKV_ELEM_ID searchedId,const char *txt);
49
+    int                     checkDeviation(int num, int den);
50
+    bool                    enforceFixedFrameRate(int num, int den);
51
   public:
52
 
53
 
54
@@ -239,5 +241,3 @@
55
         int     readBufferSize;
56
 };
57
 #endif
58
-
59
-
60
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
186
 
1
@@ -46,7 +46,7 @@
2
 
3
    parser->seek(0);
4
    DIA_workingBase *work=createWorking(QT_TRANSLATE_NOOP("matroskademuxer","Matroska Images"));
5
-   
6
+
7
    readBufferSize=200*1024;
8
    readBuffer=new uint8_t[readBufferSize];
9
     //************
10
@@ -159,8 +159,8 @@
11
       return 1;
12
 }
13
 /**
14
- * 
15
- * @return 
16
+ *
17
+ * @return
18
  */
19
 static int mkvFindStartCode(uint8_t *& start, uint8_t *end)
20
 {
21
@@ -185,7 +185,7 @@
22
     if(isH264Compatible(fcc)) return true;
23
     if(isMpeg12Compatible(fcc)) return true;
24
     return false;
25
-    
26
+
27
 }
28
 
29
 /**
30
@@ -204,8 +204,9 @@
31
   ix.flags=0;
32
   ix.Dts=timecodeMS*_timeBase;
33
   ix.Pts=timecodeMS*_timeBase;
34
+  //printf("Track=%d, timecode=%d timeBase=%d, Pts=%d\n",track,(int)timecodeMS,(int)_timeBase,ix.Pts);
35
    uint32_t rpt=_tracks[0].headerRepeatSize;
36
-   
37
+
38
    // expand buffer if needed
39
    if(size>readBufferSize)
40
    {
41
@@ -220,12 +221,12 @@
42
   // since frame type is unreliable for mkv, we scan each frame
43
   // For the 2 most common cases : mp4 & h264.
44
   // Hackish, we already read the 3 bytes header
45
-  // But they are already taken into account in the size part 
46
+  // But they are already taken into account in the size part
47
   if(!track && canRederiveFrameType(_videostream.fccHandler)) // Track 0 is video
48
   {
49
     if( isMpeg4Compatible(_videostream.fccHandler))
50
     {
51
-        
52
+
53
             if(rpt)
54
                 memcpy(readBuffer,_tracks[0].headerRepeat,rpt);
55
             parser->readBin(readBuffer+rpt,size-3);
56
@@ -236,13 +237,13 @@
57
              vops[0].type=AVI_KEY_FRAME;
58
              ADM_searchVop(readBuffer,readBuffer+rpt+size-3,&nb,vops, &timeinc);
59
              ix.flags=vops[0].type;
60
-        
61
+
62
     }else
63
     if(isH264Compatible(_videostream.fccHandler))
64
     {
65
-                
66
+
67
                 uint32_t flags=AVI_KEY_FRAME;
68
-                
69
+
70
                 if(rpt)
71
                         memcpy(readBuffer,_tracks[0].headerRepeat,rpt);
72
                 parser->readBin(readBuffer+rpt,size-3);
73
@@ -256,9 +257,9 @@
74
 
75
     }/*else if(isH265Compatible(_videostream.fccHandler))
76
     {
77
-                
78
+
79
                 uint32_t flags=AVI_KEY_FRAME;
80
-                
81
+
82
                 if(rpt)
83
                         memcpy(readBuffer,_tracks[0].headerRepeat,rpt);
84
                 parser->readBin(readBuffer+rpt,size-3);
85
@@ -282,7 +283,7 @@
86
                 while(begin<end)
87
                 {
88
                     int code=mkvFindStartCode(begin,end);
89
-                    if(code==-1) 
90
+                    if(code==-1)
91
                     {
92
                         ADM_warning("[Mpg2InMkv]No startcode found\n");
93
                         break;
94
@@ -303,9 +304,9 @@
95
                         }
96
                         break;
97
                     }
98
-                    
99
-                }             
100
-                
101
+
102
+                }
103
+
104
     }else if(isVC1Compatible(_videostream.fccHandler))
105
     {
106
         if(rpt)
107
@@ -351,8 +352,8 @@
108
   ADM_MKV_TYPE type;
109
   const char *ss;
110
   uint64_t time;
111
-  
112
-  
113
+
114
+
115
 
116
   if(!goBeforeAtomAtPosition(parser, _cuePosition,vlen, MKV_CUES,"MKV_CUES"))
117
   {
118
@@ -417,7 +418,7 @@
119
               }
120
             }
121
             aprintf("Track %" PRIx64" segmentPos=%" PRIx64" Cluster Position 0x%" PRIx64" Cue position 0x%" PRIx64" Absolute=%" PRIx64" time %" PRIu64"\n",
122
-                  tid,_segmentPosition,cluster_position,cue_position,cue_position+cluster_position+_segmentPosition,time);  
123
+                  tid,_segmentPosition,cluster_position,cue_position,cue_position+cluster_position+_segmentPosition,time);
124
 
125
             if(!searchTrackFromTid(tid)) //only keep video i.e. track zero
126
             {
127
@@ -435,7 +436,7 @@
128
        ADM_info("[MKV] No Cue found\n");
129
        return false;
130
    }
131
-   
132
+
133
 }
134
 /**
135
         \fn indexClusters
136
@@ -469,7 +470,7 @@
137
         vlen=fileSize-pos;
138
     }
139
    ADM_ebml_file segment(parser,vlen);
140
-   
141
+
142
    DIA_workingBase *work=createWorking(QT_TRANSLATE_NOOP("matroskademuxer","Matroska clusters"));
143
    while(segment.simplefind(MKV_CLUSTER,&alen,0))
144
    {
145
@@ -522,13 +523,13 @@
146
  *     length
147
  *     Actual image <= We point here
148
  * Typically the difference is ~ 16 bytes, so we accept anything between 0 and32
149
- * @return 
150
+ * @return
151
  */
152
 bool  mkvHeader::updateFlagsWithCue(void)
153
 {
154
     int nbImages=_tracks[0].index.size();
155
     int nbCues=_cueTime.size();
156
-    
157
+
158
     int lastImage=0;
159
     ADM_info("Updating Flags with Cue\n");
160
     for(int curCue=0;curCue<nbCues;curCue++)
161
@@ -536,7 +537,7 @@
162
         uint64_t tim=_cueTime[curCue];
163
         for(int curImage=lastImage;curImage<nbImages;curImage++)
164
         {
165
-            uint64_t thisTime=_tracks[0].index[curImage].Pts/_timeBase;            
166
+            uint64_t thisTime=_tracks[0].index[curImage].Pts/_timeBase;
167
             if( tim== thisTime)
168
             {
169
                 // match!
170
@@ -548,12 +549,12 @@
171
         }
172
     }
173
     ADM_info("Updating Flags with Cue done\n");
174
-    return true;   
175
+    return true;
176
 }
177
 /**
178
- * 
179
+ *
180
  * @param mx
181
- * @return 
182
+ * @return
183
  */
184
 bool mkvHeader::dumpVideoIndex(int mx)
185
 {
186
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
18
 
1
@@ -77,6 +77,8 @@
2
         c = video_st->codec;
3
         rescaleFps(s->getAvgFps1000(),&(c->time_base));
4
         video_st->time_base=c->time_base;
5
+        video_st->avg_frame_rate.den =c->time_base.num;
6
+        video_st->avg_frame_rate.num =c->time_base.den;
7
         c->gop_size=15;
8
         
9
         if(true==mkvMuxerConfig.forceDisplayWidth && mkvMuxerConfig.displayWidth)
10
@@ -116,6 +118,7 @@
11
 
12
         ADM_assert(avformat_write_header(oc, &dict) >= 0);
13
         ADM_info("Timebase codec = %d/%d\n",video_st->time_base.num,video_st->time_base.den);
14
+        ADM_info("Timebase codec2 = %d/%d\n",c->time_base.num,c->time_base.den);
15
 //        ADM_info("Original timebase = %d/%d\n",myTimeBase.num,myTimeBase.den);
16
         
17
         
18
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
40
 
1
@@ -37,8 +37,20 @@
2
     vpx_codec_dec_cfg_t cfg;
3
     vpx_codec_flags_t flags=0; //VPX_CODEC_USE_POSTPROC
4
     vpx_codec_ctx_t *instance=new vpx_codec_ctx_t;
5
-    const struct vpx_codec_iface *iface = &vpx_codec_vp8_dx_algo;
6
-    
7
+    const struct vpx_codec_iface *iface;
8
+    if(fcc==MKFCC('V','P','8',' '))
9
+    {
10
+        iface = &vpx_codec_vp8_dx_algo;
11
+    }else if(fcc==MKFCC('V','P','9',' '))
12
+    {
13
+        iface = &vpx_codec_vp9_dx_algo;
14
+    }else
15
+    {
16
+        ADM_warning("Unsupported FCC\n");
17
+        delete instance;
18
+        return;
19
+    }
20
+
21
     memset(instance,0,sizeof(*instance));
22
     memset(&cfg,0,sizeof(cfg));
23
     cfg.threads=1;
24
@@ -93,11 +105,11 @@
25
             if(r)
26
             {
27
                     r->_planes[0]=img->planes[0];
28
-                    r->_planes[1]=img->planes[1];
29
-                    r->_planes[2]=img->planes[2];
30
+                    r->_planes[1]=img->planes[2];
31
+                    r->_planes[2]=img->planes[1];
32
                     r->_planeStride[0]=img->stride[0];
33
-                    r->_planeStride[1]=img->stride[1];
34
-                    r->_planeStride[2]=img->stride[2];
35
+                    r->_planeStride[1]=img->stride[2];
36
+                    r->_planeStride[2]=img->stride[1];
37
                     r->_colorspace=ADM_COLOR_YV12;
38
                     r->Pts=in->demuxerPts;
39
                     r->flags=in->flags;
40
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
18
 
1
@@ -14,12 +14,12 @@
2
 #include "ADM_default.h"
3
 #include "ADM_coreVideoDecoderInternal.h"
4
 #include "ADM_vpx.h"
5
-static uint32_t fccs[]={MKFCC('V','P','8',' '),0};
6
+static uint32_t fccs[]={MKFCC('V','P','8',' '),MKFCC('V','P','9',' '),0};
7
 ADM_DECLARE_VIDEO_DECODER_PREAMBLE(decoderVPX);
8
 ADM_DECLARE_VIDEO_DECODER_MAIN("vpx",
9
-                               "VP8/WebmM",
10
+                               "VP8/VP9/WebM",
11
                                "Decoder using libvpx (c) mean 2010",
12
                                 fccs, // No configuration
13
                                 NULL,
14
                                 1,0,0
15
-);
16
\ No newline at end of file
17
+);
18
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
10
 
1
@@ -258,7 +258,7 @@
2
    <item row="4" column="0" colspan="3">
3
     <widget class="QGraphicsView" name="graphicsView"/>
4
    </item>
5
-   <item row="2" column="0">
6
+   <item row="2" column="0" colspan="2">
7
     <layout class="QHBoxLayout" name="toolboxLayout"/>
8
    </item>
9
   </layout>
10
avidemux_2.6.19.tar.gz/cmake/admCPackRpm.cmake -> avidemux_2.6.20.tar.gz/cmake/admCPackRpm.cmake Changed
14
 
1
@@ -11,7 +11,11 @@
2
 ENDIF (X86_64_SUPPORTED)
3
 # Mandatory
4
 SET(CPACK_RPM_PACKAGE_VERSION "${AVIDEMUX_VERSION}")
5
-SET(CPACK_RPM_PACKAGE_RELEASE "1.r${ADM_SUBVERSION}.bootstrap")
6
+IF (ADM_SUBVERSION)
7
+        SET(CPACK_RPM_PACKAGE_RELEASE "1.r${ADM_SUBVERSION}.bootstrap")
8
+ELSE (ADM_SUBVERSION)
9
+        SET(CPACK_RPM_PACKAGE_RELEASE "1.bootstrap")
10
+ENDIF (ADM_SUBVERSION)
11
 
12
 SET(CPACK_RPM_PACKAGE_LICENSE "GPLv2+")
13
 SET(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")
14
avidemux_2.6.19.tar.gz/cmake/admCheckQt5.cmake -> avidemux_2.6.20.tar.gz/cmake/admCheckQt5.cmake Changed
23
 
1
@@ -7,14 +7,13 @@
2
         MESSAGE(STATUS "Checking for Qt 5*")
3
         MESSAGE(STATUS "******************")
4
         IF(CROSS)
5
-                MESSAGE(STATUS "Cross compiling override for QT5")
6
-                IF(TYPE2_CROSS_SETUP)
7
-                        SET(CROSS5 ${CROSS}/qt5/lib/cmake)
8
-                ELSE(TYPE2_CROSS_SETUP)
9
-                        SET(CROSS5 /usr/lib/x86_64-linux-gnu/cmake/)
10
-                ENDIF(TYPE2_CROSS_SETUP)
11
-                SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets)
12
-                SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets)
13
+                SET(CROSS5 ${QT_HOME}/lib/cmake)
14
+                MESSAGE(STATUS "Cross compiling override for QT5 : ${CROSS5}")
15
+                SET(CMAKE_MODULE_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_MODULE_PATH} )
16
+                SET(CMAKE_PREFIX_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_PREFIX_PATH} )
17
+                SET(CROSS5 ${QT_HOME}/lib64/cmake) # Mingw64
18
+                SET(CMAKE_MODULE_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_MODULE_PATH} )
19
+                SET(CMAKE_PREFIX_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_PREFIX_PATH} )
20
                 MESSAGE(STATUS "Search path ${CMAKE_MODULE_PATH}")
21
                 FIND_PACKAGE(Qt5Core)    
22
                 FIND_PACKAGE(Qt5Widgets)    
23
avidemux_2.6.19.tar.gz/cmake/avidemuxVersion.cmake -> avidemux_2.6.20.tar.gz/cmake/avidemuxVersion.cmake Changed
10
 
1
@@ -7,7 +7,7 @@
2
 include(admTimeStamp)
3
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
4
 SET(CPACK_PACKAGE_VERSION_MINOR "6")
5
-SET(CPACK_PACKAGE_VERSION_P     "19")
6
+SET(CPACK_PACKAGE_VERSION_P     "20")
7
 SET(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_P}")
8
 SET(AVIDEMUX_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") 
9
 SET(AVIDEMUX_API_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}") 
10
avidemux_2.6.19.tar.gz/cmake/osx/Avidemux2.6 -> avidemux_2.6.20.tar.gz/cmake/osx/Avidemux2.6 Changed
7
 
1
@@ -1,4 +1,4 @@
2
 #!/bin/sh
3
 DIR=`dirname $0`
4
 export FONTCONFIG_FILE=$DIR/../Resources/fonts/fonts.conf
5
-cd $DIR/../Resources/bin/ && ./avidemux
6
+cd "$DIR/../Resources/bin/" && ./avidemux "$@"
7