Packman Build Service PMBS

avidemux3.changes Changed

@@ -1,4 +1,56 @@
 -------------------------------------------------------------------
+Sun Aug 18 22:41:51 UTC 2019 - enzokiel@kabelmail.de
+
+- Update to version 2.7.4
+  + New Feature:Detect and warn when cut points in H.264 video
+    streams may result in playback issues despite being on keyframes
+  + FFmpeg:Update to the 4.1.4 release
+  + Core:Fix MSVC++ builds do not run when the path to user
+    directory contains non-ASCII characters
+  + Decoder:Fix DXVA2 HW accelerated decoding on Windows 7
+  + Decoder:Fix DXVA2 HW accelerated decoding stops sometimes on
+    cuts
+  + Decoder:Enable HW accelerated decoding of 8-bit HEVC for recent
+    versions of Intel graphics driver on Windows
+  + Encoder:Fix regression with saved x264 and x265 profiles not
+    found (MSVC++ only)
+  + Demuxer:Dynamically load VapourSynth Script library to avoid
+    error messages on Windows if VapourSynth is not found
+  + Demuxer:Provide correct average audio bitrate in the Mp4
+    demuxer if the exact value for the particular codec is unknown
+  + Demuxer:Fix crash loading MP4 file with number of audio tracks
+    exceeding the max supported
+  + Demuxer:Support audio tracks in fragmented MP4 files (the
+    variety with empty moov only)
+  + Demuxer:Support E-AC3 audio tracks in MP4 files
+  + Demuxer:Fix ASF demuxer still broken by chance with MSVC++
+    only, the fix relevant for all platforms
+  + Demuxer:Support more varieties of BMP images
+  + Muxer:Optimize output of the Mp4 muxer for streaming on
+    Windows too
+  + Muxer:Add option to the Mp4 muxer to output fragmented MP4
+    files
+  + Muxer:Label HEVC video in Mp4 in a way compatible with
+    QuickTime on macOS
+  + Filter:Fix assembly in Yadif deinterlacer with MSVC++
+  + UI:Enable automatic application scaling on Windows for recent
+    Qt versions
+  + UI:Fix silent mode, automatically confirm dialogs instead of
+    choosing the default option
+  + Audio:Support WMAPRO audio codec for decoding
+  + Audio:Support AAC with signal band replication (SBR) in
+    external audio tracks
+  + Audio:Fix saving AAC audio tracks with SBR to a file
+  + Audio:Improve resilience to false positives when probing
+    external audio files for AAC
+  + Miscellaneous:Fix crash with OpenGL or DXVA2 video output in 32
+    bits Avidemux on Windows (better late than never)
+  + Miscellaneous:Fix regressed handling of empty frames in MPEG-4
+    and FRAPS video streams
+  + Miscellaneous:Numerous other fixes and polish
+- Removed avidemux-cmake-permissions.patch, fixed upstream.
+
+-------------------------------------------------------------------
 Fri Mar 22 22:41:51 UTC 2019 - enzokiel@kabelmail.de
 
 - Update to version 2.7.3

avidemux3.spec Changed

avidemux-cmake-permissions.patch Deleted

avidemux-package_version.patch Changed

@@ -1,6 +1,6 @@
-diff -uNr avidemux_2.7.2/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp avidemux_2.7.2.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
---- avidemux_2.7.2/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2019-03-16 11:52:17.881954253 +0100
-+++ avidemux_2.7.2.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2019-03-16 11:56:10.833191154 +0100
+diff -uNr avidemux_2.7.4/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp avidemux_2.7.4.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
+--- avidemux_2.7.4/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2019-08-18 16:55:06.191443864 +0200
++++ avidemux_2.7.4.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2019-08-18 17:02:34.575044048 +0200
 @@ -143,7 +143,7 @@
      QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath();
  #else
@@ -10,9 +10,9 @@
  #endif
  
      QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode));
-diff -uNr avidemux_2.7.2/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.7.2.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
---- avidemux_2.7.2/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2019-03-16 11:52:17.853954826 +0100
-+++ avidemux_2.7.2.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2019-03-16 11:56:07.877251594 +0100
+diff -uNr avidemux_2.7.4/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.7.4.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
+--- avidemux_2.7.4/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2019-08-18 16:55:06.139443411 +0200
++++ avidemux_2.7.4.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2019-08-18 17:02:31.303019793 +0200
 @@ -103,14 +103,14 @@
      if(isPortable)
      {
@@ -30,7 +30,7 @@
          ADM_i18nDir=std::string(ppath);
          delete [] ppath;
          ppath=NULL;
-@@ -143,7 +143,7 @@
+@@ -142,7 +142,7 @@
      strcpy(ADM_basedir, homeEnv);
      AddSeparator(ADM_basedir);
  
@@ -39,9 +39,9 @@
  
      strcat(ADM_basedir, ADM_DIR_NAME);
      strcat(ADM_basedir, ADM_SEPARATOR);
-diff -uNr avidemux_2.7.2/avidemux_core/ADM_core/src/ADM_folder_mac.cpp avidemux_2.7.2.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp
---- avidemux_2.7.2/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2019-03-16 11:52:17.853954826 +0100
-+++ avidemux_2.7.2.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2019-03-16 11:56:07.877251594 +0100
+diff -uNr avidemux_2.7.4/avidemux_core/ADM_core/src/ADM_folder_mac.cpp avidemux_2.7.4.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp
+--- avidemux_2.7.4/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2019-08-18 16:55:06.139443411 +0200
++++ avidemux_2.7.4.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2019-08-18 17:02:31.307019824 +0200
 @@ -124,7 +124,7 @@
      strcpy(ADM_basedir, homeEnv);
      AddSeparator(ADM_basedir);
@@ -63,9 +63,9 @@
  #endif
      std::string r=std::string(ppath);
      delete [] ppath;
-diff -uNr avidemux_2.7.2/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp avidemux_2.7.2.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
---- avidemux_2.7.2/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2019-03-16 11:52:17.737957198 +0100
-+++ avidemux_2.7.2.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2019-03-16 11:56:04.405322583 +0100
+diff -uNr avidemux_2.7.4/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp avidemux_2.7.4.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
+--- avidemux_2.7.4/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2019-08-18 16:55:05.887441210 +0200
++++ avidemux_2.7.4.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2019-08-18 17:02:27.818993969 +0200
 @@ -265,7 +265,7 @@
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1,
  			(string("Executing ") + string(name) + string("...")).c_str());
@@ -75,9 +75,9 @@
  
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1, "Done");
  
-diff -uNr avidemux_2.7.2/cmake/se_plugin.cmake avidemux_2.7.2.new/cmake/se_plugin.cmake
---- avidemux_2.7.2/cmake/se_plugin.cmake	2019-03-16 11:52:17.401964068 +0100
-+++ avidemux_2.7.2.new/cmake/se_plugin.cmake	2019-03-16 11:56:12.493157213 +0100
+diff -uNr avidemux_2.7.4/cmake/se_plugin.cmake avidemux_2.7.4.new/cmake/se_plugin.cmake
+--- avidemux_2.7.4/cmake/se_plugin.cmake	2019-08-18 16:55:05.295436042 +0200
++++ avidemux_2.7.4.new/cmake/se_plugin.cmake	2019-08-18 17:02:36.735060059 +0200
 @@ -16,7 +16,7 @@
  if (WIN32)
      set(helpDir "${CMAKE_INSTALL_PREFIX}/help/${_engineName}")
@@ -87,17 +87,17 @@
  endif (WIN32)
  
      install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}" COMPONENT plugins)
-diff -uNr avidemux_2.7.2/cmake/sql/update.sh avidemux_2.7.2.new/cmake/sql/update.sh
---- avidemux_2.7.2/cmake/sql/update.sh	2019-03-16 11:52:17.921953435 +0100
-+++ avidemux_2.7.2.new/cmake/sql/update.sh	2019-03-16 11:56:12.229162611 +0100
+diff -uNr avidemux_2.7.4/cmake/sql/update.sh avidemux_2.7.4.new/cmake/sql/update.sh
+--- avidemux_2.7.4/cmake/sql/update.sh	2019-08-18 16:55:06.235444248 +0200
++++ avidemux_2.7.4.new/cmake/sql/update.sh	2019-08-18 17:02:36.499058309 +0200
 @@ -1,3 +1,3 @@
 -sqlite3 ~/.avidemux6/jobs.sql .d > dump
 +sqlite3 ~/.avidemux3/jobs.sql .d > dump
  #sql2class -sqlite -global -license -wrapped  -lib $PWD dump
  sql2class -sqlite -build -global -prefix $PWD -lib sqlJobs -namespace db -overwrite dump
-diff -uNr avidemux_2.7.2/cmake/Ts.cmake avidemux_2.7.2.new/cmake/Ts.cmake
---- avidemux_2.7.2/cmake/Ts.cmake	2019-03-16 11:52:17.393964231 +0100
-+++ avidemux_2.7.2.new/cmake/Ts.cmake	2019-03-16 11:56:12.265161875 +0100
+diff -uNr avidemux_2.7.4/cmake/Ts.cmake avidemux_2.7.4.new/cmake/Ts.cmake
+--- avidemux_2.7.4/cmake/Ts.cmake	2019-08-18 16:55:05.283435938 +0200
++++ avidemux_2.7.4.new/cmake/Ts.cmake	2019-08-18 17:02:36.523058487 +0200
 @@ -28,7 +28,7 @@
          IF(WIN32)
                  SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")

avidemux_2.7.3.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-4.1.1.tar.bz2 Deleted

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif_asm.c Deleted

@@ -1,232 +0,0 @@
-#include <stdlib.h>
-#include <inttypes.h>
-
-#include "ADM_default.h"
-
-
-#if defined( ADM_CPU_X86) && !defined(_MSC_VER)
-        #define CAN_DO_INLINE_X86_ASM
-#endif
-
-
-#ifdef CAN_DO_INLINE_X86_ASM
-#ifdef ADM_CPU_64BIT
-typedef int64_t x86_reg;
-#else
-typedef int32_t x86_reg;
-#endif
-
-#define LOAD4(mem,dst) \
-            "movd      "mem", "#dst" \n\t"\
-            "punpcklbw %%mm7, "#dst" \n\t"
-
-#define PABS(tmp,dst) \
-            "pxor     "#tmp", "#tmp" \n\t"\
-            "psubw    "#dst", "#tmp" \n\t"\
-            "pmaxsw   "#tmp", "#dst" \n\t"
-
-#define CHECK(pj,mj) \
-            "movq "#pj"(%[cur],%[mrefs]), %%mm2 \n\t" /* cur[x-refs-1+j] */\
-            "movq "#mj"(%[cur],%[prefs]), %%mm3 \n\t" /* cur[x+refs-1-j] */\
-            "movq      %%mm2, %%mm4 \n\t"\
-            "movq      %%mm2, %%mm5 \n\t"\
-            "pxor      %%mm3, %%mm4 \n\t"\
-            "pavgb     %%mm3, %%mm5 \n\t"\
-            "pand     %[pb1], %%mm4 \n\t"\
-            "psubusb   %%mm4, %%mm5 \n\t"\
-            "psrlq     $8,    %%mm5 \n\t"\
-            "punpcklbw %%mm7, %%mm5 \n\t" /* (cur[x-refs+j] + cur[x+refs-j])>>1 */\
-            "movq      %%mm2, %%mm4 \n\t"\
-            "psubusb   %%mm3, %%mm2 \n\t"\
-            "psubusb   %%mm4, %%mm3 \n\t"\
-            "pmaxub    %%mm3, %%mm2 \n\t"\
-            "movq      %%mm2, %%mm3 \n\t"\
-            "movq      %%mm2, %%mm4 \n\t" /* ABS(cur[x-refs-1+j] - cur[x+refs-1-j]) */\
-            "psrlq      $8,   %%mm3 \n\t" /* ABS(cur[x-refs  +j] - cur[x+refs  -j]) */\
-            "psrlq     $16,   %%mm4 \n\t" /* ABS(cur[x-refs+1+j] - cur[x+refs+1-j]) */\
-            "punpcklbw %%mm7, %%mm2 \n\t"\
-            "punpcklbw %%mm7, %%mm3 \n\t"\
-            "punpcklbw %%mm7, %%mm4 \n\t"\
-            "paddw     %%mm3, %%mm2 \n\t"\
-            "paddw     %%mm4, %%mm2 \n\t" /* score */
-
-#define CHECK1 \
-            "movq      %%mm0, %%mm3 \n\t"\
-            "pcmpgtw   %%mm2, %%mm3 \n\t" /* if(score < spatial_score) */\
-            "pminsw    %%mm2, %%mm0 \n\t" /* spatial_score= score; */\
-            "movq      %%mm3, %%mm6 \n\t"\
-            "pand      %%mm3, %%mm5 \n\t"\
-            "pandn     %%mm1, %%mm3 \n\t"\
-            "por       %%mm5, %%mm3 \n\t"\
-            "movq      %%mm3, %%mm1 \n\t" /* spatial_pred= (cur[x-refs+j] + cur[x+refs-j])>>1; */
-
-#define CHECK2 /* pretend not to have checked dir=2 if dir=1 was bad.\
-                  hurts both quality and speed, but matches the C version. */\
-            "paddw    %[pw1], %%mm6 \n\t"\
-            "psllw     $14,   %%mm6 \n\t"\
-            "paddsw    %%mm6, %%mm2 \n\t"\
-            "movq      %%mm0, %%mm3 \n\t"\
-            "pcmpgtw   %%mm2, %%mm3 \n\t"\
-            "pminsw    %%mm2, %%mm0 \n\t"\
-            "pand      %%mm3, %%mm5 \n\t"\
-            "pandn     %%mm1, %%mm3 \n\t"\
-            "por       %%mm5, %%mm3 \n\t"\
-            "movq      %%mm3, %%mm1 \n\t"
-
-void filter_line_mmx2(int mode, uint8_t *dst, const uint8_t *prev, const uint8_t *cur, const uint8_t *next, int w, int refs, int parity){
-    static const uint64_t pw_1 = 0x0001000100010001ULL;
-    static const uint64_t pb_1 = 0x0101010101010101ULL;
-//    const int mode = p->mode;
-    uint64_t tmp0, tmp1, tmp2, tmp3;
-    int x;
-
-#define FILTER\
-    for(x=0; x<w; x+=4){\
-        asm volatile(\
-            "pxor      %%mm7, %%mm7 \n\t"\
-            LOAD4("(%[cur],%[mrefs])", %%mm0) /* c = cur[x-refs] */\
-            LOAD4("(%[cur],%[prefs])", %%mm1) /* e = cur[x+refs] */\
-            LOAD4("(%["prev2"])", %%mm2) /* prev2[x] */\
-            LOAD4("(%["next2"])", %%mm3) /* next2[x] */\
-            "movq      %%mm3, %%mm4 \n\t"\
-            "paddw     %%mm2, %%mm3 \n\t"\
-            "psraw     $1,    %%mm3 \n\t" /* d = (prev2[x] + next2[x])>>1 */\
-            "movq      %%mm0, %[tmp0] \n\t" /* c */\
-            "movq      %%mm3, %[tmp1] \n\t" /* d */\
-            "movq      %%mm1, %[tmp2] \n\t" /* e */\
-            "psubw     %%mm4, %%mm2 \n\t"\
-            PABS(      %%mm4, %%mm2) /* temporal_diff0 */\
-            LOAD4("(%[prev],%[mrefs])", %%mm3) /* prev[x-refs] */\
-            LOAD4("(%[prev],%[prefs])", %%mm4) /* prev[x+refs] */\
-            "psubw     %%mm0, %%mm3 \n\t"\
-            "psubw     %%mm1, %%mm4 \n\t"\
-            PABS(      %%mm5, %%mm3)\
-            PABS(      %%mm5, %%mm4)\
-            "paddw     %%mm4, %%mm3 \n\t" /* temporal_diff1 */\
-            "psrlw     $1,    %%mm2 \n\t"\
-            "psrlw     $1,    %%mm3 \n\t"\
-            "pmaxsw    %%mm3, %%mm2 \n\t"\
-            LOAD4("(%[next],%[mrefs])", %%mm3) /* next[x-refs] */\
-            LOAD4("(%[next],%[prefs])", %%mm4) /* next[x+refs] */\
-            "psubw     %%mm0, %%mm3 \n\t"\
-            "psubw     %%mm1, %%mm4 \n\t"\
-            PABS(      %%mm5, %%mm3)\
-            PABS(      %%mm5, %%mm4)\
-            "paddw     %%mm4, %%mm3 \n\t" /* temporal_diff2 */\
-            "psrlw     $1,    %%mm3 \n\t"\
-            "pmaxsw    %%mm3, %%mm2 \n\t"\
-            "movq      %%mm2, %[tmp3] \n\t" /* diff */\
-\
-            "paddw     %%mm0, %%mm1 \n\t"\
-            "paddw     %%mm0, %%mm0 \n\t"\
-            "psubw     %%mm1, %%mm0 \n\t"\
-            "psrlw     $1,    %%mm1 \n\t" /* spatial_pred */\
-            PABS(      %%mm2, %%mm0)      /* ABS(c-e) */\
-\
-            "movq -1(%[cur],%[mrefs]), %%mm2 \n\t" /* cur[x-refs-1] */\
-            "movq -1(%[cur],%[prefs]), %%mm3 \n\t" /* cur[x+refs-1] */\
-            "movq      %%mm2, %%mm4 \n\t"\
-            "psubusb   %%mm3, %%mm2 \n\t"\
-            "psubusb   %%mm4, %%mm3 \n\t"\
-            "pmaxub    %%mm3, %%mm2 \n\t"\
-            "pshufw $9,%%mm2, %%mm3 \n\t"\
-            "punpcklbw %%mm7, %%mm2 \n\t" /* ABS(cur[x-refs-1] - cur[x+refs-1]) */\
-            "punpcklbw %%mm7, %%mm3 \n\t" /* ABS(cur[x-refs+1] - cur[x+refs+1]) */\
-            "paddw     %%mm2, %%mm0 \n\t"\
-            "paddw     %%mm3, %%mm0 \n\t"\
-            "psubw    %[pw1], %%mm0 \n\t" /* spatial_score */\
-\
-            CHECK(-2,0)\
-            CHECK1\
-            CHECK(-3,1)\
-            CHECK2\
-            CHECK(0,-2)\
-            CHECK1\
-            CHECK(1,-3)\
-            CHECK2\
-\
-            /* if(p->mode<2) ... */\
-            "movq    %[tmp3], %%mm6 \n\t" /* diff */\
-            "cmpl      $2, %[mode] \n\t"\
-            "jge       1f \n\t"\
-            LOAD4("(%["prev2"],%[mrefs],2)", %%mm2) /* prev2[x-2*refs] */\
-            LOAD4("(%["next2"],%[mrefs],2)", %%mm4) /* next2[x-2*refs] */\
-            LOAD4("(%["prev2"],%[prefs],2)", %%mm3) /* prev2[x+2*refs] */\
-            LOAD4("(%["next2"],%[prefs],2)", %%mm5) /* next2[x+2*refs] */\
-            "paddw     %%mm4, %%mm2 \n\t"\
-            "paddw     %%mm5, %%mm3 \n\t"\
-            "psrlw     $1,    %%mm2 \n\t" /* b */\
-            "psrlw     $1,    %%mm3 \n\t" /* f */\
-            "movq    %[tmp0], %%mm4 \n\t" /* c */\
-            "movq    %[tmp1], %%mm5 \n\t" /* d */\
-            "movq    %[tmp2], %%mm7 \n\t" /* e */\
-            "psubw     %%mm4, %%mm2 \n\t" /* b-c */\
-            "psubw     %%mm7, %%mm3 \n\t" /* f-e */\
-            "movq      %%mm5, %%mm0 \n\t"\
-            "psubw     %%mm4, %%mm5 \n\t" /* d-c */\
-            "psubw     %%mm7, %%mm0 \n\t" /* d-e */\
-            "movq      %%mm2, %%mm4 \n\t"\
-            "pminsw    %%mm3, %%mm2 \n\t"\
-            "pmaxsw    %%mm4, %%mm3 \n\t"\
-            "pmaxsw    %%mm5, %%mm2 \n\t"\
-            "pminsw    %%mm5, %%mm3 \n\t"\
-            "pmaxsw    %%mm0, %%mm2 \n\t" /* max */\
-            "pminsw    %%mm0, %%mm3 \n\t" /* min */\
-            "pxor      %%mm4, %%mm4 \n\t"\
-            "pmaxsw    %%mm3, %%mm6 \n\t"\
-            "psubw     %%mm2, %%mm4 \n\t" /* -max */\
-            "pmaxsw    %%mm4, %%mm6 \n\t" /* diff= MAX3(diff, min, -max); */\
-            "1: \n\t"\
-\
-            "movq    %[tmp1], %%mm2 \n\t" /* d */\
-            "movq      %%mm2, %%mm3 \n\t"\
-            "psubw     %%mm6, %%mm2 \n\t" /* d-diff */\
-            "paddw     %%mm6, %%mm3 \n\t" /* d+diff */\
-            "pmaxsw    %%mm2, %%mm1 \n\t"\
-            "pminsw    %%mm3, %%mm1 \n\t" /* d = clip(spatial_pred, d-diff, d+diff); */\
-            "packuswb  %%mm1, %%mm1 \n\t"\
-\
-            :[tmp0]"=m"(tmp0),\
-             [tmp1]"=m"(tmp1),\
-             [tmp2]"=m"(tmp2),\
-             [tmp3]"=m"(tmp3)\
-            :[prev] "r"(prev),\
-             [cur]  "r"(cur),\
-             [next] "r"(next),\
-             [prefs]"r"((x86_reg)refs),\
-             [mrefs]"r"((x86_reg)-refs),\
-             [pw1]  "m"(pw_1),\
-             [pb1]  "m"(pb_1),\

avidemux_2.7.3.tar.gz/appImage/avidemux.desktop -> avidemux_2.7.4.tar.gz/appImage/avidemux.desktop Changed

avidemux_2.7.3.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_dialog/alert_none.cpp -> avidemux_2.7.4.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_dialog/alert_none.cpp Changed

@@ -3,7 +3,6 @@
 #include "config.h"
 
 #include "ADM_default.h"
-#include "prefs.h"
 #include "DIA_coreToolkit.h"
 #include "DIA_coreUI_internal.h"
 
@@ -11,24 +10,24 @@
 static int beQuiet=0;
 static void boxStart(void)
 {
-  for(int i=0;i<BOX_SIZE;i++) fprintf(stderr,"*");
-  fprintf(stderr,"\n"); 
+    for(int i=0;i<BOX_SIZE;i++) fprintf(stderr,"*");
+    fprintf(stderr,"\n");
 }
 static void boxEnd(void)
 {
-  for(int i=0;i<BOX_SIZE;i++) fprintf(stderr,"*");
-  fprintf(stderr,"\n"); 
+    for(int i=0;i<BOX_SIZE;i++) fprintf(stderr,"*");
+    fprintf(stderr,"\n");
 }
 static void boxAdd(const char *str)
 {
-  int l=strlen(str);
-  fprintf(stderr, "* %s",str);
-  if(l+4<BOX_SIZE)
-  {
-    l=BOX_SIZE-l-4;
-      for(int i=0;i<BOX_SIZE;i++) fprintf(stderr,"");
-  }
-  fprintf(stderr," *\n"); 
+    int l=strlen(str);
+    fprintf(stderr, "* %s",str);
+    if(l+4<BOX_SIZE)
+    {
+        l=BOX_SIZE-l-4;
+        for(int i=0;i<BOX_SIZE;i++) fprintf(stderr,"");
+    }
+    fprintf(stderr," *\n");
 }
 
 
@@ -37,167 +36,147 @@
 extern DIA_workingBase    *createWorking(const char *title);
 extern DIA_encodingBase   *createEncoding(uint64_t duration);
 extern DIA_audioTrackBase *createAudioTrack( PoolOfAudioTracks *pool, ActiveAudioTracks *active );
-void            GUI_Info_HIG(const ADM_LOG_LEVEL level,const char *primary, const char *secondary_format)
+
+void GUI_Info_HIG(const ADM_LOG_LEVEL level,const char *primary, const char *secondary_format)
 {
-  uint32_t msglvl=2;
+    boxStart();
+    boxAdd("Info");
+    boxAdd(primary);
 
-        prefs->get(MESSAGE_LEVEL,&msglvl);
+    if(!secondary_format)
+    {
+        boxEnd();
+        return;
+    }
 
-        boxStart();
-        boxAdd("Info");
-        boxAdd(primary);   
-        
-        if(! secondary_format)
-        {
-                boxEnd();
-                return;
-        }
+    boxAdd(secondary_format);
+    boxEnd();
+}
 
+void GUI_Error_HIG(const char *primary, const char *secondary_format)
+{
+    boxStart();
+    boxAdd("Error");
+    boxAdd(primary);
+    if(!secondary_format)
+    {
+        boxEnd();
+        return;
+    }else
+    {
         boxAdd(secondary_format);
         boxEnd();
-        
+    }
 }
 
-void            GUI_Error_HIG(const char *primary, const char *secondary_format)
-{
-        boxStart();
-        boxAdd("Error");
-        boxAdd(primary);   
-        if(!secondary_format)
-        {
-                boxEnd();
-                return;
-        }else
-        {
-          boxAdd(secondary_format);
-          boxEnd();
-        }
-}
-int             GUI_Confirmation_HIG(const char *button_confirm, const char *primary, const char *secondary_format)
+int GUI_Confirmation_HIG(const char *button_confirm, const char *primary, const char *secondary_format)
 {
-   uint32_t msglvl=2;
-
-        prefs->get(MESSAGE_LEVEL,&msglvl);
-
-        boxStart();
-        boxAdd("Question");
+    boxStart();
+    boxAdd("Question");
 
-        boxAdd(button_confirm);
-        if(! secondary_format)
-        {
-                
-                boxEnd();
-        }
-        else
-        {
-            boxAdd(secondary_format);
-            boxEnd();
-        }
-        if (beQuiet)
-        {
-          boxAdd("--> First one\n");
-          return 0;
-        }
-        else
+    boxAdd(button_confirm);
+    if(!secondary_format)
+    {
+        boxEnd();
+    }else
+    {
+        boxAdd(secondary_format);
+        boxEnd();
+    }
+    if (beQuiet)
+    {
+        boxAdd("--> Automatically confirmed\n");
+        return 1;
+    }else
+    {
+        int x;
+        while(1)
         {
-          int x;
-          while(1)
-          {
             printf("Are you sure (Y/y or N/n ):\n");
             x=tolower(getchar());
             if(x=='y') return 1;
             if(x=='n') return 0;
-          }
         }
-        return 0; 
+    }
+    return 0;
 }
 
-int             GUI_YesNo(const char *primary, const char *secondary_format)
+int GUI_YesNo(const char *primary, const char *secondary_format)
 {
-   uint32_t msglvl=2;
+    boxStart();
+    boxAdd("Question");
+    boxAdd(primary);
 
-        prefs->get(MESSAGE_LEVEL,&msglvl);
-
-        boxStart();
-        boxAdd("Question");
-        boxAdd(primary);
-
-        
-        if(! secondary_format)
-        {
-                boxEnd();
-        }
-        else
-        {
-            boxAdd(secondary_format);
-            boxEnd();
-        }
-        if (beQuiet)
-        {
-          boxAdd("--> First one\n");
-          return 0;
-        }

avidemux_2.7.3.tar.gz/avidemux/common/ADM_audioCodec/src/ADM_codecpcm16.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_audioCodec/src/ADM_codecpcm16.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_bridge.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_bridge.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_film2pal.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_film2pal.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_commonUI/CMakeLists.txt -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_commonUI/CMakeLists.txt Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_commonUI/DIA_prefs.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_commonUI/DIA_prefs.cpp Changed

@@ -31,7 +31,9 @@
 extern void 		AVDM_audioPref( void );
 extern const char* getNativeRendererDesc(int type);
 
-
+#if defined(USE_DXVA2) || defined(USE_VDPAU) || defined(USE_LIBVA) || defined(USE_VIDEOTOOLBOX)
+    #define HW_ACCELERATED_DECODING
+#endif
 
 uint8_t DIA_Preferences(void);
 
@@ -60,7 +62,6 @@
 bool     loadDefault=false;
 char     *alsaDevice=NULL;
 
-bool     balternate_mp3_tag=true;
 bool     lastReadDirAsTarget=false;
 bool     copyModeSanitizeDts=false;
 bool     altKeyboardShortcuts=false;
@@ -69,11 +70,18 @@
 uint32_t pp_type=3;
 uint32_t pp_value=5;
 
+uint32_t editor_cache_size=16;
+
+#ifdef USE_DXVA2
 bool     bdxva2=false;
+bool     bdxva2_override_version=false;
+bool     bdxva2_override_profile=false;
+#endif
 bool     bvdpau=false;
-bool     bxvba=false;
 bool     blibva=false;
+#ifdef USE_VIDEOTOOLBOX
 bool     bvideotoolbox=false;
+#endif
 bool     hzd,vzd,dring;
 bool     capsMMX,capsMMXEXT,caps3DNOW,caps3DNOWEXT,capsSSE,capsSSE2,capsSSE3,capsSSSE3,capsAll;
 bool     hasOpenGl=false;
@@ -140,22 +148,26 @@
         if( prefs->get(DEVICE_AUDIO_ALSA_DEVICE, &alsaDevice) != RC_OK )
                 alsaDevice = ADM_strdup("plughw:0,0");
 #endif
+        // Video cache
+        prefs->get(FEATURES_CACHE_SIZE,&editor_cache_size);
+#ifdef USE_DXVA2
         // dxva2
-        
-        prefs->get(FEATURES_DXVA2,&bdxva2);                
+        prefs->get(FEATURES_DXVA2,&bdxva2);
+        prefs->get(FEATURES_DXVA2_OVERRIDE_BLACKLIST_VERSION,&bdxva2_override_version);
+        prefs->get(FEATURES_DXVA2_OVERRIDE_BLACKLIST_PROFILE,&bdxva2_override_profile);
+#endif
+#ifdef USE_VDPAU
         // vdpau
         prefs->get(FEATURES_VDPAU,&bvdpau);
-        // xvba
-        prefs->get(FEATURES_XVBA,&bxvba);
+#endif
+#ifdef USE_LIBVA
         // libva
         prefs->get(FEATURES_LIBVA,&blibva);
-        // VideoToolbox
+#endif
 #ifdef USE_VIDEOTOOLBOX
+        // VideoToolbox
         prefs->get(FEATURES_VIDEOTOOLBOX,&bvideotoolbox);
 #endif
-        // Alternate mp3 tag (haali)
-        prefs->get(FEATURES_ALTERNATE_MP3_TAG,&balternate_mp3_tag);
-
         // Video renderer
         if(prefs->get(VIDEODEVICE,&render)!=RC_OK)
         {
@@ -215,18 +227,22 @@
         olddevice=newdevice=AVDM_getCurrentDevice();
         // Audio device
         /************************ Build diaelems ****************************************/
+#ifdef HW_ACCELERATED_DECODING
+    #if defined(USE_DXVA2)
         diaElemToggle useDxva2(&bdxva2,QT_TRANSLATE_NOOP("adm","Decode video using DXVA2 (windows)"));
+        diaElemToggle dxva2OverrideVersion(&bdxva2_override_version,QT_TRANSLATE_NOOP("adm","Ignore driver blacklist (Intel)"));
+        diaElemToggle dxva2OverrideProfile(&bdxva2_override_profile,QT_TRANSLATE_NOOP("adm","Ignore codec blacklist (Intel, HEVC 10bit)"));
+    #elif defined(USE_VIDEOTOOLBOX)
+        diaElemToggle useVideoToolbox(&bvideotoolbox,QT_TRANSLATE_NOOP("adm","Decode video using VideoToolbox (macOS)"));
+    #else
         diaElemToggle useVdpau(&bvdpau,QT_TRANSLATE_NOOP("adm","Decode video using VDPAU (NVIDIA)"));
-        diaElemToggle useXvba(&bxvba,QT_TRANSLATE_NOOP("adm","Decode video using XVBA (AMD)"));
         diaElemToggle useLibVA(&blibva,QT_TRANSLATE_NOOP("adm","Decode video using LIBVA (INTEL)"));
-#ifdef USE_VIDEOTOOLBOX
-        diaElemToggle useVideoToolbox(&bvideotoolbox,QT_TRANSLATE_NOOP("adm","Decode video using VideoToolbox (macOS)"));
-#endif
-        diaElemToggle useOpenGl(&hasOpenGl,QT_TRANSLATE_NOOP("adm","Enable openGl support"));
-#ifndef USE_VIDEOTOOLBOX
+    #endif
+    #ifndef USE_VIDEOTOOLBOX
         diaElemReadOnlyText hwAccelText(NULL,QT_TRANSLATE_NOOP("adm","If you use Hw decoding, it is better to use the matching display driver"),NULL);
+    #endif
 #endif
-
+        diaElemToggle useOpenGl(&hasOpenGl,QT_TRANSLATE_NOOP("adm","Enable openGl support"));
         diaElemToggle allowAnyMpeg(&mpeg_no_limit,QT_TRANSLATE_NOOP("adm","_Accept non-standard audio frequency for DVD"));
         diaElemToggle resetEncoder(&loadDefault,QT_TRANSLATE_NOOP("adm","_Revert to saved default output settings on video load"));
         diaElemToggle enableAltShortcuts(&altKeyboardShortcuts,QT_TRANSLATE_NOOP("adm","_Enable alternative keyboard shortcuts"));
@@ -286,10 +302,13 @@
         framePriority.swallow(&menuIndexPriority);
         framePriority.swallow(&menuPlaybackPriority);
 
-        diaElemToggle togTagMp3(&balternate_mp3_tag,QT_TRANSLATE_NOOP("adm","_Use alternative tag for MP3 in .mp4"));
         diaElemToggle useLastReadAsTarget(&lastReadDirAsTarget,QT_TRANSLATE_NOOP("adm","_Default to the directory of the last read file for saving"));
         diaElemToggle sanitizeDtsInCopyMode(&copyModeSanitizeDts,QT_TRANSLATE_NOOP("adm","_Sanitize decode time stamps (DTS) in copy mode"));
 
+        diaElemFrame frameCache(QT_TRANSLATE_NOOP("adm","Caching of decoded pictures"));
+        diaElemUInteger cacheSize(&editor_cache_size,QT_TRANSLATE_NOOP("adm","_Cache size:"),8,16);
+        frameCache.swallow(&cacheSize);
+
         diaMenuEntry videoMode[]={
                              {RENDER_GTK, getNativeRendererDesc(0), NULL}
 #ifdef USE_XV
@@ -301,10 +320,6 @@
 #ifdef USE_DXVA2
                              ,{RENDER_DXVA2,   QT_TRANSLATE_NOOP("adm","DXVA2 (best)"),NULL}
 #endif
-#ifdef USE_XVBA
-                             //,{RENDER_XVBA,   QT_TRANSLATE_NOOP("adm","XVBA (best)"),NULL}
-#endif
-
 #ifdef USE_OPENGL
                              ,{RENDER_QTOPENGL,   QT_TRANSLATE_NOOP("adm","OpenGL (best)"),NULL}
 #endif
@@ -439,7 +454,7 @@
 
 
         /* Output */
-        diaElem *diaOutput[]={&allowAnyMpeg,&togTagMp3,&sanitizeDtsInCopyMode,&useLastReadAsTarget};
+        diaElem *diaOutput[]={&allowAnyMpeg,&sanitizeDtsInCopyMode,&useLastReadAsTarget,&frameCache};
         diaElemTabs tabOutput(QT_TRANSLATE_NOOP("adm","Output"),4,(diaElem **)diaOutput);
 
         /* Audio */
@@ -479,12 +494,15 @@
 #endif
         diaElemTabs tabVideo(QT_TRANSLATE_NOOP("adm","Display"),sizeof(diaVideo)/sizeof(diaElem *),(diaElem **)diaVideo);
         /* HW accel */
-#ifdef USE_VIDEOTOOLBOX
+#ifdef USE_DXVA2
+        diaElem *diaHwDecoding[]={&useDxva2,&dxva2OverrideVersion,&dxva2OverrideProfile,&hwAccelText};
+        diaElemTabs tabHwDecoding(QT_TRANSLATE_NOOP("adm","HW Accel"),4,(diaElem **)diaHwDecoding);
+#elif defined(USE_VIDEOTOOLBOX)
         diaElem *diaHwDecoding[]={&useVideoToolbox};
         diaElemTabs tabHwDecoding(QT_TRANSLATE_NOOP("adm","HW Accel"),1,(diaElem **)diaHwDecoding);
-#else
-        diaElem *diaHwDecoding[]={&useVdpau,&useXvba,&useLibVA,&useDxva2,&hwAccelText};
-        diaElemTabs tabHwDecoding(QT_TRANSLATE_NOOP("adm","HW Accel"),5,(diaElem **)diaHwDecoding);
+#elif defined(HW_ACCELERATED_DECODING)
+        diaElem *diaHwDecoding[]={&useVdpau,&useLibVA,&hwAccelText};
+        diaElemTabs tabHwDecoding(QT_TRANSLATE_NOOP("adm","HW Accel"),3,(diaElem **)diaHwDecoding);
 #endif
 
         /* CPU tab */
@@ -502,24 +520,18 @@
         diaElemTabs tabAvisynth("Avisynth",2,(diaElem **)diaAvisynth);
 
         /* Global Glyph tab */
-
-
-                diaElemTabs *tabs[]={&tabUser,&tabOutput,&tabAudio,&tabVideo,
-                                &tabHwDecoding,  &tabCpu,&tabThreading, &tabAvisynth};
-                
-       void *factoryCookiez=diaFactoryRunTabsPrepare(QT_TRANSLATE_NOOP("adm","Preferences"),8,tabs);
-
+#ifdef HW_ACCELERATED_DECODING
+        diaElemTabs *tabs[]={&tabUser, &tabOutput, &tabAudio, &tabVideo, &tabHwDecoding, &tabCpu, &tabThreading, &tabAvisynth};
+        void *factoryCookiez=diaFactoryRunTabsPrepare(QT_TRANSLATE_NOOP("adm","Preferences"),8,tabs);
+#else
+        diaElemTabs *tabs[]={&tabUser, &tabOutput, &tabAudio, &tabVideo, &tabCpu, &tabThreading, &tabAvisynth};
+        void *factoryCookiez=diaFactoryRunTabsPrepare(QT_TRANSLATE_NOOP("adm","Preferences"),7,tabs);
+#endif
 // Now we can disable stuff if needed
-#ifndef USE_VIDEOTOOLBOX
-    #ifndef USE_DXVA2
-       useDxva2.enable(false);
-    #endif
+#if defined(HW_ACCELERATED_DECODING) && !defined(USE_VIDEOTOOLBOX) && !defined(USE_DXVA2)
     #ifndef USE_VDPAU
         useVdpau.enable(false);
     #endif
-    #ifndef USE_XVBA
-        useXvba.enable(false);
-    #endif
     #ifndef USE_LIBVA
         useLibVA.enable(false);
     #endif
@@ -600,7 +612,8 @@
             prefs->set(UPDATE_ENABLED,doAutoUpdate);
             // Video render
             prefs->set(VIDEODEVICE,render);
-
+            // Video cache
+            prefs->set(FEATURES_CACHE_SIZE, editor_cache_size);
             // number of threads

avidemux_2.7.3.tar.gz/avidemux/common/ADM_commonUI/myOwnMenu.h -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_commonUI/myOwnMenu.h Changed

@@ -27,123 +27,125 @@
     Action     event;
     const char *icon;
     const char *shortCut;
+    bool       translated; // If true, circumvent translator in buildMenu, the string is already translated.
+
 }MenuEntry;
 
 #ifdef MENU_DECLARE
 static const MenuEntry _myMenuFile[] = {
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Open"),               NULL,ACT_OPEN_VIDEO,       MKICON(fileopen), "Ctrl+O"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Append"),             NULL,ACT_APPEND_VIDEO     ,NULL,             "Ctrl+A"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save"),               NULL,ACT_SAVE_VIDEO       ,MKICON(filesaveas),"Ctrl+S"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Queue"),              NULL,ACT_SAVE_QUEUE       ,NULL              ,"Ctrl+U"},
-            {MENU_SUBMENU,QT_TRANSLATE_NOOP("adm","Save as Image"),     NULL,ACT_DUMMY    ,NULL,NULL},
-            {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save as BMP"),     NULL,ACT_SAVE_BMP ,NULL,"Ctrl+M"},
-            {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save as PNG"),     NULL,ACT_SAVE_PNG ,NULL,"Ctrl+P"},
-            {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save as JPEG"),    NULL,ACT_SAVE_JPG ,NULL,"Ctrl+E"},
-            {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save Selection as JPEG"),NULL,ACT_SAVE_BUNCH_OF_JPG,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Close"),              NULL,ACT_CLOSE          ,NULL,                "Ctrl+W"},
-            {MENU_SEPARATOR,QT_TRANSLATE_NOOP("adm","-"),               NULL,ACT_DUMMY             ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Information"),        NULL,ACT_VIDEO_PROPERTIES,                 MKICON(info),NULL},
-            {MENU_SEPARATOR,QT_TRANSLATE_NOOP("adm","-"),               NULL,ACT_DUMMY             ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Connect to avsproxy"),NULL,ACT_AVS_PROXY,NULL},
-            {MENU_SEPARATOR,QT_TRANSLATE_NOOP("adm","-"),               NULL,ACT_DUMMY             ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Quit"),               NULL,ACT_EXIT           ,NULL,"Ctrl+Q"}
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Open"),               NULL,ACT_OPEN_VIDEO,    MKICON(fileopen),"Ctrl+O",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Append"),             NULL,ACT_APPEND_VIDEO,  NULL,"Ctrl+A",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save"),               NULL,ACT_SAVE_VIDEO,    MKICON(filesaveas),"Ctrl+S",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Queue"),              NULL,ACT_SAVE_QUEUE,    NULL,"Ctrl+U",0},
+            {MENU_SUBMENU,QT_TRANSLATE_NOOP("adm","Save as Image"),     NULL,ACT_DUMMY,         NULL,NULL,0},
+            {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save as BMP"),     NULL,ACT_SAVE_BMP,      NULL,"Ctrl+M",0},
+            {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save as PNG"),     NULL,ACT_SAVE_PNG,      NULL,"Ctrl+P",0},
+            {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save as JPEG"),    NULL,ACT_SAVE_JPG,      NULL,"Ctrl+E",0},
+            {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save Selection as JPEG"),NULL,ACT_SAVE_BUNCH_OF_JPG,NULL,NULL,0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Close"),              NULL,ACT_CLOSE,         NULL,"Ctrl+W",0},
+            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Information"),        NULL,ACT_VIDEO_PROPERTIES, MKICON(info),NULL,0},
+            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Connect to avsproxy"),NULL,ACT_AVS_PROXY,NULL,0},
+            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Quit"),               NULL,ACT_EXIT,           NULL,"Ctrl+Q",0}
         };
 
 std::vector<MenuEntry> myMenuFile(_myMenuFile, _myMenuFile + sizeof(_myMenuFile) / sizeof(_myMenuFile[0]));
 
 static const MenuEntry _myMenuRecent[] = {
-            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL},
+            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
 #ifdef __APPLE__
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Clear recent items"), NULL,ACT_CLEAR_RECENT,NULL,"Ctrl+Shift+Backspace"}
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Clear recent items"), NULL,ACT_CLEAR_RECENT,  NULL,"Ctrl+Shift+Backspace",0}
 #else
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Clear recent items"), NULL,ACT_CLEAR_RECENT,NULL,"Ctrl+Shift+Delete"}
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Clear recent items"), NULL,ACT_CLEAR_RECENT,  NULL,"Ctrl+Shift+Delete",0}
 #endif
         };
 
 std::vector<MenuEntry> myMenuRecent(_myMenuRecent, _myMenuRecent + sizeof(_myMenuRecent) / sizeof(_myMenuRecent[0]));
 
 static const MenuEntry _myMenuEdit[] = {
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Undo"),               NULL,ACT_Undo       ,NULL,"Ctrl+Z"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Redo"),               NULL,ACT_Redo       ,NULL,"Ctrl+Y"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Edit"),         NULL,ACT_ResetSegments,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Cut"),                NULL,ACT_Cut        ,NULL,"Ctrl+X"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Copy"),               NULL,ACT_Copy       ,NULL,"Ctrl+C"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Paste"),              NULL,ACT_Paste      ,NULL,"Ctrl+V"},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Undo"),               NULL,ACT_Undo,          NULL,"Ctrl+Z",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Redo"),               NULL,ACT_Redo,          NULL,"Ctrl+Y",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Edit"),         NULL,ACT_ResetSegments, NULL,NULL,0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Cut"),                NULL,ACT_Cut,           NULL,"Ctrl+X",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Copy"),               NULL,ACT_Copy,          NULL,"Ctrl+C",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Paste"),              NULL,ACT_Paste,         NULL,"Ctrl+V",0},
 #ifdef __APPLE__
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Delete"),             NULL,ACT_Delete     ,NULL,"Backspace"},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Delete"),             NULL,ACT_Delete,        NULL,"Backspace",0},
 #else
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Delete"),             NULL,ACT_Delete     ,NULL,"Delete"},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Delete"),             NULL,ACT_Delete,        NULL,"Delete",0},
 #endif
-            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY             ,NULL,       NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Set Marker A"),       NULL,ACT_MarkA      ,NULL,"Ctrl+PgUp"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Set Marker B"),       NULL,ACT_MarkB      ,NULL,"Ctrl+PgDown"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Markers"),      NULL,ACT_ResetMarkers,NULL,"Ctrl+Home"},
-            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY             ,NULL,       NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Pr&eferences"),       NULL,ACT_PREFERENCES,NULL,NULL},
-            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY             ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save current settings as default"), NULL,ACT_SaveAsDefault,NULL,"Ctrl+Alt+D"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Load saved settings"),              NULL,ACT_LoadDefault,  NULL,"Ctrl+R"}
+            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Set Marker A"),       NULL,ACT_MarkA,         NULL,"Ctrl+PgUp",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Set Marker B"),       NULL,ACT_MarkB,         NULL,"Ctrl+PgDown",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Markers"),      NULL,ACT_ResetMarkers,  NULL,"Ctrl+Home",0},
+            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Pr&eferences"),       NULL,ACT_PREFERENCES,   NULL,NULL,0},
+            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save current settings as default"), NULL,ACT_SaveAsDefault,NULL,"Ctrl+Alt+D",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Load saved settings"),              NULL,ACT_LoadDefault,  NULL,"Ctrl+R",0}
         };
 
 std::vector<MenuEntry> myMenuEdit(_myMenuEdit, _myMenuEdit + sizeof(_myMenuEdit) / sizeof(_myMenuEdit[0]));
 
 static const MenuEntry _myMenuVideo[] = {
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Decoder Option"),     NULL,ACT_DecoderOption      ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","PostProcessing"),     NULL,ACT_SetPostProcessing  ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Filters"),            NULL,ACT_VIDEO_FILTERS      ,NULL,"Ctrl+Alt+F"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Play filtered"),      NULL,ACT_PreviewChanged     ,NULL,NULL}
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Decoder Option"),     NULL,ACT_DecoderOption,     NULL,NULL,0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","PostProcessing"),     NULL,ACT_SetPostProcessing, NULL,NULL,0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Filters"),            NULL,ACT_VIDEO_FILTERS,     NULL,"Ctrl+Alt+F",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Play filtered"),      NULL,ACT_PreviewChanged,    NULL,NULL,0}
         };
 
 std::vector<MenuEntry> myMenuVideo(_myMenuVideo, _myMenuVideo + sizeof(_myMenuVideo) / sizeof(_myMenuVideo[0]));
 
 static const MenuEntry _myMenuAudio[] = {
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Select Track"),       NULL,ACT_AUDIO_SELECT_TRACK ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save audio"),         NULL,ACT_SAVE_AUDIO         ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Filters"),            NULL,ACT_AUDIO_FILTERS      ,NULL,NULL},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Select Track"),       NULL,ACT_AUDIO_SELECT_TRACK,NULL,NULL,0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save audio"),         NULL,ACT_SAVE_AUDIO,        NULL,NULL,0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Filters"),            NULL,ACT_AUDIO_FILTERS,     NULL,NULL,0},
         };
 
 std::vector<MenuEntry> myMenuAudio(_myMenuAudio, _myMenuAudio + sizeof(_myMenuAudio) / sizeof(_myMenuAudio[0]));
 
 static const MenuEntry _myMenuHelp[] = {
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Build Option"),       NULL,ACT_BUILT_IN           ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Plugins"),            NULL,ACT_PLUGIN_INFO        ,NULL,NULL},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Build Option"),       NULL,ACT_BUILT_IN,          NULL,NULL,0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Plugins"),            NULL,ACT_PLUGIN_INFO,       NULL,NULL,0},
 #ifdef _WIN32
-			{MENU_SEPARATOR,"-",NULL,ACT_DUMMY             ,NULL,NULL},
-			{MENU_SUBMENU, QT_TRANSLATE_NOOP("adm","&Advanced"), NULL, ACT_DUMMY, NULL, NULL},
-			{MENU_SUBACTION, QT_TRANSLATE_NOOP("adm","Open Application &Log"), NULL, ACT_OPEN_APP_LOG, NULL, NULL},
-			{MENU_SUBACTION, QT_TRANSLATE_NOOP("adm","Open Application Data &Folder"), NULL, ACT_OPEN_APP_FOLDER, NULL, NULL},
+            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
+            {MENU_SUBMENU,QT_TRANSLATE_NOOP("adm","&Advanced"),         NULL,ACT_DUMMY,             NULL,NULL,0},
+            {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Open Application &Log"),NULL,ACT_OPEN_APP_LOG, NULL, NULL,0},
+            {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Open Application Data &Folder"),NULL,ACT_OPEN_APP_FOLDER,NULL,NULL,0},
 #endif
-            {MENU_SEPARATOR,"-",                                        NULL,ACT_DUMMY             ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","About"),              NULL,ACT_ABOUT              ,NULL,NULL},
+            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","About"),              NULL,ACT_ABOUT,             NULL,NULL,0}
         };
 
 std::vector<MenuEntry> myMenuHelp(_myMenuHelp, _myMenuHelp + sizeof(_myMenuHelp) / sizeof(_myMenuHelp[0]));
 std::vector<MenuEntry> myMenuTool;
 
 static const MenuEntry _myMenuGo[] = {
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Play/Stop"),           NULL,ACT_PlayAvi        ,MKICON(player_play),   "Space"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Frame"),      NULL,ACT_PreviousFrame  ,MKICON(back),          "Left"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Frame"),          NULL,ACT_NextFrame      ,MKICON(forward),       "Right"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Intra Frame"),NULL,ACT_PreviousKFrame ,MKICON(player_rew),    "Down"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Intra Frame"),    NULL,ACT_NextKFrame     ,MKICON(player_fwd),    "Up"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Black Frame"),NULL,ACT_PrevBlackFrame ,MKICON(prev_black),    NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Black Frame"),    NULL,ACT_NextBlackFrame ,MKICON(next_black),    NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","First Frame"),         NULL,ACT_Begin          ,MKICON(player_start),  "Home"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Last Frame"),          NULL,ACT_End            ,MKICON(player_end),    "End"},
-            {MENU_SEPARATOR,"-",               NULL,ACT_DUMMY          , NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Marker A"),      NULL,ACT_GotoMarkA      ,MKICON(markA)         ,"PgUp"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Marker B"),      NULL,ACT_GotoMarkB      ,MKICON(markB)         ,"PgDown"},
-            {MENU_SEPARATOR,"-",               NULL,ACT_DUMMY          , NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Time"),          NULL,ACT_GotoTime       ,NULL,                 "Ctrl+T" },
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Play/Stop"),           NULL,ACT_PlayAvi,         MKICON(player_play),   "Space",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Frame"),      NULL,ACT_PreviousFrame,   MKICON(back),          "Left",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Frame"),          NULL,ACT_NextFrame,       MKICON(forward),       "Right",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Intra Frame"),NULL,ACT_PreviousKFrame,  MKICON(player_rew),    "Down",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Intra Frame"),    NULL,ACT_NextKFrame,      MKICON(player_fwd),    "Up",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Black Frame"),NULL,ACT_PrevBlackFrame,  MKICON(prev_black),    NULL,0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Black Frame"),    NULL,ACT_NextBlackFrame,  MKICON(next_black),    NULL,0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","First Frame"),         NULL,ACT_Begin,           MKICON(player_start),  "Home",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Last Frame"),          NULL,ACT_End,             MKICON(player_end),    "End",0},
+            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Marker A"),      NULL,ACT_GotoMarkA,       MKICON(markA),         "PgUp",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Marker B"),      NULL,ACT_GotoMarkB,       MKICON(markB),         "PgDown",0},
+            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY, NULL,NULL,1},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Time"),          NULL,ACT_GotoTime,        NULL,                  "Ctrl+T",0}
         };
 
 std::vector<MenuEntry> myMenuGo(_myMenuGo, _myMenuGo + sizeof(_myMenuGo) / sizeof(_myMenuGo[0]));
 
 static const MenuEntry _myMenuView[] = {
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 1:4"),      NULL,ACT_ZOOM_1_4 ,NULL,"4"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 1:2"),      NULL,ACT_ZOOM_1_2 ,NULL,"3"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 1:1"),      NULL,ACT_ZOOM_1_1 ,NULL,"2"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 2:1"),      NULL,ACT_ZOOM_2_1 ,NULL,"1"},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 1:4"),   NULL,ACT_ZOOM_1_4,    NULL,"4",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 1:2"),   NULL,ACT_ZOOM_1_2,    NULL,"3",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 1:1"),   NULL,ACT_ZOOM_1_1,    NULL,"2",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Zoom 2:1"),   NULL,ACT_ZOOM_2_1,    NULL,"1",0}
         };
 
 std::vector<MenuEntry> myMenuView(_myMenuView, _myMenuView + sizeof(_myMenuView) / sizeof(_myMenuView[0]));

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/include/ADM_edCache.h -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/include/ADM_edCache.h Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/include/ADM_edit.hxx -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/include/ADM_edit.hxx Changed

@@ -63,6 +63,19 @@
         ENV_EDITOR_LAST=   0x8000
 }_ENV_EDITOR_FLAGS;
 
+/**
+    \enum ADM_cutPointType
+    \brief keep track of potential problems when in copy mode
+*/
+typedef enum
+{
+    ADM_EDITOR_CUT_POINT_IDR,
+    ADM_EDITOR_CUT_POINT_NON_IDR,
+    ADM_EDITOR_CUT_POINT_RECOVERY,
+    ADM_EDITOR_CUT_POINT_MISMATCH,
+    ADM_EDITOR_CUT_POINT_UNCHECKED
+}ADM_cutPointType;
+
 class ADM_edAudioTrackFromVideo;
 class ADM_edAudioTrack;
 
@@ -116,7 +129,7 @@
                     void        recalibrateSigned(int64_t *time,_SEGMENT *seg);
                     bool        updateImageTiming(_SEGMENT *seg,ADMImage *image);
                     // Need to get the image just before targetPts
-                    bool        decodeTillPictureAtPts(uint64_t targetPts,ADMImage *image);
+                    uint8_t     decodeTillPictureAtPts(uint64_t targetPts,ADMImage *image);
                     bool        getFrameNumFromPtsOrBefore(_VIDEOS *v,uint64_t refTime,int &frameNumber);
 
 protected:
@@ -149,7 +162,7 @@
                     uint32_t    _currentSegment;    // Current video segment
                     int64_t     _nextFrameDts;      // COPYMODE Used in copy mode to fill the missing timestamp
                                                     // Warning, it is actually the DTS of the NEXT frame to fetch
-                    uint8_t     compBuffer[MAXIMUM_SIZE * MAXIMUM_SIZE * 3]; // Buffer used for decoding
+                    uint8_t     compBuffer[ADM_COMPRESSED_MAX_DATA_LENGTH]; // Buffer used for decoding
                     bool        endOfStream; // The decoder has been flushed and no more compressed images from demuxer
 //****************************** Audio **********************************
                     // _audiooffset points to the offset / the total segment
@@ -164,9 +177,7 @@
                     bool        checkSamplingFrequency(ADM_audioStreamTrack *trk); // detect implicit SBR in AAC
 
 //****************************** Audio **********************************
-                    void        deleteAllVideos(void );
                     uint8_t     getMagic(const char *name,uint32_t *magic);
-                    uint32_t    searchForwardSeg(uint32_t startframe);
                     bool        rederiveFrameType(vidHeader *demuxer);
 
   public:
@@ -211,7 +222,6 @@
 					int 		saveImageJpg(const char *filename);
                     int         saveImagePng(const char *filename);
                     uint8_t 	cleanup( void);
-                    bool        isMultiSeg( void);
 /************************************* Markers *****************************/
 private:
                     uint64_t    markerAPts,markerBPts;
@@ -233,7 +243,7 @@
 protected:
                     ListOfUndoQueueElements undoQueue;
                     static const uint8_t maxUndoSteps=50;
-                    uint32_t    _cnt; // track the nb of performed undo steps for redo
+                    uint32_t    _undo_counter; // track the nb of performed undo steps for redo
 public:
                     bool        addToUndoQueue(void);
                     bool        undo(void);
@@ -249,18 +259,20 @@
                     bool        goToTimeVideo(uint64_t time);
                     void		getCurrentFrameFlags(uint32_t *flags, uint32_t *quantiser);
                     bool        goToIntraTimeVideo(uint64_t time);
-                    bool        nextPicture(ADMImage *image,bool dontcross=false);
+                    bool        nextPicture(ADMImage *image, int flags=0); // 1 = don't cross segment, 2 = don't skip to next keyframe
                     bool        samePicture(ADMImage *image);
                     bool        previousPicture(ADMImage *image);
                     bool        rewind(void);
 // Used for stream copy
                     bool        GoToIntraTime_noDecoding(uint64_t time,uint32_t *toframe=NULL);
-                    bool        getCompressedPicture(uint64_t delay,bool sanitizeDts,ADMCompressedImage *img);     //COPYMODE
+                    bool        getCompressedPicture(uint64_t start,uint64_t delay,bool sanitizeDts,ADMCompressedImage *img); //COPYMODE
                     // Use only for debug purpose !!!
                     bool        getDirectImageForDebug(uint32_t frameNum,ADMCompressedImage *img);
-                    bool        checkCutsAreOnIntra(void);
-                    bool        checkCutIsOnIntra(uint64_t time);
+                    ADM_cutPointType checkCutsAreOnIntra(void);
+                    ADM_cutPointType checkCutsAreOnIntra(uint64_t start,uint64_t end);
+                    ADM_cutPointType checkCutIsOnIntra(uint64_t time);
 private:
+                    ADM_cutPointType checkSegmentStartsOnIntra(uint32_t seg);
                     uint64_t    totalExtraDelay;
                     int64_t     desyncScore;
 public:

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/include/ADM_segment.h -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/include/ADM_segment.h Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/include/IEditor.h -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/include/IEditor.h Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/src/ADM_edRender.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/ADM_edRender.cpp Changed

@@ -209,7 +209,7 @@
     \fn NextPicture
     \brief decode & returns the next picture
 */
-bool        ADM_Composer::nextPicture(ADMImage *image,bool dontcross)
+bool ADM_Composer::nextPicture(ADMImage *image, int flags)
 {
 uint64_t pts;
 uint64_t tail;
@@ -240,6 +240,10 @@
                 maxPts=seg->_refStartTimeUs+seg->_durationUs;
             if(false== nextPictureInternal(seg->_reference,image,maxPts))
             {
+                if(flags & 2)
+                {
+                    goto np_nextSeg;
+                }
                 uint64_t nkfPts=maxPts;
                 uint32_t frame=0;
                 if(searchNextKeyFrameInRef(seg->_reference,refPts,&nkfPts) && nkfPts<maxPts)
@@ -278,7 +282,7 @@
 
 // Try to get an image for the following segment....
 np_nextSeg:
-        if(true==dontcross)
+        if(flags & 1)
         {
             ADM_warning("Not allowed to cross segment\n");
             return false;
@@ -306,7 +310,7 @@
                 dont want to decode the targetPts if it is a keyframe
                 but have the frame before
 */
-bool ADM_Composer::decodeTillPictureAtPts(uint64_t targetPts,ADMImage *image)
+uint8_t ADM_Composer::decodeTillPictureAtPts(uint64_t targetPts,ADMImage *image)
 {
  // Go to the previous keyframe and decode forward...
                 uint32_t thisSeg=_currentSegment;
@@ -328,22 +332,22 @@
                 uint64_t previousKf;
                 if(false==searchPreviousKeyFrameInRef(ref,refTime,&previousKf))
                 {
-                    ADM_warning("Cannot find previous keyframe in ref %d, time=%" PRIu64" \n",ref,refTime);
+                    ADM_warning("Cannot find previous keyframe in ref %d for ref time %s\n",ref,ADM_us2plain(refTime));
                     return false;
                 }
                 // go to it...
                 if(false==seektoTime(ref,previousKf,false))
                 {
-                    ADM_warning("Cannot seek to time=%" PRIu64" \n",previousKf);
+                    ADM_warning("Cannot seek to ref time %s\n",ADM_us2plain(previousKf));
                     return false;            
                 }
                 // Now forward till we reach out frame
                 while(1)
                 {
-                    if(false==nextPicture(image,true))
+                    if(false==nextPicture(image,3))
                     {
                             ADM_warning("Error in decoding forward\n");
-                            return false;
+                            return ADM_IGN;
                     }
                     if(image->Pts>=targetPts)
                             break;
@@ -352,10 +356,10 @@
                 }
                 if(image->Pts!=targetPts)
                 {
-                    ADM_error("Could not retrieve our own frame at PTS=%" PRIu64" ms\n",targetPts/1000);
-                    return false;
+                    ADM_warning("Could not retrieve our own frame at %s\n",ADM_us2plain(targetPts));
+                    return ADM_IGN;
                 }
-                return true;
+                return 1;
 }
 /**
     \fn previousPicture
@@ -388,7 +392,7 @@
         }
         ADMImage *cached=vid->_videoCache->getBefore(refPts);
        
-        if(cached)
+        if(cached && cached->Pts<refPts)
         {
             if(cached->Pts>=seg->_refStartTimeUs) // It might be in the cache but belonging to the previous seg
             {
@@ -419,12 +423,18 @@
         seg=_segments.getSegment(segNo);
         if(segNo==_currentSegment) // Still in the same segment..
         {
-                if(false==decodeTillPictureAtPts(targetPts,image))
+                switch(decodeTillPictureAtPts(targetPts,image))
                 {
-                    ADM_error("Cannot decode till our current pts\n");
-                    return false;
+                    case 1:
+                        cached=vid->_videoCache->getBefore(refPts);
+                        break;
+                    case ADM_IGN:
+                        ADM_warning("Cannot decode till our current pts\n");
+                        cached=vid->_videoCache->getLast();
+                        break;
+                    default:
+                        return false;
                 }
-                cached=vid->_videoCache->getBefore(refPts);
                 if(cached)
                 {
                     if(cached->Pts>=seg->_refStartTimeUs)
@@ -455,10 +465,13 @@
         vid=_segments.getRefVideo(seg->_reference);
         
 
-        decodeTillPictureAtPts(targetPts,image);
+        if(false==decodeTillPictureAtPts(targetPts,image))
+        {
+            ADM_error("Cannot decode to get a candidate.\n");
+            return false;
+        }
         _currentSegment=segNo;
         // We may have overshot...
-        uint64_t last=vid->lastDecodedPts;
         _segments.LinearToRefTime(_currentSegment,targetPts,&refPts);
         ADMImage *candidate=vid->_videoCache->getLast();
         if(!candidate)
@@ -639,10 +652,8 @@
         // If the refStartTime is 0, it is the first image
         // But the fist image might not be = 0
       _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
-      vidHeader 	*demuxer=vid->_aviheader;  
       ADM_assert(vid);
       uint64_t from=seg->_refStartTimeUs;
-      uint64_t pts,dts;
 
       if(!from) from=vid->firstFramePts;

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/src/ADM_edRenderInternal.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/ADM_edRenderInternal.cpp Changed

@@ -37,10 +37,9 @@
 */
 bool ADM_Composer::seektoTime(uint32_t ref,uint64_t timeToSeek,bool dontdecode)
 {
-   _VIDEOS *vid=_segments.getRefVideo(ref);
-    vidHeader *demuxer=vid->_aviheader;
-	EditorCache   *cache =vid->_videoCache;
-	ADM_assert(cache);
+    _VIDEOS *vid=_segments.getRefVideo(ref);
+    EditorCache   *cache =vid->_videoCache;
+    ADM_assert(cache);
     bool found=false;
     if(timeToSeek>vid->firstFramePts && !dontdecode)
     {
@@ -48,7 +47,7 @@
         if(image)
         {
             vid->lastDecodedPts=vid->lastReadPts=timeToSeek;
-            ADM_info("Image found in cache, pts=%" PRIu64" ms\n",timeToSeek/1000);
+            ADM_info("Image found in cache, pts=%" PRIu64" ms, last sent frame: %" PRIu32"\n",timeToSeek/1000,vid->lastSentFrame);
             endOfStream=false;
             return true;
         }
@@ -96,7 +95,7 @@
         vid->lastReadPts=pts;
         if(pts==timeToSeek)
         {
-            ADM_info("Image found, pts=%" PRIu64" ms\n",pts/1000);
+            ADM_info("Image found, pts=%" PRIu64" ms, last sent frame: %" PRIu32"\n",pts/1000,vid->lastSentFrame);
             return true;
         }
         if(pts>timeToSeek)
@@ -119,9 +118,8 @@
 bool ADM_Composer::samePictureInternal(uint32_t ref,ADMImage *out)
 {
     _VIDEOS *vid=_segments.getRefVideo(ref);
-    vidHeader *demuxer=vid->_aviheader;
-	EditorCache   *cache =vid->_videoCache;
-	ADM_assert(cache);
+    EditorCache   *cache =vid->_videoCache;
+    ADM_assert(cache);
 
   ADMImage *in=cache->getByPts(vid->lastDecodedPts);
   if(!in)
@@ -177,7 +175,7 @@
             // Duplicate
             if(out)
             {
-                aprintf("[getNextPicture] Looking for after> %" PRIu64", got %" PRIu64" delta=%" PRIi32" ms\n",vid->lastReadPts,img->Pts,(img->Pts-vid->lastReadPts)/1000);
+                aprintf("[getNextPicture] Looking for after> %" PRIu64", got %" PRIu64" delta=%" PRId64" ms\n",vid->lastReadPts,img->Pts,((int64_t)img->Pts-(int64_t)vid->lastReadPts)/1000);
                 out->duplicate(img);
                 vid->lastReadPts=img->Pts;
                 currentFrame++;
@@ -209,11 +207,11 @@
 */
 bool ADM_Composer::DecodeNextPicture(uint32_t ref)
 {
-  EditorCache   *cache;
-  ADMImage	*result;
-  bool drain=false;
-  uint32_t  flags;
-   _VIDEOS *vid=_segments.getRefVideo(ref);
+    EditorCache *cache;
+    ADMImage *result,*last;
+    bool drain=false;
+
+    _VIDEOS *vid=_segments.getRefVideo(ref);
     vidHeader *demuxer=vid->_aviheader;
     ADM_assert(vid->decoder);
     if(vid->decoder->endOfStreamReached())
@@ -236,7 +234,7 @@
     {
         if(!demuxer->getFrame(frame,&img))
         {
-            ADM_warning("getFrame failed for frame %" PRIu32"\n",vid->lastSentFrame);
+            ADM_warning("getFrame failed for frame %" PRIu32"\n",frame);
             drain=true;
             vid->decoder->setDrainingState(true);
         }else
@@ -244,11 +242,14 @@
             endOfStream=false;
         }
     }
+    // Be prepared for the case that the decoder doesn't output a picture
+    // but tells us to repeat the previous one.
+    last=cache->getLast();
     // Now uncompress it...
     result=cache->getFreeImage();
     if(!result)
     {
-        ADM_warning(" Cache full for frame %" PRIu32"\n",vid->lastSentFrame);
+        ADM_warning(" Cache full for frame %" PRIu32"\n",frame);
         return false;
     }
     if(!drain)
@@ -260,41 +261,59 @@
     }
     if(!decompressImage(result,&img,ref))
     {
-        ADM_info("Decoding error for frame %" PRIu32", not necessarily a problem\n",vid->lastSentFrame);
+        if(false==vid->decoder->keepFeeding())
+            ADM_info("Error decoding frame %" PRIu32"\n",frame);
         stats.nbNoImage++;
         cache->invalidate(result);
         if(drain)
             endOfStream=true;
          return true; // Not an error in itself
     }
-        aprintf("Got image with PTS=%s\n",ADM_us2plain(result->Pts));
-     uint64_t pts=result->Pts;
-     uint64_t old=vid->lastDecodedPts;
-        if(pts==ADM_COMPRESSED_NO_PTS || vid->dontTrustBFramePts) // No PTS available ?
+    if(result->_noPicture) // Handle N-VOP in mpeg4
+    {
+        if(last && !last->_noPicture)
+            result->duplicate(last);
+        else if(result->isWrittable())
+            result->blacken();
+        result->_noPicture=0;
+        result->flags=AVI_P_FRAME;
+        result->Pts=ADM_NO_PTS;
+    }
+    // else aprintf("Got a fresh image with PTS=%s\n",ADM_us2plain(result->Pts));
+    uint64_t pts=result->Pts;
+    uint64_t old=vid->lastDecodedPts;
+    if(pts==ADM_COMPRESSED_NO_PTS || vid->dontTrustBFramePts) // No PTS available ?
+    {
+        aprintf("[Editor] No PTS, guessing value\n");
+        aprintf("Image Pts : %s\n",ADM_us2plain(img.demuxerPts));
+        aprintf("Image Dts : %s\n",ADM_us2plain(img.demuxerDts));
+        vid->lastDecodedPts+=vid->timeIncrementInUs;
+        uint64_t pts=img.demuxerPts;
+        uint64_t dts=img.demuxerDts;
+        uint32_t origin=0;
+        if(frame>=vid->decoderDelay)
+            origin=frame-vid->decoderDelay;
+        demuxer->getPtsDts(origin,&pts,&dts);
+        if(dts!=ADM_NO_PTS && (vid->dontTrustBFramePts || vid->_aviheader->providePts()==false))
         {
-                aprintf("[Editor] No PTS, guessing value\n");
-                aprintf("Image Pts : %s\n",ADM_us2plain(img.demuxerPts));
-                aprintf("Image Dts : %s\n",ADM_us2plain(img.demuxerDts));
-                vid->lastDecodedPts+=vid->timeIncrementInUs;
-                if(img.demuxerDts!=ADM_NO_PTS && (vid->dontTrustBFramePts || vid->_aviheader->providePts()==false))
-                {
-                    if(img.demuxerDts>vid->lastDecodedPts)
-                    {
-                        aprintf("Dts > Guessed Pts, cranking pts\n");
-                        vid->lastDecodedPts=img.demuxerDts;
-                    }
-                }
-                result->Pts=vid->lastDecodedPts;
-        }else
-           {
-                aprintf("[Editor] got PTS\n");
-                vid->lastDecodedPts=pts;
+            aprintf("Checking guessed PTS against DTS from frame %u, decoder delay: %u frames.\n",origin,vid->decoderDelay);
+            if(dts>vid->lastDecodedPts)
+            {
+                ADM_warning("Dts > Guessed Pts, cranking pts by %" PRIu64" us.\n",dts-vid->lastDecodedPts);
+                vid->lastDecodedPts=dts;
             }
+        }
+        result->Pts=vid->lastDecodedPts;
+    }else
+    {
+        aprintf("[Editor] got PTS\n");
+        vid->lastDecodedPts=pts;
+    }
     aprintf(">>Decoded frame %" PRIu32" with pts=%" PRId64" us, %" PRId64" ms, ptsdelta=%" PRId64" ms \n",
         frame,
         vid->lastDecodedPts,
         vid->lastDecodedPts/1000,
-        (vid->lastDecodedPts-old)/1000);
+        ((int64_t)vid->lastDecodedPts-(int64_t)old)/1000);
 
     if(old>vid->lastDecodedPts) 
     {
@@ -320,89 +339,84 @@
 
 bool ADM_Composer::decompressImage(ADMImage *out,ADMCompressedImage *in,uint32_t ref)
 {
- ADMImage *tmpImage=NULL;
- _VIDEOS  *v=_segments.getRefVideo(ref);
- uint32_t refOnly=v->decoder->dontcopy(); // can we skip one memcpy ?
- // get settings from pref...
- 
-// This is only an empty Shell
+    ADMImage *tmpImage=NULL;
+    _VIDEOS  *v=_segments.getRefVideo(ref);
+    bool refOnly=v->decoder->dontcopy(); // can we skip one memcpy ?
+    // This is only an empty Shell
     if(refOnly)
     {
-                uint32_t w,h;
-                if(_scratch) // Can we reuse the old scratch memory ?
-                {
-                    _scratch->getWidthHeight(&w,&h);
-                    if(w!=_imageBuffer->_width || _imageBuffer->_height!=h)
-                    {

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/src/ADM_edSearch.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/ADM_edSearch.cpp Changed

@@ -21,7 +21,11 @@
 #include "ADM_edit.hxx"
 #include "ADM_vidMisc.h"
 
+#if 1
 #define pivotPrintf(...) {}
+#else
+#define pivotPrintf printf
+#endif
 
 /**
     \fn getNKFramePTS
@@ -96,7 +100,6 @@
 bool			ADM_Composer::getPKFramePTS(uint64_t *frameTime)
 {
 uint64_t refTime,nkTime,segTime;
-int lastSeg=_segments.getNbSegments();
 uint32_t seg;
 bool r;
     // 1- Convert frameTime to segments
@@ -164,10 +167,8 @@
 
 bool			ADM_Composer::getPtsDtsDelta(uint64_t frameTime, uint64_t *outDelta)
 {
-uint64_t refTime,nkTime,segTime;
-int lastSeg=_segments.getNbSegments();
+uint64_t refTime,segTime;
 uint32_t seg;
-bool r;
     // 1- Convert frameTime to segments
     if(false== _segments.convertLinearTimeToSeg(  frameTime, &seg, &segTime))
     {
@@ -208,13 +209,19 @@
 */
 bool ADM_Composer::searchNextKeyFrameInRef(int ref,uint64_t refTime,uint64_t *nkTime)
 {
-    // Search from the end till we get a keyframe
+    int curFrame=0;
     _VIDEOS *v=_segments.getRefVideo(ref);
+    // look up the frame we are starting from...
+    if(!getFrameNumFromPtsOrBefore(v,refTime,curFrame))
+    {
+        ADM_warning("Cannot identify the frame for time %s in reference.\n",ADM_us2plain(refTime));
+    }
     uint32_t nbFrame=v->_nb_video_frames;
     uint64_t pts,dts;
-    for(int i=0;i<nbFrame;i++)
+    curFrame -= 16; // safety margin to deal with early B-frames
+    if(curFrame < 0) curFrame = 0;
+    for(int i=curFrame;i<nbFrame;i++)
     {
-        uint64_t p;
         uint32_t flags;
         v->_aviheader->getFlags(i,&flags);
         if(!(flags & AVI_KEY_FRAME)) continue;
@@ -243,18 +250,27 @@
  */
 bool ADM_Composer::getFrameNumFromPtsOrBefore(_VIDEOS *v,uint64_t refTime,int &frameNumber)
 {
+    if(refTime == ADM_NO_PTS)
+        return false;
+    if(refTime <= v->firstFramePts)
+    {
+        frameNumber = 0;
+        return true;
+    }
+
     uint32_t nbFrame = v->_nb_video_frames;
-    uint64_t pts, dts;
+    uint64_t pts, dts, margin = v->timeIncrementInUs * 16;
+    const uint64_t rangeBegin = (refTime < margin)? 0 : (refTime - margin);
+    const uint64_t rangeEnd = refTime + margin;
     uint32_t curFrame = nbFrame >> 1;
     uint32_t splitMoval = (curFrame + 1) >> 1;
     uint32_t minFrame = 0;
+    bool worked = false;
     pivotPrintf("Looking for frame with pts %" PRIu64" us (%s)\n",refTime,ADM_us2plain(refTime));
     // Try to find the frame that as the timestamp close enough to refTime, while being smaller
     do 
     {
         // seems like the pts determination, not always works -> retry if necessary
-        bool worked;
-        uint32_t skipped = 0;
         uint32_t tmpFrame = curFrame;
         do
         {
@@ -262,54 +278,47 @@
             worked = v->_aviheader->getPtsDts(tmpFrame,&pts,&dts);
             if(worked && pts != ADM_NO_PTS)
                 break; // found
-            if(!tmpFrame)
+            if(tmpFrame <= minFrame)
             {
-                ADM_warning("The whole segment is corrupted. Aborting the search\n");
-                return false;
+                ADM_warning("Frames between %" PRIu32" and %" PRIu32" have no PTS.\n",minFrame,curFrame);
+                break;
             }
             tmpFrame--;
-            skipped++;
         } while(true);
-        if(pts == refTime)
-            break;
-        if(skipped && pts < refTime)
-        { // if we slid past the target frame...
-            pivotPrintf("skipped %" PRIu32" frames seeking back\n",skipped);
-            skipped = 0;
-            tmpFrame = curFrame + 1; // ...go back to the frame where we first encountered corrupted video...
+        if(pts == ADM_NO_PTS)
+        {
+            tmpFrame = curFrame + 1;
             do
-            { // ...and seek forward until we get a valid pts
-                pts = ADM_NO_PTS;
-                worked = v->_aviheader->getPtsDts(tmpFrame,&pts,&dts);
-                if(worked && pts != ADM_NO_PTS)
-                    break; // found                
-                tmpFrame++;
-                if(tmpFrame == nbFrame)
-                {
-                    ADM_warning("The whole segment is corrupted. Aborting the search\n");
-                    return false;
-                }
-                skipped++;
-            } while(true);
-            if(skipped)
             {
-                pivotPrintf("skipped %" PRIu32" frames seeking forward\n",skipped);
-                if(pts > refTime)
+                if(tmpFrame >= nbFrame)
                 {
-                    ADM_warning("The video at the specified time in ref is corrupted. Aborting seek\n");
+                    ADM_warning("The whole segment is corrupted, aborting seek.\n");
                     return false;
-                }else
-                {
-                    minFrame = tmpFrame;
                 }
-            }
-            curFrame = tmpFrame;
+                minFrame = tmpFrame;
+                worked = v->_aviheader->getPtsDts(tmpFrame,&pts,&dts);
+                if(worked && pts != ADM_NO_PTS)
+                    break; // found
+                tmpFrame++;
+            } while(true);
+        }
+        curFrame = tmpFrame; // resync
+        // are we lucky?
+        if(pts == refTime)
+        {
+            pivotPrintf("Perfect match for frame %" PRIu32"\n",curFrame);
+            frameNumber = curFrame;
+            return true;
         }
+        // nope, are we at least close enough?
+        if(pts != ADM_NO_PTS && pts >= rangeBegin && pts <= rangeEnd)
+            break; // switch to linear search
+        // nope, continue to bisect
         pivotPrintf("SplitMoval=%d\n",splitMoval);
-        if(!splitMoval)
-            break;        
+        if(splitMoval < 16)
+            break;
         pivotPrintf("Pivot frame is %" PRIu32" at %s\n",curFrame,ADM_us2plain(pts));
-        if (pts >= refTime)
+        if (pts > refTime)
         {
             if (curFrame <= splitMoval + minFrame)
             {
@@ -324,18 +333,47 @@
             if(curFrame >= nbFrame)
                 curFrame = nbFrame - 1;
         }
-        if(splitMoval > 1)
-            splitMoval++;
+        splitMoval++;
         splitMoval >>= 1;
-        pivotPrintf("Split=%d\n",splitMoval);        
     } while(refTime != pts);
 
-    pivotPrintf("Matching frame is %" PRIu32" at %s\n",curFrame,ADM_us2plain(pts));
-    if(pts > refTime && curFrame)
-        curFrame--;
-    pivotPrintf("Our target frame is %" PRIu32"\n",curFrame);
-    frameNumber = curFrame;
-    return true;
+    // linear search with a generous safety margin
+    curFrame = (curFrame < 32)? 0 : curFrame - 32;
+    pivotPrintf("Starting linear search at frame %" PRIu32", total frames: %" PRIu32"\n",curFrame,nbFrame);
+    int candidate = -1;
+    uint64_t last = 0;
+    for(int i = 0; i < 65; i++)
+    {
+        if(curFrame >= nbFrame) break;
+        pts = ADM_NO_PTS;
+        worked = v->_aviheader->getPtsDts(curFrame,&pts,&dts);
+        if(!worked || pts == ADM_NO_PTS)
+        {
+            pivotPrintf("Linear search, skipping frame %" PRIu32"\n",curFrame);

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/src/ADM_edStub.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/ADM_edStub.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/src/ADM_edVideoCopy.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/ADM_edVideoCopy.cpp Changed

@@ -20,6 +20,9 @@
 #include "ADM_default.h"
 #include "ADM_edit.hxx"
 #include "ADM_vidMisc.h"
+#include "ADM_videoInfoExtractor.h"
+#include "ADM_h264_tag.h"
+
 #if 0
 #define aprintf printf
 #else
@@ -28,132 +31,471 @@
 
 static int warn_cnt=0;
 
+static bool checkCodec(aviInfo *first,aviInfo *second)
+{
+    bool match=false;
+#define XCHECK(x) if(!match && x(first->fcc) && x(second->fcc)) { ADM_info("Codecs identified by %s() as matching\n",#x); match=true; }
+    XCHECK(isH264Compatible)
+    XCHECK(isH265Compatible)
+    XCHECK(isMpeg4Compatible)
+    XCHECK(isMpeg12Compatible)
+    XCHECK(isVC1Compatible)
+    XCHECK(isVP9Compatible)
+    XCHECK(isVP6Compatible)
+    XCHECK(isMSMpeg4Compatible)
+    XCHECK(isDVCompatible)
+    // catch fourcc values not covered by above
+    if(!match && first->fcc == second->fcc)
+        match=true;
+    return match;
+}
+
 /**
-    \fn checkCutsAreOnIntra
+    \fn checkSegmentStartsOnIntra
     \brief In copy mode, if the cuts are not on intra we will run into trouble :
             * We include skipped ref frames: we will have DTS going back error
-            * We skip them, we have borked video at cut points due to missing ref framesz
-    \return true if everything ok
+            * We skip them, we have borked video at cut points due to missing ref frames
 */
-bool ADM_Composer::checkCutsAreOnIntra(void)
+ADM_cutPointType ADM_Composer::checkSegmentStartsOnIntra(uint32_t segNo)
 {
-    bool fail=false;
-    int nbSeg=_segments.getNbSegments();
+    if(segNo>=_segments.getNbSegments())
+    {
+        ADM_error("Requested segment number %d out of range!\n",segNo);
+        return ADM_EDITOR_CUT_POINT_IDR;
+    }
 
-    ADMCompressedImage img;
-    uint8_t *buffer=new uint8_t[1920*1080*3];
-    img.data=buffer;
-    ADM_info("Checking cuts start on keyframe..\n");
-    for(int i=0;i<nbSeg;i++)
+    _SEGMENT *seg=_segments.getSegment(segNo);
+    _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
+    vidHeader *demuxer=vid->_aviheader;
+
+    uint32_t oldSeg=_currentSegment;
+    uint32_t oldFrame=vid->lastSentFrame;
+    uint32_t refNo=seg->_reference;
+    uint64_t refstart=(seg->_refStartTimeUs > vid->firstFramePts)? seg->_refStartTimeUs : vid->firstFramePts;
+    int frame=0;
+    uint8_t *buffer=NULL;
+    ADM_cutPointType cut=ADM_EDITOR_CUT_POINT_UNCHECKED;
+
+#define BOWOUT if(buffer) { delete [] buffer; buffer=NULL; } \
+    _currentSegment=oldSeg; vid->lastSentFrame=oldFrame; return cut;
+
+    if(false==switchToSegment(segNo,true))
     {
-        _SEGMENT *seg=_segments.getSegment(i);
-        _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
-        vidHeader *demuxer=vid->_aviheader;
+        BOWOUT
+    }
+    if(false==getFrameNumFromPtsOrBefore(vid,refstart,frame))
+    {
+        BOWOUT
+    }
+    // Cursorily check that codec matches if the ref video is not the first one.
+    aviInfo info;
+    demuxer->getVideoInfo(&info);
+    if(refNo)
+    {
+        aviInfo inf0;
+        getVideoInfo(&inf0);
+        if(!checkCodec(&info,&inf0))
+        {
+            ADM_error("Codec doesn't match the one of the first ref video. This is currently unsupported.\n");
+            cut=ADM_EDITOR_CUT_POINT_MISMATCH;
+            BOWOUT
+        }
+    }
 
-        if(false==switchToSegment(i,true))
+    uint32_t flags=0;
+    uint64_t pts,dts;
+    demuxer->getPtsDts(frame,&pts,&dts);
+
+    // After a seg switch we are at the keyframe before or equal to where we want to go
+    // if the dts do not match, it means we went back too much
+    // When re-encoding, it's not a problem, it is when copying.
+    ADM_info("seg %d: ref %d, refDTS=%" PRIu64"\n",segNo,seg->_reference,seg->_refStartDts);
+    ADM_info("seg %d: ref %d, imgDTS=%" PRIu64"\n",segNo,seg->_reference,dts);
+    if(!seg->_refStartDts && !seg->_reference)
+    {
+        ADM_info("Ignoring first seg (unreliable DTS)\n");
+    }else if(dts!=ADM_NO_PTS && seg->_refStartDts!=ADM_NO_PTS && dts!=seg->_refStartDts)
+    {
+        ADM_warning("Segment %d does not start on a known DTS (%" PRIu64" us = %s)\n",segNo,dts,ADM_us2plain(dts));
+        ADM_warning("expected: %" PRIu64" us = %s\n",seg->_refStartDts,ADM_us2plain(seg->_refStartDts));
+        cut=ADM_EDITOR_CUT_POINT_NON_IDR; // ??
+        BOWOUT
+    }
+    // DTS check passed, now check flags
+    demuxer->getFlags(frame,&flags);
+    if(!(flags & AVI_KEY_FRAME))
+    {
+        ADM_warning("Segment %d does not start on a keyframe (time in ref %s)\n",segNo,ADM_us2plain(pts));
+        cut=ADM_EDITOR_CUT_POINT_NON_IDR;
+        BOWOUT
+    }
+    // The frame is marked as keyframe
+    if(!segNo) // Not a cut point
+    {
+        cut=ADM_EDITOR_CUT_POINT_IDR;
+        BOWOUT
+    }
+
+    // It is a cut, perform codec-specific checks
+
+#define MAX_NALU_TO_CHECK 4
+    static NALU_descriptor desc[MAX_NALU_TO_CHECK];
+
+    if(isH264Compatible(info.fcc))
+    {
+        // It is H.264, check deeper. The keyframe may be a non-IDR random access point.
+        // If picture order count after a cut is going back, at least FFmpeg-based players
+        // like VLC and mpv may get stuck until the next recovery point is reached.
+        // First determine stream type
+        bool AnnexB=false;
+        uint8_t *extra;
+        uint32_t extraLen=0;
+        demuxer->getExtraHeaderData(&extraLen,&extra);
+        if(!extraLen)
+            AnnexB=true;
+        // Allocate memory to hold compressed frame
+        ADMCompressedImage img;
+#define MAX_FRAME_LENGTH (1920*1080*3) // ~7 MiB, should be enough even for 4K
+        buffer=new uint8_t[MAX_FRAME_LENGTH];
+        img.data=buffer;
+        // Get SPS to be able to decode the slice header
+        ADM_SPSInfo sps;
+        bool gotSps=false;
+        // Do we have a cached copy?
+        if(vid->paramCacheSize==sizeof(ADM_SPSInfo) && vid->paramCache)
         {
-            fail=true;
-            break;
+            memcpy(&sps,vid->paramCache,sizeof(ADM_SPSInfo));
+            gotSps=true;
+        }else
+        {
+            if(AnnexB)
+            {
+                if(!demuxer->getFrame(0,&img))
+                {
+                    ADM_warning("Unable to get the first frame in ref %d, segment %d\n",seg->_reference,segNo);
+                    BOWOUT
+                }
+                int nbNalu=ADM_splitNalu(img.data, img.data+img.dataLength, MAX_NALU_TO_CHECK, desc);
+                int spsIndex=ADM_findNalu(NAL_SPS,nbNalu,desc);
+                if(spsIndex!=-1)
+                    gotSps=extractSPSInfo(desc[spsIndex].start, desc[spsIndex].size, &sps);
+            }else
+            {
+                gotSps=extractSPSInfo(extra,extraLen,&sps);
+            }
+            if(!gotSps)
+            {
+                ADM_warning("Cannot retrieve SPS info.\n");
+                BOWOUT
+            }
+            // Store the decoded SPS info in the cache
+            vid->paramCacheSize=sizeof(ADM_SPSInfo);
+            vid->paramCache=new uint8_t[vid->paramCacheSize]; // will be destroyed with the video
+            memcpy(vid->paramCache,&sps,sizeof(ADM_SPSInfo));
         }
-        if(false==demuxer->getFrame (vid->lastSentFrame,&img))
+        // We have SPS, now get the frame we are interested in.
+        if(!demuxer->getFrame(frame,&img))
         {
-            ADM_info("Cannot get 1st frame of segment %d\n",i);
-            fail=true;
-            break;

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/src/ADM_edit.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/ADM_edit.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/src/ADM_segment.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/ADM_segment.cpp Changed

@@ -27,6 +27,7 @@
 #include "ADM_codec.h"
 #include "DIA_coreToolkit.h"
 #include "ADM_vidMisc.h"
+#include "prefs.h"
 
 #if 1
 #define aprintf printf
@@ -101,12 +102,18 @@
   uint8_t 	    *d;
   aviInfo       info;
   _SEGMENT      seg;
+  uint32_t      cacheSize;
+
+  if(false==prefs->get(FEATURES_CACHE_SIZE,&cacheSize))
+      cacheSize = EDITOR_CACHE_MAX_SIZE;
+  if(cacheSize > EDITOR_CACHE_MAX_SIZE) cacheSize = EDITOR_CACHE_MAX_SIZE;
+  if(cacheSize < EDITOR_CACHE_MIN_SIZE) cacheSize = EDITOR_CACHE_MIN_SIZE;
 
   ref->dontTrustBFramePts=ref->_aviheader->unreliableBFramePts();
   ref->_aviheader->getVideoInfo (&info);
   ref->_aviheader->getExtraHeaderData (&l, &d);
   ref->decoder = ADM_getDecoder (info.fcc,  info.width, info.height, l, d,info.bpp);
-  ref->_videoCache = new EditorCache(16,info.width,info.height);
+  ref->_videoCache = new EditorCache(cacheSize,info.width,info.height);
 
   // discard implausibly high fps, hardcode the value to 25 fps
   if (info.fps1000 > 2000 * 1000)
@@ -242,11 +249,13 @@
           v->_aviheader->close ();
           delete v->_aviheader;
       }
-    
+      if(v->paramCache)
+          delete [] v->paramCache;
       v->_videoCache=NULL;
       v->color=NULL;
       v->decoder=NULL;
       v->_aviheader=NULL;
+      v->paramCache=NULL;
      // Delete audio codec too
      // audioStream will be deleted by the demuxer
 
@@ -481,7 +490,7 @@
 {
     if(!frameTime && segments.size()) // pick the first one
     {
-        ADM_info("Frame time=0, taking first segment \n");
+        //ADM_info("Frame time=0, taking first segment \n");
         *seg=0;
         *segTime=0; // ??
         return true;

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioPcm.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioPcm.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackExternal.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackExternal.cpp Changed

@@ -71,7 +71,36 @@
 bool ADM_edAudioTrackExternal::create(uint32_t extraLen, uint8_t *extraData)
 {
     ADM_info("Initializing audio track from external %s \n",sourceFile.c_str());
-    codec=getAudioCodec(wavHeader.encoding,&wavHeader,extraLen,extraData);;
+    codec=getAudioCodec(wavHeader.encoding,&wavHeader,extraLen,extraData);
+    if(!codec || codec->isDummy())
+    {
+        ADM_warning("No decoder for %s.\n",getStrFromAudioCodec(wavHeader.encoding));
+        return false;
+    }
+    // Check AAC for SBR
+    if(wavHeader.encoding==WAV_AAC)
+    {
+        uint32_t inlen,max=ADM_EDITOR_PACKET_BUFFER_SIZE;
+        notStackAllocator inbuf(max);
+        uint8_t *in=inbuf.data;
+        uint64_t dts;
+        if(false==internalAccess->getPacket(in,&inlen,max,&dts))
+        {
+            ADM_warning("Cannot get packets.\n");
+            return false;
+        }
+
+        notStackAllocator outbuf(wavHeader.frequency*wavHeader.channels*sizeof(float));
+        float *out=(float *)outbuf.data;
+        uint32_t nbOut,fq=0;
+        if(codec->run(in,inlen,out,&nbOut))
+            fq=codec->getOutputFrequency();
+        if(fq && fq!=wavHeader.frequency)
+        {
+            ADM_warning("Updating sampling frequency from %u to %u\n",wavHeader.frequency,fq);
+            wavHeader.frequency=fq;
+        }
+    }
     size=internalAccess->getLength();
     internalAudioStream=ADM_audioCreateStream(&wavHeader,internalAccess,true);
     return true;
@@ -143,9 +172,14 @@
         ADM_warning("Cannot identify external audio track\n");
         return NULL;
     }
-    if(!hdr.channels)
+    if(!hdr.channels || hdr.channels > MAX_CHANNELS)
+    {
+        ADM_error("Number of channels out of bounds, the audio file must have been misidentified!\n");
+        return NULL;
+    }
+    if(hdr.frequency < MIN_SAMPLING_RATE || hdr.frequency > MAX_SAMPLING_RATE)
     {
-        ADM_error("Got zero channels, the audio file must have been misidentified!\n");
+        ADM_error("Sampling frequency out of bounds, the audio file must have been misidentified!\n");
         return NULL;
     }
     // Try to create an access for the file...
@@ -197,8 +231,6 @@
 bool         ADM_edAudioTrackExternal::getPCMPacket(float  *dest, uint32_t sizeMax, uint32_t *samples,uint64_t *odts)
 {
 uint32_t fillerSample=0;   // FIXME : Store & fix the DTS error correctly!!!!
-uint32_t inSize;
-bool      drop=false;
 uint32_t outFrequency=getOutputFrequency();
 uint32_t outChannels=getOutputChannels();

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edCache.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edCache.cpp Changed

@@ -32,13 +32,14 @@
 
 EditorCache::EditorCache(uint32_t size,uint32_t w, uint32_t h)
 {
-	_elem=new cacheElem[size];
-	for(uint32_t i=0;i<size;i++)
-	{
-		_elem[i].image=new ADMImageDefault(w,h);
-		_elem[i].pts=ADM_NO_PTS;
-	}
-	_nbImage=size;
+    _elem=new cacheElem[size];
+    for(uint32_t i=0;i<size;i++)
+    {
+        _elem[i].image=new ADMImageDefault(w,h);
+        _elem[i].pts=ADM_NO_PTS;
+    }
+    _nbImage=size;
+    ADM_info("Video cache created for %u decoded images.\n",_nbImage);
 }
 /**
     \fn EditorCache
@@ -46,11 +47,11 @@
 */
 EditorCache::~EditorCache(void)
 {
-	for(uint32_t i=0;i<_nbImage;i++)
-	{
-		delete _elem[i].image;
-	}
-	delete[] _elem;
+    for(uint32_t i=0;i<_nbImage;i++)
+    {
+        delete _elem[i].image;
+    }
+    delete[] _elem;
 }
 /**
 
@@ -78,10 +79,8 @@
                 the cache is big enough to be immune
                 to reuse in the same go
 */
-ADMImage	*EditorCache::getFreeImage(void)
+ADMImage *EditorCache::getFreeImage(void)
 {
-	uint32_t min=0;
-	uint64_t  delta=0;
     int found=-1;
     check();
     // next!
@@ -98,10 +97,10 @@
     
     // Mark it as used
     if(found==-1) ADM_assert(0);
-	_elem[found].pts=ADM_NO_PTS;;
+    _elem[found].pts=ADM_NO_PTS;;
     writeIndex++;
     aprintf("Using free image at index %d\n",found);
-	return _elem[found].image;
+    return _elem[found].image;
 
 }
 /**
@@ -115,6 +114,7 @@
     for(int i=0;i<_nbImage;i++)
     {
         _elem[i].pts=ADM_NO_PTS;
+        _elem[i].image->hwDecRefCount();
     }
     writeIndex=readIndex=0;
 }
@@ -127,14 +127,14 @@
     for(int i=0;i<_nbImage;i++)
     {
         if(_elem[i].image==image)
-            {
-                uint32_t prev=(writeIndex+_nbImage-1)%_nbImage;
-                 ADM_assert(i==prev);
-                 ADM_assert(_elem[i].pts==ADM_NO_PTS);
-                 aprintf("Invalidate writeIndex %" PRIu32"\n",writeIndex);
-                 writeIndex--;
-                 return;
-            }
+        {
+            uint32_t prev=(writeIndex+_nbImage-1)%_nbImage;
+            ADM_assert(i==prev);
+            ADM_assert(_elem[i].pts==ADM_NO_PTS);
+            aprintf("Invalidate writeIndex %" PRIu32"\n",writeIndex);
+            writeIndex--;
+            return;
+        }
     }
     printf("[edCache]Image not in cache\n");
     ADM_assert(0);
@@ -144,20 +144,19 @@
         \brief update the frameNo associated to a cache line (obsolete)
                Only used to mark it as valid
 */
-bool		EditorCache::validate(ADMImage *image)
+bool EditorCache::validate(ADMImage *image)
 {
-	for(uint32_t i=0;i<_nbImage;i++)
-	{
-		if(_elem[i].image==image)
-		{
+    for(uint32_t i=0;i<_nbImage;i++)
+    {
+        if(_elem[i].image==image)
+        {
             ADM_assert(_elem[i].pts==ADM_NO_PTS);
-			_elem[i].pts=image->Pts;
+            _elem[i].pts=image->Pts;
             aprintf("validate Index %" PRIu32" with pts=%" PRIu64"ms\n",i,image->Pts);
-			return true;
-		}
-
-	}
-	ADM_assert(0);
+            return true;
+        }
+    }
+    ADM_assert(0);
     return false;
 }
 /**
@@ -172,9 +171,9 @@
       cacheElem *e=&(_elem[i]);
       switch(e->pts)
         {
-            case ADM_NO_PTS:  printf("Not used %d\n",i);break;
+            case ADM_NO_PTS:  printf("Not used %02d\n",i);break;
             default:
-                printf("Edcache content[%d]: PTS : %s %" PRIu64" ms\n",i,
+                printf("Edcache content[%02d]: PTS : %s %" PRIu64" ms\n",i,
                                                                     ADM_us2plain(e->image->Pts),e->image->Pts/1000);
                 break;
         }
@@ -189,7 +188,7 @@
 {
     if(!writeIndex) return NULL;
     for(uint32_t i=readIndex;i<writeIndex-1;i++)
-	{
+    {
         int index=i%_nbImage;
         ADM_assert(_elem[index].pts!=ADM_NO_PTS);
         if(_elem[index].pts==pts)
@@ -227,7 +226,7 @@
 ADMImage    *EditorCache::getBefore(uint64_t pts)
 {
     for(int i=readIndex+1;i<writeIndex;i++)
-	{
+    {
         int index=i%_nbImage;
         ADM_assert(_elem[index].pts!=ADM_NO_PTS);
         if(_elem[index].pts==pts)
@@ -249,9 +248,9 @@
 ADMImage *EditorCache::getByPts(uint64_t Pts)
 {
     for(int i=readIndex;i<writeIndex;i++)
-	{
+    {
         int index=i%_nbImage;
-		if(_elem[index].image->Pts==Pts)
+        if(_elem[index].image->Pts==Pts)
         {
             return _elem[index].image;
         }

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edPtsDts.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edPtsDts.cpp Changed

@@ -35,7 +35,6 @@
 */
 bool ADM_verifyDts(vidHeader *hdr,uint64_t timeIncrementUs)
 {
-        int nbMissing=0;
         aviInfo info;
         hdr->getVideoInfo(&info);
         uint32_t nbFrames=0;
@@ -556,10 +555,7 @@
     *delay=0;
     int last=0;
     int nbFrames;
-    int nbBframe=0;
-    int maxBframe=0;
     uint32_t flags;
-    int nbB=0;
     uint64_t pts,dts;
 
     ADM_info("computing dts...\n");
@@ -577,19 +573,15 @@
         }
         if(flags & AVI_B_FRAME)
         {
-                
-                nbB++;
                 dts=pts;
                 hdr->setPtsDts(i,pts,dts);
                 continue;
         }
    
         uint64_t oldPts,oldDts;
-        uint64_t fwdPts,fwdDts;
           hdr->getPtsDts(last,&oldPts,&oldDts);
           dts=oldPts;
           hdr->setPtsDts(i,pts,dts);
-        nbBframe=0;
         last=i;
     }
     return 1;
@@ -602,7 +594,7 @@
 bool updatePtsAndDts(vidHeader *hdr,uint64_t timeIncrementUs,uint64_t *delay)
 {
     aviInfo info;
-    uint64_t offset,pts,dts;
+    uint64_t pts,dts;
     uint32_t nbFrames;
     uint64_t myDelay=0;
     *delay=0;
@@ -655,7 +647,7 @@
                     {
                         double deltaTime=dts-backDts;
                         deltaTime=deltaTime/(deltaFrame);
-                        if(deltaTime>41700 & deltaTime<41800)
+                        if(deltaTime>41700 && deltaTime<41800)
                         {
                             for(int j=backIndex+1;j<i;j++)
                             {

avidemux_2.7.3.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edUndoQueue.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edUndoQueue.cpp Changed

@@ -24,14 +24,14 @@
 
 bool ADM_Composer::addToUndoQueue(void)
 {
-    // truncate the dead branch first if we add a new element to the undo queue after _cnt-1 undo steps
-    if(_cnt>1 && undoQueue.size()>1)
+    // truncate the dead branch first if we add a new element to the undo queue after _undo_counter-1 undo steps
+    if(_undo_counter>1 && undoQueue.size()>1)
     {
-        for(uint32_t i=0;i<_cnt;i++)
+        for(uint32_t i=0;i<_undo_counter;i++)
         {
             undoQueue.pop_back();
         }
-        ADM_info("Deleted last %d elements from the undo queue\n",_cnt);
+        ADM_info("Deleted last %d elements from the undo queue\n",_undo_counter);
     }
     // now populate the new element...
     undoQueueElem rec;
@@ -52,7 +52,7 @@
     // ...and store the new element in the queue
     undoQueue.push_back(rec);
     ADM_info("The undo queue has now %d element(s)\n",undoQueue.size());
-    _cnt=0; // redo should not be available after a new undo-able action has been performed
+    _undo_counter=0; // redo should not be available after a new undo-able action has been performed
     return true;
 }
 
@@ -68,19 +68,19 @@
         ADM_info("The undo queue is empty, nothing to do\n");
         return false;
     }
-    if(!_cnt) // no undo steps performed yet, thus we don't have the current state in the undo queue
+    if(!_undo_counter) // no undo steps performed yet, thus we don't have the current state in the undo queue
     {
         // store the current state in the queue and bump the tracker
         // to account for the queue becoming one element longer
         addToUndoQueue();
-        _cnt=1;
+        _undo_counter=1;
     }
-    undoQueueElem rec=undoQueue.at(undoQueue.size()-_cnt-1);
-    ADM_info("Restoring the state recorded in the element %d starting with 1 of %d\n",undoQueue.size()-_cnt,undoQueue.size());
+    undoQueueElem rec=undoQueue.at(undoQueue.size()-_undo_counter-1);
+    ADM_info("Restoring the state recorded in the element %d starting with 1 of %d\n",undoQueue.size()-_undo_counter,undoQueue.size());
     _segments.setSegments(rec.segm);
     setMarkerAPts(rec.markerA);
     setMarkerBPts(rec.markerB);
-    _cnt++;
+    _undo_counter++;
     return true;
 }
 
@@ -96,12 +96,12 @@
         ADM_info("The redo queue is empty, cannot perform redo\n");
         return false;
     }
-    undoQueueElem rec=undoQueue.at(undoQueue.size()-_cnt+1);
-    ADM_info("Restoring the state recorded in the element %d starting with 1 of %d\n",undoQueue.size()-_cnt+2,undoQueue.size());
+    undoQueueElem rec=undoQueue.at(undoQueue.size()-_undo_counter+1);
+    ADM_info("Restoring the state recorded in the element %d starting with 1 of %d\n",undoQueue.size()-_undo_counter+2,undoQueue.size());
     _segments.setSegments(rec.segm);
     setMarkerAPts(rec.markerA);
     setMarkerBPts(rec.markerB);
-    _cnt--;
+    _undo_counter--;
     return true;
 }
 
@@ -121,7 +121,7 @@
 
 bool ADM_Composer::canUndo(void)
 {
-    if(undoQueue.empty() || undoQueue.size()<_cnt+1)
+    if(undoQueue.empty() || undoQueue.size()<_undo_counter+1)
         return false;
     return true;
 }
@@ -132,7 +132,7 @@
 
 bool ADM_Composer::canRedo(void)
 {
-    if(_cnt<2 || undoQueue.size()<_cnt) // _cnt=2 once the first undo operation has been performed
+    if(_undo_counter<2 || undoQueue.size()<_undo_counter) // _undo_counter=2 once the first undo operation has been performed
         return false;
     return true;
 }

avidemux_2.7.3.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopyFromAnnexB.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopyFromAnnexB.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_osSupport/ADM_crashHook.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_osSupport/ADM_crashHook.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_preview.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_preview.cpp Changed

@@ -39,21 +39,14 @@
 #include "ADM_render/GUI_render.h"
 #include "ADM_commonUI/GUI_ui.h"
 #include "ADM_preview.h"
-#include "ADM_imageResizer.h"
 #include "DIA_coreToolkit.h"
 
 extern uint8_t              UI_getPhysicalScreenSize(void* window, uint32_t *w,uint32_t *h);
-static void                 previewBlit(ADMImage *from,ADMImage *to,uint32_t startx,uint32_t starty);
+//static void                 previewBlit(ADMImage *from,ADMImage *to,uint32_t startx,uint32_t starty);
 static ADM_PREVIEW_MODE     previewMode=ADM_PREVIEW_NONE;
 
 static bool                 defered_display=false;  /* When 1, it means we are in playback mode */
 static float                zoom=ZOOM_1_1;
-static ADMImage             *resized=NULL;
-static ADMImageResizer      *resizer=NULL;
-
-
-extern bool GUI_GoToTime(uint64_t time); // hack, might be a circular dep
-
 
 /*************************************/
 ADMImage *admPreview::rdrImage=NULL; /* Unprocessed image */
@@ -105,7 +98,7 @@
       UI_getPhysicalScreenSize(NULL, &phyW,&phyH);
       if(3*phyW<4*w || 3*phyH<4*h)
       {
-          if(phyW<w/2 || phyH<h/2)
+          if(5*phyW<4*w || 5*phyH<4*h)
           {
                     nzoom=ZOOM_1_4;
           }else
@@ -215,7 +208,6 @@
 /**
       \fn previewBlit(ADMImage *from,ADMImage *to,uint32_t startx,uint32_t starty)
       \brief Blit "from" to "to" at position startx,starty
-*/
 
 void previewBlit(ADMImage *from,ADMImage *to,uint32_t startx,uint32_t starty)
 {
@@ -230,9 +222,6 @@
 
 void admPreview::displayNow(void)
 {
-
-    uint32_t fl,len;	
-    
     switch(previewMode)
     {
       case ADM_PREVIEW_NONE:

avidemux_2.7.3.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreD3D.h -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreD3D.h Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreD3D.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreD3D.cpp Changed

@@ -51,6 +51,7 @@
 static IDirect3DDevice9      *d3d9device   = NULL;
 static IDirect3DDevice9Ex    *d3d9deviceex = NULL;
 static admD3D::ADM_vendorID  d3dVendorId  =  admD3D::VENDOR_UNKNOWN;
+static int64_t               d3dDriverVersion = 0;
 
 static bool isD3D9Ex=false;
 
@@ -125,9 +126,12 @@
     {
         ADM_warning("GetAdapterIdentifier failed\n");
         d3dVendorId=admD3D::VENDOR_UNKNOWN;
+        d3dDriverVersion=0;
     }else
     {
-        ADM_info("D3D Device: %s Vendor: %x Device:%x Rev:%x\n", id.Description,id.VendorId, id.DeviceId, id.Revision );
+        ADM_info("D3D Device: %s, Vendor: %x, Device: %x, Rev: %x, Driver Version: %" PRId64"\n",
+                id.Description, id.VendorId, id.DeviceId, id.Revision, id.DriverVersion.QuadPart);
+        d3dDriverVersion=id.DriverVersion.QuadPart;
         switch(id.VendorId)
         {
         case  0x1002: d3dVendorId=admD3D::VENDOR_AMD;break;
@@ -269,6 +273,14 @@
 }
 
 /**
+    \fn getDriverVersion
+*/
+int64_t admD3D::getDriverVersion(void)
+{
+    return d3dDriverVersion;
+}
+
+/**
  */
 bool admD3D::cleanup(void)
 {

avidemux_2.7.3.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2.cpp Changed

@@ -20,9 +20,9 @@
 #include "ADM_coreD3D.h"
 #ifdef USE_DXVA2
 
-#if 1
-#define aprintf printf
 #define DUMP_GUID
+#if 0
+#define aprintf printf
 #else
 #define aprintf(...) {}
 #endif
@@ -73,10 +73,11 @@
 } dxva2_mode;
 /**
  */
-static int ALIGN(int x,int align)
+static int ALIGN(int x,int align,bool verbose=false)
 {
     int y= ((x+(align-1)) &(~(align-1)));
-    aprintf("Align %d,%d => %d\n",x,align,y);
+    if(verbose)
+        printf("Align %d,%d => %d\n",x,align,y);
     return y;
 }
 
@@ -423,17 +424,25 @@
     D3DFORMAT fmt;
     fmt=dxvaBitsToFormat(bits);
 
-    if(!admD3D::isDirect9Ex())
+    bool share=admD3D::isDirect9Ex();
+    if(share)
     {
-    
      hr = D3DCall(IDirectXVideoDecoderService,CreateSurface,decoder_service,
                                                    width,
                                                    height,
                                                    num-1,
                                                    fmt, D3DPOOL_DEFAULT, 0,
                                                    DXVA2_VideoDecoderRenderTarget,
-                                                   surfaces, NULL);
-    }else
+                                                   surfaces, &sh);
+        if(ADM_FAILED(hr))
+        {
+            // Requesting resource sharing on Windows 7 may result in a failure to allocate surfaces.
+            // On Windows 10, not requesting a shared handle seems to impact energy efficiency.
+            ADM_warning("Cannot allocate D3D9 surfaces with resource sharing, retrying without.\n");
+            share=false;
+        }
+    }
+    if(!share)
     {
      hr = D3DCall(IDirectXVideoDecoderService,CreateSurface,decoder_service,
                                                    width,
@@ -441,8 +450,7 @@
                                                    num-1,
                                                    fmt, D3DPOOL_DEFAULT, 0,
                                                    DXVA2_VideoDecoderRenderTarget,
-                                                   surfaces, &sh);
-        
+                                                   surfaces, NULL);
     }
      if(ADM_FAILED(hr))
      {
@@ -566,8 +574,8 @@
 IDirectXVideoDecoder  *admDxva2::createDecoder(AVCodecID codec, int with, int height, int numSurface, LPDIRECT3DSURFACE9 *surface,int align,int bits)
 {
     Dxv2SupportMap *cmap;
-    int paddedWidth=ALIGN(with,align);
-    int paddedHeight=ALIGN(height,align);
+    int paddedWidth=ALIGN(with,align,true);
+    int paddedHeight=ALIGN(height,align,true);
     switch(codec)
     {
         case AV_CODEC_ID_H264:

avidemux_2.7.3.tar.gz/avidemux/common/ADM_render/CMakeLists.txt -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_render/CMakeLists.txt Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_render/GUI_dxva2Render.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_render/GUI_dxva2Render.cpp Changed

@@ -30,7 +30,7 @@
 
 
 
-#if 1
+#if 0
 #define aprintf printf
 #else
 #define aprintf(...) {}
@@ -77,6 +77,7 @@
 
   protected:
                         admMutex        lock;
+                        bool            failure;
                         GUI_WindowInfo  info;
                         IDirect3DSurface9 *mySurface;
                         IDirect3DSurface9 *myYV12Surface;
@@ -115,7 +116,7 @@
     videoBuffer=NULL;
     videoWidget=NULL;
     d3dHandle=admD3D::getHandle();
-
+    failure=false;
 }
 /**
     \fn dxvaRender
@@ -571,47 +572,52 @@
 {
   // this does not work, both surfaces are coming from different device
 
-  IDirect3DSurface9 *bBuffer;
-  POINT point={0,0};
-  // OK
-  ADM_info("surface duplicated\n");
-  if( ADM_FAILED(D3DCall(IDirect3DDevice9,GetBackBuffer,d3dDevice, 0, 0,
-                                              D3DBACKBUFFER_TYPE_MONO,
-                                              &bBuffer)))
-  {
-      ADM_warning("D3D Cannot create backBuffer\n");
-      return false;
-  }
-
-  // can we directly use the surface from dxva ? (can we at all ?)
-  if (ADM_FAILED(D3DCall(IDirect3DDevice9,StretchRect,d3dDevice,
-                  surface->surface,
-                  NULL,
-                  bBuffer,
-                  NULL,
-                  D3DTEXF_LINEAR)))
-  {
-    ADM_warning("StretchRec yv12 failed\n");
-    // go to indirect route
-    if(!pic->hwDownloadFromRef())
+    if(!failure)
     {
-        ADM_warning("Failed to download yv12 from dxva\n");
-        return false;
+        IDirect3DSurface9 *bBuffer;
+        if( ADM_FAILED(D3DCall(IDirect3DDevice9,GetBackBuffer,d3dDevice, 0, 0,
+                               D3DBACKBUFFER_TYPE_MONO,
+                               &bBuffer)))
+        {
+            ADM_warning("D3D Cannot create backBuffer\n");
+            return false;
+        }
+        // OK
+        ADM_info("surface duplicated\n");
+
+        // can we directly use the surface from dxva ? (can we at all ?)
+        if (ADM_FAILED(D3DCall(IDirect3DDevice9,StretchRect,d3dDevice,
+                               surface->surface,
+                               NULL,
+                               bBuffer,
+                               NULL,
+                               D3DTEXF_LINEAR)))
+        {
+            ADM_warning("StretchRec yv12 failed\n");
+            failure=true;
+        }
+    }else
+    {
+        // go to indirect route
+        if(!pic->hwDownloadFromRef())
+        {
+            ADM_warning("Failed to download yv12 from dxva\n");
+            return false;
+        }
+        // workaround : use default non bridged path
+        if(useYV12)
+        {
+            return displayImage_yv12(pic);
+        }
+        return displayImage_argb(pic);
     }
-    // workaround : use default non bridged path
-    if(useYV12)
+    IDirect3DDevice9_BeginScene(d3dDevice);
+    IDirect3DDevice9_EndScene(d3dDevice);
+    if( ADM_FAILED(IDirect3DDevice9_Present(d3dDevice, &targetRect, 0, 0, 0)))
     {
-         return displayImage_yv12(pic);
+        ADM_warning("D3D Present failed\n");
     }
-    return displayImage_argb(pic);
-  }
-  IDirect3DDevice9_BeginScene(d3dDevice);
-  IDirect3DDevice9_EndScene(d3dDevice);
-  if( ADM_FAILED(IDirect3DDevice9_Present(d3dDevice, &targetRect, 0, 0, 0)))
-  {
-    ADM_warning("D3D Present failed\n");
-  }
-  return true;
+    return true;
 }
 
 /**

avidemux_2.7.3.tar.gz/avidemux/common/ADM_toolkit/automation.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_toolkit/automation.cpp Changed

@@ -49,7 +49,6 @@
 static void saveCB(char*name);
 static void loadCB(char *name);
 static int set_output_format(const char *str);
-static void set_reuse_2pass_log(char *p);
 static void setVar(char *in);
 extern void UI_closeGui();
 //_________________________________________________________________________
@@ -77,27 +76,25 @@
 #define avs_port_change "avisynth-port"
 AUTOMATON reaction_table[]=
 {
-    
     {"append",                 1, "append video",                                                              (one_arg_type)A_appendVideo},
-    {"audio-codec",            1, "set audio codec (MP2/MP3/AC3/NONE (WAV PCM)/TWOLAME/COPY)",                 (one_arg_type)call_audiocodec},
-    {avs_port_change,          1, "set avsproxy port accordingly",                                             (one_arg_type)A_set_avisynth_port},    
-    {"help",                   0, "print this",                                                                (one_arg_type)call_help},    
-    {"info",                   0, "show information about loaded video and audio streams",                     (one_arg_type)show_info},    
-    {"list-audio-languages",   0, "list all available audio langues",                                          (one_arg_type)list_audio_languages},        
+    {"audio-codec",            1, "set audio codec (copy|Lame|FDK_AAC|LavAC3|Opus|TwoLame|...)",               (one_arg_type)call_audiocodec},
+    {avs_port_change,          1, "set avsproxy port accordingly",                                             (one_arg_type)A_set_avisynth_port},
+    {"help",                   0, "print this",                                                                (one_arg_type)call_help},
+    {"info",                   0, "show information about loaded video and audio streams",                     (one_arg_type)show_info},
+    {"list-audio-languages",   0, "list all available audio langues",                                          (one_arg_type)list_audio_languages},
     {"load",                   1, "load video or workbench",                                                   (one_arg_type)loadCB},
     {"nogui",                  0, "Run in silent mode",                                                        (one_arg_type)GUI_Quiet},
-    {"output-format",          1, "set output format (AVI|OGM|ES|PS|AVI_DUAL|AVI_UNP|...)",                    (one_arg_type)set_output_format},
+    {"output-format",          1, "set output format (MKV|MP4|ffTS|ffPS|AVI|RAW|...)",                         (one_arg_type)set_output_format},
     {"quit",                   0, "exit avidemux",                                                             (one_arg_type)call_quit},
-    {"slave",                  1, "run as slave, master is on port arg",                                       (one_arg_type)call_slave},    
-    {"reuse-2pass-log",        0, "reuse 2pass logfile if it exists",                                          (one_arg_type)set_reuse_2pass_log},        
+    {"slave",                  1, "run as slave, master is on port arg",                                       (one_arg_type)call_slave},
     {"run",                    1, "load and run a script",                                                     (one_arg_type)call_scriptEngine},
     {"save",                   1, "save video",                                                                (one_arg_type)saveCB},
     {"save-jpg",               1, "save a jpeg",                                                               (one_arg_type)A_saveJpg},
     {"save-raw-audio",         1, "save audio as-is ",                                                         (one_arg_type)A_saveAudioCopy},
     {"save-uncompressed-audio",1, "save uncompressed audio",                                                   (one_arg_type)A_saveAudioProcessed},
-    {"set-audio-language",     2, "Set language of an active audio track {track_index} {language_short_name}", (one_arg_type)A_setAudioLang},    
-    {"var",                    1, "set var (--var myvar=3)",                                                   (one_arg_type)setVar},    
-    {"video-codec",            1, "set video codec (x264/...)",                                                (one_arg_type)call_videocodec},    
+    {"set-audio-language",     2, "Set language of an active audio track {track_index} {language_short_name}", (one_arg_type)A_setAudioLang},
+    {"var",                    1, "set var (--var myvar=3)",                                                   (one_arg_type)setVar},
+    {"video-codec",            1, "set video codec (Copy|x264|x265|xvid4|ffMpeg2|ffNvEnc|...)",                (one_arg_type)call_videocodec},
 };
 #define NB_AUTO (sizeof(reaction_table)/sizeof(AUTOMATON))
 
@@ -204,7 +201,6 @@
                     myargc-=1+reaction_table[index].have_arg;
                 }
     } // end while
-    GUI_Verbose();
     printf("\n ********** Automation ended***********\n");
     return 0; // Do not call me anymore
 }
@@ -498,15 +494,6 @@
 
 /**
  * 
- * @param p
- */
-void set_reuse_2pass_log(char *p)
-{
-   prefs->set(FEATURES_REUSE_2PASS_LOG,true);
-}
-
-/**
- * 
  * @param name
  */
 void  loadCB(char *name)

avidemux_2.7.3.tar.gz/avidemux/common/ADM_videoCodec/private_inc/ADM_codecDxva2.h -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_videoCodec/private_inc/ADM_codecDxva2.h Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp Changed

@@ -37,11 +37,10 @@
 #include "prefs.h"
 #include "ADM_coreDxva2.h"
 #include "../private_inc/ADM_codecDxva2.h"
-#include "ADM_threads.h"
 #include "ADM_vidMisc.h"
-#include "prefs.h"
 
 static bool         dxva2Working=false;
+static int          totalSurfaces=0;
 static int  ADM_DXVA2getBuffer(AVCodecContext *avctx, AVFrame *pic,int flags);
 static void ADM_DXVA2releaseBuffer(void *s, uint8_t *d);
 static admMutex     imageMutex;
@@ -194,9 +193,13 @@
 }
 
 
-
-
-
+static const char *humanReadable(int64_t version)
+{
+    char str[49];
+    snprintf(str,48,"%u.%u.%u.%u", (version>>48) & 0xFFFF, (version>>32) & 0xFFFF, (version>>16) & 0xFFFF, version & 0xFFFF);
+    str[48]=0;
+    return ADM_strdup(str);
+}
 
 extern "C"
 {
@@ -204,10 +207,12 @@
 static enum AVPixelFormat ADM_DXVA2_getFormat(struct AVCodecContext *avctx,  const enum AVPixelFormat *fmt)
 {
     int i;
+    bool ignore_version, ignore_profile;
     ADM_info("[DXVA2]: GetFormat\n");
     AVCodecID id=AV_CODEC_ID_NONE;
     AVPixelFormat c;
     AVPixelFormat outPix;
+    ignore_version=ignore_profile=false;
     for(i=0;fmt[i]!=AV_PIX_FMT_NONE;i++)
     {
         c=fmt[i];
@@ -219,25 +224,39 @@
 
         if(c!=AV_PIX_FMT_DXVA2_VLD) continue;
 #define FMT_V_CHECK(x,y)      case AV_CODEC_ID_##x:   outPix=AV_PIX_FMT_DXVA2_VLD;id=avctx->codec_id;break;
-
+#define INTEL_MIN_DRIVER_VERSION_FOR_HEVC 7036960323672538 // 25.20.100.6618
 
         switch(avctx->codec_id)  //AV_CODEC_ID_H265
         {
             FMT_V_CHECK(H264,H264)
             case AV_CODEC_ID_H265:
-              {
-                    admD3D::ADM_vendorID vid=admD3D::getVendorID();
-                    if(vid==admD3D::VENDOR_INTEL)
+            {
+                admD3D::ADM_vendorID vid=admD3D::getVendorID();
+                int64_t drv=admD3D::getDriverVersion();
+                if(vid==admD3D::VENDOR_INTEL && drv<INTEL_MIN_DRIVER_VERSION_FOR_HEVC)
+                {
+                    prefs->get(FEATURES_DXVA2_OVERRIDE_BLACKLIST_VERSION,&ignore_version);
+                    const char *minversion=humanReadable(INTEL_MIN_DRIVER_VERSION_FOR_HEVC);
+                    if(!ignore_version)
                     {
-                        ADM_warning("Intel blacklisted for H265 decoding \n");
+                        ADM_warning("Intel driver version %s < %s is blacklisted for HEVC decoding.\n",humanReadable(drv),minversion);
+                        continue;
                     }
-                    else
+                    ADM_warning("Overriding Intel driver version blacklist for %s\n",humanReadable(drv));
+                }else if(vid==admD3D::VENDOR_INTEL && dxvaBitDepthFromContext(avctx)==10)
+                {
+                    prefs->get(FEATURES_DXVA2_OVERRIDE_BLACKLIST_PROFILE,&ignore_profile);
+                    if(!ignore_profile)
                     {
-                      outPix=AV_PIX_FMT_DXVA2_VLD;
-                      id=avctx->codec_id;
+                        ADM_warning("Intel is blacklisted for 10bit HEVC.\n");
+                        continue;
                     }
-              }
-              break;
+                    ADM_warning("Overriding blacklist for 10bit HEVC on Intel.\n");
+                }
+                outPix=AV_PIX_FMT_DXVA2_VLD;
+                id=avctx->codec_id;
+            }
+            break;
             //FMT_V_CHECK(H265,H265)
             default:
                 ADM_info("DXVA2 No hw support for format %d\n",avctx->codec_id);
@@ -308,7 +327,14 @@
     memset(dx_context,0,sizeof(*dx_context)); // dangerous...
 
     // Allocate temp buffer
-    num_surfaces=4;
+    uint32_t cacheSize;
+    if(!prefs->get(FEATURES_CACHE_SIZE,&cacheSize))
+        cacheSize = EDITOR_CACHE_MAX_SIZE;
+    if(cacheSize > EDITOR_CACHE_MAX_SIZE) cacheSize = EDITOR_CACHE_MAX_SIZE;
+    if(cacheSize < EDITOR_CACHE_MIN_SIZE) cacheSize = EDITOR_CACHE_MIN_SIZE;
+    num_surfaces = cacheSize;
+    if(!totalSurfaces)
+        num_surfaces+=ADM_THREAD_QUEUE_SIZE;
 
     switch(avctx->codec_id)
     {
@@ -367,8 +393,9 @@
     dx_context->surface_count   = num_surfaces;
     dx_context->cfg             = admDxva2::getDecoderConfig(avctx->codec_id,bits);
 
-    ADM_info("Ctor Successfully setup DXVA2 hw accel (%d surface created, ffdxva=%p,parent=%p,context=%p)\n",num_surfaces,this,parent,avctx);
     alive=true;
+    totalSurfaces+=num_surfaces;
+    ADM_info("Successfully setup DXVA2 hw accel (%d surface created, %d total, ffdxva=%p,parent=%p,context=%p)\n",num_surfaces,totalSurfaces,this,parent,avctx);
 }
 
 /**
@@ -379,6 +406,7 @@
     if(alive)
     {
         admDxva2::destroyD3DSurface(num_surfaces,surfaces);
+        totalSurfaces-=num_surfaces;
         // TODO : flush pool
     }
     if(_context->hwaccel_context)
@@ -414,8 +442,9 @@
 {
 
    imageMutex.lock();
-   surface->refCount--;
-   aprintf("Surface %x, Ref count is now %d\n",surface->surface,surface->refCount);
+   if(surface->refCount>0)
+       surface->refCount--;
+   aprintf("Surface 0x%p, Ref count is now %d\n",surface->surface,surface->refCount);
    if(!surface->refCount)
    {
         surface->removeRef();
@@ -482,8 +511,6 @@
 
     int ret = avcodec_receive_frame(_context, frame);
 
-    if(!ret)
-        _parent->setEndOfStream(false);
     if(!_parent->decodeErrorHandler(ret))
         return false;

avidemux_2.7.3.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_videotoolbox.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_videotoolbox.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_videoFilter2/include/ADM_filterThread.h -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_videoFilter2/include/ADM_filterThread.h Changed

avidemux_2.7.3.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_filterThread.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_filterThread.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/GUI_jobs.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/GUI_jobs.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/gui_main.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/gui_main.cpp Changed

@@ -52,7 +52,7 @@
 admMutex singleThread;
 
 float currentZoom=ZOOM_1_1;
-static bool cutsNotOnIntraWarned;
+static int cutsNotOnIntraWarned;
 #include "DIA_audioTracks.h"
 //***********************************
 //******** A Function ***************
@@ -142,9 +142,6 @@
 }
 void HandleAction (Action action)
 {
-  uint32_t nf = 0;
-  uint32_t old;
-
   admScopedMutex autolock(&singleThread); // make sure only one thread at a time calls this
   
   ADM_warning("************ %s **************\n",getActionName(action));
@@ -264,9 +261,8 @@
                     std::string f=LAST_SESSION_FILE;
                     if(ADM_fileExist(f.c_str()))
                     {
-                        int err=remove(f.c_str());
-                        if(err)
-                            ADM_warning("Error %d deleting last editing state %s\n",err,f.c_str());
+                        if(!ADM_eraseFile(f.c_str()))
+                            ADM_warning("Could not delete last editing state %s\n",f.c_str());
                     }
                 }
                 return;
@@ -564,17 +560,47 @@
               {
                   video_body->pasteFromClipBoard(currentPts);
               }
-              if(!UI_getCurrentVCodec() && !video_body->checkCutsAreOnIntra())
+              ADM_cutPointType chk=ADM_EDITOR_CUT_POINT_IDR;
+              if(!UI_getCurrentVCodec())
+                  chk=video_body->checkCutsAreOnIntra();
+              if(cutsNotOnIntraWarned!=(int)chk && chk!=ADM_EDITOR_CUT_POINT_IDR)
               {
-                  if(!GUI_Question(QT_TRANSLATE_NOOP("adm","The cut points of the pasted video are not on keyframes.\n"
-                      "Video saved in copy mode will be corrupted at these points.\n"
-                      "Proceed anyway?")))
+                  const char *alert;
+                  bool ask=true;
+                  switch(chk)
+                  {
+                      case ADM_EDITOR_CUT_POINT_NON_IDR:
+                          alert=QT_TRANSLATE_NOOP("adm","The cut points of the pasted video are not on keyframes.\n"
+                              "Video saved in copy mode will be corrupted at these points.\n"
+                              "Proceed anyway?");
+                          break;
+                      case ADM_EDITOR_CUT_POINT_RECOVERY:
+                          alert=QT_TRANSLATE_NOOP("adm","This video uses non-IDR recovery points instead of IDR as keyframes. "
+                              "Picture reordering information in the video stream is not reset at non-IDR frames. "
+                              "The cut points of the pasted selection may result in playback interruption "
+                              "due to reversed display order of frames if saved in copy mode.\n"
+                              "Proceed anyway?");
+                          break;
+                      case ADM_EDITOR_CUT_POINT_MISMATCH:
+                          alert=QT_TRANSLATE_NOOP("adm","Codec or codec settings across a cut point of the pasted video do not match.\n"
+                              "Playback of the video saved in copy mode may stop at this point.\n"
+                              "Proceed anyway?");
+                          break;
+                      case ADM_EDITOR_CUT_POINT_UNCHECKED:
+                          alert=QT_TRANSLATE_NOOP("adm","Cut points of the pasted video could not be checked. "
+                              "This indicates an issue with a source video, the state of editing or a bug in the program. "
+                              "Please check the application log file or console output for details.\n"
+                              "Try anyway?");
+                      default:
+                          ask=false; break;
+                  }
+                  if(ask && !GUI_Question(alert))
                   {
                       video_body->undo();
-                      cutsNotOnIntraWarned=false;
+                      cutsNotOnIntraWarned=-1;
                       break;
                   }
-                  cutsNotOnIntraWarned=true;
+                  cutsNotOnIntraWarned=(int)chk;
               }
               video_body->getVideoInfo (avifileinfo);
               d=video_body->getVideoDuration()-d;
@@ -692,27 +718,64 @@
                 GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Cutting"),QT_TRANSLATE_NOOP("adm","Error while cutting out."));
                 break;
             }
-            if(!cutsNotOnIntraWarned && !lastFrame && !UI_getCurrentVCodec() && !video_body->checkCutIsOnIntra(a))
+            ADM_cutPointType chk=ADM_EDITOR_CUT_POINT_IDR;
+            if(!lastFrame && !UI_getCurrentVCodec())
+                chk=video_body->checkCutIsOnIntra(a);
+            if(cutsNotOnIntraWarned!=(int)chk && chk!=ADM_EDITOR_CUT_POINT_IDR)
             {
                 const char *alert;
-                if(action==ACT_Cut)
+                bool ask=true;
+                switch(chk)
                 {
-                    alert=QT_TRANSLATE_NOOP("adm","The end point of the cut is not on a keyframe.\n"
-                        "Video saved in copy mode will be corrupted at this point.\n"
-                        "Proceed anyway?");
-                }else
-                {
-                    alert=QT_TRANSLATE_NOOP("adm","The end point of the deletion is not on a keyframe.\n"
-                        "Video saved in copy mode will be corrupted at this point.\n"
-                        "Proceed anyway?");
+                    case ADM_EDITOR_CUT_POINT_NON_IDR:
+                        if(action==ACT_Cut)
+                            alert=QT_TRANSLATE_NOOP("adm","The end point of the cut is not on a keyframe.\n"
+                                "Video saved in copy mode will be corrupted at this point.\n"
+                                "Proceed anyway?");
+                        else
+                            alert=QT_TRANSLATE_NOOP("adm","The end point of the deletion is not on a keyframe.\n"
+                                "Video saved in copy mode will be corrupted at this point.\n"
+                                "Proceed anyway?");
+                        break;
+                    case ADM_EDITOR_CUT_POINT_RECOVERY:
+                        if(action==ACT_Cut)
+                            alert=QT_TRANSLATE_NOOP("adm","This video uses non-IDR recovery points instead of IDR as keyframes. "
+                                "Picture reordering information in the video stream is not reset at non-IDR frames. "
+                                "The chosen start and end points of the cut may result in playback interruption "
+                                "due to reversed display order of frames if saved in copy mode.\n"
+                                "Proceed anyway?");
+                        else
+                            alert=QT_TRANSLATE_NOOP("adm","This video uses non-IDR recovery points instead of IDR as keyframes. "
+                                "Picture reordering information in the video stream is not reset at non-IDR frames. "
+                                "The chosen start and end points of the deletion may result in playback interruption "
+                                "due to reversed display order of frames if saved in copy mode.\n"
+                                "Proceed anyway?");
+                        break;
+                    case ADM_EDITOR_CUT_POINT_MISMATCH:
+                        if(action==ACT_Cut)
+                            alert=QT_TRANSLATE_NOOP("adm","Codec or codec settings across the cut do not match. "
+                                "Playback of the video saved in copy mode may stop at this point.\n"
+                                "Proceed anyway?");
+                        else
+                            alert=QT_TRANSLATE_NOOP("adm","Codec or codec settings across the deletion do not match. "
+                                "Playback of the video saved in copy mode may stop at this point.\n"
+                                "Proceed anyway?");
+                        break;
+                    case ADM_EDITOR_CUT_POINT_UNCHECKED:
+                        alert=QT_TRANSLATE_NOOP("adm","Cut points could not be checked.\n"
+                            "This indicates an issue with a source video, the state of editing or a bug in the program. "
+                            "Please check the application log file or console output for details.\n"
+                            "Proceed anyway?");
+                        break;
+                    default: ask=false; break;
                 }
-                if(!GUI_Question(alert))
+                if(ask && !GUI_Question(alert))
                 {
                     video_body->undo();
-                    cutsNotOnIntraWarned=false;
+                    cutsNotOnIntraWarned=-1;
                     break;
                 }
-                cutsNotOnIntraWarned=true;
+                cutsNotOnIntraWarned=(int)chk;
             }
             A_ResetMarkers();
             A_Resync(); // total duration & stuff
@@ -854,6 +917,7 @@
 
     {
         int i;
+#if 0
         FILE *fd = NULL;
         char magic[4];
 
@@ -861,7 +925,6 @@
          ** by video_body->addFile (name);
          */
         //#warning FIXME
-#if 0
         if ((fd = ADM_fopen(longname, "rb")))
         {
             if (fread(magic, 4, 1, fd) == 4)
@@ -1036,8 +1099,6 @@
 
 void ReSync (void)
 {
-  uint8_t isaviaud;
-
   // update audio stream
   // If we were on avi , mark it...
   GUI_setAllFrameAndTime ();
@@ -1192,8 +1253,9 @@
     delete writer;
     
     std::string script = stream.str();
-    ADM_info("Generated settings=%s\n",script.c_str());
-    
+    ADM_info("Generated settings:\n");
+    printf("%s\n",script.c_str());
+
     FILE *file = ADM_fopen(fileName.c_str(), "wt");
     ADM_fwrite(script.c_str(), script.length(), 1, file);
     ADM_fclose(file);

avidemux_2.7.3.tar.gz/avidemux/common/gui_navigate.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/gui_navigate.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/common/gui_play.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/gui_play.cpp Changed

@@ -118,8 +118,6 @@
         return;
     }
 
-    uint32_t framelen,flags;
-    uint32_t max,err;
     uint64_t oldTimeFrame,newTimeFrame;
     aviInfo info;
     float oldZoom=admPreview::getCurrentZoom();
@@ -342,11 +340,9 @@
                 delta=(int32_t)movieTime-(int32_t)systemTime;
             }
         }
-      }
+    }
     while (!stop_req);
-
-abort_play:
-        return true;
+    return true;
 };
 
 /**
@@ -456,13 +452,13 @@
       }
       fill+=small_;
     }
-    AVDM_AudioPlay(wavbuf, fill);
     // Let audio latency sets in...
     ticktock.reset();
+    AVDM_AudioPlay(wavbuf, fill);
+    updateVu();
+#if 0
     uint32_t slice=(frequency * channels)/100; // 10 ms
     // pump data until latency is over
-    updateVu();
-    #if 0
     while(ticktock.getElapsedMS()<latency)
     {
         if(AVDM_getMsFullness()<AUDIO_PRELOAD)
@@ -477,8 +473,8 @@
        ADM_usleep(10*1000);
        updateVu();
     }
-    #endif
     printf("[Playback] Latency is now %u\n",ticktock.getElapsedMS());
+#endif
     return true;
 }
 /**

avidemux_2.7.3.tar.gz/avidemux/common/gui_save.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/gui_save.cpp Changed

@@ -118,8 +118,8 @@
                 }else
                 {
                     std::string oFile;
-                    char *oText=NULL;
-                    
+                    std::string prefilled=std::string("Job ")+ADM_getTimeDateAsString();
+                    char *oText=ADM_strdup(prefilled.c_str());
                     diaElemFile wFile(1,oFile,QT_TRANSLATE_NOOP("adm","Output file"),"");
                     diaElemText wText(&oText,QT_TRANSLATE_NOOP("adm","Job name"));
                     diaElem *elems[2]={&wText,&wFile};
@@ -147,7 +147,7 @@
 #endif
     case ACT_SAVE_AUDIO:
     {
-        std:string ext;
+        std::string ext;
         if(false==audioSavePrepare(&ext))
             break;
         if(ext.size())
@@ -226,7 +226,7 @@
 */
 static bool A_saveAudioCommon (const char *name,ADM_audioStream *stream,double duration)
 {
-  uint32_t written, max;
+  uint32_t written;
   uint64_t dts;
   DIA_workingBase *work;
 #define ONE_STRIKE (64*1024)
@@ -248,7 +248,6 @@
 
   work=createWorking(QT_TRANSLATE_NOOP("adm","Saving audio"));
 
-  uint64_t timeEnd,timeStart;
   uint32_t hold,len,sample;
   uint64_t tgt_sample,cur_sample;
 
@@ -666,21 +665,36 @@
     IScriptEngine *engine=getPythonScriptEngine();
             if(!engine)
             {
-                GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Queue"),QT_TRANSLATE_NOOP("adm","Cannot get tinyPÿ script engine"));
+                GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Error"),QT_TRANSLATE_NOOP("adm","Cannot get tinyPy script engine"));
                 return;
             }
 
             job.outputFileName=string(outputFile);
+            if(job.outputFileName.empty())
+            {
+                GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Error"),QT_TRANSLATE_NOOP("adm","Output file not specified"));
+                return;
+            }
             job.jobName=string(jobName);
 //#warning make sure it is unique
             job.scriptName=string(jobName)+string(".")+engine->defaultFileExtension();
-            if(false==ADMJob::jobAdd(job))
+            string completePath=string(ADM_getJobDir());
+            completePath+=job.scriptName;
+            bool collision=false;
+            if(ADM_fileExist(completePath.c_str()))
+            {
+                char str[4096+512+1];
+                str[0]='\0';
+                snprintf(str,4096+512+1,QT_TRANSLATE_NOOP("adm","Job script %s already exists. Overwrite?"),completePath.c_str());
+                str[4096+512]='\0';
+                if(false==GUI_Question(str))
+                    collision=true;
+            }
+            if(collision || false==ADMJob::jobAdd(job))
             {
-                GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Queue"),QT_TRANSLATE_NOOP("adm","Cannot add job %s"),jobName);
+                GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Error"),QT_TRANSLATE_NOOP("adm","Cannot add job %s"),jobName);
                 return;
             }
-            string completePath=string(ADM_getJobDir());
-            completePath=completePath+string("/")+job.scriptName;
             // Save the script...
 
             A_saveScript(engine, completePath.c_str());

avidemux_2.7.3.tar.gz/avidemux/common/gui_savenew.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/gui_savenew.cpp Changed

@@ -174,7 +174,7 @@
     if(videoDuration<5000) videoDuration=5000;
     printf("[Save] Performing Pass one,using %s as log file\n",logFileName.c_str());
     
-    if(ADM_fileExist(logFileName.c_str()))
+    if(false==GUI_isQuiet() && ADM_fileExist(logFileName.c_str()))
     {
         if(GUI_Question(QT_TRANSLATE_NOOP("adm","Reuse previous first pass data ?\nWarning, the settings must be close.")))
         {
@@ -435,27 +435,47 @@
 
 bool admSaver::save(void)
 {
-
-
     int ret=false;
-    
-    
+
     ADM_info("Audio starting time %s\n",ADM_us2plain(startAudioTime));
     ADM_info("[A_Save] Saving..\n");
-    
-    
-    EditableAudioTrack *ed=NULL;
-    
+
     if(!videoEncoderIndex) 
     {
-        if(false==video_body-> checkCutsAreOnIntra())
+        ADM_cutPointType chk=video_body->checkCutsAreOnIntra(startAudioTime,markerB);
+        const char *alert;
+        bool ask=true;
+        switch(chk)
         {
-            if(!GUI_Question(QT_TRANSLATE_NOOP("adm","The video is in copy mode but the cut points are not on keyframes.\n"
-                            "The video will be saved but there will be corruption at cut point(s).\n"
-                             "Do you want to continue anyway ?")))
-            {
-                return false;
-            }
+            case ADM_EDITOR_CUT_POINT_NON_IDR:
+                alert=QT_TRANSLATE_NOOP("adm","The video is in copy mode but the cut points are not on keyframes.\n"
+                    "The video will be saved but there will be corruption at cut point(s).\n"
+                    "Do you want to continue anyway ?");
+                break;
+            case ADM_EDITOR_CUT_POINT_RECOVERY:
+                alert=QT_TRANSLATE_NOOP("adm","This video uses non-IDR recovery points instead of IDR as keyframes. "
+                    "Picture reordering information in the video stream is not reset at non-IDR frames. "
+                    "The choice of cut points may result in playback interruption "
+                    "due to reversed display order of frames if saved in copy mode.\n"
+                    "Do you want to continue anyway?");
+                break;
+            case ADM_EDITOR_CUT_POINT_MISMATCH:
+                alert=QT_TRANSLATE_NOOP("adm","Codec or codec settings across a cut point do not match. "
+                    "Playback of the video saved in copy mode may stop at this point.\n"
+                    "Do you want to continue anyway?");
+                break;
+            case ADM_EDITOR_CUT_POINT_UNCHECKED:
+                alert=QT_TRANSLATE_NOOP("adm","Cut points could not be checked. "
+                    "This indicates an issue with a source video, the state of editing or a bug in the program. "
+                    "Please check the application log file or console output for details.\n"
+                    "Try anyway?");
+                break;
+            default:
+                ask=false; break;
+        }
+        if(ask && !GUI_Question(alert))
+        {
+            return false;
         }
     }
 
@@ -493,7 +513,7 @@
         ret=muxer->save();
         muxer->close();
     }
-abort123:
+
     if(video)
         delete video;
     video=NULL;

avidemux_2.7.3.tar.gz/avidemux/common/main.cpp -> avidemux_2.7.4.tar.gz/avidemux/common/main.cpp Changed

@@ -33,14 +33,15 @@
 #include "audio_out.h"
 #include "ADM_assert.h"
 #include "adm_main.h"
+#include "ADM_render/GUI_render.h"
 
 void abortExitHandler(void);
 
-typedef struct flavors
+typedef struct
 {
         const char *qt4;
         const char *qt5;
-};
+}flavors;
 
 static flavors myFlavors={"qt4","qt5"};
 
@@ -57,7 +58,7 @@
 
 #if defined(_WIN32) && (ADM_UI_TYPE_BUILD == ADM_UI_GTK || ADM_UI_TYPE_BUILD == ADM_UI_QT4) 
 	// redirect output before registering exception handler so error dumps are captured
-	redirectStdoutToFile();
+	redirectStdoutToFile("admlog.txt");
 #endif
 
 	installSigHandler();
@@ -427,25 +428,25 @@
 */
 bool setPrefsDefault(void)
 {
-#ifdef __MINGW32__
+#ifdef _WIN32
         prefs->set(AUDIO_DEVICE_AUDIODEVICE,std::string("Win32"));
-    #ifdef USE_OPENGL
-        prefs->set(VIDEODEVICE,(uint32_t)5); // QTGL
+    #ifdef USE_DXVA2
+        prefs->set(VIDEODEVICE,(uint32_t)RENDER_DXVA2);
     #endif
 #endif
 #ifdef __linux__
-            prefs->set(AUDIO_DEVICE_AUDIODEVICE,std::string("PulseAudioS"));
+        prefs->set(AUDIO_DEVICE_AUDIODEVICE,std::string("PulseAudioS"));
     #ifdef USE_VDPAU
-            prefs->set(VIDEODEVICE,(uint32_t)4); // VDPAU
-    #else
-            prefs->set(VIDEODEVICE,(uint32_t)1); // XV
+        prefs->set(VIDEODEVICE,(uint32_t)RENDER_VDPAU);
+    #elif defined(USE_XV)
+        prefs->set(VIDEODEVICE,(uint32_t)RENDER_XV);
     #endif
 #endif
 #ifdef __APPLE__
         prefs->set(AUDIO_DEVICE_AUDIODEVICE,std::string("CoreAudio"));
     #ifdef USE_OPENGL
         prefs->set(FEATURES_ENABLE_OPENGL,true);
-        prefs->set(VIDEODEVICE,(uint32_t)5); // QTGL
+        prefs->set(VIDEODEVICE,(uint32_t)RENDER_QTOPENGL);
     #endif
 #endif
     return true;

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_UIs/src/FAC_frame.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/src/FAC_frame.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_UIs/src/T_dialogFactory.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/src/T_dialogFactory.cpp Changed

@@ -45,22 +45,19 @@
         factoryCookie(const char *title)
         {
             dialog=new QDialog(qtLastRegisteredDialog());
-            qtRegisterDialog(dialog);
             dialog->setWindowTitle(QString::fromUtf8(title));
-            vboxlayout = new QVBoxLayout();
-            
+            vboxlayout = new QVBoxLayout(dialog);
             tabWidget=NULL;
             layout=NULL;
-            
         }
         virtual ~factoryCookie()
         {
+            if(vboxlayout)
+                delete vboxlayout;
             if(dialog)
-            {
-                qtUnregisterDialog(dialog);
                 delete dialog;
-            }
             dialog=NULL;
+            vboxlayout=NULL;
         }
 public:
         QDialog     *dialog;
@@ -146,6 +143,8 @@
 
    cookie->dialog->setLayout(cookie->vboxlayout);
 
+   qtRegisterDialog(cookie->dialog);
+
   if(cookie->dialog->exec()==QDialog::Accepted)
   {
      int nb=cookie->items.size();
@@ -156,6 +155,9 @@
       }
      r=true;
   }
+
+  qtUnregisterDialog(cookie->dialog);
+
   delete cookie;
   return r;
 }
@@ -226,6 +228,8 @@
      cookie->dialog->adjustSize();
      cookie->tabWidget->setUsesScrollButtons(true);
 
+    qtRegisterDialog(cookie->dialog);
+
     if(cookie->dialog->exec()==QDialog::Accepted)
     {
         // Read tabs
@@ -233,7 +237,8 @@
         for(int i=0;i<n;i++)
             cookie->items[i]->getMe();
         r=true;
-    }    
+    }
+    qtUnregisterDialog(cookie->dialog);
     delete cookie;
     return r;
 }

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_UIs/src/toolkit.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_UIs/src/toolkit.cpp Changed

@@ -13,27 +13,29 @@
     if (widgetStack.count())
     {
         Qt::WindowFlags flags = dialog->windowFlags();
+#if defined(__APPLE__) // && QT_VERSION == QT_VERSION_CHECK(5,10,1)
+        //ADM_info("Working around Qt bug introduced in 5.10.1 resulting in non-resizable dialogs with Cocoa\n");
+
+        // Work around a presumable Qt bug which allows application-modal parents of application-modal dialogs to receive focus.
+        dialog->setWindowFlag(Qt::Dialog, false);
+        dialog->setParent(widgetStack.top(), Qt::Window);
+        flags = dialog->windowFlags();
+        flags |= Qt::CustomizeWindowHint;
+        flags &= ~Qt::WindowMinimizeButtonHint;
+        flags &= ~Qt::WindowFullscreenButtonHint;
+        dialog->setWindowFlags(flags);
+        dialog->setWindowModality(Qt::ApplicationModal);
+#else
         bool reparent = false;
         bool isDialog = false;
         if (dialog->parentWidget() != widgetStack.top())
             reparent = true;
         if (flags & Qt::Dialog)
             isDialog = true;
-#if defined(__APPLE__) && QT_VERSION == QT_VERSION_CHECK(5,10,1)
-        if (reparent || isDialog)
-        {
-            ADM_info("Working around Qt bug introduced in 5.10.1 resulting in non-resizable dialogs with Cocoa\n");
-            dialog->setWindowFlag(Qt::Dialog, false);
-            dialog->setParent(widgetStack.top(), Qt::Window);
-            dialog->setWindowModality(Qt::ApplicationModal);
-            dialog->show();
-        }
-#else
         if (reparent || !isDialog)
         {
             ADM_info("reparenting widget %s\n",dialog->objectName().toUtf8().constData());
             dialog->setParent(widgetStack.top(), Qt::Dialog);
-            dialog->show(); // reparenting makes the widget invisible
         }
 #endif
     }

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_openGL/src/ADM_openGlDownload_asm.asm -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_openGL/src/ADM_openGlDownload_asm.asm Changed

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp Changed

@@ -73,8 +73,6 @@
                             this,SLOT(languagesClicked(int)));   
  * */          
         }
-        // set the parent and show the window
-        qtRegisterDialog(window);
 };
 /**
  * \fn setLanguageFromPool
@@ -172,14 +170,22 @@
         _pool->addInternalTrack(ext);
         for(int i=0;i<NB_MENU;i++)
         {
-            int forced=-1;
-            if(i==dex) forced=poolIndex;
+            bool checked=window->enabled[i]->isChecked();
+            int forced=window->inputs[i]->currentIndex();
+            if(i==dex)
+            {
+                checked=true;
+                forced=poolIndex;
+            }
             setupMenu(i,forced);
+            // restore enabled / disabled state
+            window->enabled[i]->blockSignals(true);
+            if(checked)
+                enable(i);
+            else
+                disable(i);
+            window->enabled[i]->blockSignals(false);
         }
-        // set enabled if needed
-          window->enabled[dex]->blockSignals(true);
-          enable(dex);
-          window->enabled[dex]->blockSignals(false);
         return;
 }
   
@@ -273,6 +279,7 @@
 {
     ADM_info("Running QT4 audioTrack GUI\n");
     bool r=false;
+    qtRegisterDialog(window);
     again:
     if(window->exec()==QDialog::Accepted)
     {

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.cpp Changed

@@ -31,7 +31,7 @@
 
 //*******************************************
 #define WIDGET(x) (ui->x)
-#define WRITEM(x,y) ui->x->setText(y)
+#define WRITEM(x,y) ui->x->setText(QString::fromUtf8(y))
 #define WRITE(x) WRITEM(x,stringMe)
 /*************************************/
 
@@ -182,11 +182,11 @@
     {
         ui->tabWidget->setTabEnabled(1, false); // disable the "Advanced" tab
         ui->checkBoxShutdown->setVisible(false); // hide the shutdown checkbox
-        this->setWindowTitle(QT_TRANSLATE_NOOP("qencoding","First Pass"));
+        this->setWindowTitle(QString::fromUtf8(QT_TRANSLATE_NOOP("qencoding","First Pass")));
         WRITEM(labelPhasis,QT_TRANSLATE_NOOP("qencoding","Pass 1"));
     }else
     {
-        this->setWindowTitle(QT_TRANSLATE_NOOP("qencoding","Encoding..."));
+        this->setWindowTitle(QString::fromUtf8(QT_TRANSLATE_NOOP("qencoding","Encoding...")));
         ui->tabWidget->setTabEnabled(1, true);
 #if 0
         ui->checkBoxShutdown->setVisible(true);
@@ -362,7 +362,7 @@
           ADM_assert(ui);
           std::string s;
           ADM_durationToString(milliseconds,s);
-          ui->labelETA->setText(QString(s.c_str()));
+          ui->labelETA->setText(QString::fromUtf8(s.c_str()));
 }
 
 /**

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_jobs.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_jobs.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_processing.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_processing.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.cpp Changed

@@ -38,11 +38,11 @@
     if (!avifileinfo)
         return;
 
-#define FILLTEXT(a,b,c) {snprintf(text,79,b,c); listOfValues.push_back(text); ui.a->setText(text);}
-#define FILLTEXT4(a,b,c,d) {snprintf(text,79,b,c,d); listOfValues.push_back(text); ui.a->setText(text);}
-#define FILLTEXT5(a,b,c,d,e) {snprintf(text,79,b,c,d,e); listOfValues.push_back(text); ui.a->setText(text);}
-#define SET_YES(a,b) ui.a->setText(yesno[b])
-#define FILLQT_TRANSLATE_NOOP(a,q) listOfValues.push_back(text); ui.q->setText(text);
+#define FILLTEXT(a,b,c) {snprintf(text,79,b,c); listOfValues.push_back(QString::fromUtf8(text)); ui.a->setText(QString::fromUtf8(text));}
+#define FILLTEXT4(a,b,c,d) {snprintf(text,79,b,c,d); listOfValues.push_back(QString::fromUtf8(text)); ui.a->setText(QString::fromUtf8(text));}
+#define FILLTEXT5(a,b,c,d,e) {snprintf(text,79,b,c,d,e); listOfValues.push_back(QString::fromUtf8(text)); ui.a->setText(QString::fromUtf8(text));}
+#define SET_YES(a,b) ui.a->setText(QString::fromUtf8(yesno[b])
+#define FILLQT_TRANSLATE_NOOP(a,q) listOfValues.push_back(QString::fromUtf8(text)); ui.q->setText(QString::fromUtf8(text));
 
     //------------------------------------
 
@@ -154,9 +154,9 @@
 }
 
 #define ADDCATEGORY(a) props += QString("\n=====================================================\n")\
-                               +QString(a)\
+                               +QString::fromUtf8(a)\
                                +QString("\n=====================================================\n");
-#define ADDNAMEVALUE(a,b) props += QString(a)+QString("\t")+QString(b)+QString("\n");
+#define ADDNAMEVALUE(a,b) props += QString::fromUtf8(a)+QString("\t")+QString(b)+QString("\n");
 
 /**
     \fn propsCopyToClipboard

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.cpp Changed

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/alert_qt4.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/alert_qt4.cpp Changed

@@ -27,234 +27,248 @@
 
 namespace ADM_Qt4CoreUIToolkit
 {
-	void GUI_Alert(const char *alertstring)
-	{
-		QMessageBox::critical(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Alert")),
-			QString::fromUtf8(alertstring), QMessageBox::Ok );
-	}
-
-	void GUI_Info(const char *alertstring)
-	{
-		QMessageBox::information(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Info")),
-			QString::fromUtf8(alertstring), QMessageBox::Ok );
-	}
-
-	void GUI_Info_HIG(const ADM_LOG_LEVEL level,const char *primary, const char *secondary_format)
-	{
-		uint32_t msglvl=2;
-		QString alertString;
-
-		prefs->get(MESSAGE_LEVEL,&msglvl);
-
-		if(msglvl<level)
-		{
-			printf("Info : %s \n",primary);
-			return;
-		}
-
-		if(! secondary_format)
-			alertString = "<big><b>" + QString::fromUtf8(primary) + "</b></big>";
-		else
-		{
-			alertString = "<big><b>" + QString::fromUtf8(primary) + "</b></big><br><br>" + QString::fromUtf8(secondary_format);
-			alertString.replace("\n", "<br>");
-		}
-
-		QMessageBox::information(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Info")),
-			alertString, QMessageBox::Ok);
-	}
-
-	void GUI_Error_HIG(const char *primary, const char *secondary_format)
-	{
-		uint32_t msglvl=2;
-		QString alertString;
-
-		prefs->get(MESSAGE_LEVEL,&msglvl);
-
-		if(msglvl==ADM_LOG_NONE) 
-		{
-			printf("Error :%s\n",primary);
-			return;
-		}
-
-		if(! secondary_format)
-			alertString = "<big><b>" + QString::fromUtf8(primary) + "</b></big>";
-		else
-		{
-			alertString = "<big><b>" + QString::fromUtf8(primary) + "</b></big><br><br>" + QString::fromUtf8(secondary_format);
-			alertString.replace("\n", "<br>");
-		}
-
-		QMessageBox::critical(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Info")),
-			alertString, QMessageBox::Ok);
-	}
-
-	int GUI_Confirmation_HIG(const char *button_confirm, const char *primary, const char *secondary_format)
-	{
-		QString alertString;
-
-		if (beQuiet)
-		{
-			printf("Info: %s\n", primary);
-			return 0;
-		}
-
-		if (!secondary_format)
-			alertString = "<big><b>" + QString::fromUtf8(primary) + "</b></big>";
-		else
-		{	
-			alertString = "<big><b>" + QString::fromUtf8(primary) + "</b></big><br><br>" + QString::fromUtf8(secondary_format);
-			alertString.replace("\n", "<br>");
-		}
-
-		QMessageBox::StandardButton reply;
-
-		reply = QMessageBox::question(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Confirmation")),
-			alertString, QMessageBox::Yes | QMessageBox::No);
-
-		if (reply == QMessageBox::Yes)
-			return 1;
-
-		return 0; 
-	}
-
-	int GUI_YesNo(const char *primary, const char *secondary_format)
-	{
-		uint32_t msglvl=2;
-		QString alertString;
-
-		if (beQuiet)
-		{
-			printf("Info: %s\n", primary);
-			return 0;
-		}
-
-		if (!secondary_format)
-			alertString = "<big><b>" + QString::fromUtf8(primary) + "</b></big>";
-		else
-		{	
-			alertString = "<big><b>" + QString::fromUtf8(primary) + "</b></big><br><br>" + QString::fromUtf8(secondary_format);
-			alertString.replace("\n", "<br>");
-		}
-
-		QMessageBox::StandardButton reply;
-
-		reply = QMessageBox::question(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Confirmation")),
-			alertString, QMessageBox::Yes | QMessageBox::No );
-
-		if (reply == QMessageBox::Yes)
-			return 1;
-
-		return 0; 
-	}
-
-	int GUI_Question(const char *alertstring)
-	{
-		QMessageBox::StandardButton reply;
-
-		if (beQuiet)
-		{
-			printf("Question: %s\n", alertstring);
-			return 0;
-		}
-
-		reply = QMessageBox::question(qtLastRegisteredDialog(), QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Question")),
-			QString::fromUtf8(alertstring), QMessageBox::Yes | QMessageBox::No);
-
-		if (reply==QMessageBox::Yes)
-			return 1;
-
-		return 0;
-	}
-	/**
-	\fn GUI_Alternate(char *title,char *choice1,char *choice2)
-	\brief Popup a dialog box name title with 2 buttons (choice1/choice2)
-	\return 0 if first is selected, 1 if second
-	*/
-int      GUI_Alternate(const char *title,const char *choice1,const char *choice2)
-	{
-		if (beQuiet)
-		{
-			printf("Alternate<%s>: %s or %s\n", title,choice1,choice2);
-			return 0;
-		}
-
-		QMessageBox box(qtLastRegisteredDialog());
-
-		box.setWindowTitle(QString::fromUtf8(QT_TRANSLATE_NOOP("qtalert","Question?")));
-		box.addButton(QString::fromUtf8(choice1),QMessageBox::YesRole);
-		box.addButton(QString::fromUtf8(choice2),QMessageBox::NoRole);
-
-		if (title)
-			box.setText(QString::fromUtf8(title));
-		else
-			box.setText(QT_TRANSLATE_NOOP("qtalert","Question"));
-
-		box.setIcon(QMessageBox::Question);
-
-		if (box.exec() == 0)
-			return 1;
-		else
-			return 0;
-	}
-
-	uint8_t  GUI_getDoubleValue(double *valye, float min, float max, const char *title)
-	{
-		return 0; 
-	}
-
-	uint8_t	GUI_isQuiet(void)
-	{
-		return beQuiet;
-	}
-
-	void GUI_Verbose(void)
-	{
-		beQuiet=0;
-	}
-
-	void GUI_Quiet(void)
-	{
-		beQuiet=1;
-	}
-
-	extern DIA_workingBase *createWorking(const char *title);
-        extern DIA_processingBase *createProcessing(const char *title, uint64_t totalToProcess);
-	extern DIA_encodingBase *createEncoding(uint64_t duration);
-        extern DIA_audioTrackBase *createAudioTrack( PoolOfAudioTracks *pool, ActiveAudioTracks *active );
-	void getVersion(uint32_t *maj,uint32_t *minor)

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp Changed

@@ -288,11 +288,7 @@
 void filtermainWindow::closePreview()
 {
     if (previewDialog)
-    {
         qtUnregisterDialog(previewDialog);
-        delete previewDialog;
-        previewDialog = NULL;
-    }
 }
 
 /**
@@ -502,8 +498,8 @@
         uint32_t major,minor,patch;
         ADM_vf_getFilterInfo((VF_CATEGORY)family,i,&name, &desc,&major,&minor,&patch);
 
-        QString s1 = QString(name);
-        QString s2 = QString(desc);
+        QString s1 = QString::fromUtf8(name);
+        QString s2 = QString::fromUtf8(desc);
 
         QListWidgetItem *item;
         item=new QListWidgetItem(NULL,availableList,ALL_FILTER_BASE+i+family*100);
@@ -559,8 +555,8 @@
         const char *conf=instance->getConfiguration();
         printf("%d %s\n",i,name);
 
-        QString s1 = QString(name);
-        QString s2 = QString(conf);
+        QString s1 = QString::fromUtf8(name);
+        QString s2 = QString::fromUtf8(conf);
 
         QListWidgetItem *item=new QListWidgetItem(NULL,activeList,ACTIVE_FILTER_BASE+i);
         item->setData(FilterItemDelegate::FilterNameRole, s1);

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp Changed

@@ -25,24 +25,24 @@
  */
 Ui_seekablePreviewWindow::Ui_seekablePreviewWindow(QWidget *parent, ADM_coreVideoFilter *videoStream, uint32_t defaultFrame) : QDialog(parent)
 {
-	ui.setupUi(this);
+    ui.setupUi(this);
 
-	seekablePreview = NULL;
-	canvas = NULL;
+    seekablePreview = NULL;
+    canvas = NULL;
 
-	resetVideoStream(videoStream);
-        
-        seekablePreview->addControl(ui.toolLayout);
-	seekablePreview->sliderSet(defaultFrame);
-	seekablePreview->sliderChanged();
+    resetVideoStream(videoStream);
 
-	connect(ui.horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(sliderChanged(int)));
+    seekablePreview->addControl(ui.toolLayout);
+    seekablePreview->sliderSet(defaultFrame);
+    seekablePreview->sliderChanged();
+
+    connect(ui.horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(sliderChanged(int)));
 }
 
 Ui_seekablePreviewWindow::~Ui_seekablePreviewWindow()
 {
-	delete seekablePreview;
-	delete canvas;
+    delete seekablePreview;
+    delete canvas;
 }
 
 /**
@@ -51,20 +51,19 @@
  */
 void Ui_seekablePreviewWindow::resetVideoStream(ADM_coreVideoFilter *videoStream)
 {
-	if (seekablePreview)
-		delete seekablePreview;
-        seekablePreview=NULL;
-	if (canvas)
-		delete canvas;
-        canvas=NULL;
+    if (seekablePreview)
+        delete seekablePreview;
+    seekablePreview=NULL;
+    if (canvas)
+        delete canvas;
+    canvas=NULL;
 
-	uint32_t canvasWidth = videoStream->getInfo()->width;
-	uint32_t canvasHeight = videoStream->getInfo()->height;
+    uint32_t canvasWidth = videoStream->getInfo()->width;
+    uint32_t canvasHeight = videoStream->getInfo()->height;
 
-	canvas = new ADM_QCanvas(ui.graphicsView, canvasWidth, canvasHeight);
-	canvas->show();
-	seekablePreview = new flySeekablePreview(this,canvasWidth, canvasHeight, videoStream, canvas, ui.horizontalSlider);	
-	seekablePreview->sliderChanged();
+    canvas = new ADM_QCanvas(ui.graphicsView, canvasWidth, canvasHeight);
+    seekablePreview = new flySeekablePreview(this,canvasWidth, canvasHeight, videoStream, canvas, ui.horizontalSlider);
+    seekablePreview->sliderChanged();
 }
 /**
  * 
@@ -72,7 +71,7 @@
  */
 uint32_t Ui_seekablePreviewWindow::frameIndex()
 {
-	return seekablePreview->sliderGet();
+    return seekablePreview->sliderGet();
 }
 
 /**
@@ -81,7 +80,7 @@
  */
 void Ui_seekablePreviewWindow::sliderChanged(int value)
 {
-	seekablePreview->sliderChanged();
+    seekablePreview->sliderChanged();
 }

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp Changed

@@ -469,6 +469,13 @@
     buildMyMenu();
     buildCustomMenu(); // action lists are populated (i.e. buildActionLists() called) within buildCustomMenu()
     buildButtonLists();
+
+#define AUTOREPEAT_TOOLBUTTON(x) ui.x->setAutoRepeat(true); ui.x->setAutoRepeatDelay(500); ui.x->setAutoRepeatInterval(100);
+    AUTOREPEAT_TOOLBUTTON(toolButtonPreviousFrame)
+    AUTOREPEAT_TOOLBUTTON(toolButtonNextFrame)
+    AUTOREPEAT_TOOLBUTTON(toolButtonPreviousIntraFrame)
+    AUTOREPEAT_TOOLBUTTON(toolButtonNextIntraFrame)
+
     // Crash in some cases addScriptReferencesToHelpMenu();
     connect(ui.menuVideo->actions().at(3),SIGNAL(toggled(bool)),this,SLOT(previewModeChangedFromMenu(bool)));
     connect(ui.toolBar->actions().at(5),SIGNAL(toggled(bool)),this,SLOT(previewModeChangedFromToolbar(bool)));
@@ -509,7 +516,7 @@
 
     threshold = RESIZE_THRESHOLD;
     actZoomCalled = false;
-    ignoreResizeEvent = true;
+    ignoreResizeEvent = false;
     blockResizing = false;
     blockZoomChanges = true;
 
@@ -568,7 +575,11 @@
     for(int i=0;i<nb;i++)
     {
         MenuEntry *m=menu+i;
-        QString qs=QString::fromUtf8(QT_TRANSLATE_NOOP("adm",m->text.c_str()));
+        QString qs;
+        if(m->translated)
+            qs=QString::fromUtf8(m->text.c_str());
+        else
+            qs=QString::fromUtf8(QT_TRANSLATE_NOOP("adm",m->text.c_str()));
         switch(m->type)
         {
             case MENU_SEPARATOR:
@@ -1637,13 +1648,21 @@
 */
 int UI_Init(int nargc, char **nargv)
 {
-        ADM_info("Starting QT4 GUI...\n");
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+    ADM_info("Starting Qt5 GUI...\n");
+#else
+    ADM_info("Starting Qt4 GUI...\n");
+#endif
     initTranslator();
 
     global_argc=nargc;
     global_argv=nargv;
     ADM_renderLibInit(&UI_Hooks);
-
+#if defined(_WIN32) && QT_VERSION >= QT_VERSION_CHECK(5,11,0)
+    // Despite HiDPI scaling being supported from Qt 5.6 on, important aspects
+    // like OpenGL support were fixed only in much later versions.
+    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+#endif
     myApplication=new myQApplication (global_argc, global_argv);
     myApplication->connect(myApplication, SIGNAL(lastWindowClosed()), myApplication, SLOT(quit()));
     myApplication->connect(myApplication, SIGNAL(aboutToQuit()), myApplication, SLOT(cleanup()));
@@ -1673,10 +1692,13 @@
     UI_getPhysicalScreenSize(QuiMainWindows, &w,&h);
     printf("The screen seems to be %u x %u px\n",w,h);
     mw->ui.frame_video->setAttribute(Qt::WA_OpaquePaintEvent);
-    
 
     UI_QT4VideoWidget(mw->ui.frame_video);  // Add the widget that will handle video display
+#if QT_VERSION < QT_VERSION_CHECK(5,11,0) // not sure about the version
     mw->ui.frame_video->setAcceptDrops(true); // needed for drag and drop to work on windows
+#endif
+    admPreview::setMainDimension(0,0,ZOOM_1_1);
+
     UI_updateRecentMenu();
     UI_updateRecentProjectMenu();
 
@@ -1702,8 +1724,6 @@
         ADM_info("OpenGL: Not enabled at built time.\n");
 #endif
 
-    admPreview::setMainDimension(0,0,ZOOM_1_1);
-
     return 1;
 }
 /**
@@ -2382,8 +2402,7 @@
 {
     char txt[50];
     sprintf(txt,QT_TRANSLATE_NOOP("qgui2"," (%d track(s))"),nb);
-     WIDGET(TrackCountLabel)->setText(QString(txt));
-
+    WIDGET(TrackCountLabel)->setText(QString::fromUtf8(txt));
 }
 /**
  * \fn dtor

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp Changed

@@ -34,7 +34,7 @@
         {
             if (this->_scriptEngines.size() > 0)
             {
-                MenuEntry separatorEntry = {MENU_SEPARATOR, "-", NULL, ACT_DUMMY, NULL, NULL};
+                MenuEntry separatorEntry = {MENU_SEPARATOR, "-", NULL, ACT_DUMMY, NULL, NULL, true};
 
                 fileMenu.insert(fileMenu.begin() + i, separatorEntry);
                 i++;
@@ -55,20 +55,20 @@
                     itemName = this->_scriptEngines[engineIndex]->name() + QT_TRANSLATE_NOOP("qgui2menu"," Project");
                 }
 
-                MenuEntry dummyEntry = {MENU_SUBMENU, itemName, NULL, ACT_DUMMY, NULL, NULL};
+                MenuEntry dummyEntry = {MENU_SUBMENU, itemName, NULL, ACT_DUMMY, NULL, NULL, true};
                 it = fileMenu.insert(it, dummyEntry);
 
-                MenuEntry runProjectEntry = {MENU_SUBACTION, QT_TRANSLATE_NOOP("qgui2menu","&Run Project..."), NULL, firstMenuId, NULL, NULL};
+                MenuEntry runProjectEntry = {MENU_SUBACTION, QT_TRANSLATE_NOOP("qgui2menu","&Run Project..."), NULL, firstMenuId, NULL, NULL, true};
                 it = fileMenu.insert(it + 1, runProjectEntry);
 
                 if ((this->_scriptEngines[engineIndex]->capabilities() & IScriptEngine::Debugger) == IScriptEngine::Debugger)
                 {
-                    MenuEntry debugEntry = {MENU_SUBACTION, QT_TRANSLATE_NOOP("qgui2menu","&Debug Project..."), NULL, (Action)(firstMenuId + 1), NULL, NULL};
+                    MenuEntry debugEntry = {MENU_SUBACTION, QT_TRANSLATE_NOOP("qgui2menu","&Debug Project..."), NULL, (Action)(firstMenuId + 1), NULL, NULL, true};
                     it = fileMenu.insert(it + 1, debugEntry);
                     i++;
                 }
 
-                MenuEntry saveAsProjectEntry = {MENU_SUBACTION, QT_TRANSLATE_NOOP("qgui2menu","Save &As Project..."), NULL, (Action)(firstMenuId + 2), NULL, NULL};
+                MenuEntry saveAsProjectEntry = {MENU_SUBACTION, QT_TRANSLATE_NOOP("qgui2menu","Save &As Project..."), NULL, (Action)(firstMenuId + 2), NULL, NULL, true};
                 it = fileMenu.insert(it + 1, saveAsProjectEntry);
                 i += 3;
             }
@@ -95,7 +95,7 @@
             itemName = this->_scriptEngines[engineIndex]->name() + QT_TRANSLATE_NOOP("qgui2menu"," Shell");
         }
 
-        MenuEntry entry = {MENU_ACTION, itemName, NULL, (Action)(ACT_SCRIPT_ENGINE_SHELL_FIRST + engineIndex), NULL, NULL};
+        MenuEntry entry = {MENU_ACTION, itemName, NULL, (Action)(ACT_SCRIPT_ENGINE_SHELL_FIRST + engineIndex), NULL, NULL, true};
 
         it = toolMenu.insert(it, entry) + 1;
     }
@@ -291,10 +291,10 @@
                 vector<MenuEntry>::iterator it = menu.begin() + i;
                 // add session restore menu entry
                 string restoreSessionEntryName = QT_TRANSLATE_NOOP("qgui2menu","Restore previous session");
-                MenuEntry restoreSessionEntry = {MENU_ACTION, restoreSessionEntryName, NULL, ACT_RESTORE_SESSION, NULL, NULL};
+                MenuEntry restoreSessionEntry = {MENU_ACTION, restoreSessionEntryName, NULL, ACT_RESTORE_SESSION, NULL, NULL, true};
                 it = menu.insert(it + 1, restoreSessionEntry);
                 // add separator
-                MenuEntry separatorEntry = {MENU_SEPARATOR, "-", NULL, ACT_DUMMY, NULL, NULL};
+                MenuEntry separatorEntry = {MENU_SEPARATOR, "-", NULL, ACT_DUMMY, NULL, NULL, true};
                 menu.insert(it + 1, separatorEntry);
             }
             break;

avidemux_2.7.3.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp -> avidemux_2.7.4.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp Changed

@@ -42,7 +42,7 @@
     QString str,outputPath,outputExt=QString("");
     QString fileName,dot=QString(".");
     QString separator = QString("/");
-    QString filterFile=QString(QT_TRANSLATE_NOOP("qfile","All files (*.*)"));
+    QString filterFile=QString::fromUtf8(QT_TRANSLATE_NOOP("qfile","All files (*.*)"));
     bool doFilter = !!(ext && strlen(ext));
     bool isProject=false;
     QFileDialog::Options opts;
@@ -125,10 +125,10 @@
 
     if(doFilter)
     {
-        filterFile=QString(ext)+QString(QT_TRANSLATE_NOOP("qfile"," files (*."))+QString(ext)+QString(");;")+filterFile;
+        filterFile=QString(ext)+QString::fromUtf8(QT_TRANSLATE_NOOP("qfile"," files (*."))+QString(ext)+QString(");;")+filterFile;
     }
     fileName = QFileDialog::getSaveFileName(fileSelGetParent(),
-                    label,  // caption
+                    QString::fromUtf8(label),  // caption
                     str,    // folder
                     filterFile,   // filter
                     NULL,QFileDialog::DontConfirmOverwrite);   // selected filter
@@ -149,8 +149,9 @@
     if(newFile.exists())
     {
         QFileInfo fileInfo(newFile);
-        QString q=QString(QT_TRANSLATE_NOOP("qfile","Overwrite file "))+fileInfo.fileName()+QString("?");
-        if(!GUI_Question(q.toUtf8().constData()))
+        QString q=QString::fromUtf8(QT_TRANSLATE_NOOP("qfile","Overwrite file "))+fileInfo.fileName()+QString("?");
+        // Show the dialog even in silent mode or if the user has disabled alerts.
+        if(!GUI_Question(q.toUtf8().constData(),true))
         {
             return 0;
         }
@@ -183,7 +184,7 @@
 {
     QString str;
     QString fileName,dot=QString(".");
-    QString filterFile=QString(QT_TRANSLATE_NOOP("qfile","All files (*.*)"));
+    QString filterFile=QString::fromUtf8(QT_TRANSLATE_NOOP("qfile","All files (*.*)"));
     bool doFilter = !!(ext && strlen(ext));
     bool isProject=false;
     QFileDialog::Options opts;
@@ -230,10 +231,10 @@
 
     if(doFilter)
     {
-        filterFile=QString(ext)+QString(QT_TRANSLATE_NOOP("qfile"," files (*."))+QString(ext)+QString(");;")+filterFile;
+        filterFile=QString(ext)+QString::fromUtf8(QT_TRANSLATE_NOOP("qfile"," files (*."))+QString(ext)+QString(");;")+filterFile;
     }
     fileName = QFileDialog::getOpenFileName(fileSelGetParent(),
-                                label,  // caption
+                                QString::fromUtf8(label),  // caption
                                 str,    // folder
                                 filterFile,   // filter
                                 NULL,   // selected filter

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux.pro -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux.pro Changed

@@ -37,6 +37,7 @@
 ../../../avidemux_core/ADM_core/include/ADM_byteBuffer.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_crashdump_apple.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_ptrQueue.h \ 
+../../../avidemux_core/ADM_core/include/ADM_crashdump_vs.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_prettyPrint.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_crashdump_unix.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_queue.h \ 
@@ -234,6 +235,7 @@
 ../../../avidemux_core/ADM_coreUtils/include/prefs.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/ADM_codecType.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/ADM_coreCodecMapping.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_putbits.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/FFcodecContext_param.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/ADM_confCouple.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/ADM_paramList.h \ 
@@ -407,6 +409,7 @@
 ../../../avidemux_plugins/ADM_demuxers/NativeAvisynth/avs/cpuid.h \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.h \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudioProbe.h \ 
+../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsInternal.h \ 
 ../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vs.h \ 
 ../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.h \ 
 ../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsProxy.h \ 
@@ -842,8 +845,8 @@
 ../../../avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreLibVAEnc/src/ADM_coreLibVA_encodingContext.cpp \ 
 ../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecSettings_desc.cpp.h \ 
 ../../../avidemux_core/ffmpeg_package/patches/libavformat_mpegenc.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_h263dec.c.patch \ 
 ../../../avidemux_core/ffmpeg_package/patches/libavcodec_hevc_parser.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/attic/libavcodec_h263dec.c.patch \ 
 ../../../avidemux_core/ffmpeg_package/patches/libavcodec_mpegvideo_enc.c.patch \ 
 ../../../avidemux_core/ffmpeg_package/patches/libavcodec_mpeg12enc.c.patch \ 
 ../../../avidemux_core/ffmpeg_package/patches/libavcodec_nvenc.c.patch \ 
@@ -956,6 +959,7 @@
 ../../../avidemux_core/ADM_coreUtils/src/ADM_getbits.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/prefs2.conf \ 
 ../../../avidemux_core/ADM_coreUtils/src/ADM_codecType.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_putbits.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/ADM_infoExtractorVC1.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONAllocator.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONNode_Mutex.cpp \ 
@@ -1368,9 +1372,10 @@
 ../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif_asm.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif_body.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc_util.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc_json.cpp \ 
@@ -1445,7 +1450,6 @@
 ../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_font.c \ 
 ../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_utils.c \ 
 ../../../avidemux_plugins/ADM_videoFilters6/ass/ass_ssa_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ass_ssa_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/ass/ass_ssa.conf \ 
 ../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/changeFps/confChangeFps_desc.cpp \

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_ca.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_ca.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Ha fallat l&apos;intent d&apos;obrir %s!</translation>
     </message>
@@ -56,7 +56,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+43"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1050,11 +1050,21 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+12"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">_Permet freq. d&apos;àudio no estàndard per a DVD</translation>
@@ -1182,12 +1192,11 @@
         <translation type="unfinished">Priorització</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="unfinished">_Usa etiqueta (tag) alternativa per a MP3 en MP4</translation>
+        <translation type="obsolete">_Usa etiqueta (tag) alternativa per a MP3 en MP4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1197,7 +1206,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>XVideo (best)</source>
         <translation type="unfinished">Xv (millor)</translation>
     </message>
@@ -1207,7 +1216,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+11"/>
         <source>SDL (good)</source>
         <translation type="unfinished">SDL (bona)</translation>
     </message>
@@ -1337,7 +1346,7 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1354,7 +1363,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
         <source>CPU</source>
         <translation type="unfinished">CPU</translation>
     </message>
@@ -1364,24 +1373,22 @@
         <translation type="unfinished">Multiprocessament</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+11"/>
+        <location line="+3"/>
         <source>Preferences</source>
         <translation type="unfinished">Preferències</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+43"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+45"/>
         <source>Close</source>
         <translation type="unfinished">Tanca</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+2"/>
-        <location line="+2"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation type="obsolete">-</translation>
     </message>
     <message>
-        <location line="-1"/>
+        <location line="+4"/>
         <source>Connect to avsproxy</source>
         <translation type="unfinished">Connecta a l&apos;avsproxy</translation>
     </message>
@@ -1651,12 +1658,31 @@
         <translation type="unfinished">S&apos;ha produït un error de còdec</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+373"/>
+        <location filename="../../common/gui_main.cpp" line="+369"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">No s&apos;ha codificat en aquesta versió</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+209"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Codec or codec settings across a cut point of the pasted video do not match.
+Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut points of the pasted video could not be checked. This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
+Try anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
         <source>Are you sure?</source>
         <translation type="unfinished">N&apos;esteu segur?</translation>
     </message>
@@ -1676,21 +1702,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>The end point of the cut is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>The end point of the deletion is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the cut may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the deletion may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Codec or codec settings across the cut do not match. Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Codec or codec settings across the deletion do not match. Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_cs.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_cs.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Selhalo otevření %s!</translation>
     </message>
@@ -56,7 +56,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+43"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1050,11 +1050,21 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+12"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">P_ovolit nestandardní frekvenci zvuku pro DVD</translation>
@@ -1170,17 +1180,16 @@
         <translation type="unfinished">Priority</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="unfinished">_Používat alternativní značku pro MP3 v .mp4</translation>
+        <translation type="obsolete">_Používat alternativní značku pro MP3 v .mp4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>XVideo (best)</source>
         <translation type="unfinished">XVideo (nejlepší)</translation>
     </message>
@@ -1190,7 +1199,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+11"/>
         <source>SDL (good)</source>
         <translation type="unfinished">SDL (dobré)</translation>
     </message>
@@ -1314,7 +1323,7 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1331,7 +1340,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
         <source>CPU</source>
         <translation type="unfinished">CPU</translation>
     </message>
@@ -1341,12 +1350,13 @@
         <translation type="unfinished">Vlákna</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+11"/>
+        <location line="+3"/>
         <source>Preferences</source>
         <translation type="unfinished">Předvolby</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+38"/>
         <source>Save</source>
         <translation type="unfinished">Uložit</translation>
     </message>
@@ -1356,14 +1366,11 @@
         <translation type="unfinished">Zavřít</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+2"/>
-        <location line="+2"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation type="obsolete">-</translation>
     </message>
     <message>
-        <location line="-1"/>
+        <location line="+4"/>
         <source>Connect to avsproxy</source>
         <translation type="unfinished">Připojit se k avsproxy</translation>
     </message>
@@ -1615,7 +1622,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-314"/>
+        <location filename="../../common/gui_save.cpp" line="-313"/>
         <source>No audio track</source>
         <translation type="unfinished">Chybí zvuková stopa</translation>
     </message>
@@ -1660,12 +1667,31 @@
 To je potřeba k vytvoření PSP kompatibilního videa.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+373"/>
+        <location filename="../../common/gui_main.cpp" line="+369"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">Nepodporováno v této verzi</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+209"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Codec or codec settings across a cut point of the pasted video do not match.
+Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut points of the pasted video could not be checked. This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
+Try anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
         <source>Are you sure?</source>
         <translation type="unfinished">Určitě?</translation>
     </message>
@@ -1685,21 +1711,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>The end point of the cut is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>The end point of the deletion is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the cut may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the deletion may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Codec or codec settings across the cut do not match. Playback of the video saved in copy mode may stop at this point.

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_da.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_da.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+85"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+102"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation>Denne video indeholder B-frames, men præsentationstidsstemplerne (PTS) findes enten ikke eller øges monotont. Avidemux kan forsøge at rekonstruere de korrekte PTS&apos;er ved at dekodere hele videoen. Dette kan tage lang tid. Fortsæt?</translation>
     </message>
@@ -31,7 +31,7 @@
 Drop timinginformationer?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+196"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+194"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>Kan ikke finde en demuxer for %s</translation>
     </message>
@@ -80,7 +80,7 @@
 2.) sæt dem sammen</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-172"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-189"/>
         <source>Checking if timestamps are valid..</source>
         <translation>Tjekker om tidsstempler er gyldige...</translation>
     </message>
@@ -1058,7 +1058,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+34"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
         <source>Open</source>
         <translation>Åbn</translation>
     </message>
@@ -1074,8 +1074,6 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/gui_save.cpp" line="+659"/>
-        <location line="+10"/>
         <source>Queue</source>
         <translation>Sæt i kø</translation>
     </message>
@@ -1110,14 +1108,11 @@
         <translation>Luk</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+2"/>
-        <location line="+2"/>
         <source>-</source>
-        <translation>-</translation>
+        <translation type="vanished">-</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="+2"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
@@ -1179,7 +1174,8 @@
         <translation>Sæt markør B</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+510"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+525"/>
+        <location line="+3"/>
         <source>Preferences</source>
         <translation>Præferencer</translation>
     </message>
@@ -1368,7 +1364,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-144"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-147"/>
         <source>Stereo</source>
         <translation>Stereo</translation>
     </message>
@@ -1514,7 +1510,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
@@ -1550,12 +1546,12 @@
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-46"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="-612"/>
+        <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1628,12 +1624,12 @@
         <translation>Pluginsinfo</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-232"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-227"/>
         <source>Enable openGl support</source>
         <translation>Aktivér understøttelse af OpenGL</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+1"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>_Acceptér ikke-standard lydfrekvens for DVD</translation>
     </message>
@@ -1755,17 +1751,16 @@
         <translation>Prioritering</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation>_Brug alternativt mærkat for MP3 i .mp4</translation>
+        <translation type="vanished">_Brug alternativt mærkat for MP3 i .mp4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished">Foreslå at gemme i mappen fra den sidst åbnede fil</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>XVideo (best)</source>
         <translation>XVideo (bedste)</translation>
     </message>
@@ -1775,7 +1770,7 @@
         <translation>VDPAU (bedste)</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+6"/>
         <source>OpenGL (best)</source>
         <translation>OpenGL (bedste)</translation>
     </message>
@@ -1906,13 +1901,13 @@
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+53"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+56"/>
         <source>Threading</source>
         <translation>Trådning</translation>
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-314"/>
+        <location filename="../../common/gui_save.cpp" line="-313"/>
         <source>No audio track</source>
         <translation>Ingen lydspor</translation>
     </message>
@@ -1969,7 +1964,7 @@
 Det er nødvendigt for at kunne oprette PSP-kompatibel video.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+189"/>
+        <location filename="../../common/gui_main.cpp" line="+186"/>
         <source>Select script to save</source>
         <translation>Vælg script som skal gemmes</translation>
     </message>
@@ -1979,19 +1974,38 @@
         <translation>Du er igang med at slette listen over de sidst åbnede filer og projekter. Dette kan ikke fortrydes. Fortsæt?</translation>
     </message>
     <message>
-        <location line="+117"/>
+        <location line="+116"/>
         <source>Not coded in this version</source>
         <translation>Ikke kodet i denne version</translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+204"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+5"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_de.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_de.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
         <source>Attempt to open %s failed!</source>
         <translation>Der Versuch, %s zu öffnen, ist fehlgeschlagen!</translation>
     </message>
@@ -58,7 +58,7 @@
         <translation>Prüfe Gültigkeit der Zeitstempel...</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+43"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation>Dieses Video enthält B-Frames, aber Presentation Timestamps (PTS) entweder fehlen oder monoton ansteigen. Avidemux kann durch Dekodierung des ganzen Videos die korrekten PTS zu rekonstruieren versuchen. Das kann viel Zeit in Anspruch nehmen. Fortfahren?</translation>
     </message>
@@ -1052,7 +1052,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+230"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+246"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">_Erlaube auch nicht DVD-konforme Audiofrequenzen (DVD-konform sind lediglich 48kHz und 96kHz)</translation>
     </message>
@@ -1167,12 +1167,11 @@
         <translation type="unfinished">Priorisierung bestimmter Aufgaben</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="unfinished">_Alternativen &apos;Tag&apos; für MP3-Tonspuren in MPEG-4 Containern benutzen</translation>
+        <translation type="obsolete">_Alternativen &apos;Tag&apos; für MP3-Tonspuren in MPEG-4 Containern benutzen</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation>_Den Ordner der gerade geladenen Datei als Speicherziel vorschlagen</translation>
     </message>
@@ -1182,7 +1181,17 @@
         <translation>Im Kopiermodus _Gleichmäßigkeit der Zeitstempel für Dekodierung (DTS) erhöhen</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+2"/>
+        <source>Caching of decoded pictures</source>
+        <translation>Zwischenspeicher für dekodierte Frames</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Cache size:</source>
+        <translation>Größe des _Zwischenspeichers:</translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>XVideo (best)</source>
         <translation type="unfinished">XVideo (bestens)</translation>
     </message>
@@ -1192,7 +1201,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+11"/>
         <source>SDL (good)</source>
         <translation type="unfinished">SDL (gut)</translation>
     </message>
@@ -1289,7 +1298,7 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1306,7 +1315,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
         <source>CPU</source>
         <translation type="unfinished">Prozessor</translation>
     </message>
@@ -1326,12 +1335,13 @@
         <translation>Standardport</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
         <source>Pr&amp;eferences</source>
         <translation>&amp;Einstellungen</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+10"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+7"/>
+        <location line="+3"/>
         <source>Preferences</source>
         <translation>Einstellungen</translation>
     </message>
@@ -1352,8 +1362,6 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/gui_save.cpp" line="+288"/>
-        <location line="+10"/>
         <source>Queue</source>
         <translation>Zur &amp;Warteschlange hinzufügen...</translation>
     </message>
@@ -1731,12 +1739,12 @@
         <translation type="unfinished">Audiogeräte</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-285"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-283"/>
         <source>Enable openGl support</source>
         <translation>OpenG_L benutzen</translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+232"/>
         <source>_Limit Refresh Rate</source>
         <translation>_Bildwiederholungsfrequenz begrenzen</translation>
     </message>
@@ -1746,29 +1754,39 @@
         <translation>Bild _neu aufbauen nicht häufiger als nach (ms)</translation>
     </message>
     <message>
-        <location line="-189"/>
+        <location line="-188"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+47"/>
         <source>High</source>
         <translation>Hoch</translation>
     </message>
     <message>
-        <location line="-56"/>
+        <location line="-58"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Video mittels _DXVA2 dekodieren (nur Windows)</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+60"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-2"/>
         <source>Low</source>
         <translation>Niedrig</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+24"/>
         <source>VDPAU (best)</source>
         <translation type="unfinished">VDPAU (bestens)</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+6"/>
         <source>OpenGL (best)</source>
         <translation>OpenGL (bestens)</translation>
     </message>
@@ -1811,46 +1829,106 @@
         <translation>Codec-Fehler</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+373"/>
+        <location filename="../../common/gui_main.cpp" line="+369"/>
         <source>Not coded in this version</source>
         <translation>Nicht implementiert in dieser Version</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+209"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation>Dieses Video verwendet Nicht-IDR-Frames für den Direktzugriff. Der Zähler für die Anzeigereihenfolge der Frames (POC) wird an solchen Keyframes nicht zurückgesetzt. Die Wiedergabe des im Kopiermodus gespeicherten editierten Videos kann durch den unerwartet zurückgehenden Zähler an Schnittpunkten der eingefügten Auswahl stocken.
+Trotzdem fortsetzen?</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Codec or codec settings across a cut point of the pasted video do not match.
+Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation>Codec oder Codec-Parameter an den Schnittpunkten der eingefügten Auswahl sind nicht identisch. Die Wiedergabe des im Kopiermodus gespeicherten editierten Videos kann an diesen Stellen abbrechen.
+Trotzdem fortsetzen?</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut points of the pasted video could not be checked. This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_el.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_el.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
         <source>Attempt to open %s failed!</source>
         <translation>Η προσπάθεια ανοίγματος του %s απέτυχε.</translation>
     </message>
@@ -58,7 +58,7 @@
         <translation>Ελέγχεται η εγκυρότητα των χρονοσφραγίδων...</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+43"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation>Αυτό το βίντεο περιέχει Β΄-στιγμιότυπα.
 Αλλά, οι Χρονοσφραγίδες Παρουσίασης (PTS), είτε λείπουν, είτε αυξάνονται μονοτονικά.
@@ -1059,11 +1059,21 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Αποκωδικοποίηση του βίντεου με τη χρήση DXVA2 (windows)</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+13"/>
         <source>_Revert to saved default output settings on video load</source>
         <translation>_Επαναφορά στις προεπιλεγμένες ρυθμίσεις εξόδου του βίντεου, κατά τη φόρτωση του αρχείου</translation>
@@ -1186,7 +1196,7 @@
         <translation>Ορισμός Προτεραιοτήτων</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation>_Προεπιλογή, για αποθήκευση, στον κατάλογο του τελευταίου διαβασμένου αρχείου</translation>
     </message>
@@ -1196,7 +1206,17 @@
         <translation>Εξυγίαν_ση των Στιγμιότυπων Αποκωδικοποίησης (DTS), όταν λειτουργεί σε κατάσταση αντιγραφής</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+2"/>
+        <source>Caching of decoded pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Cache size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>XVideo (best)</source>
         <translation>XVideo (καλύτερη)</translation>
     </message>
@@ -1206,7 +1226,7 @@
         <translation>DXVA2 (καλύτερη)</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+11"/>
         <source>SDL (good)</source>
         <translation>SDL (καλή)</translation>
     </message>
@@ -1309,7 +1329,7 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1326,24 +1346,22 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
         <source>CPU</source>
         <translation>Κεντρικός Επεξεργαστής</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+18"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+15"/>
+        <location line="+3"/>
         <source>Preferences</source>
         <translation>Προτιμήσεις</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
-        <location line="+2"/>
-        <location line="+2"/>
         <source>-</source>
-        <translation>-</translation>
+        <translation type="vanished">-</translation>
     </message>
     <message>
-        <location line="-1"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+49"/>
         <source>Connect to avsproxy</source>
         <translation>Σύνδεση στο avsproxy</translation>
     </message>
@@ -1547,12 +1565,31 @@
         <translation>Σφάλμα Κώδικα</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+373"/>
+        <location filename="../../common/gui_main.cpp" line="+369"/>
         <source>Not coded in this version</source>
         <translation>Δεν κωδικοποιήθηκε σε αυτή την έκδοση</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+209"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Codec or codec settings across a cut point of the pasted video do not match.
+Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut points of the pasted video could not be checked. This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
+Try anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
         <source>Are you sure?</source>
         <translation>Στα σίγουρα;</translation>
     </message>
@@ -1574,7 +1611,7 @@
 Παρακαλώ, έλεγξε, ξανά, τις θέσεις των δεικτών Α και Β.</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>The end point of the cut is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
@@ -1585,7 +1622,7 @@
 Να συνεχιστεί, έτσι κι αλλιώς;</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>The end point of the deletion is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
@@ -1596,7 +1633,38 @@
 Να συνεχιστεί, έτσι κι αλλιώς;</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the cut may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the deletion may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Codec or codec settings across the cut do not match. Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Codec or codec settings across the deletion do not match. Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut points could not be checked.

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_en.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_en.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+196"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+194"/>
         <source>Cannot find a demuxer for %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -56,7 +56,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+43"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1050,7 +1050,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+34"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
         <source>Open</source>
         <translation>&amp;Open...</translation>
     </message>
@@ -1066,8 +1066,6 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/gui_save.cpp" line="+659"/>
-        <location line="+10"/>
         <source>Queue</source>
         <translation>Qu&amp;eue</translation>
     </message>
@@ -1298,7 +1296,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+366"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+381"/>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1454,7 +1452,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
         <source>CPU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1500,12 +1498,12 @@
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-46"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="-612"/>
+        <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1610,42 +1608,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-170"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Decode video using XVBA (AMD)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
         <source>Decode video using LIBVA (INTEL)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-3"/>
         <source>Decode video using VideoToolbox (macOS)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+9"/>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-3"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-9"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1778,21 +1781,26 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Use alternative tag for MP3 in .mp4</source>
+        <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Default to the directory of the last read file for saving</source>
+        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+        <source>_Cache size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>XVideo (best)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1807,7 +1815,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+3"/>
         <source>OpenGL (best)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1951,6 +1959,7 @@
     <message>
         <location line="+4"/>
         <location line="+3"/>
+        <location line="+3"/>
         <source>HW Accel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1970,7 +1979,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+7"/>
+        <location line="+3"/>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1985,14 +1995,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+2"/>
-        <location line="+2"/>
-        <source>-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-1"/>
+        <location line="+6"/>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_es.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_es.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
         <source>Attempt to open %s failed!</source>
         <translation>¡Error al intentar abrir %s!</translation>
     </message>
@@ -58,7 +58,7 @@
         <translation>Comprobando si las marcas de tiempo son válidas..</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+43"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation>Este vídeo contiene fotogramas-B, pero las marcas de tiempo de presentación (PTS) faltan o aumentan monotónicamente. Avidemux puede intentar reconstruir las PTS correctas decodificando el vídeo entero. Esto puede llevar mucho tiempo. ¿Quiere proceder?</translation>
     </message>
@@ -1058,11 +1058,21 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Decodificar vídeos usando DXVA2 (windows)</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+12"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>Permitir frecuencias de _audio no estándar para DVD</translation>
@@ -1190,12 +1200,11 @@
         <translation>Priorización</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation>_Usar una etiqueta alternativa para MP3 en .mp4</translation>
+        <translation type="vanished">_Usar una etiqueta alternativa para MP3 en .mp4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation>Usar por _defecto el diretorio del último archivo leído para guardar</translation>
     </message>
@@ -1205,7 +1214,7 @@
         <translation>_Sanear las marcas de tiempo de decodificación (DTS) en modo de copia</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>XVideo (best)</source>
         <translation>XVideo (mejor)</translation>
     </message>
@@ -1215,7 +1224,7 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+11"/>
         <source>SDL (good)</source>
         <translation>SDL (bueno)</translation>
     </message>
@@ -1340,7 +1349,7 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1357,7 +1366,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
         <source>CPU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1367,12 +1376,13 @@
         <translation>Subprocesos</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
         <source>Pr&amp;eferences</source>
         <translation>Pr&amp;eferencias</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+14"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+11"/>
+        <location line="+3"/>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
@@ -1393,8 +1403,6 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/gui_save.cpp" line="+288"/>
-        <location line="+10"/>
         <source>Queue</source>
         <translation>Cola</translation>
     </message>
@@ -1429,14 +1437,7 @@
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location line="+1"/>
         <location line="+2"/>
-        <location line="+2"/>
-        <source>-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-3"/>
         <source>Information</source>
         <translation>Información</translation>
     </message>
@@ -1826,23 +1827,23 @@
         <translation>Guardar tarea</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-285"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-283"/>
         <source>Enable openGl support</source>
         <translation>Activar el soporte para openGL</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+73"/>
         <source>VDPAU (best)</source>
         <translation>VDPAU (mejor)</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+6"/>
         <source>OpenGL (best)</source>
         <translation>OpenGL (mejor)</translation>
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-612"/>
+        <location filename="../../common/gui_save.cpp" line="-313"/>
         <source>No audio track</source>
         <translation>No hay pistas de audio</translation>
     </message>
@@ -1899,17 +1900,36 @@
 Se necesita para crear vídeos compatibles con PSP.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+189"/>
+        <location filename="../../common/gui_main.cpp" line="+186"/>
         <source>Select script to save</source>
         <translation>Seleccionar script a guardar</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+183"/>
         <source>Not coded in this version</source>
         <translation>Sin codificar en esta versión</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+209"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Codec or codec settings across a cut point of the pasted video do not match.
+Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut points of the pasted video could not be checked. This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
+Try anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
         <source>Are you sure?</source>
         <translation>¿Está seguro?</translation>
     </message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_eu.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_eu.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+196"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+194"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>Ezin da desmultiplexatzailea aurkitu %s-rako</translation>
     </message>
@@ -44,7 +44,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+85"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+102"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78,7 +78,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-172"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-189"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1099,7 +1099,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+366"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+381"/>
         <source>Stereo</source>
         <translation>Estereoa</translation>
     </message>
@@ -1250,7 +1250,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
@@ -1296,12 +1296,12 @@
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-46"/>
         <location line="+3"/>
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1406,17 +1406,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-170"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+1"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>Enable openGl support</source>
         <translation>Gaitu openGl sostengua</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+1"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>_Onartu audio maiztasun ez-estandarra DVD-rako</translation>
     </message>
@@ -1543,16 +1553,25 @@
         <translation>Lehentasunpena</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation>_Erabili aukerazko etiketak MP3-rako .mp4-an</translation>
+        <translation type="vanished">_Erabili aukerazko etiketak MP3-rako .mp4-an</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
+        <source>Caching of decoded pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Cache size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>XVideo (best)</source>
         <translation>XVideo (hoberena)</translation>
@@ -1568,7 +1587,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+3"/>
         <source>OpenGL (best)</source>
         <translation>OpenGL (hoberena)</translation>
     </message>
@@ -1677,17 +1696,18 @@
         <translation>Bideoa</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+53"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+56"/>
         <source>Threading</source>
         <translation>Hariak</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+11"/>
+        <location line="+3"/>
         <source>Preferences</source>
         <translation>Hobespenak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+34"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
         <source>Open</source>
         <translation>Ireki</translation>
     </message>
@@ -1703,8 +1723,6 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/gui_save.cpp" line="+288"/>
-        <location line="+10"/>
         <source>Queue</source>
         <translation>Lerrokatu</translation>
     </message>
@@ -1739,14 +1757,11 @@
         <translation>Itxi</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+2"/>
-        <location line="+2"/>
         <source>-</source>
-        <translation>-</translation>
+        <translation type="vanished">-</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="+2"/>
         <source>Information</source>
         <translation>Argibideak</translation>
     </message>
@@ -1965,7 +1980,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-612"/>
+        <location filename="../../common/gui_save.cpp" line="-313"/>
         <source>No audio track</source>
         <translation>Audio biderik ez</translation>
     </message>
@@ -2022,17 +2037,36 @@
 Hau beharrezkoa da PSP bateragarri bideoa sortzeko.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+189"/>
+        <location filename="../../common/gui_main.cpp" line="+186"/>
         <source>Select script to save</source>
         <translation>Hautatu gordetzeko eskripta</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+183"/>
         <source>Not coded in this version</source>
         <translation>Kodeatu gabe bertsio honetan</translation>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_fr.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_fr.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+85"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+102"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30,7 +30,7 @@
 Ignorer les informations de timing ?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+196"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+194"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>Impossible de trouver un demuxer pour lire %s</translation>
     </message>
@@ -79,7 +79,7 @@
 2) Concaténer ces videos ensembles</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-172"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-189"/>
         <source>Checking if timestamps are valid..</source>
         <translation>Vérification des informations de temps</translation>
     </message>
@@ -1057,17 +1057,27 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Utiliser DXVA2 pour décoder (Windows)</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+1"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>Enable openGl support</source>
         <translation>Activer OpenGL</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+1"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>Accepter les fréquences non standard pour les DVDs</translation>
     </message>
@@ -1184,17 +1194,16 @@
         <translation>Priorités</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation>Utiliser un tag alternatif pour les pistes mp3 (.mp4)</translation>
+        <translation type="vanished">Utiliser un tag alternatif pour les pistes mp3 (.mp4)</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation>Utiliser le répertoire du dernier fichier lu comme répertoire de sauvegarde par défaut</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>XVideo (best)</source>
         <translation>Xvideo (rapide)</translation>
     </message>
@@ -1209,7 +1218,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+3"/>
         <source>OpenGL (best)</source>
         <translation>OpenGL (rapide)</translation>
     </message>
@@ -1311,7 +1320,7 @@
         <translation>Sortie</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+34"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
@@ -1715,17 +1724,17 @@
         <translation>Impossible de choisir le codec FLV1.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+189"/>
+        <location filename="../../common/gui_main.cpp" line="+186"/>
         <source>Select script to save</source>
         <translation>Choisir le script à sauvegarder</translation>
     </message>
     <message>
-        <location line="+435"/>
+        <location line="+464"/>
         <source>Are you sure?</source>
         <translation>Etes vous sur ?</translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+218"/>
         <source>Cannot open &quot;%s&quot;.</source>
         <translation>Impossible d&apos;ouvrir &quot;%s&quot;.</translation>
     </message>
@@ -1745,7 +1754,7 @@
         <translation>Plusieurs pistes audio</translation>
     </message>
     <message>
-        <location line="+424"/>
+        <location line="+425"/>
         <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+120"/>
         <source>Something bad happened</source>
         <translation>Quelque chose d&apos;anormal c&apos;est produit</translation>
@@ -1842,7 +1851,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
         <source>CPU</source>
         <translation></translation>
     </message>
@@ -1888,12 +1897,12 @@
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-46"/>
         <location line="+3"/>
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1971,14 +1980,13 @@
         <translation>Deringing</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-238"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-234"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation>Utiliser VDPAU pour décoder (NVIDIA)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Decode video using XVBA (AMD)</source>
-        <translation>Utiliser XVBA pour décoder (AMD)</translation>
+        <translation type="vanished">Utiliser XVBA pour décoder (AMD)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1986,17 +1994,17 @@
         <translation>Utiliser LIBVA pour décoder (INTEL/...)</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-3"/>
         <source>Decode video using VideoToolbox (macOS)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation>Si vous activez le décodage HW, il est préférable d&apos;utiliser la même méthode d&apos;affichage</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+8"/>
         <source>_Check for new release</source>
         <translation>Vérifier si il y a de nouvelle version</translation>
     </message>
@@ -2011,12 +2019,22 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>_Sanitize decode time stamps (DTS) in copy mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_hu.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_hu.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
         <source>Attempt to open %s failed!</source>
         <translation>A %s megnyitása sikertelen!</translation>
     </message>
@@ -39,7 +39,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+85"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+102"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78,7 +78,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-172"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-189"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1056,11 +1056,21 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+12"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>Nem szabványos DVD hangsáv frekvencia elfogadása</translation>
@@ -1176,12 +1186,11 @@
         <translation>Prioritások beállítása</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation>Alternatív MP3 Tag használata .mp4-ben</translation>
+        <translation type="vanished">Alternatív MP3 Tag használata .mp4-ben</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1191,7 +1200,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>XVideo (best)</source>
         <translation>XVideo (legjobb)</translation>
     </message>
@@ -1201,7 +1210,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+11"/>
         <source>SDL (good)</source>
         <translation>SDL (jó)</translation>
     </message>
@@ -1298,7 +1307,7 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1315,7 +1324,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
@@ -1325,12 +1334,13 @@
         <translation>Szálak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
         <source>Pr&amp;eferences</source>
         <translation>Beállítások</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+14"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+11"/>
+        <location line="+3"/>
         <source>Preferences</source>
         <translation>Beállítások</translation>
     </message>
@@ -1351,8 +1361,6 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/gui_save.cpp" line="+288"/>
-        <location line="+10"/>
         <source>Queue</source>
         <translation>Küldendő</translation>
     </message>
@@ -1387,14 +1395,11 @@
         <translation>Bezárás</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+2"/>
-        <location line="+2"/>
         <source>-</source>
-        <translation>-</translation>
+        <translation type="vanished">-</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="+2"/>
         <source>Information</source>
         <translation>Jellemzők</translation>
     </message>
@@ -1891,12 +1896,12 @@
         <translation>Bővítmények infó</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-285"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-283"/>
         <source>Enable openGl support</source>
         <translation>OpenGL engedélyezés</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+4"/>
         <source>High</source>
         <translation>Magas</translation>
@@ -1908,12 +1913,12 @@
         <translation>Alacsony</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+24"/>
         <source>VDPAU (best)</source>
         <translation>VDPAU (legjobb)</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+6"/>
         <source>OpenGL (best)</source>
         <translation>OpenGL (legjobb)</translation>
     </message>
@@ -1952,7 +1957,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-612"/>
+        <location filename="../../common/gui_save.cpp" line="-313"/>
         <source>No audio track</source>
         <translation>Nincs hangsáv</translation>
     </message>
@@ -2009,17 +2014,36 @@
 A PSP kompatibilis videóhoz szükséges.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+189"/>
+        <location filename="../../common/gui_main.cpp" line="+186"/>
         <source>Select script to save</source>
         <translation>Mentendő szkript választás</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+183"/>
         <source>Not coded in this version</source>
         <translation>Nem kódolt ebben a verzióban</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+209"/>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_it.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_it.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
         <source>Attempt to open %s failed!</source>
         <translation>Tentativo di aprire %s fallito!</translation>
     </message>
@@ -39,7 +39,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+85"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+102"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -78,7 +78,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-172"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-189"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1056,11 +1056,21 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+12"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>_Accetta frequenze audio non standard per DVD</translation>
@@ -1188,12 +1198,11 @@
         <translation>Prioritizzazione</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation>_Usa etichette alternative per gli MP3 in file .mp4</translation>
+        <translation type="vanished">_Usa etichette alternative per gli MP3 in file .mp4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1203,7 +1212,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+2"/>
+        <source>Caching of decoded pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Cache size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>XVideo (best)</source>
         <translation>XVideo (migliore)</translation>
     </message>
@@ -1213,7 +1232,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+11"/>
         <source>SDL (good)</source>
         <translation>SDL (buono)</translation>
     </message>
@@ -1343,7 +1362,7 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1360,7 +1379,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
@@ -1370,12 +1389,13 @@
         <translation>Threading</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
         <source>Pr&amp;eferences</source>
         <translation>Preferenze</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+14"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+11"/>
+        <location line="+3"/>
         <source>Preferences</source>
         <translation>Preferenze</translation>
     </message>
@@ -1396,8 +1416,6 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/gui_save.cpp" line="+288"/>
-        <location line="+10"/>
         <source>Queue</source>
         <translation>Coda</translation>
     </message>
@@ -1432,14 +1450,11 @@
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+2"/>
-        <location line="+2"/>
         <source>-</source>
-        <translation>-</translation>
+        <translation type="vanished">-</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="+2"/>
         <source>Information</source>
         <translation>Informazioni</translation>
     </message>
@@ -1934,23 +1949,23 @@
         <translation>Info plugin</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-285"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-283"/>
         <source>Enable openGl support</source>
         <translation>Attiva supporto OpenGL</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+73"/>
         <source>VDPAU (best)</source>
         <translation>VDPAU (migliore)</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+6"/>
         <source>OpenGL (best)</source>
         <translation>OpenGL (migliore)</translation>
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-612"/>
+        <location filename="../../common/gui_save.cpp" line="-313"/>
         <source>No audio track</source>
         <translation>Nessuna traccia audio</translation>
     </message>
@@ -2007,17 +2022,36 @@
 È necessario per creare un video compatibile con PSP.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+189"/>
+        <location filename="../../common/gui_main.cpp" line="+186"/>
         <source>Select script to save</source>
         <translation>Seleziona lo script da salvare</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+183"/>
         <source>Not coded in this version</source>
         <translation>Non incluso in questa versione</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+209"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_ja.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_ja.ts Changed

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="ja_JP">
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">%s を開く試みは失敗しました!</translation>
     </message>
@@ -56,7 +56,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+43"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1050,11 +1050,21 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+12"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">DVDに標準でない音声周波数を受け付ける(_A)</translation>
@@ -1195,12 +1205,11 @@
             </translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="unfinished">.mp4にmp3の代替タグを使う(_U)</translation>
+        <translation type="obsolete">.mp4にmp3の代替タグを使う(_U)</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1210,7 +1219,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>XVideo (best)</source>
         <translation type="unfinished">
             </translation>
@@ -1221,7 +1230,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+11"/>
         <source>SDL (good)</source>
         <translation type="unfinished">
             </translation>
@@ -1349,7 +1358,7 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1366,7 +1375,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
         <source>CPU</source>
         <translation type="unfinished">CPU</translation>
     </message>
@@ -1377,19 +1386,17 @@
             </translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+11"/>
+        <location line="+3"/>
         <source>Preferences</source>
         <translation type="unfinished">設定</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
-        <location line="+2"/>
-        <location line="+2"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation type="obsolete">-</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+72"/>
         <source>Copy</source>
         <translation type="unfinished">コピー</translation>
     </message>
@@ -1558,12 +1565,31 @@
         <translation type="unfinished">コーデックエラー</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+373"/>
+        <location filename="../../common/gui_main.cpp" line="+369"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">このバージョンではコード化されていません</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+209"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Codec or codec settings across a cut point of the pasted video do not match.
+Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut points of the pasted video could not be checked. This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
+Try anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
         <source>Are you sure?</source>
         <translation type="unfinished">本当ですか&#xa0;?</translation>
     </message>
@@ -1583,21 +1609,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>The end point of the cut is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>The end point of the deletion is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the cut may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the deletion may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Codec or codec settings across the cut do not match. Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Codec or codec settings across the deletion do not match. Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_ko.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_ko.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+196"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+194"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>%s용 디먹서를 찾을 수 없습니다</translation>
     </message>
@@ -58,7 +58,7 @@
         <translation>타임스탬프가 유효한지 검사 중..</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+43"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1058,7 +1058,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+34"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
         <source>Open</source>
         <translation>열기</translation>
     </message>
@@ -1074,8 +1074,6 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/gui_save.cpp" line="+659"/>
-        <location line="+10"/>
         <source>Queue</source>
         <translation>대기열</translation>
     </message>
@@ -1306,7 +1304,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+366"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+381"/>
         <source>Stereo</source>
         <translation>스테레오</translation>
     </message>
@@ -1462,7 +1460,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
@@ -1508,12 +1506,12 @@
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-46"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="-612"/>
+        <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1618,19 +1616,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-170"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>DXVA2로 비디오 디코드 (윈도우)</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation>VDPAU로 비디오 디코드 (엔비디아)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Decode video using XVBA (AMD)</source>
-        <translation>XVBA로 비디오 디코드 (AMD)</translation>
+        <translation type="vanished">XVBA로 비디오 디코드 (AMD)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1638,22 +1635,32 @@
         <translation>LIBVA로 비디오 디코드 (인텔)</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-3"/>
         <source>Decode video using VideoToolbox (macOS)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+9"/>
         <source>Enable openGl support</source>
         <translation>OpenGL 지원 활성화하기</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-3"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation>하드웨어 디코딩시, 일치하는 디스플레이 드라이버 사용</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-9"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>DVD에 대해 비표준 오디오 주파수 받아들이기 </translation>
     </message>
@@ -1785,12 +1792,11 @@
         <translation>우선 순위</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation>.mp4에서 MP3용 대체 태그 사용하기</translation>
+        <translation type="vanished">.mp4에서 MP3용 대체 태그 사용하기</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation>최근 읽은 파일의 폴더를 저장용 폴더로 사용하기</translation>
     </message>
@@ -1800,7 +1806,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+2"/>
+        <source>Caching of decoded pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Cache size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>XVideo (best)</source>
         <translation>XVideo (최상)</translation>
     </message>
@@ -1815,7 +1831,7 @@
         <translation>DXVA2 (최상)</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+3"/>
         <source>OpenGL (best)</source>
         <translation>OpenGL (최상)</translation>
     </message>
@@ -1959,6 +1975,7 @@
     <message>
         <location line="+4"/>
         <location line="+3"/>
+        <location line="+3"/>
         <source>HW Accel</source>
         <translation>HW 가속</translation>
     </message>
@@ -1978,7 +1995,8 @@
         <translation>기본 사용 포트</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+7"/>
+        <location line="+3"/>
         <source>Preferences</source>
         <translation>환경 설정</translation>
     </message>
@@ -1993,14 +2011,11 @@
         <translation>JPEG로 저장</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+2"/>
-        <location line="+2"/>
         <source>-</source>
-        <translation>-</translation>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_pl.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_pl.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
         <source>Attempt to open %s failed!</source>
         <translation>Nie udało się otworzyć %s!</translation>
     </message>
@@ -58,7 +58,7 @@
         <translation>Sprawdzanie, czy znaczniki czasu są prawidłowe...</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+43"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation>Ten film wideo zawiera klatki B, ale znaczniki czasu prezentacji (PTS) są albo nieobecne, albo rosną monotonicznie. Avidemux może spróbować zrekonstruować poprawne PTS przez dekodowanie całego wideo. To może zająć dużo czasu. Kontynuować?</translation>
     </message>
@@ -1058,11 +1058,21 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Dekoduj wideo używając DXVA2 (windows)</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+12"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>_Akceptuj niestandardową częstotliwość dźwięku dla DVD</translation>
@@ -1190,12 +1200,11 @@
         <translation>Priorytetyzacja</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation>_Użyj alternatywnej etykiety dla pliku MP3 w .mp4</translation>
+        <translation type="vanished">_Użyj alternatywnej etykiety dla pliku MP3 w .mp4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation>Domyślnie do zapisu użyj katalog, z którego wczytano ostatni plik</translation>
     </message>
@@ -1205,7 +1214,7 @@
         <translation>Oczyść dekodowane znaczniki czasowe (DTS) w trybie kopiowania</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>XVideo (best)</source>
         <translation>XVideo (najlepszy)</translation>
     </message>
@@ -1215,7 +1224,7 @@
         <translation>DXVA2 (najlepsze)</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+11"/>
         <source>SDL (good)</source>
         <translation>SDL (dobry)</translation>
     </message>
@@ -1345,7 +1354,7 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1362,7 +1371,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
         <source>CPU</source>
         <translation>Procesor</translation>
     </message>
@@ -1372,24 +1381,22 @@
         <translation>Wątkowanie</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
         <source>Pr&amp;eferences</source>
         <translation>Preferencje</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+14"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+11"/>
+        <location line="+3"/>
         <source>Preferences</source>
         <translation>Preferencje</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-38"/>
-        <location line="+2"/>
-        <location line="+2"/>
         <source>-</source>
-        <translation>-</translation>
+        <translation type="vanished">-</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-12"/>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
@@ -1619,12 +1626,31 @@
         <translation>Błąd kodeka</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+373"/>
+        <location filename="../../common/gui_main.cpp" line="+369"/>
         <source>Not coded in this version</source>
         <translation>Nie zaimplementowane w tej wersji</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+209"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Codec or codec settings across a cut point of the pasted video do not match.
+Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut points of the pasted video could not be checked. This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
+Try anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
         <source>Are you sure?</source>
         <translation>Na pewno?</translation>
     </message>
@@ -1644,7 +1670,7 @@
         <translation>Nie można usunąć całego wideo. Proszę sprawdzić pozycję znaczników A i B.</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>The end point of the cut is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
@@ -1653,7 +1679,7 @@
 Czy kontynuować mimo to?</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>The end point of the deletion is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
@@ -1662,7 +1688,38 @@
 Czy kontynuować mimo to?</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the cut may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the deletion may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Codec or codec settings across the cut do not match. Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Codec or codec settings across the deletion do not match. Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_pt_BR.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_pt_BR.ts Changed

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="pt_BR">
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+196"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+194"/>
         <source>Cannot find a demuxer for %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -56,7 +56,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+43"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1050,7 +1050,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+443"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+458"/>
         <source>Output</source>
         <translation type="unfinished">Saida</translation>
     </message>
@@ -1254,7 +1254,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
         <source>CPU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1300,12 +1300,12 @@
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-46"/>
         <location line="+3"/>
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1410,42 +1410,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-170"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Decode video using XVBA (AMD)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
         <source>Decode video using LIBVA (INTEL)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-3"/>
         <source>Decode video using VideoToolbox (macOS)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+9"/>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-3"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-9"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1578,21 +1583,26 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>_Use alternative tag for MP3 in .mp4</source>
+        <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Default to the directory of the last read file for saving</source>
+        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Sanitize decode time stamps (DTS) in copy mode</source>
+        <source>_Cache size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>XVideo (best)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1607,7 +1617,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+3"/>
         <source>OpenGL (best)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1746,6 +1756,7 @@
     <message>
         <location line="+4"/>
         <location line="+3"/>
+        <location line="+3"/>
         <source>HW Accel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1765,12 +1776,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+7"/>
+        <location line="+3"/>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+34"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1786,8 +1798,6 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/gui_save.cpp" line="+288"/>
-        <location line="+10"/>
         <source>Queue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1822,14 +1832,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <location line="+2"/>
-        <location line="+2"/>
-        <source>-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-3"/>
         <source>Information</source>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_ru.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_ru.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Ошибка при открытии %s!</translation>
     </message>
@@ -58,7 +58,7 @@
         <translation type="unfinished">Проверка правильности временных меток...</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+43"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -529,7 +529,7 @@
     <message>
         <location line="-10"/>
         <source>&amp;Tools</source>
-        <translation type="unfinished">С&amp;ервис</translation>
+        <translation type="unfinished">&amp;Инструменты</translation>
     </message>
     <message>
         <location line="-36"/>
@@ -1060,11 +1060,21 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Декодировать видео посредством DXVA2 (Windows)</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+12"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">_Разрешать нестандартную частоту звука для DVD</translation>
@@ -1187,12 +1197,11 @@
         <translation type="unfinished">Приоритет</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="unfinished">_Использовать альтернативные тэги для MP3 в .MP4</translation>
+        <translation type="obsolete">_Использовать альтернативные тэги для MP3 в .MP4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished">_Сохранять видео в папке с последним прочитанным файлом по умолчанию</translation>
     </message>
@@ -1202,7 +1211,7 @@
         <translation type="unfinished">В режиме _копирования повысить равномерность отметок времени декодирования (DTS)</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>XVideo (best)</source>
         <translation type="unfinished">XVideo (лучшее)</translation>
     </message>
@@ -1212,7 +1221,7 @@
         <translation type="unfinished">DXVA2 (лучшее)</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+11"/>
         <source>SDL (good)</source>
         <translation type="unfinished">SDL (хорошо)</translation>
     </message>
@@ -1311,7 +1320,7 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1327,17 +1336,18 @@
         <translation type="unfinished">Видео</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+39"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+42"/>
         <source>Threading</source>
         <translation type="unfinished">Многопоточность</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
         <source>Pr&amp;eferences</source>
         <translation>&amp;Настройки</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+14"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+11"/>
+        <location line="+3"/>
         <source>Preferences</source>
         <translation>Настройки</translation>
     </message>
@@ -1486,46 +1496,106 @@
         <translation type="unfinished">Ошибка аудиокодера</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+373"/>
+        <location filename="../../common/gui_main.cpp" line="+369"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">Нет в этой версии</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+209"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation>Это видео использует кадры прямого доступа без мгновенного обновления декодирования (non-IDR). Счётчик очерёдности показа изображений (POC) на таких ключевых кадрах не сбрасывается. Образовавшиеся точки разреза вставки при сохранении видео в режиме копирования могут привести к задержке воспроизведения из-за нарушенного порядка показа изображений.
+Всё равно продолжить?</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Codec or codec settings across a cut point of the pasted video do not match.
+Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation>Кодек или параметры кодирования на точках разреза вставки не совпадают. Воспроизведение видео, сохранённого в режиме копирования, может на этих точках обрываться.
+Всё равно продолжить?</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut points of the pasted video could not be checked. This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
+Try anyway?</source>
+        <translation>Не удалось проверить точки разреза вставки. Это указывает на проблему либо с исходным видео, либо с шагами редактирования, либо является проявлением ошибки в программе. За деталями обратитесь, пожалуйста, к журнальному файлу приложения или к консольным сообщениям.
+Всё равно продолжить?</translation>
+    </message>
+    <message>
+        <location line="+60"/>
         <source>Are you sure?</source>
         <translation type="unfinished">Вы уверены?</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>It is impossible to cut out the entire video. Please recheck the position of markers A and B.</source>
-        <translation type="unfinished"></translation>
+        <translation>Вырезать видео целиком недопустимо. Пожалуйста, проверьте положение меток A и B.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Deleting</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Удаление</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>It is impossible to delete the entire video. Please recheck the position of markers A and B.</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить видео целиком недопустимо. Пожалуйста, проверьте порожение меток A и B.</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>The end point of the cut is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Конечная точка вырезки находится не на ключевом кадре. При сохранении видео в режиме копирования на этом месте будут повреждения.
+Всё равно продолжить?</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>The end point of the deletion is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Конечная точка удаления находится не на ключевом кадре. При сохранении видео в режиме копирования на этом месте будут повреждения.
+Всё равно продолжить?</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the cut may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation>Это видео использует кадры прямого доступа без мгновенного обновления декодирования (non-IDR). Счётчик очерёдности показа изображений (POC) на таких ключевых кадрах не сбрасывается. Выбранные конечные точки выреза при сохранении видео в режиме копирования могут привести к задержке воспроизведения из-за нарушенного порядка показа изображений.
+Всё равно продолжить?</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the deletion may result in playback interruption due to reversed display order of frames if saved in copy mode.

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_sr.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_sr.ts Changed

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="sr_RS">
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Покушај да отворим %s није успео!</translation>
     </message>
@@ -56,7 +56,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+43"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1050,11 +1050,21 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+12"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">_Дозволи нестандардне учестаности звука за ДВД</translation>
@@ -1182,12 +1192,11 @@
         <translation type="unfinished">Постављање приоритета</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="unfinished">Користи _алтернативни таг за MP3 у .mp4</translation>
+        <translation type="obsolete">Користи _алтернативни таг за MP3 у .mp4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1197,7 +1206,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>XVideo (best)</source>
         <translation type="unfinished">XVideo (најбоље)</translation>
     </message>
@@ -1207,7 +1216,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+11"/>
         <source>SDL (good)</source>
         <translation type="unfinished">SDL (добро)</translation>
     </message>
@@ -1332,7 +1341,7 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1349,7 +1358,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
         <source>CPU</source>
         <translation type="unfinished">Процесори</translation>
     </message>
@@ -1359,19 +1368,17 @@
         <translation type="unfinished">Више нити</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+11"/>
+        <location line="+3"/>
         <source>Preferences</source>
         <translation type="unfinished">Поставке</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
-        <location line="+2"/>
-        <location line="+2"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation type="obsolete">-</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+72"/>
         <source>Copy</source>
         <translation type="unfinished">Без измене</translation>
     </message>
@@ -1540,12 +1547,31 @@
         <translation type="unfinished">Грешка у кодецима</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+373"/>
+        <location filename="../../common/gui_main.cpp" line="+369"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">Није кодирано у овој верзији</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+209"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Codec or codec settings across a cut point of the pasted video do not match.
+Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut points of the pasted video could not be checked. This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
+Try anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
         <source>Are you sure?</source>
         <translation type="unfinished">Да ли си сигуран?</translation>
     </message>
@@ -1565,21 +1591,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>The end point of the cut is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>The end point of the deletion is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the cut may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the deletion may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Codec or codec settings across the cut do not match. Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Codec or codec settings across the deletion do not match. Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_sr@latin.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_sr@latin.ts Changed

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="sr_Latn_RS">
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Pokušaj da otvorim %s nije uspeo!</translation>
     </message>
@@ -56,7 +56,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+43"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1050,11 +1050,21 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+12"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">_Dozvoli nestandardne učestanosti zvuka za DVD</translation>
@@ -1182,12 +1192,11 @@
         <translation type="unfinished">Postavljanje prioriteta</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="unfinished">Koristi _alternativni tag za MP3 u .mp4</translation>
+        <translation type="obsolete">Koristi _alternativni tag za MP3 u .mp4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1197,7 +1206,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>XVideo (best)</source>
         <translation type="unfinished">XVideo (najbolje)</translation>
     </message>
@@ -1207,7 +1216,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+11"/>
         <source>SDL (good)</source>
         <translation type="unfinished">SDL (dobro)</translation>
     </message>
@@ -1332,7 +1341,7 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1349,7 +1358,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
         <source>CPU</source>
         <translation type="unfinished">Procesori</translation>
     </message>
@@ -1359,19 +1368,17 @@
         <translation type="unfinished">Više niti</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+11"/>
+        <location line="+3"/>
         <source>Preferences</source>
         <translation type="unfinished">Postavke</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
-        <location line="+2"/>
-        <location line="+2"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation type="obsolete">-</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+72"/>
         <source>Copy</source>
         <translation type="unfinished">Bez izmene</translation>
     </message>
@@ -1540,12 +1547,31 @@
         <translation type="unfinished">Greška u kodecima</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+373"/>
+        <location filename="../../common/gui_main.cpp" line="+369"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">Nije kodirano u ovoj verziji</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+209"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Codec or codec settings across a cut point of the pasted video do not match.
+Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut points of the pasted video could not be checked. This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
+Try anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
         <source>Are you sure?</source>
         <translation type="unfinished">Da li si siguran?</translation>
     </message>
@@ -1565,21 +1591,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>The end point of the cut is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>The end point of the deletion is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the cut may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the deletion may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Codec or codec settings across the cut do not match. Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Codec or codec settings across the deletion do not match. Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_tr.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_tr.ts Changed

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="tr_TR">
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+232"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+230"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">%s açma teşebbüsü başarısız oldu!</translation>
     </message>
@@ -56,7 +56,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+43"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1054,11 +1054,21 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+218"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+232"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Ignore driver blacklist (Intel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+12"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">
@@ -1207,13 +1217,12 @@
             </translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>_Use alternative tag for MP3 in .mp4</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
             </translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+5"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1223,7 +1232,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>XVideo (best)</source>
         <translation type="unfinished">
             </translation>
@@ -1234,7 +1243,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+11"/>
         <source>SDL (good)</source>
         <translation type="unfinished">
             </translation>
@@ -1367,7 +1376,7 @@
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+57"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1384,7 +1393,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
         <source>CPU</source>
         <translation type="unfinished">
             </translation>
@@ -1396,20 +1405,18 @@
             </translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+11"/>
+        <location line="+3"/>
         <source>Preferences</source>
         <translation type="unfinished">Tercihler</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
-        <location line="+2"/>
-        <location line="+2"/>
         <source>-</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
             </translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+72"/>
         <source>Copy</source>
         <translation type="unfinished">Kopyala</translation>
     </message>
@@ -1600,12 +1607,31 @@
         <translation type="unfinished">Kodek Hatası</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+373"/>
+        <location filename="../../common/gui_main.cpp" line="+369"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">Bu sürümde kodlanmamış</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+209"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Codec or codec settings across a cut point of the pasted video do not match.
+Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cut points of the pasted video could not be checked. This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
+Try anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
         <source>Are you sure?</source>
         <translation type="unfinished">
             </translation>
@@ -1626,21 +1652,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>The end point of the cut is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>The end point of the deletion is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the cut may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the deletion may result in playback interruption due to reversed display order of frames if saved in copy mode.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Codec or codec settings across the cut do not match. Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Codec or codec settings across the deletion do not match. Playback of the video saved in copy mode may stop at this point.
+Proceed anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_zh_CN.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_zh_CN.ts Changed

@@ -9,7 +9,7 @@
         <translation>检查时间戳是否有效..</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+43"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19,7 +19,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+260"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+258"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1060,11 +1060,8 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
-        <location line="+2"/>
-        <location line="+2"/>
         <source>-</source>
-        <translation>-</translation>
+        <translation type="vanished">-</translation>
     </message>
     <message>
         <location filename="../../common/gui_save.cpp" line="+67"/>
@@ -1082,12 +1079,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+276"/>
         <source>Failed to save as JPEG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+87"/>
         <source>Saving selection as set of JPEG images</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1117,6 +1114,21 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+67"/>
+        <source>Cannot get tinyPy script engine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Output file not specified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Job script %s already exists. Overwrite?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+372"/>
         <source>1:1</source>
         <translation>1:1</translation>
@@ -1143,7 +1155,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+492"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+510"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
@@ -1158,7 +1170,7 @@
         <translation>DTS</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+21"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+71"/>
         <source>Cut</source>
         <translation>剪切</translation>
     </message>
@@ -1168,7 +1180,7 @@
         <translation>GMC</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-475"/>
+        <location filename="../../common/gui_save.cpp" line="-571"/>
         <source>Job</source>
         <translation>工作</translation>
     </message>
@@ -1193,13 +1205,13 @@
         <translation>MP4</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-214"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-216"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-19"/>
         <source>Low</source>
         <translation>低</translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+79"/>
         <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-12"/>
         <source>PCM</source>
         <translation>PCM</translation>
@@ -1245,7 +1257,7 @@
         <translation>H263</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+441"/>
+        <location filename="../../common/gui_save.cpp" line="+450"/>
         <location line="+83"/>
         <source>Done</source>
         <translation>完成</translation>
@@ -1256,7 +1268,7 @@
         <translation>增益</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-84"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-83"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-45"/>
         <source>High</source>
         <translation>高</translation>
@@ -1267,7 +1279,7 @@
         <translation>LPCM</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-186"/>
+        <location filename="../../common/gui_save.cpp" line="-196"/>
         <source>Jpeg</source>
         <translation>Jpeg</translation>
     </message>
@@ -1304,7 +1316,7 @@
         <translation>QDM2</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1835"/>
+        <location filename="../../common/gui_main.cpp" line="+1901"/>
         <source>Oops</source>
         <translation>Oops</translation>
     </message>
@@ -1350,7 +1362,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-398"/>
+        <location filename="../../common/gui_save.cpp" line="-397"/>
         <source>No audio track</source>
         <translation>没有音轨</translation>
     </message>
@@ -1376,7 +1388,7 @@
         <translation>它没&apos;有LAME！，它需要去建立 FLV视频。</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+588"/>
+        <location filename="../../common/gui_save.cpp" line="+597"/>
         <source>File %s was NOT saved correctly.</source>
         <translation>文件 %s 保存不正确。</translation>
     </message>
@@ -1392,12 +1404,12 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-86"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+212"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+211"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="-588"/>
+        <location filename="../../common/gui_save.cpp" line="-597"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1410,7 +1422,7 @@
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
         <location line="+30"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
         <location line="+35"/>
@@ -1423,18 +1435,21 @@
         <translation>只显示错误警告</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
         <location line="+44"/>
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/avidemux_zh_TW.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/avidemux_zh_TW.ts Changed

@@ -9,7 +9,7 @@
         <translation>檢查時間戳記是否有效..</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+43"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19,7 +19,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+260"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+258"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1060,11 +1060,8 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+44"/>
-        <location line="+2"/>
-        <location line="+2"/>
         <source>-</source>
-        <translation>-</translation>
+        <translation type="vanished">-</translation>
     </message>
     <message>
         <location filename="../../common/gui_save.cpp" line="+67"/>
@@ -1082,12 +1079,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+276"/>
         <source>Failed to save as JPEG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+87"/>
         <source>Saving selection as set of JPEG images</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1117,6 +1114,21 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+67"/>
+        <source>Cannot get tinyPy script engine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Output file not specified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Job script %s already exists. Overwrite?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+372"/>
         <source>1:1</source>
         <translation>1:1</translation>
@@ -1143,7 +1155,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+492"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+510"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
@@ -1158,7 +1170,7 @@
         <translation>DTS</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+21"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+71"/>
         <source>Cut</source>
         <translation>剪下</translation>
     </message>
@@ -1168,7 +1180,7 @@
         <translation>GMC</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-475"/>
+        <location filename="../../common/gui_save.cpp" line="-571"/>
         <source>Job</source>
         <translation>工作</translation>
     </message>
@@ -1193,13 +1205,13 @@
         <translation>MP4</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-214"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-216"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-19"/>
         <source>Low</source>
         <translation>低</translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+79"/>
         <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-12"/>
         <source>PCM</source>
         <translation>PCM</translation>
@@ -1245,7 +1257,7 @@
         <translation>H263</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+441"/>
+        <location filename="../../common/gui_save.cpp" line="+450"/>
         <location line="+83"/>
         <source>Done</source>
         <translation>完成</translation>
@@ -1256,7 +1268,7 @@
         <translation>增音</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-84"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-83"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-45"/>
         <source>High</source>
         <translation>高</translation>
@@ -1267,7 +1279,7 @@
         <translation>LPCM</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-186"/>
+        <location filename="../../common/gui_save.cpp" line="-196"/>
         <source>Jpeg</source>
         <translation>Jpeg</translation>
     </message>
@@ -1304,7 +1316,7 @@
         <translation>QDM2</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1835"/>
+        <location filename="../../common/gui_main.cpp" line="+1901"/>
         <source>Oops</source>
         <translation>Oops</translation>
     </message>
@@ -1350,7 +1362,7 @@
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
-        <location filename="../../common/gui_save.cpp" line="-398"/>
+        <location filename="../../common/gui_save.cpp" line="-397"/>
         <source>No audio track</source>
         <translation>沒有音軌</translation>
     </message>
@@ -1376,7 +1388,7 @@
         <translation>它沒&apos;有LAME！，它需要去建立 FLV影片。</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="+588"/>
+        <location filename="../../common/gui_save.cpp" line="+597"/>
         <source>File %s was NOT saved correctly.</source>
         <translation>檔案 %s 儲存不正確。</translation>
     </message>
@@ -1392,12 +1404,12 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-86"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+212"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+211"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="-588"/>
+        <location filename="../../common/gui_save.cpp" line="-597"/>
         <location line="+10"/>
-        <location line="+278"/>
+        <location line="+277"/>
         <location line="+19"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+423"/>
@@ -1410,7 +1422,7 @@
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+171"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+173"/>
         <location line="+30"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
         <location line="+35"/>
@@ -1423,18 +1435,21 @@
         <translation>只顯示錯誤警告</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+637"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+653"/>
         <location line="+44"/>
-        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/qtbase_ca.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/qtbase_ca.ts Changed

@@ -1009,7 +1009,7 @@
     </message>
     <message>
         <source>Show </source>
-        <translation>Mostra</translation>
+        <translation>Mostra </translation>
     </message>
     <message>
         <source>&amp;Rename</source>
@@ -1150,7 +1150,7 @@
     </message>
     <message>
         <source>%1 KB</source>
-        <translation type="vanished">%1 KB</translation>
+        <translation type="vanished">%1 kB</translation>
     </message>
     <message>
         <source>%1 bytes</source>
@@ -1246,11 +1246,11 @@
     </message>
     <message>
         <source>Extra Light</source>
-        <translation>Extra fi</translation>
+        <translation>Extrafi</translation>
     </message>
     <message>
         <source>Extra Bold</source>
-        <translation>Extra negreta</translation>
+        <translation>Extranegreta</translation>
     </message>
     <message>
         <source>Extra</source>
@@ -1989,17 +1989,13 @@
     </message>
     <message>
         <source>missing section data. This is not a library.</source>
-        <translation>manca la secció «data». Això no es cap biblioteca.</translation>
+        <translation>manca la secció «data». Això no és cap biblioteca.</translation>
     </message>
     <message>
         <source>Plugin verification data mismatch in &apos;%1&apos;</source>
         <translation type="vanished">Error de verificació de dades del connector a «%1»</translation>
     </message>
     <message>
-        <source>Out of memory while loading plugin &apos;%1&apos;.</source>
-        <translation>Sense memòria en carregar el connector «%1».</translation>
-    </message>
-    <message>
         <source>Failed to extract plugin meta data from &apos;%1&apos;</source>
         <translation>Ha fallat en extreure les metadades del connector des de «%1»</translation>
     </message>
@@ -2824,7 +2820,7 @@
     <name>QPSQLResult</name>
     <message>
         <source>Query results lost - probably discarded on executing another SQL query.</source>
-        <translation>S&apos;han perdut els resultats de la consulta - probablement s&apos;han descartat en executar una altra consulta SQL.</translation>
+        <translation>S&apos;han perdut els resultats de la consulta - probablement descartats en executar una altra consulta SQL.</translation>
     </message>
     <message>
         <source>Unable to create query</source>
@@ -2832,7 +2828,7 @@
     </message>
     <message>
         <source>Unable to get result</source>
-        <translation>No s&apos;ha pogut obtenir el resultat</translation>
+        <translation>No s&apos;ha pogut obtenir els resultats</translation>
     </message>
     <message>
         <source>Unable to send query</source>
@@ -3632,11 +3628,11 @@
     </message>
     <message>
         <source>Invalid Pages Definition</source>
-        <translation>Definició no vàlida de pàgina</translation>
+        <translation>Definició no vàlida de les pàgines</translation>
     </message>
     <message>
         <source>%1 does not follow the correct syntax. Please use &apos;,&apos; to separate ranges and pages, &apos;-&apos; to define ranges and make sure ranges do not intersect with each other.</source>
-        <translation>%1 no segueix la sintaxi correcta. Useu «,» per separarar intervals i pàgines, «-» per definir intervals i assegureu-vos que els intervals no intersequen entre ells.</translation>
+        <translation>%1 no segueix la sintaxi correcta. Useu «,» per separar intervals i pàgines, «-» per definir intervals, i assegureu-vos que els intervals no se sobreposen entre ells.</translation>
     </message>
     <message>
         <source>Print to File (PDF)</source>
@@ -3786,7 +3782,7 @@
     </message>
     <message>
         <source>There are conflicts in some advanced options. Do you want to fix them?</source>
-        <translation>Hi ha conflictes a diverses opcions avançades. Voleu arreglar-los?</translation>
+        <translation>Hi ha conflictes a les opcions avançades. Els voleu solucionar?</translation>
     </message>
 </context>
 <context>
@@ -3805,7 +3801,7 @@
     </message>
     <message>
         <source>There are conflicts in some options. Please fix them.</source>
-        <translation>Hi ha conflictes a diverses opcions. Esmeneu-los.</translation>
+        <translation>Hi ha conflictes a diverses opcions. Si us plau, solucioneu-los.</translation>
     </message>
 </context>
 <context>
@@ -3900,7 +3896,7 @@
     </message>
     <message>
         <source>Specify pages or ranges separated by commas. Ranges are specified by two numbers separated by a hyphen. E.g: 3,5-7,9 prints pages 3, 5, 6, 7 and 9.</source>
-        <translation>Especifique les pàgines o intervals separats per comes. Els intervals s&apos;especifiquen amb dos nombres separats per un guió. P. ex: 3,5-7,9 imprimeix les pàgines 3, 5, 6, 7 i 9.</translation>
+        <translation>Especifiqueu les pàgines o intervals separats per comes. Els intervals s&apos;especifiquen amb dos nombres separats per un guió. P. ex: 3,5-7,9 imprimeix les pàgines 3, 5, 6, 7 i 9.</translation>
     </message>
 </context>
 <context>
@@ -4209,7 +4205,7 @@
     </message>
     <message>
         <source>PCRE does not support \L, \l, \N{name}, \U, or \u</source>
-        <translation>PCRE not accepta \L, \l, \N{nom}, \U, ni \u</translation>
+        <translation>PCRE no accepta \L, \l, \N{nom}, \U, ni \u</translation>
     </message>
     <message>
         <source>number after (?C is &gt; 255</source>
@@ -4317,7 +4313,7 @@
     </message>
     <message>
         <source>different names for subpatterns of the same number are not allowed</source>
-        <translation>no es permeten noms diferents per subpatrons dels mateix nombre</translation>
+        <translation>no es permeten noms diferents per subpatrons del mateix nombre</translation>
     </message>
     <message>
         <source>(*MARK) must have an argument</source>
@@ -4409,7 +4405,7 @@
     </message>
     <message>
         <source>unrecognised compile-time option bit(s)</source>
-        <translation>bit/s no reconegut/s d&apos;opció en temps de compilació </translation>
+        <translation>bit/s no reconegut/s d&apos;opció en temps de compilació</translation>
     </message>
     <message>
         <source>missing ) after (?# comment</source>
@@ -4437,7 +4433,7 @@
     </message>
     <message>
         <source>this version of PCRE2 does not have Unicode support</source>
-        <translation>aquesta versió del PCRE2 no implementa el Unicode</translation>
+        <translation>aquesta versió del PCRE2 no implementa l&apos;Unicode</translation>
     </message>
     <message>
         <source>parentheses are too deeply nested (stack check)</source>
@@ -4445,7 +4441,7 @@
     </message>
     <message>
         <source>character code point value in \x{} or \o{} is too large</source>
-        <translation>el valor del codi de caràcter de coma en \x{} o \o{} es massa gran</translation>
+        <translation>el valor del codi de caràcter de coma en \x{} o \o{} és massa gran</translation>
     </message>
     <message>
         <source>\C is not allowed in a lookbehind assertion</source>
@@ -4513,11 +4509,11 @@
     </message>
     <message>
         <source>character code point value in \u.... sequence is too large</source>
-        <translation>el valor del codi de caràcter de coma a una seqüència en \u.... es massa gran</translation>
+        <translation>el valor del codi de caràcter de coma a una seqüència en \u.... és massa gran</translation>
     </message>
     <message>
         <source>digits missing in \x{} or \o{}</source>
-        <translation>manquen els dígits a\x{} o \o{} </translation>
+        <translation>manquen els dígits a\x{} o \o{}</translation>
     </message>
     <message>
         <source>syntax error in (?(VERSION condition</source>
@@ -4713,11 +4709,11 @@
     </message>
     <message>
         <source>too much recursion for DFA matching</source>
-        <translation>hi ha massa recursió per a la coincidència DFA</translation>
+        <translation>hi ha massa recursivitat per a la coincidència DFA</translation>
     </message>
     <message>
         <source>backreference condition or recursion test is not supported for DFA matching</source>
-        <translation>la condició de referència cap enrere o la prova de recursió no estan admeses a la coincidència DFA</translation>
+        <translation>la condició de referència cap enrere o la prova de recursivitat no estan admeses a la coincidència DFA</translation>
     </message>
     <message>
         <source>function is not supported for DFA matching</source>
@@ -4765,7 +4761,7 @@
     </message>
     <message>
         <source>nested recursion at the same subject position</source>
-        <translation>recursió imbricada en la mateixa posició del subjecte</translation>
+        <translation>recursivitat imbricada a la mateixa posició del subjecte</translation>
     </message>
     <message>
         <source>recursion limit exceeded</source>
@@ -5141,7 +5137,7 @@
     </message>
     <message>
         <source>ScrollLock</source>
-        <translation>BloqDespl</translation>
+        <translation>Bloq Despl</translation>
     </message>
     <message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/qtbase_de.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/qtbase_de.ts Changed

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/qtbase_pl.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/qtbase_pl.ts Changed

@@ -743,11 +743,11 @@
     <message>
         <source>Float</source>
         <extracomment>Accessible name for button undocking a dock widget (floating state)</extracomment>
-        <translation>Zwolnij</translation>
+        <translation>Uwolnij</translation>
     </message>
     <message>
         <source>Undocks and re-attaches the dock widget</source>
-        <translation>Zwalnia i ponownie dokuje widżet</translation>
+        <translation>Uwalnia i ponownie dokuje widżet</translation>
     </message>
     <message>
         <source>Close</source>
@@ -756,7 +756,7 @@
     </message>
     <message>
         <source>Closes the dock widget</source>
-        <translation>Zamyka zadokowany widżet</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3926,7 +3926,7 @@
     </message>
     <message>
         <source>invalid escape sequence in character class</source>
-        <translation>nieprawidłowa sekwencja ucieczki w klasie znaków</translation>
+        <translation>niepoprawna sekwencja specjalna w klasie znakowej</translation>
     </message>
     <message>
         <source>range out of order in character class</source>
@@ -4794,7 +4794,7 @@
     </message>
     <message>
         <source>Home</source>
-        <translation>Home</translation>
+        <translation>Katalog domowy</translation>
     </message>
     <message>
         <source>End</source>
@@ -6379,8 +6379,7 @@
     </message>
     <message>
         <source>Home</source>
-        <translatorcomment>Keyboard button name</translatorcomment>
-        <translation>Home</translation>
+        <translation>Katalog domowy</translation>
     </message>
     <message>
         <source>Cache</source>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/qtbase_ru.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/qtbase_ru.ts Changed

@@ -9,10 +9,41 @@
     </message>
 </context>
 <context>
+    <name>MAC_APPLICATION_MENU</name>
+    <message>
+        <source>About %1</source>
+        <translation>О %1</translation>
+    </message>
+    <message>
+        <source>Preferences...</source>
+        <translation>Настройки...</translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation>Службы</translation>
+    </message>
+    <message>
+        <source>Hide %1</source>
+        <translation>Скрыть %1</translation>
+    </message>
+    <message>
+        <source>Hide Others</source>
+        <translation>Скрыть другое</translation>
+    </message>
+    <message>
+        <source>Show All</source>
+        <translation>Показать всё</translation>
+    </message>
+    <message>
+        <source>Quit %1</source>
+        <translation>Выйти из %1</translation>
+    </message>
+</context>
+<context>
     <name>QAbstractSocket</name>
     <message>
         <source>Socket operation timed out</source>
-        <translation>Время операции истекло</translation>
+        <translation>Время на операцию истекло</translation>
     </message>
     <message>
         <source>Operation on socket is not supported</source>
@@ -158,6 +189,25 @@
     </message>
 </context>
 <context>
+    <name>QAndroidPlatformTheme</name>
+    <message>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
+    <message>
+        <source>Yes to All</source>
+        <translation>Да для всех</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Нет</translation>
+    </message>
+    <message>
+        <source>No to All</source>
+        <translation>Нет для всех</translation>
+    </message>
+</context>
+<context>
     <name>QApplication</name>
     <message>
         <source>Executable &apos;%1&apos; requires Qt %2, found Qt %3.</source>
@@ -169,6 +219,69 @@
     </message>
 </context>
 <context>
+    <name>QCocoaMenuItem</name>
+    <message>
+        <source>About Qt</source>
+        <translation>О Qt</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translatorcomment>здесь и далее (до exit включительно) слова используются для определения пункта меню по началу его надписи (caption).</translatorcomment>
+        <translation>О </translation>
+    </message>
+    <message>
+        <source>Config</source>
+        <translation>Конфигурация</translation>
+    </message>
+    <message>
+        <source>Preference</source>
+        <translation>Предпочтени</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Параметры</translation>
+    </message>
+    <message>
+        <source>Setting</source>
+        <translation>Настройк</translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation>Параметр</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation>Выйти</translation>
+    </message>
+    <message>
+        <source>Exit</source>
+        <translation>Выход</translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation>Вырезать</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Копировать</translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation>Вставить</translation>
+    </message>
+    <message>
+        <source>Select All</source>
+        <translation>Выделить всё</translation>
+    </message>
+</context>
+<context>
+    <name>QCocoaTheme</name>
+    <message>
+        <source>Don&apos;t Save</source>
+        <translation>Не сохранять</translation>
+    </message>
+</context>
+<context>
     <name>QColorDialog</name>
     <message>
         <source>Hu&amp;e:</source>
@@ -241,22 +354,22 @@
     </message>
     <message>
         <source>Open the combo box selection popup</source>
-        <translation>Открыть выпадающий список</translation>
+        <translation>Открыть раскрывающийся список</translation>
     </message>
 </context>
 <context>
     <name>QCommandLineParser</name>
     <message>
         <source>Displays version information.</source>
-        <translation>Отобразить информацию о версии.</translation>
+        <translation>Показать сведения о версии.</translation>
     </message>
     <message>
         <source>Displays this help.</source>
-        <translation>Отобразить эту справку.</translation>
+        <translation>Показать эту справку.</translation>
     </message>
     <message>
         <source>Unknown option &apos;%1&apos;.</source>
-        <translation>Неизвестный параметр &apos;%1&apos;.</translation>
+        <translation>Неизвестный параметр «%1».</translation>
     </message>
     <message>
         <source>Unknown options: %1.</source>
@@ -264,11 +377,11 @@
     </message>
     <message>
         <source>Missing value after &apos;%1&apos;.</source>
-        <translation>Отсутствует значение после &apos;%1&apos;.</translation>
+        <translation>Отсутствует значение после «%1».</translation>
     </message>
     <message>
         <source>Unexpected value after &apos;%1&apos;.</source>
-        <translation>Неожиданное значение после &apos;%1&apos;.</translation>
+        <translation>Неожиданное значение после «%1».</translation>
     </message>
     <message>
         <source>[options]</source>
@@ -386,7 +499,7 @@
     <message>
         <source>Unclassified</source>
         <comment>CUPS Banner page</comment>
-        <translation>Открытая информация</translation>
+        <translation>Без ограничения доступа</translation>
     </message>
     <message>
         <source>Confidential</source>
@@ -396,7 +509,7 @@
     <message>
         <source>Classified</source>
         <comment>CUPS Banner page</comment>
-        <translation>Ограниченный доступ</translation>
+        <translation>С ограничением доступа</translation>
     </message>
     <message>
         <source>Secret</source>
@@ -714,7 +827,7 @@
     </message>

avidemux_2.7.3.tar.gz/avidemux/qt4/i18n/qtbase_zh_TW.ts -> avidemux_2.7.4.tar.gz/avidemux/qt4/i18n/qtbase_zh_TW.ts Changed

@@ -1,2413 +1,2924 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="zh_TW">
+<TS version="2.1" language="zh_TW">
 <context>
-    <name>QWidget</name>
+    <name>CloseButton</name>
     <message>
-        <source>*</source>
-        <translation>+</translation>
+        <source>Close Tab</source>
+        <translation>關閉分頁</translation>
     </message>
 </context>
 <context>
-    <name>QShortcut</name>
+    <name>MAC_APPLICATION_MENU</name>
     <message>
-        <source>+</source>
-        <translation>+</translation>
+        <source>About %1</source>
+        <translation>關於 %1</translation>
     </message>
     <message>
-        <source>No</source>
-        <translation>否</translation>
+        <source>Preferences...</source>
+        <translation>偏好設定…</translation>
     </message>
     <message>
-        <source>Up</source>
-        <translation>上鍵</translation>
+        <source>Services</source>
+        <translation>服務</translation>
     </message>
     <message>
-        <source>Alt</source>
-        <translation>Alt</translation>
+        <source>Hide %1</source>
+        <translation>隱藏 %1</translation>
     </message>
     <message>
-        <source>F%1</source>
-        <translation>F%1</translation>
+        <source>Hide Others</source>
+        <translation>隱藏其他</translation>
     </message>
     <message>
-        <source>Del</source>
-        <translation>Del</translation>
+        <source>Show All</source>
+        <translation>顯示全部</translation>
     </message>
     <message>
-        <source>End</source>
-        <translation>End</translation>
+        <source>Quit %1</source>
+        <translation>結束 %1</translation>
     </message>
+</context>
+<context>
+    <name>Print Device Input Slot</name>
     <message>
-        <source>Esc</source>
-        <translation>Esc</translation>
+        <source>Automatic</source>
+        <translation>自動</translation>
     </message>
+</context>
+<context>
+    <name>Print Device Output Bin</name>
     <message>
-        <source>Ins</source>
-        <translation>Ins</translation>
+        <source>Automatic</source>
+        <translation>自動</translation>
     </message>
+</context>
+<context>
+    <name>QAbstractSocket</name>
     <message>
-        <source>Tab</source>
-        <translation>Tab</translation>
+        <source>Socket operation timed out</source>
+        <translation>Socket 操作逾時</translation>
     </message>
     <message>
-        <source>Yes</source>
-        <translation>是</translation>
+        <source>Operation on socket is not supported</source>
+        <translation>不支援於 Socket 上操作</translation>
     </message>
     <message>
-        <source>Back</source>
-        <translation>返回</translation>
+        <source>Host not found</source>
+        <translation>找不到主機</translation>
     </message>
     <message>
-        <source>Call</source>
-        <translation>呼叫</translation>
+        <source>Connection refused</source>
+        <translation>連線被拒</translation>
     </message>
     <message>
-        <source>Ctrl</source>
-        <translation>Ctrl</translation>
+        <source>Connection timed out</source>
+        <translation>連線逾時</translation>
     </message>
     <message>
-        <source>Down</source>
-        <translation>下鍵</translation>
+        <source>Trying to connect while connection is in progress</source>
+        <translation>嘗試在連線時連線</translation>
     </message>
     <message>
-        <source>Flip</source>
-        <translation>反轉</translation>
+        <source>Socket is not connected</source>
+        <translation>未連線 Socket</translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation>說明</translation>
+        <source>Network unreachable</source>
+        <translation>無法連到網路</translation>
     </message>
+</context>
+<context>
+    <name>QAbstractSpinBox</name>
     <message>
-        <source>Home</source>
-        <translation>Home</translation>
+        <source>&amp;Select All</source>
+        <translation>全部選擇(&amp;S)</translation>
     </message>
     <message>
-        <source>Left</source>
-        <translation>左鍵</translation>
+        <source>&amp;Step up</source>
+        <translation>單步向上(&amp;S)</translation>
     </message>
     <message>
-        <source>Menu</source>
-        <translation>選單</translation>
+        <source>Step &amp;down</source>
+        <translation>單步向下(&amp;D)</translation>
     </message>
+</context>
+<context>
+    <name>QAccessibleActionInterface</name>
     <message>
-        <source>Meta</source>
-        <translation>Meta</translation>
+        <source>Press</source>
+        <translation>按下</translation>
     </message>
     <message>
-        <source>PgUp</source>
-        <translation>PgUp</translation>
+        <source>Increase</source>
+        <translation>增加</translation>
     </message>
     <message>
-        <source>Stop</source>
-        <translation>停止</translation>
+        <source>Decrease</source>
+        <translation>減少</translation>
     </message>
     <message>
-        <source>Enter</source>
-        <translation>Enter</translation>
+        <source>ShowMenu</source>
+        <translation>顯示選單</translation>
     </message>
     <message>
-        <source>Pause</source>
-        <translation>Pause</translation>
+        <source>SetFocus</source>
+        <translation>設定焦點</translation>
     </message>
     <message>
-        <source>Print</source>
-        <translation>Print</translation>
+        <source>Toggle</source>
+        <translation>切換</translation>
     </message>
     <message>
-        <source>Right</source>
-        <translation>右鍵</translation>
+        <source>Scroll Left</source>
+        <translation>往左捲動</translation>
     </message>
     <message>
-        <source>Shift</source>
-        <translation>Shift</translation>
+        <source>Scroll Right</source>
+        <translation>往右捲動</translation>

avidemux_2.7.3.tar.gz/avidemux/qt4/xdg_data/org.avidemux.Avidemux.appdata.xml.in -> avidemux_2.7.4.tar.gz/avidemux/qt4/xdg_data/org.avidemux.Avidemux.appdata.xml.in Changed

avidemux_2.7.3.tar.gz/avidemux/winInstaller/ChangeLog.release -> avidemux_2.7.4.tar.gz/avidemux/winInstaller/ChangeLog.release Changed

@@ -7,34 +7,35 @@
 </head>
 <body>
     <div id="inner">
-        <h1>Changes in Avidemux v2.7.1 – v2.7.2 Beta</h1>
+        <h1>Changes in Avidemux v2.7.2 – v2.7.4</h1>
         <table>
-            <tr><td>New Demuxer:</td><td>Native AviSynth demuxer (MSVC++ 64 bits Windows builds only)</td></tr>
-            <tr><td>New Demuxer:</td><td>VapourSynth demuxer to directly load .vpy scripts (MSVC++, macOS with Homebrew, custom Linux builds)</td></tr>
-            <tr><td>New Installer:</td><td>Replace NSIS installer with Qt Installer Framework for native MSVC++ 64 bits Windows builds</td></tr>
-            <tr><td>New Encoder:</td><td>Add FFmpeg-based VA-API HW accelerated H.264 encoder (Intel/Linux)</td></tr>
-            <tr><td>New Encoder:</td><td>Add FFmpeg-based VA-API HW accelerated HEVC encoder (Intel/Linux)</td></tr>
-            <tr><td>FFmpeg:</td><td>Migrate to the 4.x branch</td></tr>
-            <tr><td>Decoder:</td><td>As a result of the FFmpeg upgrade, HW accelerated HEVC decoding on macOS is now available when supported by the hardware</td></tr>
-            <tr><td>Encoder:</td><td>Fix issues with image quality and skipped frames in the MJPEG encoder</td></tr>
-            <tr><td>Demuxer:</td><td>Fix audio delay calculation in the Mp4 demuxer</td></tr>
-            <tr><td>Demuxer:</td><td>Fix crash loading large MP4 files with LPCM audio</td></tr>
-            <tr><td>Demuxer:</td><td>Fix multiple issues in the ASF demuxer, allow to cancel indexing</td></tr>
-            <tr><td>Demuxer:</td><td>Allow to cancel indexing of MKV files</td></tr>
-            <tr><td>Demuxer:</td><td>Re-enable multiloading for MPEG-TS streams cut in chunks of 256, 512 MiB, 1, 2 and 4 GiB in size only</td></tr>
-            <tr><td>Demuxer:</td><td>Fix MPEG-TS indexer to start a H.264 or HEVC frame with the Access Unit Delimiter</td></tr>
-            <tr><td>Muxer:</td><td>Add Annex B to Annex B video stream filter to deal with misplaced frame boundaries</td></tr>
-            <tr><td>Muxer:</td><td>Add support for setting rotation flag to the MP4 muxer</td></tr>
-            <tr><td>Filter:</td><td>Add rubber band selector to the "Blacken Borders" filter</td></tr>
-            <tr><td>Filter:</td><td>Add option to deal with anamorphic display to the subtitle filter, fix issues in SRT to SSA converter</td></tr>
-            <tr><td>UI:</td><td>Autosave session on video close, add session restore feature</td></tr>
-            <tr><td>UI:</td><td>Add file name extension when saving audio for some audio types</td></tr>
-            <tr><td>Audio:</td><td>Make maximum level in the "Normalize" filter customizable</td></tr>
-            <tr><td>Audio:</td><td>Improve AAC sampling frequency detection</td></tr>
-            <tr><td>Audio:</td><td>Add decoding support for multichannel Opus audio</td></tr>
-            <tr><td>Miscellaneous:</td><td>Fix regression playback stuck after going to the previous picture</td></tr>
-            <tr><td>Miscellaneous:</td><td>Fix regression "Fade to black" reset when starting filtered playback close to the end of video</td></tr>
-            <tr><td>Miscellaneous:</td><td>Fix regression stopping playback rewinds to the start of video if seek back to the last displayed picture fails</td></tr>
+            <tr><td>New Feature:</td><td>Detect and warn when cut points in H.264 video streams may result in playback issues despite being on keyframes</td></tr>
+            <tr><td>FFmpeg:</td><td>Update to the 4.1.4 release</td></tr>
+            <tr><td>Core:</td><td>Fix MSVC++ builds do not run when the path to user directory contains non-ASCII characters</td></tr>
+            <tr><td>Decoder:</td><td>Fix DXVA2 HW accelerated decoding on Windows 7</td></tr>
+            <tr><td>Decoder:</td><td>Fix DXVA2 HW accelerated decoding stops sometimes on cuts</td></tr>
+            <tr><td>Decoder:</td><td>Enable HW accelerated decoding of 8-bit HEVC for recent versions of Intel graphics driver on Windows</td></tr>
+            <tr><td>Encoder:</td><td>Fix regression with saved x264 and x265 profiles not found (MSVC++ only)</td></tr>
+            <tr><td>Demuxer:</td><td>Dynamically load VapourSynth Script library to avoid error messages on Windows if VapourSynth is not found</td></tr>
+            <tr><td>Demuxer:</td><td>Provide correct average audio bitrate in the Mp4 demuxer if the exact value for the particular codec is unknown</td></tr>
+            <tr><td>Demuxer:</td><td>Fix crash loading MP4 file with number of audio tracks exceeding the max supported</td></tr>
+            <tr><td>Demuxer:</td><td>Support audio tracks in fragmented MP4 files (the variety with empty moov only)</td></tr>
+            <tr><td>Demuxer:</td><td>Support E-AC3 audio tracks in MP4 files</td></tr>
+            <tr><td>Demuxer:</td><td>Fix ASF demuxer still broken by chance with MSVC++ only, the fix relevant for all platforms</td></tr>
+            <tr><td>Demuxer:</td><td>Support more varieties of BMP images</td></tr>
+            <tr><td>Muxer:</td><td>Optimize output of the Mp4 muxer for streaming on Windows too</td></tr>
+            <tr><td>Muxer:</td><td>Add option to the Mp4 muxer to output fragmented MP4 files</td></tr>
+            <tr><td>Muxer:</td><td>Label HEVC video in Mp4 in a way compatible with QuickTime on macOS</td></tr>
+            <tr><td>Filter:</td><td>Fix assembly in Yadif deinterlacer with MSVC++</td></tr>
+            <tr><td>UI:</td><td>Enable automatic application scaling on Windows for recent Qt versions</td></tr>
+            <tr><td>UI:</td><td>Fix silent mode, automatically confirm dialogs instead of choosing the default option</td></tr>
+            <tr><td>Audio:</td><td>Support WMAPRO audio codec for decoding</td></tr>
+            <tr><td>Audio:</td><td>Support AAC with signal band replication (SBR) in external audio tracks</td></tr>
+            <tr><td>Audio:</td><td>Fix saving AAC audio tracks with SBR to a file</td></tr>
+            <tr><td>Audio:</td><td>Improve resilience to false positives when probing external audio files for AAC</td></tr>
+            <tr><td>Miscellaneous:</td><td>Fix crash with OpenGL or DXVA2 video output in 32 bits Avidemux on Windows (better late than never)</td></tr>
+            <tr><td>Miscellaneous:</td><td>Fix regressed handling of empty frames in MPEG-4 and FRAPS video streams</td></tr>
+            <tr><td>Miscellaneous:</td><td>Numerous other fixes and polish</td></tr>
         </table>
     </div>
 </body>

avidemux_2.7.4.tar.gz/avidemux/winInstaller/qtifw/packages/org.avidemux.run/data Added

avidemux_2.7.4.tar.gz/avidemux/winInstaller/qtifw/packages/org.avidemux.run/data/scripts Added

avidemux_2.7.4.tar.gz/avidemux/winInstaller/qtifw/packages/org.avidemux.run/data/scripts/auto_uninstall.js Added

avidemux_2.7.3.tar.gz/avidemux/winInstaller/qtifw/packages/org.avidemux.run/meta/installscript.js -> avidemux_2.7.4.tar.gz/avidemux/winInstaller/qtifw/packages/org.avidemux.run/meta/installscript.js Changed

@@ -52,17 +52,26 @@
         component.loaded.connect(this, Component.prototype.installerLoaded);
         ComponentSelectionPage = gui.pageById(QInstaller.ComponentSelection);
 		
-		var text=installer.value( "TargetDir");
-		if (installer.fileExists(text + "/components.xml")) 
+		var folder=installer.value( "TargetDir");
+		if (installer.fileExists(folder + "/components.xml")) 
 		{							
 			update=true;
+    	    // remove old one
+			// https://stackoverflow.com/questions/46455360/workaround-for-qt-installer-framework-not-overwriting-existing-installation
+			QMessageBox.question("question","Uninstall","I will now uninstall the previous version of avidemux VC++" ,  QMessageBox.Yes);     			
+		    if (installer.fileExists(folder + "/scripts/auto_uninstall.js")) 
+			    installer.execute(folder+"/Uninstall Avidemux VC++ 64bits.exe", "--script="+folder+"/scripts/auto_uninstall.js");			
+            else
+			    installer.execute(folder+"/Uninstall Avidemux VC++ 64bits.exe");
 		}        
 
         installer.setDefaultPageVisible(QInstaller.TargetDirectory, !update);
         installer.setDefaultPageVisible(QInstaller.ComponentSelection, !update);
         installer.setDefaultPageVisible(QInstaller.LicenseCheck, !update);
+		/*
         if (systemInfo.productType === "windows")
             installer.setDefaultPageVisible(QInstaller.StartMenuSelection, !update);
+			*/
         installer.setDefaultPageVisible(QInstaller.ReadyForInstallation, false);
     }
 }

avidemux_2.7.3.tar.gz/avidemux/winInstaller/qtifw/split.bash -> avidemux_2.7.4.tar.gz/avidemux/winInstaller/qtifw/split.bash Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/include/ADM_misc.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/include/ADM_misc.h Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/include/ADM_win32.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/include/ADM_win32.h Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/src/ADM_debug.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_debug.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/src/ADM_fileio.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_fileio.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/src/ADM_folder_linux.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_folder_linux.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/src/ADM_folder_unix.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_folder_unix.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/src/ADM_folder_win32.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_folder_win32.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/src/ADM_memcpy.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_memcpy.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/src/ADM_memsupport.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_memsupport.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/src/ADM_misc.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_misc.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/src/ADM_win32.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_win32.cpp Changed

@@ -38,23 +38,28 @@
 {
 void gettimeofday(struct timeval *p, TIMZ *tz);
 }
-
-void gettimeofday(struct timeval *p, TIMZ *tz)
+// https://stackoverflow.com/questions/10905892/equivalent-of-gettimeday-for-windows
+void gettimeofday(struct timeval * tp, TIMZ * tzp)
 {
-    unsigned long int sec;
-    SYSTEMTIME  tme;
-
-    GetSystemTime(&tme);
-
-    sec=tme.wSecond;
-    sec+=60*tme.wMinute;
-    sec+=60*60*tme.wHour;
-
-    p->tv_sec=sec;
-    p->tv_usec=tme.wMilliseconds*1000;
-
-    return;
+    // Note: some broken versions only have 8 trailing zero's, the correct epoch has 9 trailing zero's
+    // This magic number is the number of 100 nanosecond intervals since January 1, 1601 (UTC)
+    // until 00:00:00 January 1, 1970 
+    static const uint64_t EPOCH = ((uint64_t)116444736000000000ULL);
+
+    SYSTEMTIME  system_time;
+    FILETIME    file_time;
+    uint64_t    time;
+
+    GetSystemTime(&system_time);
+    SystemTimeToFileTime(&system_time, &file_time);
+    time = ((uint64_t)file_time.dwLowDateTime);
+    time += ((uint64_t)file_time.dwHighDateTime) << 32;
+
+    tp->tv_sec = (long)((time - EPOCH) / 10000000L);
+    tp->tv_usec = (long)(system_time.wMilliseconds * 1000);
+    return ;
 }
+
 #endif    // HAVE_GETTIMEOFDAY
 
 int getpriority(int which, int who)

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/src/ADM_win32_mingw.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_win32_mingw.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/src/ADM_win32_vs.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/ADM_win32_vs.cpp Changed

@@ -9,7 +9,7 @@
 #include "ADM_win32.h"
 #include "ADM_misc.h"
 #include <algorithm>
-void redirectStdoutToFile(void)
+void redirectStdoutToFile(const char *logFile)
 {
     // Don't redirect stdout and stderr if SDL hasn't already hijacked it.
     // This allows us to optionally compile all EXEs as console applications
@@ -39,10 +39,21 @@
     remove(stderrPath);
 
     // Redirect output to log file in the user's profile directory
-    const char* logFile = "admlog.txt";
-
+ #if 1
     std::string filePath=std::string(ADM_getLogDir())+std::string(logFile);
-
-    freopen(filePath.c_str(),"w",stdout);
- 
+#else
+    std::string filePath=std::string("f:\\tmp\\élém\\")+std::string(logFile);
+#endif
+
+    int length = utf8StringToWideChar(filePath.c_str(), -1, NULL);
+    wchar_t *filePath2 = new wchar_t[length+1];
+    wchar_t mode[] = L"w";
+    utf8StringToWideChar(filePath.c_str(), -1, filePath2);
+    FILE *newFD=_wfreopen(filePath2, mode,stdout);
+    delete[] filePath2;
+    if (!newFD)
+    {
+        assert(0);
+        ADM_assert(0);
+    }
 }

avidemux_2.7.3.tar.gz/avidemux_core/ADM_core/src/TLK_clock.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_core/src/TLK_clock.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioAccessFileAACADTS.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioAccessFileAACADTS.h Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS.cpp Changed

@@ -26,12 +26,13 @@
 {
     aac=new  ADM_adts2aac();    
     // ----- extract data frequency etc.. to initialize clock
+    fseek(_fd,_offset,SEEK_SET);
 #define PROBE_SIZE 8000
     uint8_t buffer[PROBE_SIZE+1];
     int n=fread(buffer,1,PROBE_SIZE,_fd);
     if(n<=0) return false;
-    fseek(_fd,0,SEEK_SET);
-    ADM_info("Probing AAC/ADTS with %d bytes\n",n);
+    fseek(_fd,_offset,SEEK_SET);
+    ADM_info("Probing AAC/ADTS with %d bytes at offset %d\n",n,_offset);
     if(!aac->addData(n,buffer)) return false;
     if(ADM_adts2aac::ADTS_OK!=aac->getAACFrame(NULL,NULL))
     {
@@ -59,12 +60,12 @@
     clock= new audioClock(headerInfo.frequency);
     
     // ----- build time map
-    fseek(_fd,0,SEEK_SET);
-    adtsIndexer dexer(_fd,headerInfo.frequency,headerInfo.channels);
+    fseek(_fd,_offset,SEEK_SET);
+    adtsIndexer dexer(_fd,_offset,headerInfo.frequency,headerInfo.channels);
     ADM_info("Indexing adts/aac file\n");
     dexer.index(seekPoints );  
     ADM_info("found %d seekPoints\n",seekPoints.size());
-    fseek(_fd,0,SEEK_SET);
+    fseek(_fd,_offset,SEEK_SET);
     payloadSize=dexer.getPayloadSize();
     // 
     // compute duration
@@ -88,13 +89,11 @@
 
 ADM_audioAccessFileAACADTS::ADM_audioAccessFileAACADTS(const char *fileName,int offset)
 {
-        fileSize=ADM_fileSize(fileName)-offset;
-        _fd=ADM_fopen(fileName,"rb");
-        ADM_assert(_fd);
-        clock=NULL;
-        inited=init();;
-        
-        
+    _offset=(offset>0)? offset : 0;
+    _fd=ADM_fopen(fileName,"rb");
+    ADM_assert(_fd);
+    clock=NULL;
+    inited=init();
 }
 /**
     \fn

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS_indexer.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS_indexer.cpp Changed

@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#define AAC_SEEK_PERIOD (10000000LL) // 10 sec
+#define AAC_SEEK_PERIOD (200000LL) // 0.2 sec
 
 /**
  * \class adtsIndexer
@@ -23,9 +23,10 @@
 {
 public:
     
-            adtsIndexer(FILE *fd,int fq,int chan)
+            adtsIndexer(FILE *fd,int off,int fq,int chan)
             {
                 f=fd;
+                startOffset=off;
                 this->fq=fq;
                 this->channels=chan;
                 payload=0;
@@ -42,6 +43,7 @@
     
 protected:
     FILE *f;
+    int  startOffset;
     int  fq;
     int  channels;
     int  payload;
@@ -55,9 +57,7 @@
  */
 bool adtsIndexer::index(std::vector<aacAdtsSeek>& seekPoints)
 {
-#define CHUNK_SIZE (5*1024)
-   uint8_t  buffer[CHUNK_SIZE];
-   int      fileOffset=0;;
+   uint8_t  buffer[ADTS_MAX_AAC_FRAME_SIZE];
    uint64_t lastPoint=0;
    int      len;
    
@@ -67,23 +67,24 @@
    int offset;
 
    start.dts=0;
-   start.position=0;
+   start.position=startOffset;
    seekPoints.push_back(start); // initial start
    
    while(1)
    {
        ADM_adts2aac::ADTS_STATE s=aac.getAACFrame(&len,buffer,&offset);
+       offset+=startOffset;
        switch(s)
        {
            case ADM_adts2aac::ADTS_OK:
             {
                uint64_t currentPoint=clk.getTimeUs();
-               if( (currentPoint-lastPoint)>AAC_SEEK_PERIOD) // one seek point every 10 s
+               if( (currentPoint-lastPoint)>AAC_SEEK_PERIOD) // one seek point every 200 ms
                {
                    start.dts=currentPoint;
                    start.position=offset;
                    seekPoints.push_back(start);
-                   lastPoint=currentPoint;   
+                   lastPoint=currentPoint;
                }
                 payload+=len;
                 clk.advanceBySample(1024);
@@ -100,7 +101,7 @@
            case ADM_adts2aac::ADTS_MORE_DATA_NEEDED:
            {
               
-               int n=fread(buffer,1,CHUNK_SIZE,f);
+               int n=fread(buffer,1,ADTS_MAX_AAC_FRAME_SIZE,f);
                if(n<=0)
                    return true;
                if(!aac.addData(n,buffer))

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioIdentify.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioIdentify.cpp Changed

@@ -165,7 +165,6 @@
 	          }
 	       }
 
-	    uint32_t length;
 	    wRead32(t32);
 	    ADM_info(" %lu bytes data \n", totalSize);
 	    info.blockalign=1;
@@ -317,35 +316,52 @@
  */
 static bool idAAACADTS(int bufferSize,const uint8_t *data,WAVHeader &info,uint32_t &offset)
 {
+    int firstOffset,expected,sync=0;
     ADM_adts2aac aac;
+    uint8_t out[ADTS_MAX_AAC_FRAME_SIZE];
     const uint8_t *start=data;
     const uint8_t *end=data+bufferSize;
+    offset=firstOffset=expected=0;
     while(start<end)
     {
         int incoming=500;
-        int outLen;
+        int off,outLen=0;
         if(start+500>end) incoming=end-start;
-        ADM_adts2aac::ADTS_STATE state=aac.convert2(incoming,start,&outLen,NULL);
+        bool r=false;
+        if(incoming>0)
+            r=aac.addData(incoming,start);
+        ADM_adts2aac::ADTS_STATE state=aac.getAACFrame(&outLen,out,&off);
         start+=incoming;
         switch(state)
         {
-            case ADM_adts2aac::ADTS_ERROR: 
+            case ADM_adts2aac::ADTS_ERROR:
+                    return false;
+            case ADM_adts2aac::ADTS_MORE_DATA_NEEDED:
+                    if(r) continue;
                     return false;
-                    break;
-            case ADM_adts2aac::ADTS_MORE_DATA_NEEDED: 
-                    continue;
-                    break;
             case ADM_adts2aac::ADTS_OK:
                     // Got sync
+                    if(!sync)
+                        firstOffset=off;
+                    else if(off>expected)
+                    {
+                        ADM_warning("Skipped at least %d bytes between frames, assuming a false positive.\n",off-expected);
+                        return false;
+                    }
+                    sync++;
+                    expected=off+outLen+9; // ADTS header max size
+                    ADM_info("Sync %d at offset %d, frame size %d\n",sync,off,outLen);
+                    if(sync<3)
+                        continue;
                     info.encoding=WAV_AAC;
                     info.channels=aac.getChannels();
                     info.blockalign=0;
                     info.bitspersample=16;
                     info.byterate=128000>>3;
                     info.frequency=aac.getFrequency();
-                    ADM_info("Detected as AAC, fq=%d, channels=%d\n",info.frequency,info.channels);
+                    offset=firstOffset;
+                    ADM_info("Detected as AAC, fq=%d, channels=%d, offset=%d\n",info.frequency,info.channels,offset);
                     return true;
-                    break;
             default:
                 ADM_assert(0);
                 break;

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioWriteAAC.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioWriteAAC.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioXiphUtils.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioXiphUtils.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudioParser/include/ADM_aacadts.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudioParser/include/ADM_aacadts.h Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_aacadts.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_aacadts.cpp Changed

@@ -176,11 +176,11 @@
     int nbFrames=0;
     bool crc=false;
     int match;
-    for( p=(buffer.at(tail));p<(buffer.at(head-2));p++)
+    for( p=(buffer.at(tail));p<(buffer.at(head-6));p++)
     {
-        if(p[0]!=0xff || ((p[1]&0xf0)!=0xf0))
+        if(p[0]!=0xff || (p[1]&0xf0)!=0xf0 || p[1]&6)
             continue;
-        
+
         match=p-buffer.at(0); // offset of syncword
         packetLen=((p[3]&0x3)<<11)+(p[4]<<3)+(p[5]>>5);
         nbFrames=1+(p[6]&3);
@@ -198,15 +198,15 @@
             found=true;
             break;
         }
-        if(match+packetLen+2>head && match+packetLen!=head)
+        if(match+packetLen+3>head && match+packetLen!=head)
         {
             aprintf("[ADTS]** not enough data **\n");
             return ADTS_MORE_DATA_NEEDED;
         }
         // do we have sync at the end ?
-        if(p[packetLen]!=0xff)
+        if(p[packetLen]!=0xff || (p[packetLen+1]&0xf0)!=0xf0 || p[packetLen+1]&6)
         {
-            aprintf("[ADTS] no ff marker at the end\n");
+            aprintf("[ADTS] no syncword at the end or layer!=0\n");
             continue;
         }
         aprintf("[ADTS] End marker found\n");
@@ -217,7 +217,7 @@
     if(found==false)
     {
         aprintf("[ADTS]No sync\n");
-        tail=head-1;
+        tail=head-6;
         return ADTS_MORE_DATA_NEEDED;
     }
     if(!hasExtra)

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_aacinfo.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_aacinfo.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_dcainfo.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_dcainfo.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_eac3info.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_eac3info.cpp Changed

@@ -21,10 +21,14 @@
 /**
     \fn ADM_EAC3GetInfo
 */
-bool ADM_EAC3GetInfo(const uint8_t *buf, uint32_t len, uint32_t *syncoff, ADM_EAC3_INFO *info, bool plainAC3)
+bool ADM_EAC3GetInfo(const uint8_t *data, uint32_t len, uint32_t *syncoff, ADM_EAC3_INFO *info, bool plainAC3)
 {
     uint32_t of=0;
     *syncoff=0;
+    uint8_t *buf=new uint8_t[len+AV_INPUT_BUFFER_PADDING_SIZE];
+    memset(buf,0,len+AV_INPUT_BUFFER_PADDING_SIZE);
+    memcpy(buf,data,len);
+#define CLEANUP delete [] buf; buf=NULL; av_free(hdr); hdr=NULL;
     //	printf("\n Syncing on %d \n",len);
     // Search for startcode
     // 0x0b 0x77
@@ -33,20 +37,20 @@
         if(len<7)
         {
             ADM_warning("Not enough info to find a52 syncword\n");
+            delete [] buf;
+            buf=NULL;
             return false;
         }
-        if( *buf!=0x0b || *(buf+1)!=0x77)
+        if(*(buf+of)!=0x0b || *(buf+of+1)!=0x77)
         {
             len--;
-            buf++;
             of++;
             continue;
         }
         AC3HeaderInfo *hdr=NULL;
-        if(avpriv_ac3_parse_header(&hdr,buf,len)<0)
+        if(avpriv_ac3_parse_header(&hdr,buf+of,len)<0)
         {
             len--;
-            buf++;
             of++;
             ADM_info("Sync failed... continuing\n");
             continue;
@@ -54,15 +58,13 @@
         if(!plainAC3 && hdr->bitstream_id<=10) // this is not EAC3 but plain ac3
         {
             ADM_info("Bitstream ID = %d: not EAC3\n",hdr->bitstream_id);
-            av_free(hdr);
-            hdr=NULL;
+            CLEANUP
             return false;
         }
         if(plainAC3 && hdr->bitstream_id>10) // this is not AC3 but EAC3
         {
             ADM_info("Bitstream ID = %d: not AC3\n",hdr->bitstream_id);
-            av_free(hdr);
-            hdr=NULL;
+            CLEANUP
             return false;
         }
 //            printf("Sync found at offset %"PRIu32"\n",of);
@@ -72,9 +74,10 @@
         info->channels=hdr->channels;
         info->frameSizeInBytes=hdr->frame_size;
         info->samples=265*6; // ??
-        av_free(hdr);
-        hdr=NULL;
+        CLEANUP
         return true;
     }
+    delete [] buf;
+    buf=NULL;
     return true;
 }

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/ADM_indexFile.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/include/ADM_indexFile.h Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/src/dmx_io.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/src/dmx_io.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreImage/include/ADM_imageFlags.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreImage/include/ADM_imageFlags.h Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreImage/src/ADM_image.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreImage/src/ADM_image.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp Changed

@@ -151,10 +151,6 @@
 {
     int step=w/4;
     int left=w-4*step;
-    uint8_t *xsrc=src;
-    uint8_t *xdst=dst;
-    uint8_t *xdst2=dst2;
-
 
     for(int y=0;y<h;y++)
     {
@@ -208,7 +204,6 @@
 {
         int mod8=w>>3;
         int leftOver=w&7;
-        int x;
         for(int y=0;y<h;y++)
         {
                 adm_uv_to_nv12_mmx(srcu,srcv,dst,mod8);
@@ -254,7 +249,6 @@
 {
         int mod8=w>>3;
         int leftOver=w&7;
-        int x;
         for(int y=0;y<h;y++)
         {
                 uint8_t *ssrc=src;
@@ -355,16 +349,13 @@
  */
 bool    ADMImage::convertToNV12(uint8_t *yData, uint8_t *uvData, int strideY, int strideUV)
 {
-        // Y
-        int w=_width;
-        int h=_height;
         int sstride=GetPitch(PLANAR_Y);
         int dstride=strideY;
         uint8_t *src=GetReadPtr(PLANAR_Y);
         uint8_t *dst=yData;
         for(int y=0;y<_height;y++)
         {
-            memcpy(dst,src,w);
+            memcpy(dst,src,_width);
             src+=sstride;
             dst+=dstride;
         }
@@ -466,10 +457,10 @@
     uint8_t dst2[50],dst2b[50];
 
     for(int i=0;i<50;i++) src[i]=(i*0x55) ^( i+1);
-    memset(dst,50,0);
-    memset(dst2,50,0);
-    memset(dstb,50,0);
-    memset(dst2b,50,0);
+    memset(dst,0,50);
+    memset(dst2,0,50);
+    memset(dstb,0,50);
+    memset(dst2b,0,50);
 
 
 #define ROW_SIZE 23
@@ -495,10 +486,10 @@
     uint8_t dst2[50],dst2b[50];
 
     for(int i=0;i<50;i++) src[i]=(i*0x55) ^( i+1);
-    memset(dst,50,0);
-    memset(dst2,50,0);
-    memset(dstb,50,0);
-    memset(dst2b,50,0);
+    memset(dst,0,50);
+    memset(dst2,0,50);
+    memset(dstb,0,50);
+    memset(dst2b,0,50);
 
 
 
@@ -527,8 +518,8 @@
     uint8_t dst2[SRC_SIZE];
 
     for(int i=0;i<SRC_SIZE;i++) src[i]=i;
-    memset(dst,SRC_SIZE,0);
-    memset(dst2,SRC_SIZE,0);
+    memset(dst,0,SRC_SIZE);
+    memset(dst2,0,SRC_SIZE);
 
 
     yuv444_MMX(src,dst,ROW_SIZE,1,ROW_SIZE,4*ROW_SIZE);
@@ -563,8 +554,8 @@
           srcu[i]=i;
           srcv[i]=0x80^i;
       }
-      memset(dst,SRC_SIZE,0);
-      memset(dst2,SRC_SIZE,0);
+      memset(dst,0,SRC_SIZE);
+      memset(dst2,0,SRC_SIZE);
 
 
       uv_to_nv12_mmx(ROW_SIZE,1,ROW_SIZE>>1,ROW_SIZE>>1,srcu,srcv,ROW_SIZE,dst2);

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageUtils_asm.asm -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageUtils_asm.asm Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreImage/src/ADM_pp.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreImage/src/ADM_pp.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreJobs/src/ADM_coreJobs.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreJobs/src/ADM_coreJobs.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreSubtitles/src/ADM_subLoader.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreSubtitles/src/ADM_subLoader.cpp Changed

@@ -79,9 +79,10 @@
 
 
 /**
- *      \fn updateTiming
+ *      \fn updateTiming // unused
  *      \brief srt does not provide 'end display' timeing information, make a guess
  */
+#if 0
 static bool updateSrtTiming(ListOfSubtitleLines &lines)
 {
     int n=lines.size();
@@ -96,9 +97,8 @@
     if(n)
         lines[n-1].stop=lines[n-1].start+HOLD_ON_TIMER;
     return true;
-    
-    
 }
+#endif
 /**
  * \fn loadSrt
  * @param file
@@ -113,7 +113,6 @@
         ADM_warning("Cannot open subtitle %s\n,file");
         return false;
     }
-    bool status=true;
     char buffer[1024];
     SRT_STATE state=STATE_LINENO;
     subtitleTextEntry entry;
@@ -142,14 +141,12 @@
                         if(length<2) 
                         { 
                             ADM_warning("Inconsistent file\n");
-                            status=false;
                             break;
                         }
                         uint64_t start,end;
                         if(!splitSrtTiming(buffer,start,end))
                         {
                              ADM_warning("Inconsistent timing line\n");
-                             status=false;
                              break;
                         }
                         entry.start=start;

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUI/include/DIA_coreToolkit.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUI/include/DIA_coreToolkit.h Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUI/include/DIA_coreUI_internal.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUI/include/DIA_coreUI_internal.h Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUI/src/DIA_coreToolkit.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUI/src/DIA_coreToolkit.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_compressedImage.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_compressedImage.h Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_videoInfoExtractor.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_videoInfoExtractor.h Changed

@@ -34,7 +34,12 @@
     uint32_t darNum;
     uint32_t darDen;
     bool     hasStructInfo;
+    bool     hasPocInfo;
     uint32_t CpbDpbToSkip;
+    uint32_t log2MaxFrameNum;
+    uint32_t log2MaxPocLsb;
+    bool     frameMbsOnlyFlag;
+    uint32_t refFrames;
 }ADM_SPSInfo;
 
 /**
@@ -64,9 +69,9 @@
 ADM_COREUTILS6_EXPORT bool    extractSPSInfo(uint8_t *data, uint32_t len,ADM_SPSInfo *info);
 ADM_COREUTILS6_EXPORT bool    extractSPSInfo_mp4Header(uint8_t *data, uint32_t len,ADM_SPSInfo *info);
 
-ADM_COREUTILS6_EXPORT uint8_t extractH264FrameType(uint32_t nalSize,uint8_t *buffer,uint32_t len,uint32_t *flags,uint32_t *recovery=NULL);
+ADM_COREUTILS6_EXPORT uint8_t extractH264FrameType(uint8_t *buffer,uint32_t len,uint32_t *flags,int *pocLsb,ADM_SPSInfo *sps,uint32_t *recovery=NULL);
 ADM_COREUTILS6_EXPORT uint8_t extractH265FrameType(uint32_t nalSize,uint8_t *buffer,uint32_t len,uint32_t *flags);
-ADM_COREUTILS6_EXPORT uint8_t extractH264FrameType_startCode(uint32_t nalSize,uint8_t *buffer,uint32_t len,uint32_t *flags);
+ADM_COREUTILS6_EXPORT uint8_t extractH264FrameType_startCode(uint8_t *buffer,uint32_t len,uint32_t *flags,int *pocLsb,ADM_SPSInfo *sps,uint32_t *recovery=NULL);
 ADM_COREUTILS6_EXPORT bool    ADM_getH264SpsPpsFromExtraData(uint32_t extraLen,uint8_t *extra,
                                     uint32_t *spsLen,uint8_t **spsData,
                                     uint32_t *ppsLen,uint8_t **ppsData); // return a copy of pps/sps extracted

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/include/prefs2_list.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/include/prefs2_list.h Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_codecType.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_codecType.cpp Changed

@@ -23,11 +23,7 @@
 */
 bool  isMpeg4Compatible (uint32_t fourcc)
 {
-#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) \
-						{divx4=1; }
-
-  uint8_t divx4 = 0;
-
+#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) return true
   CHECK ("FMP4");
   CHECK ("fmp4");
   CHECK ("DIVX");
@@ -39,10 +35,7 @@
   CHECK ("M4S2");
   CHECK ("3IV2");
   CHECK ("SEDG");
-
-  return divx4;
-
-#undef CHECK
+  return false;
 }
 #ifdef ADM_BIG_ENDIAN
 #define SWAP32(x) x=R32(x)
@@ -55,18 +48,13 @@
 
 bool isMpeg12Compatible (uint32_t fourcc)
 {
-#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) \
-						{mpeg=1; }
-
-  uint8_t mpeg = 0;
   CHECK ("MPEG");
   CHECK ("mpg1");
   CHECK ("mpg2");
   SWAP32 (fourcc);
   if (fourcc == 0x10000002 || fourcc==0x10000001) //Mplayer fourcc
-    mpeg = 1;
-  return mpeg;
-#undef CHECK
+    return true;
+  return false;
 }
 /**
     \fn isH264Compatible
@@ -74,20 +62,13 @@
 
 bool isH264Compatible (uint32_t fourcc)
 {
-#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) \
-                                                {h264=1; }
-
-  uint8_t h264 = 0;
-
   CHECK ("X264");
   CHECK ("x264");
   CHECK ("h264");
   CHECK ("H264");
   CHECK ("AVC1");
   CHECK ("avc1");
-  return h264;
-
-#undef CHECK
+  return false;
 }
 
 /**
@@ -96,11 +77,6 @@
 
 bool isH265Compatible (uint32_t fourcc)
 {
-#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) \
-                                                {h265=1; }
-
-  uint8_t h265 = 0;
-
   CHECK ("X265");
   CHECK ("x265");
   CHECK ("h265");
@@ -109,9 +85,7 @@
   CHECK ("hevc");
   CHECK ("HVC1");
   CHECK ("hvc1");
-  return h265;
-
-#undef CHECK
+  return false;
 }
 
 /**
@@ -120,11 +94,6 @@
 
 bool isMSMpeg4Compatible (uint32_t fourcc)
 {
-#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) \
-						{divx3=1; }
-
-  uint8_t divx3 = 0;
-
   CHECK ("MP43");
   CHECK ("mp43");
   CHECK ("div3");
@@ -132,27 +101,16 @@
   CHECK ("DIV4");
   CHECK ("div4");
   CHECK ("COL1");
-
-  return divx3;
-
-#undef CHECK
+  return false;
 }
 /**
     \fn isVC1Compatible
 */
 bool isVC1Compatible    (uint32_t fourcc)
 {
-
-#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) \
-						{divx3=1; }
-
-  uint8_t divx3 = 0;
-
   CHECK ("VC1 ");
   CHECK ("WVC1");
-  return divx3;
-
-#undef CHECK
+  return false;
 }
 /**
     \fn isVP6Compatible
@@ -160,42 +118,22 @@
 
 bool isVP6Compatible (uint32_t fourcc)
 {
-
-#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) \
-						{divx3=1; }
-
-  uint8_t divx3 = 0;
-
   CHECK ("VP6F");
   CHECK ("VP6 ");
   CHECK ("VP61");
   CHECK ("VP62");
-
-  return divx3;
-
-#undef CHECK
+  return false;
 }
 
-
-
 /**
     \fn isVP9Compatible
 */
 
 bool isVP9Compatible (uint32_t fourcc)
 {
-
-#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) \
-						{vp9=1; }
-
-  uint8_t vp9 = 0;
-
   CHECK ("VP9 ");
   CHECK ("VP90");
-
-  return vp9;
-
-#undef CHECK
+  return false;
 }
 
 /**
@@ -204,19 +142,11 @@
 
 bool isDVCompatible (uint32_t fourcc)
 {
-#define CHECK(x) if(fourCC::check(fourcc,(uint8_t *)x)) \
-						{dv=1; }
-
-  uint8_t dv = 0;
-
   CHECK ("dvsd");
   CHECK ("DVSD");
   CHECK ("dvpp");
   CHECK ("CDVC");
   CHECK ("cdvc");
-
-  return dv;
-
-#undef CHECK
+  return false;
 }
 //EOF

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_coreCodecMapping.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_coreCodecMapping.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_file.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_file.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractor.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractor.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH264.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH264.cpp Changed

@@ -24,7 +24,7 @@
 #include "libavcodec/avcodec.h"
 #include "libavcodec/ff_spsinfo.h"
 #include "libavutil/mem.h"
-extern int ff_h264_info(AVCodecParserContext *parser,ffSpsInfo *ndo);
+extern int ff_h264_info(AVCodecParserContext *parser, int ticksPerFrame, ffSpsInfo *ndo);
 }
 
 #include "ADM_Video.h"
@@ -32,7 +32,6 @@
 #include "fourcc.h"
 //#include "ADM_mp4.h"
 
-#define aprintf(...) {}
 #include "ADM_getbits.h"
 #include "ADM_videoInfoExtractor.h"
 #include "ADM_h264_tag.h"
@@ -48,8 +47,11 @@
 #define check(...) {}
 #endif
 
-static ADMCountdown msgRateLimiter(100);
-static ADMCountdown limiterReset(199);
+#if 0
+#define seiprintf ADM_info
+#else
+#define seiprintf(...) {}
+#endif
 
 /**
     \fn ADM_getH264SpsPpsFromExtraData
@@ -462,11 +464,9 @@
 */
 static bool getRecoveryFromSei(uint32_t nalSize, uint8_t *org,uint32_t *recoveryLength)
 {
-    static int count=0;
-    if(msgRateLimiter.done() && limiterReset.done())
-        count=0;
-    uint8_t *payloadBuffer=(uint8_t *)malloc(nalSize+16);
-    int     originalNalSize=nalSize+16;
+    int originalNalSize=nalSize+16;
+    uint8_t *payloadBuffer=(uint8_t *)malloc(originalNalSize+AV_INPUT_BUFFER_PADDING_SIZE);
+    memset(payloadBuffer,0,originalNalSize+AV_INPUT_BUFFER_PADDING_SIZE);
     uint8_t *payload=payloadBuffer;
     bool r=false;
     nalSize=ADM_unescapeH264(nalSize,org,payload);
@@ -477,67 +477,53 @@
         return false;
     }
 
-#define RATE_LIMITED_WARNING(x) if(!count)\
-    { \
-        ADM_warning(#x"\n"); \
-        msgRateLimiter.reset(); \
-    } \
-    if(msgRateLimiter.done() && count) \
-    { \
-        ADM_warning(#x" (message repeated %d times)\n",count); \
-        msgRateLimiter.reset(); \
-        count=0; \
-    } \
-    count++; \
-    limiterReset.reset();
-
     uint8_t *tail=payload+nalSize;
     *recoveryLength=16;
     while( payload<tail)
     {
-                uint32_t sei_type=0,sei_size=0;
-                while(payload[0]==0xff)
-                {
-                        sei_type+=0xff;payload++;
-                        if(payload+2>=tail)
-                        {
-                            RATE_LIMITED_WARNING(Cannot decode SEI)
-                            goto abtSei;
-                        }
-                };
-                sei_type+=payload[0];payload++;
-                if(payload>=tail)
-                {
-                            RATE_LIMITED_WARNING(Cannot decode SEI)
-                            goto abtSei;
-                }
-                while(payload[0]==0xff)
-                {
-                    sei_size+=0xff;payload++;
-                    if(payload+1>=tail)
-                        {
-                            RATE_LIMITED_WARNING(Cannot decode SEI (2))
-                            goto abtSei;
-                        }
-                };
-                sei_size+=payload[0];payload++;
-                aprintf("  [SEI] Type : 0x%x size:%d\n",sei_type,sei_size);
-                if(payload+sei_size>tail) break;
-                switch(sei_type) // Recovery point
-                {
-                       case 6:
-                        {
-                            getBits bits(sei_size,payload);
-                            payload+=sei_size;
-                            *recoveryLength=bits.getUEG();
-                            r=true;
-                            count=0;
-                            break;
-                        }
-                        default:
-                            payload+=sei_size;
-                            break;
-                }
+        uint32_t sei_type=0,sei_size=0;
+        while(payload[0]==0xff)
+        {
+            sei_type+=0xff;payload++;
+            {
+                seiprintf("Not enough data.\n");
+                goto abtSei;
+            }
+        }
+        sei_type+=payload[0];payload++;
+        if(payload>=tail)
+        {
+            seiprintf("No data left after decoding SEI type.\n");
+            goto abtSei;
+        }
+        while(payload[0]==0xff)
+        {
+            sei_size+=0xff;payload++;
+            if(payload+1>=tail)
+            {
+                seiprintf("Not enough data left after decoding SEI size.\n");
+                goto abtSei;
+            }
+        }
+        sei_size+=payload[0];payload++;
+        seiprintf("  [SEI] Type : 0x%x size:%d\n",sei_type,sei_size);
+        if(payload+sei_size>tail) break;
+        switch(sei_type)
+        {
+            case 6: // Recovery point
+            {
+                getBits bits(sei_size,payload);
+                int distance=bits.getUEG();
+                seiprintf("Recovery distance: %d\n",distance);
+                *recoveryLength=distance;
+                r=true;
+                goto abtSei;
+                break;
+            }
+            default:
+                payload+=sei_size;
+                break;
+        }
     }
 abtSei:
     free(payloadBuffer);
@@ -546,19 +532,33 @@
 /**
     \fn getNalType
     \brief Return the slice type. The stream is escaped by the function. If recovery==0
-            I as considered IDR else as P.
+           or frame_num==0 I is considered IDR else as P.
 */
-static bool getNalType (uint8_t * head, uint8_t * tail, uint32_t * flags,int recovery)
+static bool getNalType (uint8_t *head, uint8_t *tail, uint32_t *flags, ADM_SPSInfo *sps, int *poc_lsb, int recovery)
 {
-    uint8_t *out=(uint8_t *)malloc(tail-head);
+    if(tail<=head)
+        return false;
+    uint8_t *out=(uint8_t *)malloc(tail-head+AV_INPUT_BUFFER_PADDING_SIZE);
+    memset(out,0,tail-head+AV_INPUT_BUFFER_PADDING_SIZE);
     int size=ADM_unescapeH264(tail-head,head,out);
 
     getBits bits(size,out);
     uint32_t sliceType;
-    *flags = 0;
+    int frame = -1;
+    *poc_lsb = -1;
 
     bits.getUEG();               // first mb in slice
     sliceType = bits.getUEG31(); // get_ue_golomb_31??
+    if(sps && sps->hasPocInfo && sps->log2MaxFrameNum > 3 && sps->log2MaxFrameNum < 17) // sanity check
+    {
+        bits.getUEG(); // skip PPS id
+        frame = bits.get(sps->log2MaxFrameNum);
+        if(!sps->frameMbsOnlyFlag && bits.get(1))
+            bits.get(1); // skip field_pic_flag
+        if(*flags & AVI_KEY_FRAME) // from NAL
+            bits.getUEG(); // skip idr_pic_id
+        *poc_lsb = bits.get(sps->log2MaxPocLsb);
+    }
     if (sliceType > 9)
     {
       ADM_warning ("Weird Slice %d\n", sliceType);
@@ -574,7 +574,7 @@
         case 0: *flags=  AVI_P_FRAME;break;
         case 1: *flags = AVI_B_FRAME;break;
         case 2: case 4:
-                if(!recovery) *flags=AVI_KEY_FRAME;

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH265.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH265.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/src/prefs.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/prefs.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.conf -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.conf Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.h Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_desc.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_desc.cpp Changed

@@ -8,9 +8,11 @@
  {"features.audiobar_uses_master",offsetof(my_prefs_struct,features.audiobar_uses_master),"bool",ADM_param_bool},
  {"features.threading_lavc",offsetof(my_prefs_struct,features.threading_lavc),"uint32_t",ADM_param_uint32_t},
  {"features.cpu_caps",offsetof(my_prefs_struct,features.cpu_caps),"uint32_t",ADM_param_uint32_t},
+ {"features.cache_size",offsetof(my_prefs_struct,features.cache_size),"uint32_t",ADM_param_uint32_t},
  {"features.mpeg_no_limit",offsetof(my_prefs_struct,features.mpeg_no_limit),"bool",ADM_param_bool},
- {"features.alternate_mp3_tag",offsetof(my_prefs_struct,features.alternate_mp3_tag),"bool",ADM_param_bool},
  {"features.dxva2",offsetof(my_prefs_struct,features.dxva2),"bool",ADM_param_bool},
+ {"features.dxva2_override_blacklist_version",offsetof(my_prefs_struct,features.dxva2_override_blacklist_version),"bool",ADM_param_bool},
+ {"features.dxva2_override_blacklist_profile",offsetof(my_prefs_struct,features.dxva2_override_blacklist_profile),"bool",ADM_param_bool},
  {"features.vdpau",offsetof(my_prefs_struct,features.vdpau),"bool",ADM_param_bool},
  {"features.xvba",offsetof(my_prefs_struct,features.xvba),"bool",ADM_param_bool},
  {"features.libva",offsetof(my_prefs_struct,features.libva),"bool",ADM_param_bool},

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_json.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_json.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_pref.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_pref.h Changed

@@ -19,9 +19,11 @@
 { FEATURES_AUDIOBAR_USES_MASTER,"features.audiobar_uses_master"       ,ADM_param_bool    	,"0",	0,	1},
 { FEATURES_THREADING_LAVC,"features.threading_lavc"                   ,ADM_param_uint32_t	,"0",	0,	32},
 { FEATURES_CPU_CAPS,"features.cpu_caps"                               ,ADM_param_uint32_t	,"4294967295",	0,	4294967295},
+{ FEATURES_CACHE_SIZE,"features.cache_size"                           ,ADM_param_uint32_t	,"16",	8,	16},
 { FEATURES_MPEG_NO_LIMIT,"features.mpeg_no_limit"                     ,ADM_param_bool    	,"0",	0,	1},
-{ FEATURES_ALTERNATE_MP3_TAG,"features.alternate_mp3_tag"             ,ADM_param_bool    	,"1",	0,	1},
 { FEATURES_DXVA2,"features.dxva2"                                     ,ADM_param_bool    	,"0",	0,	1},
+{ FEATURES_DXVA2_OVERRIDE_BLACKLIST_VERSION,"features.dxva2_override_blacklist_version",ADM_param_bool    	,"0",	0,	1},
+{ FEATURES_DXVA2_OVERRIDE_BLACKLIST_PROFILE,"features.dxva2_override_blacklist_profile",ADM_param_bool    	,"0",	0,	1},
 { FEATURES_VDPAU,"features.vdpau"                                     ,ADM_param_bool    	,"0",	0,	1},
 { FEATURES_XVBA,"features.xvba"                                       ,ADM_param_bool    	,"0",	0,	1},
 { FEATURES_LIBVA,"features.libva"                                     ,ADM_param_bool    	,"0",	0,	1},

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp Changed

@@ -455,7 +455,6 @@
 {
     Display *dis=(Display *)x->display;
     ADM_coreLibVA::display=vaGetDisplay(dis);
-    int maj=0,min=0,patch=0;
     ADM_info("[LIBVA] Initializing LibVA library ...\n");
 
 
@@ -914,7 +913,6 @@
 bool        admLibVA::putX11Surface(ADM_vaSurface *img,int widget,int displayWidth,int displayHeight)
 {
     int xError;
-    VASurfaceStatus status;
     CHECK_WORKING(false);
     CHECK_ERROR(vaPutSurface ( ADM_coreLibVA::display, img->surface,(Drawable)widget,0,0,img->w, img->h,0,0,displayWidth,displayHeight,
                               NULL,0 // clip & and num clip
@@ -934,7 +932,6 @@
 {
 
     int xError;
-    VASurfaceStatus status;
     CHECK_WORKING(false);
     CHECK_ERROR(vaPutImage(ADM_coreLibVA::display,
                            dst->surface,
@@ -958,7 +955,6 @@
 {
 
     int xError;
-    VASurfaceStatus status;
     CHECK_WORKING(false);
     CHECK_ERROR(vaGetImage(ADM_coreLibVA::display,
                            dst->surface,
@@ -983,7 +979,6 @@
 bool   admLibVA::uploadToImage( ADMImage *src,VAImage *dest)
 {
     int xError;
-    VASurfaceStatus status;
     CHECK_WORKING(false);
     uint8_t *ptr=NULL;
     CHECK_ERROR(vaMapBuffer(ADM_coreLibVA::display, dest->buf, (void**)&ptr))
@@ -1021,7 +1016,6 @@
 bool   admLibVA::downloadFromImage( ADMImage *src,VAImage *dest,ADMColorScalerSimple *color)
 {
     int xError;
-    VASurfaceStatus status;
     CHECK_WORKING(false);
     uint8_t *ptr=NULL;
     CHECK_ERROR(vaMapBuffer(ADM_coreLibVA::display, dest->buf, (void**)&ptr))
@@ -1124,7 +1118,6 @@
 {
     int xError;
     bool r=false;
-    VASurfaceStatus status;
     CHECK_WORKING(false);
     uint8_t *ptr=NULL;

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA_test.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA_test.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_codec.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_codec.h Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h Changed

@@ -59,6 +59,7 @@
            bool         hurryUp;
            bool         _drain;
            bool         _done;
+           bool         _keepFeeding;
            bool         _endOfStream;
            bool         _setBpp;
            bool         _setFcc;
@@ -115,7 +116,8 @@
       //  virtual uint32_t getSpecificMpeg4Info (void);
         virtual uint8_t getPARWidth (void);
         virtual uint8_t getPARHeight (void);
-        virtual bool decodeErrorHandler(int code, bool headerOnly=false);
+        virtual bool decodeErrorHandler(int code);
+        virtual bool keepFeeding(void) { return _keepFeeding; }
         virtual bool endOfStreamReached(void) { return _endOfStream; }
         virtual void setEndOfStream(bool reached) { _endOfStream=reached; }
         virtual bool getDrainingState(void) { return _drain; }
@@ -148,7 +150,7 @@
 FF_SIMPLE_DECLARE(decoderFF_ffhuff,)
 FF_SIMPLE_DECLARE(decoderFFficv, bool uncompress(ADMCompressedImage *in, ADMImage *out);)
 FF_SIMPLE_DECLARE(decoderFFPng,)
-FF_SIMPLE_DECLARE(decoderFFMpeg4, bool uncompress (ADMCompressedImage * in, ADMImage * out);
+FF_SIMPLE_DECLARE(decoderFFMpeg4, bool uncompress(ADMCompressedImage *in, ADMImage *out);
                                 // mpeg4 can have B-frame
                                 virtual bool bFramePossible (void)   {  return 1;   })
 FF_SIMPLE_DECLARE(decoderFFMpeg12,

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffVp9.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffVp9.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp Changed

@@ -26,22 +26,18 @@
     #define LAV_VERBOSITY_LEVEL AV_LOG_INFO
 #endif
 
-extern "C"
-{
-    static void ADM_releaseBuffer(struct AVCodecContext *avctx, AVFrame *pic);
-    static int  ADM_getBuffer(AVCodecContext *avctx, AVFrame *pic);
-}
-
 #define aprintf(...) {}
 
 
 //****************************
 extern uint8_t DIA_lavDecoder (bool *swapUv);
+#if 0
 extern "C"
 {
   int av_is_voppacked (AVCodecContext * avctx, int *vop_packed, int *gmc,
 		       int *qpel);
 };
+#endif
 /**
     \fn clonePic
     \brief Convert AvFrame to ADMImage
@@ -170,6 +166,7 @@
   hurryUp=false;
   _drain=false;
   _done=false;
+  _keepFeeding=false;
   _endOfStream=false;
   _setBpp=false;
   _setFcc=false;
@@ -328,7 +325,7 @@
     \fn decodeErrorHandler
     \brief Evaluate return value of avcodec_receive_frame
 */
-bool decoderFF::decodeErrorHandler(int code, bool headerOnly)
+bool decoderFF::decodeErrorHandler(int code)
 {
     if(code<0)
     {
@@ -336,25 +333,30 @@
         {
             case AVERROR_EOF:
                 ADM_warning("[lavc] End of video stream reached\n");
-                setEndOfStream(true);
+                _keepFeeding=false;
+                _endOfStream=true;
                 flush();
                 return false;
             case AVERROR(EAGAIN):
+#ifdef ADM_DEBUG
                 ADM_info("[lavc] The decoder expects more input before output can be produced\n");
+#endif
+                _keepFeeding=true;
                 return false;
             case AVERROR(EINVAL):
                 ADM_error("[lavc] Codec not opened\n");
                 return false;
             default:
-                if(!headerOnly)
-                {
-                    char er[2048]={0};
-                    av_make_error_string(er, sizeof(er)-1, code);
-                    ADM_warning("Error %d in lavcodec (%s)\n",code,er);
-                    return false;
-                }
+            {
+                char er[2048]={0};
+                av_make_error_string(er, sizeof(er)-1, code);
+                ADM_warning("Error %d in lavcodec (%s)\n",code,er);
+                return false;
+            }
         }
     }
+    _keepFeeding=false;
+    _endOfStream=false;
     return true;
 }
 
@@ -364,7 +366,6 @@
 */
 bool   decoderFF::uncompress (ADMCompressedImage * in, ADMImage * out)
 {
-  uint8_t *oBuff[3];
   int ret = 0;
   out->_noPicture = 0;
   if(hwDecoder)
@@ -372,30 +373,16 @@
  
   //printf("Frame size : %d\n",in->dataLength);
 
-  if (in->dataLength == 0 && !_allowNull)	// Null frame, silently skipped
+    if (in->dataLength == 0 && !_allowNull) // Null frame, silently skipped
     {
-
-      printf ("[Codec] null frame\n");
-        // search the last image
-        if (_context->coded_frame &&
-            _context->coded_frame->data &&
-            _context->coded_frame->data[0]
-            )
-          {
-            printf("[Codec] Cloning older pic\n");
-            clonePic (_context->coded_frame, out);
-            out->Pts=ADM_COMPRESSED_NO_PTS;
-          }
-        else
-            {
-                out->_noPicture = 1;
-                out->Pts=ADM_COMPRESSED_NO_PTS;
-                printf("[Codec] No Picture\n");
-            }
-          return 1;
+        printf ("[Codec] null frame\n");
+        out->_noPicture = 1;
+        out->Pts=ADM_COMPRESSED_NO_PTS;
+        printf("[Codec] No Picture\n");
+        return 1;
     }
-   // Put a safe value....
-   out->Pts=in->demuxerPts;
+    // Put a safe value....
+    out->Pts=in->demuxerPts;
     _context->reordered_opaque=in->demuxerPts;
   //_frame.opaque=(void *)out->Pts;
   //printf("Incoming Pts :%"PRId64"\n",out->Pts);
@@ -422,74 +409,53 @@
 
     ret = avcodec_receive_frame(_context, _frame);
 
-    if(!ret)
-        _endOfStream=false;
-    if(!decodeErrorHandler(ret,hurryUp))
-        return false;
+    out->_qStride = 0; // Default = no quant
 
-  if(!bFramePossible())
-  {
-    // No delay, the value is sure, no need to hide it in opaque
-    _frame->reordered_opaque=(int64_t)in->demuxerPts;
-  }
-  out->_qStride = 0;		//Default = no quant
-#if 0
-  if (0 > ret && !hurryUp)
+    if (ret && !hurryUp)
     {
-      printf ("\n[lavc] error in lavcodec decoder!\n");
-      printf ("[lavc] Err: %d, size :%d\n", ret, in->dataLength);
-      return 0;
+        // Some encoder code a vop header with the
+        // vop flag set to 0
+        // it is meant to mean frame skipped but very dubious
+#define MPEG4_EMPTY_FRAME_THRESHOLD 19 // MAX_NVOP_SIZE
+#define FRAPS_EMPTY_FRAME_THRESHOLD  8 // assumption
+        if ((in->dataLength <= MPEG4_EMPTY_FRAME_THRESHOLD && codecId == AV_CODEC_ID_MPEG4) ||
+            (in->dataLength <= FRAPS_EMPTY_FRAME_THRESHOLD && codecId == AV_CODEC_ID_MPEG4))
+        {
+            printf ("[lavc] Probably placeholder frame (data length: %u)\n",in->dataLength);
+            out->_Qp = 2;
+            out->Pts=ADM_NO_PTS; // not sure
+            out->_noPicture = 1;
+            return true;
+        }
+        // allow null means we allow null frame in and so potentially
+        // have no frame out for a time
+        // in that case silently fill with black and returns it as KF
+        if (_allowNull)
+        {
+            out->flags = AVI_KEY_FRAME;
+	    if (!_refCopy)
+                out->blacken();
+	    else
+	        out->_noPicture = 1;
+            printf ("\n[lavc] ignoring that we got no picture\n");
+	    return 1;
+        }
     }
-#endif
-  if (ret && !hurryUp)
+    if (hurryUp)
     {
-      // Some encoder code a vop header with the
-      // vop flag set to 0
-      // it is meant to mean frame skipped but very dubious
-      if (in->dataLength <= 8)
-        if(codecId == AV_CODEC_ID_MPEG4||codecId==AV_CODEC_ID_FRAPS)
-	{
-	  printf ("[lavc] Probably pseudo black frame...\n");
-	  out->_Qp = 2;
-	  out->flags = 0;	// assume P ?
-          if(_context->coded_frame)
-            clonePic (_context->coded_frame, out);
-          else
-             out->_noPicture = 1;
-          out->Pts=ADM_NO_PTS; // not sure
-	  return 1;
-	}
-      // allow null means we allow null frame in and so potentially

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoder.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoder.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp -> avidemux_2.7.4.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp Changed

@@ -422,32 +422,42 @@
 */
 bool ADM_coreVideoEncoderFFmpeg::loadStatFile(const char *file)
 {
-  printf("[FFmpeg] Loading stat file :%s\n",file);
-  FILE *_statfile = ADM_fopen (file, "rb");
-  int statSize;
+    ADM_info("Loading stat file %s\n",file);
+    FILE *_statfile = ADM_fopen (file, "rb");
 
-  if (!_statfile)
+    if (!_statfile)
     {
-      printf ("[ffmpeg] internal file does not exists ?\n");
-      return false;
+        ADM_error ("Cannot open stat file. Does it exist?\n");
+        return false;
     }
 
-  fseek (_statfile, 0, SEEK_END);
-  statSize = ftello (_statfile);
-  fseek (_statfile, 0, SEEK_SET);
-  _context->stats_in = (char *) av_malloc(statSize+1);
-  _context->stats_in[statSize] = 0;
-  fread (_context->stats_in, statSize, 1, _statfile);
-  fclose(_statfile);
-
+    fseek (_statfile, 0, SEEK_END);
+    uint64_t statSize = ftello (_statfile);
+    if (statSize >= INT_MAX - 32) // enforce the av_malloc limit
+    {
+        ADM_error ("Stat file too large.\n");
+        fclose(_statfile);
+        return false;
+    }
+    fseek (_statfile, 0, SEEK_SET);
+    _context->stats_in = (char *) av_malloc(statSize+1);
+    _context->stats_in[statSize] = 0;
+    if (!fread (_context->stats_in, statSize, 1, _statfile))
+    {
+        ADM_error ("Cannot read stat file.\n");
+        fclose(_statfile);
+        return false;
+    }
+    fclose(_statfile);
 
     int i;
     char *p=_context->stats_in;
-   for(i=-1; p; i++){
-            p= strchr(p+1, ';');
-        }
-  printf("[FFmpeg] stat file loaded ok, %d frames found\n",i);
-  return true;
+    for(i=-1; p; i++)
+    {
+        p= strchr(p+1, ';');
+    }
+    ADM_info ("Stat file loaded ok, %d frames found.\n",i);
+    return true;
 }
 /**
         \fn postEncode

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-4.1.4.tar.bz2 Added

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/attic Added

avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/attic/libavcodec_h263dec.c.patch Changed

avidemux_2.7.3.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_ff_spsinfo.h.patch -> avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_ff_spsinfo.h.patch Changed

avidemux_2.7.3.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_h264_parser.c.patch -> avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_h264_parser.c.patch Changed

@@ -1,13 +1,13 @@
---- libavcodec/h264_parser.c.org	2017-03-10 18:39:39.106069071 +0100
-+++ libavcodec/h264_parser.c	2017-03-10 18:38:20.586520540 +0100
-@@ -64,6 +64,102 @@
+--- libavcodec/h264_parser.c.orig	2019-04-01 13:16:31.000000000 +0200
++++ libavcodec/h264_parser.c	2019-07-15 23:20:28.365062563 +0200
+@@ -64,6 +64,112 @@
      int last_frame_num, last_picture_structure;
  } H264ParseContext;
  
 +#include "ff_spsinfo.h" // MEANX
 +#include <assert.h>
 + // MEANX
-+int ff_h264_info(AVCodecParserContext *parser,ffSpsInfo *info);
++int ff_h264_info(AVCodecParserContext *parser, int ticksPerFrame, ffSpsInfo *info);
 +/**
 +    \fn AVCodecParserContext
 + *  \brief find a valid sps,take the 1st one that look sok
@@ -42,7 +42,7 @@
 + * @param info
 + * @return 
 + */
-+int ff_h264_info(AVCodecParserContext *parser,ffSpsInfo *info)
++int ff_h264_info(AVCodecParserContext *parser, int ticksPerFrame, ffSpsInfo *info)
 +{
 +    H264ParseContext *ctx = parser->priv_data;    
 +    int f;   
@@ -60,7 +60,10 @@
 +    {
 +            float scale=sps->time_scale ;
 +            float ticks=sps->num_units_in_tick;
-+            info->fps1000 =  (uint32_t) ((scale/ticks) *    1000.);
++            float fps = scale/ticks;
++            if(ticksPerFrame>1)
++                fps /= ticksPerFrame;
++            info->fps1000 = (uint32_t)(fps * 1000.);
 +#undef printf
 +            printf("Scale : %d, tick=%d, fps=%d\n",(int)scale,(int)ticks,(int)info->fps1000);
 +    }else
@@ -71,7 +74,9 @@
 +    // D.2.2 SEI Timing present if CpbDbpDelayPresentFlag=1 or pictStructPresent=1
 +    // CpbDbpDelayPresentFlag =1 if nal_hdr or vcl_hrd or ???
 +    f=sps->nal_hrd_parameters_present_flag | sps->vcl_hrd_parameters_present_flag;
-+    info->hasStructInfo=f | sps->pic_struct_present_flag;;
++    info->hasStructInfo=f | sps->pic_struct_present_flag;
++    // Check whether POC is explicitely set in slice header
++    info->hasPocInfo=!sps->poc_type;
 +    // While decoding SEI, if CpbDpbDelaysPresentFlags is there we skip cpb_removal_delay + dpb_output_delay
 +
 +    info->CpbDpbToSkip=0;
@@ -79,6 +84,10 @@
 +    {
 +        info->CpbDpbToSkip=sps->cpb_removal_delay_length+sps->dpb_output_delay_length;
 +    }
++    info->log2MaxFrameNum=sps->log2_max_frame_num;
++    info->log2MaxPocLsb=sps->log2_max_poc_lsb;
++    // Needed to determine the offset of poc_lsb
++    info->frameMbsOnlyFlag=sps->frame_mbs_only_flag;
 +//#warning fixme sar vs dar
 +    info->darNum=sps->sar.num;
 +    info->darDen=sps->sar.den;
@@ -96,6 +105,7 @@
 +         info->height-=sps->crop_bottom*mul;
 +
 +    }
++    info->refFrames=sps->ref_frame_count;
 +    return 1;
 +}
 +// /MEANX

avidemux_2.7.3.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc.c.patch -> avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc.c.patch Changed

avidemux_2.7.3.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc_vp9.c.patch -> avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc_vp9.c.patch Changed

avidemux_2.7.3.tar.gz/avidemux_core/ffmpeg_package/patches/libavutil_file_open.c.patch -> avidemux_2.7.4.tar.gz/avidemux_core/ffmpeg_package/patches/libavutil_file_open.c.patch Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp Changed

@@ -24,7 +24,6 @@
 #include "fourcc.h"
 #include "ADM_audioXiphUtils.h"
 
-#define SCRATCH_PAD_SIZE (100*1000*2)
 #define ADMWA_BUF (4*1024*16) // 64 kB internal
 /**
  * \class ADM_AudiocoderLavcodec
@@ -40,10 +39,10 @@
                 ADM_outputFlavor        outputFlavor;
                 AVCodecContext          *_context;
                 AVFrame                 *_frame;
+                uint8_t                 *_paddedExtraData;
                 uint8_t    _buffer[ ADMWA_BUF];
                 uint32_t   _tail,_head;
                 uint32_t   _blockalign;
-                uint8_t scratchPad[SCRATCH_PAD_SIZE];
     uint32_t    channels;
     bool        decodeToS16(float **outptr,uint32_t *nbOut);
     bool        decodeToFloat(float **outptr,uint32_t *nbOut);
@@ -109,6 +108,7 @@
     ADM_info(" [ADM_AD_LAV] Using decoder for type 0x%x\n",info->encoding);
     ADM_info(" [ADM_AD_LAV] #of channels %d\n",info->channels);
     _tail=_head=0;
+    _paddedExtraData=NULL;
     channels=info->channels;
     _blockalign=0;
     _frame=av_frame_alloc();
@@ -185,20 +185,24 @@
     _context->bit_rate = info->byterate*8;
     _context->sample_fmt=AV_SAMPLE_FMT_FLT;
     _context->request_sample_fmt=AV_SAMPLE_FMT_FLT;
-    
+
     if(fourcc==WAV_OGG_VORBIS)
     {
         // Need to translate from adm to xiph
         int xiphLen=(int)l+(l/255)+4+5;
-        uint8_t *xiph=new uint8_t[xiphLen];
+        uint8_t *xiph=new uint8_t[xiphLen+AV_INPUT_BUFFER_PADDING_SIZE];
+        memset(xiph,0,xiphLen+AV_INPUT_BUFFER_PADDING_SIZE);
         xiphLen=ADMXiph::admExtraData2xiph(l,d,xiph);
-        _context->extradata=xiph;
-        _context->extradata_size=xiphLen;
-    }else
+        _paddedExtraData=xiph;
+        l=xiphLen;
+    }else if(l)
     {
-        _context->extradata=(uint8_t *)d;
-        _context->extradata_size=(int)l;    
+        _paddedExtraData=new uint8_t[l+AV_INPUT_BUFFER_PADDING_SIZE];
+        memset(_paddedExtraData,0,l+AV_INPUT_BUFFER_PADDING_SIZE);
+        memcpy(_paddedExtraData,d,l);
     }
+    _context->extradata=_paddedExtraData;
+    _context->extradata_size=l;
 
     if (!_blockalign) 
     {
@@ -277,11 +281,16 @@
     \fn dtor
 */
  ADM_AudiocoderLavcodec::~ADM_AudiocoderLavcodec()
- {
-        avcodec_close(_context);
-        av_free(_context);
-        _context=NULL;
-        av_frame_free(&_frame);
+{
+    avcodec_close(_context);
+    av_free(_context);
+    _context=NULL;
+    av_frame_free(&_frame);
+    if(_paddedExtraData)
+    {
+        delete [] _paddedExtraData;
+       _paddedExtraData=NULL;
+    }
 }
 /**
     \fn decodeToS16
@@ -442,7 +451,8 @@
     AVPacket pkt;
     av_init_packet(&pkt);
     int nbChunk,res=0;
-    while(_tail-_head>=_blockalign)
+    bool eof=false;
+    while(_tail-_head>=_blockalign && !eof)
     {
         nbChunk=(_tail-_head)/_blockalign;
         pkt.size=nbChunk*_blockalign;
@@ -458,14 +468,15 @@
             if(res==AVERROR(EAGAIN)) break; // we need to send more input
             if(res==AVERROR_EOF)
             {
-                return 1;
+                eof=true;
+                break;
             }
             if(res<0)
             {
                 char er[2048]={0};
                 av_make_error_string(er, sizeof(er)-1, res);
                 ADM_warning("[ADM_ad_lav] decoding error: %s\n",er);
-                return 1;
+                break;
             }
 
             bool invalid=false;

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv_audio.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv_audio.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.h Changed

@@ -75,6 +75,7 @@
     uint32_t    extraDataSize;
     uint8_t     *extraData;
     WAVHeader   _rdWav;
+    uint64_t    totalDataSize;
     int64_t     delay; // in movie scale units
     int64_t     startOffset; // media time in track scale units
     std::vector <mp4Fragment>     fragments;
@@ -122,6 +123,7 @@
 #define _3GP_MAX_TRACKS 8
 #define VDEO _tracks[0]
 #define ADIO _tracks[nbAudioTrack+1]._rdWav
+#define AUDIO_BYTERATE_UNSET 0xFFFFFFFF
 /**
  * 
  */
@@ -193,7 +195,7 @@
           int                           lookupIndex(int desc)          ;
           bool                          parseTrun(int trackNo,adm_atom &son,const mp4TrafInfo &info);
           uint8_t                       decodeVideoAtom(void *ztom);
-          uint8_t                       parseMdia(void *ztom,uint32_t *trackType);
+          uint8_t                       parseMdia(void *ztom,uint32_t *trackType,uint32_t *trackId);
           uint8_t                       parseEdts(void *ztom,uint32_t trackType);
           uint8_t                       parseStbl(void *ztom,uint32_t trackType,uint32_t trackScale);
           uint8_t                       decodeEsds(void *ztom,uint32_t trackType);

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp Changed

@@ -208,6 +208,7 @@
     uint32_t container;
     uint32_t w,h;
     uint32_t trackType=TRACK_OTHER;
+    uint32_t trackId=0;
     _currentDelay=0;
     _currentStartOffset=0;
 
@@ -235,7 +236,8 @@
                 else
                     tom->skipBytes(8);
 
-                aprintf("Track Id: %" PRIu32"\n", son.read32());
+                trackId = son.read32();
+                aprintf("[parseTrack] Track Id: %" PRIu32"\n", trackId);
                 son.skipBytes(4);
 
                 uint64_t duration = (version == 1) ? son.read64() : son.read32();
@@ -253,7 +255,7 @@
             }
             case ADM_MP4_MDIA:
             {
-                if(!parseMdia(&son,&trackType))
+                if(!parseMdia(&son,&trackType,&trackId))
                     return false;
                 break;
             }
@@ -274,7 +276,7 @@
       \fn parseMdia
       \brief Parse mdia header
 */
-uint8_t MP4Header::parseMdia(void *ztom,uint32_t *trackType)
+uint8_t MP4Header::parseMdia(void *ztom,uint32_t *trackType,uint32_t *trackId)
 {
     adm_atom *tom=(adm_atom *)ztom;
     ADMAtoms id;
@@ -347,10 +349,14 @@
                         _movieDuration=trackDuration;
                         _videoScale=trackScale;
                         _tracks[0].scale=_videoScale;
+                        _tracks[0].id=*trackId;
                         break;
                     case MKFCCR('s','o','u','n'): // 'soun'
                         _tracks[1+nbAudioTrack].delay=_currentDelay;
                         _tracks[1+nbAudioTrack].startOffset=_currentStartOffset;
+                        _tracks[1+nbAudioTrack].id=*trackId;
+                        if(!*trackId)
+                            ADM_warning("Invalid track ID for audio track %d\n",1+nbAudioTrack);
                         *trackType=TRACK_AUDIO;
                         ADM_info("hdlr audio found \n ");
                         break;
@@ -851,7 +857,8 @@
                                     while(!son.isDone())
                                     {
                                         adm_atom avcc(&son);
-                                        printf("Reading hev1, got %s\n",fourCC::tostringBE(avcc.getFCC()));
+                                        const char *hevc = (entryName == MKFCCR('h','e','v','1'))? "hev1" : "hvc1";
+                                        printf("Reading %s, got %s\n",hevc,fourCC::tostringBE(avcc.getFCC()));
                                         if( avcc.getFCC()== MKFCCR('h','v','c','C'))
                                         {
                                             VDEO.extraDataSize=avcc.getRemainingSize();
@@ -938,7 +945,7 @@
                             // Put some defaults
                             ADIO.encoding=1234;
                             ADIO.frequency=44100;
-                            ADIO.byterate=128000>>3;
+                            ADIO.byterate=AUDIO_BYTERATE_UNSET;
                             ADIO.channels=2;
                             ADIO.bitspersample=16;
 
@@ -1029,7 +1036,10 @@
                                 case MKFCCR('a','c','-','3'):
                                 case MKFCCR('s','a','c','3'):
                                     audioCodec(AC3);
-                                    ADIO.byterate=128000>>3;
+
+                                    break;
+                                case MKFCCR('e','c','-','3'):
+                                    audioCodec(EAC3);
 
                                     break;
                                 case MKFCCR('l','p','c','m'):
@@ -1068,7 +1078,6 @@
                                     break;
                                 case MKFCCR('.','m','p','3'): //.mp3
                                     audioCodec(MP3);
-                                    ADIO.byterate=128000>>3;
 
                                     break;
                                 case MKFCCR('r','a','w',' '):
@@ -1280,18 +1289,29 @@
               info.SzIndentical=info.SzIndentical*ADIO.channels;
             }
 #endif
+            if(nbAudioTrack>=_3GP_MAX_TRACKS-1)
+            {
+                ADM_warning("Maximum number of tracks reached, cannot add audio track.\n");
+                r=1;
+                break;
+            }
             r=indexify(&(_tracks[1+nbAudioTrack]),trackScale,&info,1,&nbo);
             ADM_info("Indexed audio, nb blocks:%u\n",nbo);
+            nbAudioTrack++;
+            _tracks[nbAudioTrack].scale=trackScale;
             if(r)
             {
-                nbo=_tracks[1+nbAudioTrack].nbIndex;
-                if(nbo)
-                    _tracks[1+nbAudioTrack].nbIndex=nbo;
-                else
-                    _tracks[1+nbAudioTrack].nbIndex=info.nbSz;
-                ADM_info("Indexed audio, nb blocks:%u (final)\n",_tracks[1+nbAudioTrack].nbIndex);
-                _tracks[1+nbAudioTrack].scale=trackScale;
-                nbAudioTrack++;
+                nbo=_tracks[nbAudioTrack].nbIndex;
+                if(!nbo)
+                    _tracks[nbAudioTrack].nbIndex=info.nbSz;
+                ADM_info("Indexed audio, nb blocks:%u (final)\n",_tracks[nbAudioTrack].nbIndex);
+            }else
+            {
+                if(_tracks[nbAudioTrack].index)
+                {
+                    delete [] _tracks[nbAudioTrack].index;
+                    _tracks[nbAudioTrack].index=NULL;
+                }
             }
 
             break;

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Fragments.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Fragments.cpp Changed

@@ -85,7 +85,7 @@
 {        
         ADMAtoms id;
         uint32_t container;
-        aprintf("[TRAF]\n");
+        aprintf("[TRAF] Starting at 0x%" PRIx64"\n",moofStart);
         uint32_t trafFlags=0;
         mp4TrafInfo info;
         int trackIndex=-1;
@@ -128,11 +128,12 @@
                             info.baseOffset=moofStart;
                             aprintf("base is moof at %llx\n",(long long int)info.baseOffset);
                     }
-                    trackIndex=lookupIndex((!info.trackID)? 0 : info.trackID-1);
+                    trackIndex=lookupIndex(info.trackID);
                     if(-1==trackIndex)
                     {
-                        ADM_warning("Cannot find track for %d\n",info.sampleDesc);
+                        ADM_warning("Cannot find track with id %d\n",info.trackID);
                     }
+                    break;
                 }
                 case ADM_MP4_TFDT:
                 {
@@ -148,8 +149,6 @@
                     break;
                 default:break;
             }
-           
-            aprintf("[MOOF]Found atom %s \n",fourCC::tostringBE(son.getFCC()));
             son.skipAtom();
         }     
         tom.skipAtom();
@@ -171,14 +170,14 @@
     std::vector <mp4Fragment>   &fragList=_tracks[trackNo].fragments;
     if(flags & 0x1)
     {
-            firstOffset+=tom.read32()&0xffff; // Signed!
+            firstOffset+=tom.read32(); // Signed!
     }
     if(flags & 0x4)    
             firstSampleFlags=tom.read32(); // Signed!
     else 
             firstSampleFlags=info.defaultFlags;
    
-    aprintf("[TRUN] count=%d, offset=0x%x,synth=0x%x, flags=%x\n",count,firstOffset,(long long int)firstOffset+info.baseOffset,firstSampleFlags);
+    aprintf("[TRUN] count=%d, offset=0x%" PRIx64", base=0x%" PRIx64", flags=%x\n",count,firstOffset,info.baseOffset,firstSampleFlags);
     for(int i=0;i<count;i++)
     {
        mp4Fragment frag;
@@ -213,16 +212,16 @@
     trk->index=new MP4Index[trk->nbIndex];
     uint64_t sum=0;
     int intra=0;
-    for(int i=0;i<trk->nbIndex;i++)
+    for(uint32_t i=0;i<trk->nbIndex;i++)
     {
         MP4Index *dex=trk->index+i;
         dex->offset=fragList[i].offset;
         dex->size=fragList[i].size;
-        
+        trk->totalDataSize+=fragList[i].size;
+
         double dts=sum;
         double ctts=fragList[i].composition;
-        dts=sum;
-        
+
         dts=dts/_videoScale;
         dts*=1000000.;
         ctts=ctts/_videoScale;
@@ -237,7 +236,8 @@
         else
             dex->intra=0;    
         sum+=fragList[i].duration;
-        aprintf("[FRAG] offset=0x%llx size=%d dts=%s pts=%s\n",dex->offset,(int)dex->size,ADM_us2plain(dex->dts),ADM_us2plain(dex->pts));
+        aprintf("[FRAG] Video entry %u offset=0x%llx size=%d dts=%s ",i,dex->offset,(int)dex->size,ADM_us2plain(dex->dts));
+        aprintf("pts=%s\n",ADM_us2plain(dex->pts));
     }
     printf("Found %d intra\n",intra);
     MP4Index *ff=trk->index;
@@ -258,20 +258,31 @@
     trk->nbIndex=fragList.size();
     trk->index=new MP4Index[trk->nbIndex];
     uint64_t sum=0;
-    for(int i=0;i<trk->nbIndex;i++)
+    for(uint32_t i=0;i<trk->nbIndex;i++)
     {
         MP4Index *dex=trk->index+i;
         dex->offset=fragList[i].offset;
         dex->size=fragList[i].size;
+        trk->totalDataSize+=fragList[i].size;
         
         double dts=sum;
-        dts=sum;
+        dts/=trk->scale;
+        dts*=1000000.;
         dex->dts=dts;
-        dex->pts=dex->dts+fragList[i].composition*10;
+        dex->pts=dex->dts;
+        if(fragList[i].composition)
+        {
+            dts=fragList[i].composition;
+            dts/=trk->scale;
+            dts*=1000000.;
+            dex->pts+=dts;
+        }
         dex->intra=0;    
         sum+=fragList[i].duration;
-        aprintf("[FRAG] offset=0x%llx size=%d dts=%s pts=%s\n",dex->offset,(int)dex->size,ADM_us2plain(dex->dts),ADM_us2plain(dex->pts));
-    }   
+        aprintf("[FRAG] Audio entry %d offset=0x%llx size=%d dts=%s ",i,dex->offset,(int)dex->size,ADM_us2plain(dex->dts));
+        aprintf("pts=%s\n",ADM_us2plain(dex->pts));
+    }
+    fragList.clear();
     return true;
 }
 // EOF

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp Changed

@@ -122,14 +122,14 @@
 bool	MP4Header::processAudio( MP4Track *track,  uint32_t trackScale,  
                                     MPsampleinfo *info,uint32_t *nbOut)
 {
-    uint64_t audioClock=0;
-    
-    uint32_t totalBytes=info->SzIndentical*info->nbSz;
+    uint64_t totalBytes=info->SzIndentical*info->nbSz;
     uint32_t totalSamples=0;
     double   skewFactor=1;
-    ADM_info("All the same size: %u (total size %u bytes)\n",info->SzIndentical,totalBytes);
+    ADM_info("All the same size: %u (total size %" PRIu64" bytes)\n",info->SzIndentical,totalBytes);
     ADM_info("Byte per frame =%d\n",(int)info->bytePerFrame);
     ADM_info("SttsC[0] = %d, sttsN[0]=%d\n",info->SttsC[0],info->SttsN[0]);
+
+    track->totalDataSize=totalBytes;
     
     if(info->nbStts!=1) 
     {
@@ -204,7 +204,8 @@
     if(info->nbCo)
         track->index[0].pts=0;
     ADM_info("Found %u bytes, spread over %d blocks\n",totalBytes,info->nbCo);
-    //
+    track->totalDataSize=totalBytes;
+
     // split large chunk into smaller ones if needed
     splitAudio(track,info, trackScale);
 
@@ -291,12 +292,14 @@
             aprintf("\t size for all %u frames : %u\n",info->nbSz,info->SzIndentical);
             for(i=0;i<info->nbSz;i++)
                 track->index[i].size=info->SzIndentical;
+            track->totalDataSize+=info->nbSz*info->SzIndentical;
         }else // Different size
         {
             for(i=0;i<info->nbSz;i++)
             {
                 track->index[i].size=info->Sz[i];
                 aprintf("\t size : %d : %u\n",i,info->Sz[i]);
+                track->totalDataSize+=info->Sz[i];
             }
         }
 	// if no sample to chunk we map directly

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4audio.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4audio.cpp Changed

@@ -44,34 +44,48 @@
 */
  ADM_mp4AudioAccess::ADM_mp4AudioAccess(const char *name,MP4Track *track)
 {
-	_nb_chunks=track->nbIndex;
-	_fd=ADM_fopen(name,"rb");
+    _nb_chunks=track->nbIndex;
+    _fd=ADM_fopen(name,"rb");
     ADM_assert(_fd);
-	_current_index=0;
-	_index=track->index;
-	_msg_counter = 0;
-	_msg_ratelimit = new ADMCountdown(200);
-	_msg_ratelimit->reset();
+    _current_index=0;
+    _index=track->index;
+    _msg_counter = 0;
+    _msg_ratelimit = new ADMCountdown(200);
+    _msg_ratelimit->reset();
 
-	extraDataLen=track->extraDataSize;
-	extraData=track->extraData;
+    extraDataLen=track->extraDataSize;
+    extraData=track->extraData;
 
-	// Check if MP3 track is actually MP2
-	if (track->_rdWav.encoding == WAV_MP3 && _nb_chunks && _index[0].size >= 4)
-	{
-		uint8_t sample[4];
-
-		fseeko(_fd, _index[0].offset, SEEK_SET);
-		if(fread(&sample, 1, 4, _fd) < 4) return;
+    // Check if MP3 track is actually MP2
+    if(track->_rdWav.encoding == WAV_MP3 && _nb_chunks && _index[0].size >= 4)
+    {
+        uint8_t sample[4];
 
-		uint32_t fcc = sample[0] << 24 | sample[1] << 16 | sample[2] << 8 | sample[3];
-		int layer = 4 - ((fcc >> 17) & 0x3);
+        fseeko(_fd, _index[0].offset, SEEK_SET);
+        if(fread(&sample, 1, 4, _fd) < 4) return;
 
-		if (layer == 2)
-			track->_rdWav.encoding = WAV_MP2;
-	}
+        uint32_t fcc = sample[0] << 24 | sample[1] << 16 | sample[2] << 8 | sample[3];
+        int layer = 4 - ((fcc >> 17) & 0x3);
 
+        if (layer == 2)
+            track->_rdWav.encoding = WAV_MP2;
+    }
 
+    if(track->_rdWav.byterate == AUDIO_BYTERATE_UNSET)
+    {
+        track->_rdWav.byterate = 128000 >> 3; // dummy value
+        ADM_info("Estimating audio byterate...\n");
+        uint64_t duration = _index[_nb_chunks-1].dts;
+        if(duration != ADM_NO_PTS && duration > 100000) // at least 0.1 s
+        {
+            double d = duration;
+            d /= 1000;
+            d = track->totalDataSize / d;
+            d *= 1000;
+            if(d > 0 && d < (192000 * 32)) // anything beyond 7.1 at 192 kHz float must be clearly bogus
+                track->_rdWav.byterate = (uint32_t)d;
+        }
+    }
 }
 /**
     \fn ADM_mp4AudioAccess

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp Changed

@@ -43,7 +43,8 @@
     if(r==ADM_IGN)
     {
         ADM_warning("Indexing cancelled by the user, deleting the index file. Bye.\n");
-        remove(idxName);
+        if(!ADM_eraseFile(idxName))
+            ADM_warning("Could not delete %s\n",idxName);
         free(idxName);
         return r;
     }
@@ -59,6 +60,7 @@
     char *type;
     uint64_t startDts;
     uint32_t version=0;
+    bool reindex=false;
     indexFile index;
     r=0;
 
@@ -77,7 +79,8 @@
     version=index.getAsUint32("Version");
     if(version!=ADM_INDEX_FILE_VERSION)
     {
-        GUI_Error_HIG(QT_TRANSLATE_NOOP("psdemuxer","Error"), QT_TRANSLATE_NOOP("psdemuxer","This file's index has been created with an older version of avidemux.\nPlease delete the idx2 file and reopen."));
+        if(GUI_Question(QT_TRANSLATE_NOOP("psdemuxer","This file's index has been created with an older version of avidemux.\nThe file must be re-indexed. Proceed?")))
+            reindex=true;
         goto abt;
     }
     type=index.getAsString("Type");
@@ -162,11 +165,22 @@
     }
 abt:
     index.close();
-    free(idxName);
-    if(r)
-        ADM_info("Loaded %s successfully\n",name);
-    else
-        ADM_warning("Loading %s failed\n",name);
+    if(reindex)
+    {
+        uint8_t success=ADM_eraseFile(idxName);
+        free(idxName);
+        if(success)
+            r=open(name);
+        else
+            ADM_error("Can't delete old index file.\n");
+    }else
+    {
+        free(idxName);
+        if(r)
+            ADM_info("Loaded %s successfully\n",name);
+        else
+            ADM_warning("Loading %s failed\n",name);
+    }
     return r;
 }

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp Changed

@@ -25,9 +25,7 @@
 #define MY_CLASS tsHeader
 #include "ADM_coreDemuxerMpegTemplate.cpp.h"
 
-
-
-uint32_t ADM_UsecFromFps1000(uint32_t fps1000);
+extern uint8_t tsIndexer(const char *file);
 
 /**
       \fn open
@@ -37,14 +35,35 @@
 uint8_t tsHeader::open(const char *name)
 {
     char *idxName=(char *)malloc(strlen(name)+6);
-    bool r=false;
+    uint8_t r=1;
+
+    sprintf(idxName,"%s.idx2",name);
+    if(!ADM_fileExist(idxName))
+        r=tsIndexer(name);
+    if(r==ADM_IGN)
+    {
+        ADM_warning("Indexing cancelled by the user, deleting the index file. Bye.\n");
+        if(!ADM_eraseFile(idxName))
+            ADM_warning("Could not delete %s\n",idxName);
+        free(idxName);
+        return r;
+    }
+    if(!r)
+    {
+        ADM_error("Indexing of %s failed, aborting\n",name);
+        // Currently, indexer returns 0 only if it can't create the .idx2 file, nothing to remove.
+        free(idxName);
+        return r;
+    }
+
     FP_TYPE appendType=FP_DONT_APPEND;
-    uint32_t append;
     char *type;
     uint64_t startDts;
     uint32_t version=0;
+    bool reindex=false;
+    uint32_t append;
+    r=0;
 
-    sprintf(idxName,"%s.idx2",name);
     indexFile index;
     if(!index.open(idxName))
     {
@@ -67,7 +86,8 @@
     version=index.getAsUint32("Version");
     if(version!=ADM_INDEX_FILE_VERSION)
     {
-        GUI_Error_HIG(QT_TRANSLATE_NOOP("tsdemuxer","Error"),QT_TRANSLATE_NOOP("tsdemuxer","This file's index has been created with an older version of avidemux.\nPlease delete the idx2 file and reopen."));
+        if(GUI_Question(QT_TRANSLATE_NOOP("tsdemuxer","This file's index has been created with an older version of avidemux.\nThe file must be re-indexed. Proceed?")))
+            reindex=true;
         goto abt;
     }
     append=index.getAsUint32("Append");
@@ -127,9 +147,18 @@
         }
     }
 abt:
-    free(idxName);
     index.close();
-    printf("[tsDemuxer] Loaded %d\n",r);
+    if(reindex)
+    {
+        uint8_t success=ADM_eraseFile(idxName);
+        free(idxName);
+        if(success)
+            r=open(name);
+        else
+            ADM_error("Can't delete old index file.\n");
+    }else
+        free(idxName);
+    printf("[tsDemuxer] open() returned %d\n",r);
     return r;
 }

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.h Changed

@@ -144,7 +144,7 @@
 public:
                 TsIndexerBase(listOfTsAudioTracks *tr);
         virtual ~TsIndexerBase();
-virtual bool    run(const char *file,ADM_TS_TRACK *videoTrac)=0;                
+virtual uint8_t run(const char *file,ADM_TS_TRACK *videoTrac)=0;
         bool    writeVideo(TSVideo *video,ADM_TS_TRACK_TYPE trkType);
         bool    writeAudio(void);
         bool    writeSystem(const char *filename,bool append=false);
@@ -190,7 +190,7 @@
                 {
                   
                 } 
-        bool    run(const char *file,ADM_TS_TRACK *videoTrac);
+        uint8_t run(const char *file,ADM_TS_TRACK *videoTrac);
         bool    updatePicStructure(TSVideo &video,const uint32_t t)
                         {
                                             switch(t)
@@ -223,7 +223,7 @@
                         {
                           
                         }
-        bool            run(const char *file,ADM_TS_TRACK *videoTrac);
+        uint8_t         run(const char *file,ADM_TS_TRACK *videoTrac);
                         TsIndexerVC1(listOfTsAudioTracks *tr) : TsIndexerBase(tr)
                         {
 
@@ -243,7 +243,7 @@
                 {
                   
                 }
-        bool    run(const char *file,ADM_TS_TRACK *videoTrac);
+        uint8_t run(const char *file,ADM_TS_TRACK *videoTrac);
                 TsIndexerMpeg2(listOfTsAudioTracks *tr) : TsIndexerBase(tr)
                 {
 
@@ -271,7 +271,7 @@
                 {
                   
                 }
-        bool    run(const char *file,ADM_TS_TRACK *videoTrac);
+        uint8_t run(const char *file,ADM_TS_TRACK *videoTrac);
                 TsIndexerH265(listOfTsAudioTracks *tr) : TsIndexerBase(tr)
                 {

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp Changed

@@ -85,53 +85,48 @@
     TS_PESpacket SEI_nal(0);
     while(keepRunning)
     {
-      int startCode=pkt->findStartCode();
+        int startCode=pkt->findStartCode();
 
-      if(!pkt->stillOk())
-      {
-          keepRunning=false;
-          continue;
-      }
-      if(startCode&0x80) continue; // Marker missing
-      startCode&=0x1f;
-      if(startCode!=NAL_SPS) 
-          continue;
+        if(!pkt->stillOk())
+        {
+            keepRunning=false;
+            continue;
+        }
+        if(startCode&0x80) continue; // Marker missing
+        startCode&=0x1f;
+        if(startCode!=NAL_SPS)
+            continue;
 
         // Got SPS!
-
-        uint32_t xA,xR;
         // Get info
         pkt->getInfo(&tmpInfo);
         // Read just enough...
+        SEI_nal.empty();
+        uint32_t code=0xffff+0xffff0000;
+        while(((code&0xffffff)!=1) && pkt->stillOk())
+        {
+            uint8_t r=pkt->readi8();
+            code=(code<<8)+r;
+            SEI_nal.pushByte(r);
+        }
+        if(!pkt->stillOk()) break;
+        pkt->seek(tmpInfo.startAt,tmpInfo.offset-5);
+        if (extractSPSInfo(SEI_nal.payload, SEI_nal.payloadSize-3,&spsInfo))
         {
-          SEI_nal.empty();
-          uint32_t code=0xffff+0xffff0000;
-          while(((code&0xffffff)!=1) && pkt->stillOk())
-          {
-                  uint8_t r=pkt->readi8();
-                  code=(code<<8)+r;
-                  SEI_nal.pushByte(r);
-          }
-          if(!pkt->stillOk()) break;;
-          pkt->seek(tmpInfo.startAt,tmpInfo.offset-5);
-          if (extractSPSInfo(SEI_nal.payload, SEI_nal.payloadSize-4,&spsInfo))
-          {
             ADM_info("[TsIndexer] Found video %" PRIu32"x%" PRIu32", fps=%" PRIu32"\n",video.w,video.h,video.fps);
             ADM_info("[TsIndexer] SPS says %" PRIu32"x%" PRIu32"\n",spsInfo.width,spsInfo.height);
             seq_found=1;
             video.w=spsInfo.width;
             video.h=spsInfo.height;
             video.fps=spsInfo.fps1000;
-            xA=spsInfo.darNum;
-            xR=spsInfo.darDen;
             writeVideo(&video,ADM_TS_H264);
             writeAudio();
             qfprintf(index,"[Data]");
             // Rewind
 
             break;
-        };
-      }
+        }
+        pkt->seek(tmpInfo.startAt,tmpInfo.offset);
     }
     return seq_found;
 }
@@ -139,7 +134,7 @@
     \fn run
     \brief Index H264 stream
 */
-bool TsIndexerH264::run(const char *file, ADM_TS_TRACK *videoTrac)
+uint8_t TsIndexerH264::run(const char *file, ADM_TS_TRACK *videoTrac)
 {
     bool seq_found=false;
     bool firstSps=true;
@@ -147,7 +142,7 @@
     TSVideo video;
     indexerData data;
 
-    bool result=false;
+    uint8_t result=0;
     bool bAppend=false;
 
     beginConsuming=0;
@@ -170,8 +165,8 @@
 
     if(!index)
     {
-        printf("[PsIndex] Cannot create %s\n",indexName.c_str());
-        return false;
+        ADM_error("[TsIndexerH264] Cannot create %s\n",indexName.c_str());
+        return 0;
     }
 
     uint64_t lastAudOffset=0;
@@ -292,7 +287,10 @@
 
                 decodingImage=false;
                 if(!addUnit(data,unitTypeSei,thisUnit,startCodeLength))
-                    keepRunning=false;
+                {
+                    result=ADM_IGN;
+                    goto the_end;
+                }
                 fourBytes=true;
                 goto resume;
             }
@@ -329,7 +327,10 @@
                     }
                 }
                 if(!addUnit(data,unitTypeSps,thisUnit,startCodeLength))
-                    keepRunning=false;
+                {
+                    result=ADM_IGN;
+                    goto the_end;
+                }
             }
                 break;
 
@@ -385,7 +386,10 @@
                 audCount=0;
 
                 if(!addUnit(data,unitTypePic,thisUnit,startCodeLength))
-                    keepRunning=false;
+                {
+                    result=ADM_IGN;
+                    goto the_end;
+                }
                 // reset to default
                 thisUnit.imageStructure=pictureFrame;
                 thisUnit.recoveryCount=0xff;
@@ -396,7 +400,7 @@
                 break;
         }
     } // End while
-    result=true;
+    result=1;
 the_end:
     printf("\n");
     qfprintf(index,"\n[End]\n");

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp Changed

@@ -106,8 +106,7 @@
  */
 static bool findGivenStartCode(tsPacketLinearTracker *pkt,int match, const char *name)
 {
-    bool keepRunning=true;    
-    while(keepRunning)
+    while(true)
     {
       int startCode=pkt->findStartCode();
       if(!pkt->stillOk())
@@ -157,7 +156,6 @@
  */
 bool TsIndexerH265::findH265VPS(tsPacketLinearTracker *pkt,TSVideo &video)
 {    
-    bool keepRunning=true;
     dmxPacketInfo packetInfo;
     uint8_t headerBuffer[512+5]={0,0,0,1,(NAL_H265_VPS<<1)}; // we are forcing some bits to be zero...
     // This is a bit naive...
@@ -282,7 +280,7 @@
     \fn run
     \brief Index H265 stream
 */
-bool TsIndexerH265::run(const char *file,ADM_TS_TRACK *videoTrac)
+uint8_t TsIndexerH265::run(const char *file,ADM_TS_TRACK *videoTrac)
 {
     TSVideo video;
     indexerData data;
@@ -310,7 +308,7 @@
         return false;
     }
 
-    bool result=false;
+    uint8_t result=0;
     bool bAppend=false;
     bool seq_found=false;
     bool firstSps=true;
@@ -336,7 +334,6 @@
     fullSize=pkt->getSize();
     gui=createProcessing(QT_TRANSLATE_NOOP("tsdemuxer","Indexing"),pkt->getSize());
     int lastRefIdc=0;
-    bool keepRunning=true;
     //******************
     // 1 search SPS
     //******************
@@ -355,7 +352,7 @@
     // 2 Index
     //******************
     bool fourBytes;
-    while(keepRunning)
+    while(true)
     {
         fourBytes=false;
         int startCode=pkt->findStartCode2(fourBytes);
@@ -424,7 +421,10 @@
                     thisUnit.imageType=picType;
                     thisUnit.unitType=unitTypePic;
                     if(!addUnit(data,unitTypePic,thisUnit,startCodeLength))
-                        keepRunning=false;
+                    {
+                        result=ADM_IGN;
+                        goto the_end;
+                    }
                     // reset to default
                     thisUnit.imageStructure=pictureFrame;
                     thisUnit.recoveryCount=0xff;
@@ -455,14 +455,17 @@
                     thisUnit.consumedSoFar=lastAudOffset;
                 }
                 if(!addUnit(data,unitTypeSps,thisUnit,startCodeLength))
-                    keepRunning=false;
+                {
+                    result=ADM_IGN;
+                    goto the_end;
+                }
                 break;
             }
             default:
                 break;
         }
     } // End while
-    result=true;
+    result=1;
 the_end:
         printf("\n");
         qfprintf(index,"\n[End]\n");

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp Changed

@@ -37,7 +37,7 @@
 /**
     \fn runMpeg2
 */  
-bool TsIndexerMpeg2::run(const char *file,ADM_TS_TRACK *videoTrac)
+uint8_t TsIndexerMpeg2::run(const char *file,ADM_TS_TRACK *videoTrac)
 {
 uint32_t temporal_ref,val;
 uint8_t buffer[50*1024];
@@ -50,6 +50,7 @@
 indexerData  data;    
 dmxPacketInfo tmpInfo;
 
+uint8_t result=1;
 bool bAppend=false;
 
     listOfUnits.clear();
@@ -70,8 +71,8 @@
 
     if(!index)
     {
-        printf("[PsIndex] Cannot create %s\n",indexName.c_str());
-        return false;
+        printf("[TsIndexerMpeg2] Cannot create %s\n",indexName.c_str());
+        return 0;
     }
     
     pkt=new tsPacketLinearTracker(videoTrac->trackPid, audioTracks);
@@ -93,13 +94,12 @@
     fullSize=pkt->getSize();
     int startCode;
     decodingImage=false;
-    bool keepRunning=true;
 #define likely(x) x
 #define unlikely(x) x
     int lastStartCode=0xb3;
 
 #define REMEMBER() { lastStartCode=startCode;}   
-      while(keepRunning)
+      while(true)
       {
         startCode=pkt->findStartCode();
         if(!pkt->stillOk()) break;
@@ -115,7 +115,10 @@
                                 pkt->getInfo(&thisUnit.packetInfo);
                                 thisUnit.consumedSoFar=pkt->getConsumed();
                                 if(!addUnit(data,unitTypeSps,thisUnit,4))
-                                    keepRunning=false;
+                                {
+                                    result=ADM_IGN;
+                                    goto the_end;
+                                }
                                 pkt->forward(8);  // Ignore
                                 continue;
                           }
@@ -139,7 +142,10 @@
                           pkt->getInfo(&thisUnit.packetInfo);
                           thisUnit.consumedSoFar=pkt->getConsumed();
                           if(!addUnit(data,unitTypeSps,thisUnit,4+4+4))
-                              keepRunning=false;
+                          {
+                              result=ADM_IGN;
+                              goto the_end;
+                          }
                           continue;
                           break;
 //#warning FIXME, update pic field info.... It triggers a end-of-pic message as it is
@@ -192,7 +198,10 @@
                           pkt->getInfo(&thisUnit.packetInfo);
                           thisUnit.consumedSoFar=pkt->getConsumed();
                           if(!addUnit(data,unitTypeSps,thisUnit,4))
-                              keepRunning=false;
+                          {
+                              result=ADM_IGN;
+                              goto the_end;
+                          }
                           break;                                            
                   case 0x00 : // picture
                         {
@@ -219,7 +228,10 @@
                           thisUnit.consumedSoFar=pkt->getConsumed();
                           thisUnit.imageType=type;
                           if(!addUnit(data,unitTypePic,thisUnit,4+2))
-                              keepRunning=false;
+                          {
+                              result=ADM_IGN;
+                              goto the_end;
+                          }
                           pkt->invalidatePtsDts();
                           data.nbPics++;
                         }
@@ -228,7 +240,7 @@
                     break;
                   }
       }
-    
+the_end:
         printf("\n");
         qfprintf(index,"\n[End]\n");
         qfprintf(index,"\n# Found %" PRIu32" images \n",data.nbPics); // Size
@@ -239,7 +251,7 @@
         audioTracks=NULL;
         delete pkt;
         pkt=NULL;
-        return 1; 
+        return result;
 }
 
 /********************************************************************************************/

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp Changed

@@ -23,7 +23,7 @@
     \fn runVC1
     \brief Index VC1 stream
 */  
-bool TsIndexerVC1::run(const char *file,ADM_TS_TRACK *videoTrac)
+uint8_t TsIndexerVC1::run(const char *file,ADM_TS_TRACK *videoTrac)
 {
 uint32_t temporal_ref,val;
 uint8_t buffer[50*1024];
@@ -64,6 +64,7 @@
     data.pkt=pkt;
     fullSize=pkt->getSize();
     gui= createProcessing(QT_TRANSLATE_NOOP("tsdemuxer","Indexing"),pkt->getSize());
+    uint8_t result=1;
     int startCode;
     decodingImage=false;
 #define likely(x) x
@@ -81,7 +82,11 @@
                           {
                               pkt->getInfo(&thisUnit.packetInfo);
                               thisUnit.consumedSoFar=pkt->getConsumed();
-                              addUnit(data,unitTypeSps,thisUnit,4);
+                              if(!addUnit(data,unitTypeSps,thisUnit,4))
+                              {
+                                  result=ADM_IGN;
+                                  goto the_end;
+                              }
                               decodingImage=false;
                               break;
                           }
@@ -113,7 +118,11 @@
                           
                           pkt->getInfo(&thisUnit.packetInfo);
                           thisUnit.consumedSoFar=pkt->getConsumed();
-                          addUnit(data,unitTypeSps,thisUnit,seqSize+4);
+                          if(!addUnit(data,unitTypeSps,thisUnit,seqSize+4))
+                          {
+                              result=ADM_IGN;
+                              goto the_end;
+                          }
                           decodingImage=false;
                           
                           continue;
@@ -136,7 +145,11 @@
                           if(!decodeVC1Pic(bits,fType,sType)) continue;
                           thisUnit.imageType=fType;
                           updatePicStructure(video,sType);
-                          addUnit(data,unitTypePic,thisUnit,4);
+                          if(!addUnit(data,unitTypePic,thisUnit,4))
+                          {
+                              result=ADM_IGN;
+                              goto the_end;
+                          }
                           decodingImage=true;
                           data.nbPics++;
                         }
@@ -145,7 +158,7 @@
                     break;
                   }
       }
-    
+the_end:
         printf("\n");
 //        Mark(&data,&info,2);
         qfprintf(index,"\n[End]\n");
@@ -157,7 +170,7 @@
         audioTracks=NULL;
         delete pkt;
         pkt=NULL;
-        return 1; 
+        return result;
 }
 /**
     \fn decodeVc1Seq

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPlugin.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPlugin.cpp Changed

@@ -27,74 +27,21 @@
 
 static bool detectTs(const char *file);
 static bool checkMarker(uint8_t *buffer, uint32_t bufferSize,uint32_t block);
-uint8_t   tsIndexer(const char *file);
+
 /**
     \fn Probe
 */
 
 extern "C"  uint32_t ADM_PLUGIN_EXPORT        probe(uint32_t magic, const char *fileName)
 {
-char *index=(char *)malloc(strlen(fileName)+6);
-int count=0;
     printf("[TS Demuxer] Probing...\n");
     if( !detectTs(fileName))
     {
         printf(" [TS Demuxer] Not a ts file\n");
-        free(index);
         return false;
     }
-    sprintf(index,"%s.idx2",fileName);
-again:    
-    if(ADM_fileExist(index)) 
-    {
-        printf(" [TS Demuxer] There is an index for that file \n");
-        FILE *f=ADM_fopen(index,"rt");
-        char signature[10];
-        fread(signature,4,1,f);
-        signature[4]=0;
-        fclose(f);
-        if(!strcmp(signature,"PSD1"))
-        {
-                // Check if it is a valid index for us...
-                 indexFile indexFile;
-                 char *type;
-                 if(!indexFile.open(index))
-                 {
-                    printf("[tsDemux] Cannot open index file %s\n",index);
-                    indexFile.close();
-                    free(index);
-                    return false;
-                  }
-                 if(!indexFile.readSection("System"))
-                {
-                    printf("[tsDemux] Cannot read system section\n");
-                    indexFile.close();
-                    free(index);
-                    return false;
-                }
-                type=indexFile.getAsString("Type");
-                if(!type || type[0]!='T')
-                    {
-                        printf("[TsDemux] Incorrect or not found type\n");
-                        indexFile.close();
-                        free(index);
-                        return false;
-                    }
-                return 50;
-        }
-        printf("[TSDemuxer] Not a valid index\n");
-        return false;
-
-     }
-    if(count) return false;
-    printf("[TSDemuxer] Analyzing file..\n");
-    count++;
     
-  
-    if(true==tsIndexer(fileName)) goto again;
-    free(index);
-    printf("[TSDemuxer] Failed..\n");
-   return 0;
+    return 50;
 }
 #define PROBE_SIZE (1024*1024)
 /**

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsReadIndex.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsReadIndex.cpp Changed

@@ -181,6 +181,17 @@
 
                 }
                 frame->len=len;
+                if(!interlaced && (frame->pictureType & AVI_FIELD_STRUCTURE))
+                {
+                    printf("[processVideoIndex] Setting interlaced flag.\n");
+                    interlaced=true;
+                    // Set fps to field rate for interlaced H.264 streams, necessary for copy mode
+                    if(_videostream.fccHandler==fourCC::get((uint8_t *)"H264"))
+                    {
+                        _videostream.dwRate*=2;
+                        printf("[processVideoIndex] Doubling fps1000 for interlaced H.264, new value = %d\n",_videostream.dwRate);
+                    }
+                }
                 ListOfFrames.push_back(frame);
                 count++;
                 if(!next) 
@@ -203,7 +214,7 @@
 {
     printf("[TsDemuxerer] Reading Video\n");
     if(!index->readSection("Video")) return false;
-    uint32_t w,h,fps,ar;
+    uint32_t w,h,fps;
     
     w=index->getAsUint32("Width");
     h=index->getAsUint32("height");

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.conf -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.conf Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer_desc.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer_desc.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp Changed

@@ -32,7 +32,7 @@
 mp4_muxer muxerConfig=
 {
     MP4_MUXER_MP4,
-    true,
+    MP4_MUXER_OPT_FASTSTART,
     false,
     WIDE,
     MP4_MUXER_ROTATE_0
@@ -98,6 +98,8 @@
         c = video_st->codec;
         AVCodecParameters *par;
         par = video_st->codecpar;
+        if(isH265Compatible(s->getFCC()))
+            par->codec_tag = MKTAG('h', 'v', 'c', '1');
         rescaleFps(s->getAvgFps1000(),&(c->time_base));
         myTimeBase=video_st->time_base=c->time_base;
         ADM_info("Video stream time base :%d,%d\n",video_st->time_base.num,video_st->time_base.den);
@@ -139,7 +141,11 @@
             printf("[MP4] Failed to init audio\n");
             return false;
         }
-
+        // Mark all audio tracks as enabled, VLC is picky about that.
+        for(int i=0;i<nbAudioTrack;i++)
+        {
+            audio_st[i]->disposition |= AV_DISPOSITION_DEFAULT;
+        }
         // /audio
         int er = avio_open(&(oc->pb), file, AVIO_FLAG_WRITE);
 
@@ -158,9 +164,19 @@
         snprintf(buf, sizeof(buf), "%d", AV_TIME_BASE / 10);
         av_dict_set(&dict, "preload", buf, 0);
         av_dict_set(&dict, "max_delay", "200000", 0);
-#ifndef _WIN32 // does not work on windows as the file must be opened twice at the same time        
-        av_dict_set(&dict, "movflags","faststart",0);
-#endif
+
+        switch(muxerConfig.optimize)
+        {
+            case(MP4_MUXER_OPT_FASTSTART):
+                av_dict_set(&dict, "movflags", "faststart", 0);
+                break;
+            case(MP4_MUXER_OPT_FRAGMENT):
+                av_dict_set(&dict, "movflags", "frag_keyframe+empty_moov", 0);
+                av_dict_set(&dict, "min_frag_duration", "2000000", 0); // 2 seconds, an arbitrary value
+                break;
+            default: break;
+        }
+
         const char *angle=NULL;
         switch(muxerConfig.rotation)
         {

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp Changed

@@ -18,17 +18,22 @@
 #include "muxerMP4.h"
 #define ADM_MINIMAL_UI_INTERFACE
 #include "DIA_factory.h"
-#include "fourcc.h"
+
 bool mp4Configure(void)
 {
         uint32_t fmt=(uint32_t)muxerConfig.muxerType;
         uint32_t dar=(uint32_t)muxerConfig.aspectRatio;
         uint32_t rot=(uint32_t)muxerConfig.rotation;
-        bool alt=muxerConfig.useAlternateMp3Tag;
+        uint32_t opt=(uint32_t)muxerConfig.optimize;
         bool force=muxerConfig.forceAspectRatio;
         diaMenuEntry format[]={{MP4_MUXER_MP4,"MP4"},{MP4_MUXER_PSP,"PSP"}};
         diaElemMenu  menuFormat(&fmt,QT_TRANSLATE_NOOP("mp4muxer","Muxing Format"),2,format,"");
-        diaElemToggle alternate(&alt,QT_TRANSLATE_NOOP("mp4muxer","Use alternate MP3 tag"));
+        diaMenuEntry streamOpt[]={
+            {MP4_MUXER_OPT_NONE,QT_TRANSLATE_NOOP("mp4muxer","No optimization")},
+            {MP4_MUXER_OPT_FASTSTART,QT_TRANSLATE_NOOP("mp4muxer","Move index to the beginning of the file")},
+            {MP4_MUXER_OPT_FRAGMENT,QT_TRANSLATE_NOOP("mp4muxer","Use fragmentation")}
+        };
+        diaElemMenu  menuOptimize(&opt,QT_TRANSLATE_NOOP("mp4muxer","Optimize for Streaming"),3,streamOpt,"");
         diaElemToggle forceAR(&force,QT_TRANSLATE_NOOP("mp4muxer","Force aspect ratio"));
         diaMenuEntry aspect[]={{STANDARD,"4:3"},{WIDE,"16:9"},{UNI,"18:9"},{CINEMA,"64:27"}};
         diaElemMenu  menuAspect(&dar,QT_TRANSLATE_NOOP("mp4muxer","Aspect Ratio (DAR)"),4,aspect,"");
@@ -39,12 +44,12 @@
             {MP4_MUXER_ROTATE_270,QT_TRANSLATE_NOOP("mp4muxer","270°")}
         };
         diaElemMenu menuRotation(&rot,QT_TRANSLATE_NOOP("mp4muxer","Rotate video"),4,rotation,"");
+        diaElem *tabs[]={&menuFormat,&menuOptimize,&forceAR,&menuAspect,&menuRotation};
 
-        diaElem *tabs[]={&menuFormat,&alternate,&forceAR,&menuAspect,&menuRotation};
         if( diaFactoryRun(QT_TRANSLATE_NOOP("mp4muxer","MP4 Muxer"),5,tabs))
         {
             muxerConfig.muxerType=(MP4_MUXER_TYPE)fmt;
-            muxerConfig.useAlternateMp3Tag=alt;
+            muxerConfig.optimize=(MP4_MUXER_OPTIMIZE)opt;
             muxerConfig.forceAspectRatio=force;
             muxerConfig.aspectRatio=(MP4_MUXER_DAR)dar;
             muxerConfig.rotation=(MP4_MUXER_ROTATION)rot;

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp Changed

@@ -187,28 +187,34 @@
         }
 
         upload();
-        ADM_pluginInstallSystem( std::string("x264"),std::string(".json"),pluginVersion);
+        ADM_pluginInstallSystem( std::string("x264"),std::string("json"),pluginVersion);
         updatePresetList();
-        int n=ui.configurationComboBox->count();
-        ui.configurationComboBox->setCurrentIndex(n-1);
+        adjustSize();
 }
 /**
     \fn updatePresetList
 */
-bool x264Dialog::updatePresetList(void)
+bool x264Dialog::updatePresetList(const char *match)
 {
     QComboBox *combo=ui.configurationComboBox;
     std::string rootPath;
     vector <std::string >  list;
     ADM_pluginGetPath("x264",pluginVersion,rootPath);
-    ADM_listFile(rootPath,".json",list);
+    ADM_listFile(rootPath,"json",list);
     int l=list.size();
+    int idx=l;
+    std::string current;
+    if(match)
+        current=std::string(match);
     combo->clear();
     for( int i=0;i<l;i++)
     {
+        if(match && list[i]==current)
+            idx=i;
         combo->addItem(list[i].c_str());
     }
     combo->addItem(QString(QT_TRANSLATE_NOOP("x264","Custom")));
+    combo->setCurrentIndex(idx);
     return true;
 }
 
@@ -797,9 +803,9 @@
     \fn getProfileName  
     \brief Popup a dialog that asks the user the preset name
 */
-static char *getProfileName(void)
+static char *getProfileName(QDialog *parent)
 {
-  QDialog dialog;
+  QDialog dialog(parent);
   dialog.setWindowTitle(QString::fromUtf8(QT_TRANSLATE_NOOP("x264","Save Profile")));
   QDialogButtonBox *buttonBox = new QDialogButtonBox();  
   QVBoxLayout *vboxLayout = new QVBoxLayout();
@@ -811,22 +817,22 @@
   QLineEdit *text=new QLineEdit;
 //  text->setAcceptRichText(false);
 
-  text->setText(QT_TRANSLATE_NOOP("x264","my profile"));
+  text->setText("my profile");
   text->selectAll();
 
   vboxLayout->addWidget(text);
   vboxLayout->addWidget(buttonBox);
-
+//  dialog.setModal(true);
+//  dialog.setWindowModality(Qt::ApplicationModal);
   dialog.setLayout(vboxLayout);
 
   if(dialog.exec()!=QDialog::Accepted)
   {
-        ADM_info("Canceled");
+        ADM_info("Cancelled");
         return NULL;
   }
-  QString fileName=text->text();
-  const char *out=fileName.toUtf8().constData();
-  return ADM_strdup(out);
+  std::string st = std::string(text->text().toUtf8().constData());
+  return ADM_strdup(st.c_str());
 }
 /**
         \fn saveAsButton_pressed
@@ -835,13 +841,14 @@
 void x264Dialog::saveAsButton_pressed(void)
 {
   // 1-ask name
-  char *out=getProfileName();
+  char *out=getProfileName(this);
   if(!out) return;
   ADM_info("Using %s\n",out);
   download();
   std::string rootPath;
   ADM_pluginGetPath("x264",pluginVersion,rootPath);
-  std::string fullpath=rootPath+std::string(ADM_SEPARATOR)+out+std::string(".json");
+  std::string name=std::string(out);
+  std::string fullpath=rootPath+std::string(ADM_SEPARATOR)+name+std::string(".json");
 
   if(ADM_fileExist(fullpath.c_str()))
   {
@@ -857,7 +864,7 @@
         GUI_Error_HIG(QT_TRANSLATE_NOOP("x264","Error"),QT_TRANSLATE_NOOP("x264","Cannot save preset"));
         ADM_error("Cannot write to %s\n",out);
   }
-  updatePresetList();
+  updatePresetList(name.c_str());
 }
 /**
 
@@ -874,15 +881,15 @@
   QString preset=ui.configurationComboBox->itemText(n);
   QString msg=QString(QT_TRANSLATE_NOOP("x264","Do you really want to delete the "))+preset+
             QString(QT_TRANSLATE_NOOP("x264"," profile ?.\nIf it is a system profile it will be recreated next time."));
-  if(true==GUI_Confirmation_HIG(QT_TRANSLATE_NOOP("x264","Delete preset"),QT_TRANSLATE_NOOP("x264","Delete"),msg.toUtf8().constData()))
+  if(true==GUI_Confirmation_HIG(QT_TRANSLATE_NOOP("x264","Delete"),QT_TRANSLATE_NOOP("x264","Delete preset"),msg.toUtf8().constData()))
   {
     std::string rootPath;
     ADM_pluginGetPath("x264",pluginVersion,rootPath);
     QString text=QString("/")+ui.configurationComboBox->itemText(n);
     text=QString(rootPath.c_str())+text+QString(".json");
-    unlink(text.toUtf8().constData());
+    if(!ADM_eraseFile(text.toUtf8().constData()))
+        ADM_warning("Could not delete %s\n",text.toUtf8().constData());
   }
   updatePresetList();
 }
 
-

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp Changed

@@ -193,28 +193,34 @@
         }
 
         upload();
-        ADM_pluginInstallSystem( std::string("x265"),std::string(".json"),pluginVersion);
+        ADM_pluginInstallSystem( std::string("x265"),std::string("json"),pluginVersion);
         updatePresetList();
-        int n=ui.configurationComboBox->count();
-        ui.configurationComboBox->setCurrentIndex(n-1);
+        adjustSize();
 }
 /**
     \fn updatePresetList
 */
-bool x265Dialog::updatePresetList(void)
+bool x265Dialog::updatePresetList(const char *match)
 {
     QComboBox *combo=ui.configurationComboBox;
     std::string rootPath;
     vector <std::string >  list;
     ADM_pluginGetPath("x265",pluginVersion,rootPath);
-    ADM_listFile(rootPath,".json",list);
+    ADM_listFile(rootPath,"json",list);
     int l=list.size();
+    int idx=l;
+    std::string current;
+    if(match)
+        current=std::string(match);
     combo->clear();
     for( int i=0;i<l;i++)
     {
+        if(match && list[i]==current)
+            idx=i;
         combo->addItem(list[i].c_str());
     }
     combo->addItem(QString(QT_TRANSLATE_NOOP("x265","Custom")));
+    combo->setCurrentIndex(idx);
     return true;
 }
 
@@ -761,9 +767,9 @@
     \fn getProfileName  
     \brief Popup a dialog that asks the user the preset name
 */
-static char *getProfileName(void)
+static char *getProfileName(QDialog *parent)
 {
-  QDialog dialog;
+  QDialog dialog(parent);
   dialog.setWindowTitle(QString::fromUtf8(QT_TRANSLATE_NOOP("x265","Save Profile")));
   QDialogButtonBox *buttonBox = new QDialogButtonBox();  
   QVBoxLayout *vboxLayout = new QVBoxLayout();
@@ -780,17 +786,17 @@
 
   vboxLayout->addWidget(text);
   vboxLayout->addWidget(buttonBox);
-
   dialog.setLayout(vboxLayout);
+//  dialog.setModal(true);
+//  dialog.setWindowModality(Qt::ApplicationModal);
 
   if(dialog.exec()!=QDialog::Accepted)
   {
-        ADM_info("Canceled");
+        ADM_info("Cancelled");
         return NULL;
   }
-  QString fileName=text->text();
-  const char *out=fileName.toUtf8().constData();
-  return ADM_strdup(out);
+  std::string st = std::string( text->text().toUtf8().constData());
+  return ADM_strdup(st.c_str());
 }
 /**
         \fn saveAsButton_pressed
@@ -799,13 +805,14 @@
 void x265Dialog::saveAsButton_pressed(void)
 {
   // 1-ask name
-  char *out=getProfileName();
+  char *out=getProfileName(this);
   if(!out) return;
   ADM_info("Using %s\n",out);
   download();
   std::string rootPath;
   ADM_pluginGetPath("x265",pluginVersion,rootPath);
-  std::string fullpath=rootPath+std::string(ADM_SEPARATOR)+out+std::string(".json");
+  std::string name=std::string(out);
+  std::string fullpath=rootPath+std::string(ADM_SEPARATOR)+name+std::string(".json");
 
   if(ADM_fileExist(fullpath.c_str()))
   {
@@ -821,7 +828,7 @@
         GUI_Error_HIG(QT_TRANSLATE_NOOP("x265","Error"),QT_TRANSLATE_NOOP("x265","Cannot save preset"));
         ADM_error("Cannot write to %s\n",out);
   }
-  updatePresetList();
+  updatePresetList(name.c_str());
 }
 /**
 
@@ -838,15 +845,15 @@
   QString preset=ui.configurationComboBox->itemText(n);
   QString msg=QString(QT_TRANSLATE_NOOP("x265","Do you really want to delete the "))+preset+
             QString(QT_TRANSLATE_NOOP("x265"," profile ?.\nIf it is a system profile it will be recreated next time."));
-  if(true==GUI_Confirmation_HIG(QT_TRANSLATE_NOOP("x265","Delete preset"),QT_TRANSLATE_NOOP("x265","Delete"),msg.toUtf8().constData()))
+  if(true==GUI_Confirmation_HIG(QT_TRANSLATE_NOOP("x265","Delete"),QT_TRANSLATE_NOOP("x265","Delete preset"),msg.toUtf8().constData()))
   {
     std::string rootPath;
     ADM_pluginGetPath("x265",pluginVersion,rootPath);
     QString text=QString("/")+ui.configurationComboBox->itemText(n);
     text=QString(rootPath.c_str())+text+QString(".json");
-    unlink(text.toUtf8().constData());
+    if(!ADM_eraseFile(text.toUtf8().constData()))
+        ADM_warning("Could not delete %s\n",text.toUtf8().constData());
   }
   updatePresetList();
 }
 
-

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/DIA_flyBlackenBorders.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/DIA_flyBlackenBorders.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/Q_blackenBorders.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/Q_blackenBorders.cpp Changed

@@ -38,7 +38,7 @@
     myBlacken->addControl(ui.toolboxLayout);
     myBlacken->upload();
     myBlacken->sliderChanged();
-
+    myBlacken->rubber->nestedIgnore=1;
 
     connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
     connect( ui.pushButtonReset,SIGNAL(clicked(bool)),this,SLOT(reset(bool)));
@@ -49,9 +49,6 @@
     SPINNER(Bottom);
 
     setModal(true);
-    show();
-    myBlacken->adjustCanvasPosition();
-    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
   }
   void Ui_blackenWindow::sliderUpdate(int foo)
   {
@@ -121,6 +118,15 @@
     
 }
 
+void Ui_blackenWindow::showEvent(QShowEvent *event)
+{
+    myBlacken->rubber->rubberband->show(); // must be called first
+    QDialog::showEvent(event);
+    myBlacken->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing both ways after the dialog has settled
+    myBlacken->rubber->nestedIgnore=0;
+}
+
 //************************
 uint8_t flyBlacken::upload(bool redraw, bool toRubber)
 {

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/Q_blackenBorders.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/Q_blackenBorders.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/colorYUV/avsColor.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/colorYUV/avsColor.cpp Changed

@@ -59,7 +59,7 @@
 	int i,j,wby4;
 	int modulo;
 
-#ifdef _DEBUG
+#ifdef cyuv_DEBUG
 	COUNT y0,u0,v0;
 	COUNT y,u,v;
 	COUNT r,g,b;
@@ -239,7 +239,7 @@
 	  MakeGammaLUT();
   }
 
-#ifdef _DEBUG
+#ifdef cyuv_DEBUG
 	total = wby4 * h;
 	totalby2 = total / 2;
 
@@ -275,7 +275,7 @@
 		  {
 			  pixel.data = *srcp;
 
-#ifdef _DEBUG
+#ifdef cyuv_DEBUG
 			pixel0.data = pixel.data;
 			CheckYUV(NULL, &pixel, &y0, &u0, &v0, 0);
 			
@@ -291,7 +291,7 @@
 			  pixel.yuv.v  = LUT_V[pixel.yuv.v ];
 			  *srcp++ = pixel.data;
 
-#ifdef _DEBUG
+#ifdef cyuv_DEBUG
 			CheckYUV(&pixel0, &pixel, &y, &u, &v, 1);
 
 			YUV2RGB(pixel.yuv.y0, pixel.yuv.u, pixel.yuv.v, &r.d, &g.d, &b.d, matrix);
@@ -332,7 +332,7 @@
     }
   }
 
-#ifdef _DEBUG
+#ifdef cyuv_DEBUG
 /*
 	y.ave  = ( y.ave+total)/total/2; u.ave  = ( u.ave+totalby2)/total;   v.ave  = ( v.ave+totalby2)/total;
 	y0.ave = (y0.ave+total)/total/2; u0.ave = (u0.ave+totalby2)/total;   v0.ave = (v0.ave+totalby2)/total;
@@ -521,7 +521,7 @@
 		LUT_V[i] = (unsigned char)val;
     }
 
-#ifdef _DEBUG
+#ifdef cyuv_DEBUG
 	DumpLUT();
 #endif

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp Changed

@@ -35,7 +35,6 @@
                 : ADM_flyDialogRgb(parent,width, height,in,canvas, slider,RESIZE_LAST)
 {
     rubber=new ADM_rubberControl(this,canvas);
-    rubber->resize(width,height);
     _ox=0;
     _oy=0;
     _ow=width;
@@ -344,7 +343,6 @@
     canvas=new ADM_QCanvas(ui.graphicsView,width,height);
 
     myCrop=new flyCrop( this,width, height,in,canvas,ui.horizontalSlider);
-    myCrop->rubber->nestedIgnore++; // don't modify crop parameters simply by opening the dialog
     myCrop->left=param->left;
     myCrop->right=param->right;
     myCrop->top=param->top;
@@ -354,9 +352,9 @@
     myCrop->addControl(ui.toolboxLayout);
     myCrop->upload(false,true);
     myCrop->sliderChanged();
+    myCrop->rubber->nestedIgnore=1;
 
     ui.checkBoxRubber->setChecked(myCrop->rubber_is_hidden);
-    myCrop->rubber->setVisible(!(myCrop->rubber_is_hidden));
 
     connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
     connect( ui.checkBoxRubber,SIGNAL(stateChanged(int)),this,SLOT(toggleRubber(int)));
@@ -369,10 +367,6 @@
       SPINNER(Bottom);
 
     setModal(true);
-    show();
-    myCrop->adjustCanvasPosition();
-    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing both ways after the dialog has settled
-    myCrop->rubber->nestedIgnore--;
 }
 /**
  * 
@@ -481,5 +475,19 @@
     myCrop->blockChanges(false);
 }
 
+/**
+ * \fn showEvent
+ * \brief set canvas size and position
+ */
+void Ui_cropWindow::showEvent(QShowEvent *event)
+{
+    myCrop->rubber->rubberband->show(); // must be called first
+    myCrop->rubber->setVisible(!(myCrop->rubber_is_hidden));
+    QDialog::showEvent(event);
+    myCrop->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing both ways after the dialog has settled
+    myCrop->rubber->nestedIgnore=0;
+}
+
 //EOF

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/Q_crop.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/Q_crop.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.cpp Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp Changed

@@ -198,6 +198,8 @@
         aprintf("Uploading\n");
         myCrop->upload();
         myCrop->sliderChanged();
+        myCrop->rubber->nestedIgnore=1;
+
         connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
 #define SPINNER(x) connect( ui.x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); 
         SPINNER(spinX);
@@ -216,9 +218,6 @@
         ui.labelHelp->setPixmap(QPixmap(":/images/grips.png"));
 
         setModal(true);
-        show();
-        myCrop->adjustCanvasPosition();
-        canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
   }
 
 /**
@@ -239,6 +238,18 @@
 }
 
 /**
+    \fn showEvent
+*/
+void Ui_mpdelogoWindow::showEvent(QShowEvent *event)
+{
+    myCrop->rubber->rubberband->show(); // must be called first
+    QDialog::showEvent(event);
+    myCrop->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing both ways after the dialog has settled
+    myCrop->rubber->nestedIgnore=0;
+}
+
+/**
     \fn sliderUpdate
 */

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp Changed

@@ -1,5 +1,29 @@
 /*
-	Yadif C-plugin for Avisynth 2.5 - Yet Another DeInterlacing Filter
+ * 
+ * Ported from yadif c plugin, then ported from ffmpeg vf_yadif
+ * 
+ * 
+ * Copyright (C) 2006-2011 Michael Niedermayer <michaelni@gmx.at>
+ *               2010      James Darnley <james.darnley@gmail.com>
+
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * 
+ 	Yadif C-plugin for Avisynth 2.5 - Yet Another DeInterlacing Filter
 	Copyright (C)2007 Alexander G. Balakhnin aka Fizick  http://avisynth.org.ru
     Port of YADIF filter from MPlayer
 	Copyright (C) 2006 Michael Niedermayer <michaelni@gmx.at>
@@ -21,10 +45,6 @@
 	Assembler optimized for GNU C compiler
 
 */
-/*
-  Ported to avidemux by mean
-  Same license as original (?GPL)
-*/
 
 #include "ADM_default.h"
 #include "ADM_coreVideoFilter.h"
@@ -32,27 +52,49 @@
 #include "DIA_factory.h"
 #include "yadif.h"
 #include "yadif_desc.cpp"
-
-#if defined( ADM_CPU_X86) && !defined(_MSC_VER)
+#include "libavutil/common.h"
+#if defined( ADM_CPU_X86) 
         #define CAN_DO_INLINE_X86_ASM
 #endif
 
 
 //************************************************
-#define MIN(a,b) ((a) > (b) ? (b) : (a))
-#define MAX(a,b) ((a) < (b) ? (b) : (a))
-#define ABS(a) ((a) > 0 ? (a) : (-(a)))
 
-#define MIN3(a,b,c) MIN(MIN(a,b),c)
-#define MAX3(a,b,c) MAX(MAX(a,b),c)
+
+static void filter_line_c( uint8_t *dst1,  const uint8_t  *prev1, const uint8_t  *cur1, const uint8_t  *next1, int w, int prefs, int mrefs, int parity, int mode);
+static void filter_edges_c(uint8_t *dst1, const uint8_t  *prev1, const uint8_t  *cur1, const uint8_t  *next1, int w, int prefs, int mrefs, int parity, int mode);
+static void filter_end_c(void) {};
 
 //===========================================================================//
 #ifdef CAN_DO_INLINE_X86_ASM
 extern "C"
 {
-void filter_line_mmx2(int mode, uint8_t *dst, const uint8_t *prev, const uint8_t *cur, const uint8_t *next, int w, int refs, int parity);
+ void filter_end_sse(void);     // emms , not needed for sse2
+ void adm_yadif_filter_line_sse2( uint8_t *dst1,  const uint8_t  *prev1, const uint8_t  *cur1, const uint8_t  *next1, int w, int prefs, int mrefs, int parity, int mode);
+ void adm_yadif_filter_line_ssse3( uint8_t *dst1,  const uint8_t  *prev1, const uint8_t  *cur1, const uint8_t  *next1, int w, int prefs, int mrefs, int parity, int mode);
 }
 #endif
+
+
+enum YADIFMode {
+    YADIF_MODE_SEND_FRAME           = 0, ///< send 1 frame for each frame
+    YADIF_MODE_SEND_FIELD           = 1, ///< send 1 frame for each field
+    YADIF_MODE_SEND_FRAME_NOSPATIAL = 2, ///< send 1 frame for each frame but skips spatial interlacing check
+    YADIF_MODE_SEND_FIELD_NOSPATIAL = 3, ///< send 1 frame for each field but skips spatial interlacing check
+};
+
+enum YADIFParity {
+    YADIF_PARITY_TFF  =  0, ///< top field first
+    YADIF_PARITY_BFF  =  1, ///< bottom field first
+    YADIF_PARITY_AUTO = -1, ///< auto detection
+};
+
+enum YADIFDeint {
+    YADIF_DEINT_ALL        = 0, ///< deinterlace all frames
+    YADIF_DEINT_INTERLACED = 1, ///< only deinterlace frames marked as interlaced
+};
+
+
 //
 /**
     \class yadifFilter
@@ -72,6 +114,13 @@
         virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
 		virtual void setCoupledConf(CONFcouple *couples);
         virtual bool         configure(void) ;                        /// Start graphical user interface
+        
+protected:
+    void (*filter_line) (uint8_t *dst, const uint8_t  *prev, const uint8_t  *cur, const uint8_t  *next, int w, int prefs, int mrefs, int parity, int mode);
+    void (*filter_edges)(uint8_t *dst, const uint8_t  *prev, const uint8_t  *cur, const uint8_t  *next, int w, int prefs, int mrefs, int parity, int mode);
+    void (*filter_end)(void);    
+    
+    void filter_plane(int mode, uint8_t *dst, int dst_stride, const uint8_t *prev0, const uint8_t *cur0, const uint8_t *next0, int refs, int w, int h, int parity, int tff, int mmx);
 };
 
 // Add the hook to make it valid plugin
@@ -98,11 +147,27 @@
     if(!setup || !ADM_paramLoad(setup,yadif_param,&configuration))
     {
         // Default value
-        configuration.mode=0;
-        configuration.order=1;
+        configuration.mode=YADIF_MODE_SEND_FRAME;
+        configuration.deint=YADIF_DEINT_ALL; 
+        configuration.parity=YADIF_PARITY_AUTO;
     }
-    
     updateInfo();
+
+    filter_line=filter_line_c;
+    filter_edges=filter_edges_c;
+    filter_end=filter_end_c;
+
+#ifdef CAN_DO_INLINE_X86_ASM    
+     if (CpuCaps::hasSSE3()) 
+     {
+        filter_line=adm_yadif_filter_line_ssse3;
+     }else 
+        if (CpuCaps::hasSSE2()) 
+        {
+           filter_line=adm_yadif_filter_line_sse2;
+        }
+#endif
+    
     myName="yadif";
 }
 /**
@@ -112,8 +177,6 @@
 {
         delete  original;
         original=NULL;
-       
-       
 }
 /**
     \fn updateInfo
@@ -121,7 +184,7 @@
 
 void yadifFilter::updateInfo(void)
 {
-   memcpy(&info,previousFilter->getInfo(),sizeof(info)); 
+  memcpy(&info,previousFilter->getInfo(),sizeof(info)); 
   if(configuration.mode &1 ) // Bob
   {
     info.frameIncrement/=2;
@@ -133,28 +196,37 @@
 bool yadifFilter::configure( void) 
 {
     
-     diaMenuEntry tMode[]={
-                             {0,      QT_TRANSLATE_NOOP("yadif","Temporal & spatial check"),NULL},
-                             {1,   QT_TRANSLATE_NOOP("yadif","Bob, temporal & spatial check"),NULL},
-                             {2,      QT_TRANSLATE_NOOP("yadif","Skip spatial temporal check"),NULL},
-                             {3,  QT_TRANSLATE_NOOP("yadif","Bob, skip spatial temporal check"),NULL}
+    diaMenuEntry tMode[]={
+                             {0,      QT_TRANSLATE_NOOP("yadif","Frame : Temporal & spatial check"),NULL},
+                             {1,   QT_TRANSLATE_NOOP("yadif","Field :  Temporal & spatial check"),NULL},
+                             {2,      QT_TRANSLATE_NOOP("yadif","Frame : Skip spatial temporal check"),NULL},
+                             {3,  QT_TRANSLATE_NOOP("yadif","Field : Skip spatial temporal check"),NULL}
           };
-     diaMenuEntry tOrder[]={
-                             {0,      QT_TRANSLATE_NOOP("yadif","Bottom field first"),NULL},
-                             {1,   QT_TRANSLATE_NOOP("yadif","Top field first"),NULL}
+    diaMenuEntry tOrder[]={
+                            //{0,   QT_TRANSLATE_NOOP("yadif","Auto"),NULL},
+                            {1,   QT_TRANSLATE_NOOP("yadif","Top field first"),NULL},
+                            {2,      QT_TRANSLATE_NOOP("yadif","Bottom field first"),NULL}                             
           };
-  
-     diaElemMenu mMode(&(configuration.mode),   QT_TRANSLATE_NOOP("yadif","_Mode:"), 4,tMode);
-     diaElemMenu morder(&(configuration.order),   QT_TRANSLATE_NOOP("yadif","_Order:"), 2,tOrder);
+
+    diaMenuEntry tDeint[]={
+                            {0,   QT_TRANSLATE_NOOP("yadif","Deint all"),NULL},
+                            {1,   QT_TRANSLATE_NOOP("yadif","Deint interlaced"),NULL}
+          };
+
      
-     diaElem *elems[]={&mMode,&morder};
+    uint32_t parity=configuration.parity+1;
+    diaElemMenu mMode(&(configuration.mode),   QT_TRANSLATE_NOOP("yadif","_Mode:"), 4,tMode);
+    diaElemMenu mDeint(&(configuration.deint),   QT_TRANSLATE_NOOP("yadif","_Deint:"), 2,tDeint);

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif_body.cpp Added

@@ -0,0 +1,297 @@
+/*
+ * Copyright (C) 2006-2011 Michael Niedermayer <michaelni@gmx.at>
+ *               2010      James Darnley <james.darnley@gmail.com>
+
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+#define MAX_ALIGN 8
+
+/**
+    \fn getConfiguration
+    \brief Return current setting as a string
+*/
+bool yadifFilter::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+
+        int mode;
+        int parity;
+        int tff;
+        int iplane;
+        int cpu;
+        int n;
+        ADMImage *src, *dst, * prev, *next;
+        
+    
+        mode = configuration.mode;
+
+        if (mode & 1) 
+        {
+                n = (nextFrame>>1); // bob
+        }
+        else
+                n = nextFrame;
+
+        src = vidCache->getImage(n);
+        *fn=nextFrame;
+        if(!src) return false;
+        
+  
+        // If possible get previous image...
+        if (n>0)
+                prev =  vidCache->getImage( n-1); // get previous frame
+        else
+                prev= src; // get very first frame
+
+        ADM_assert(prev);
+        next=vidCache->getImage(n+1);
+        if(!next) next=src;
+        ADM_assert(next);
+        
+        dst = image;
+        dst->copyInfo(src);
+
+        if(!prev || !src || !next)
+        {
+            printf("Failed to read frame for frame %u\n",nextFrame);
+            vidCache->unlockAll();
+            return 0;
+        }
+        
+  // Construct a frame based on the information of the current frame
+  // contained in the "vi" struct.
+#if 0 //MEANX
+        if (configuration.order == -1)
+//		tff = avs_is_tff(&p->vi) == 0 ? 0 : 1; // 0 or 1
+                tff = avs_get_parity(p->child, n) ? 1 : 0; // 0 or 1
+        else
+#endif
+                tff = configuration.parity;	
+        
+        parity = (mode & 1) ? (nextFrame & 1) ^ (1^tff) : (tff ^ 1);  // 0 or 1
+
+      //MEANX  cpu = avs_get_cpu_flags(p->env);
+
+        for (iplane = 0; iplane<3; iplane++)
+        {
+                ADM_PLANE plane = (iplane==0) ? PLANAR_Y : (iplane==1) ? PLANAR_U : PLANAR_V;
+
+                const unsigned char* srcp = src->GetWritePtr(plane);
+          // Request a Read pointer from the current source frame
+
+                const unsigned char* prevp0 = prev->GetWritePtr( plane);
+                unsigned char* prevp = (unsigned char*) prevp0; // with same pitch
+          // Request a Read pointer from the prev source frame.
+
+                const unsigned char* nextp0 = next->GetWritePtr( plane);
+                unsigned char* nextp = (unsigned char*) nextp0; // with same pitch
+          // Request a Read pointer from the next source frame.
+
+                unsigned char* dstp = dst->GetWritePtr( plane);
+                // Request a Write pointer from the newly created destination image.
+          // You can request a writepointer to images that have just been
+
+                const int dst_pitch = dst->GetPitch( plane);
+          // Requests pitch (length of a line) of the destination image.
+          // For more information on pitch see: http://www.avisynth.org/index.php?page=WorkingWithImages
+                // (short version - pitch is always equal to or greater than width to allow for seriously fast assembly code)
+
+                const int width =dst->GetPitch( plane);
+          // Requests rowsize (number of used bytes in a line.
+          // See the link above for more information.
+
+                const int height = dst->GetHeight( plane);
+          // Requests the height of the destination image.
+
+                const int src_pitch = src->GetPitch(plane);
+                const int prev_pitch = prev->GetPitch(plane);
+                const int next_pitch = next->GetPitch(plane);
+
+                // in v.0.1-0.3  all source pitches are  assumed equal (for simplicity)
+                                // consider other (rare) case
+                if (prev_pitch != src_pitch)
+                {
+                    prevp = (unsigned char *)ADM_alloc(height*src_pitch);
+                    int h;
+                    for (h=0; h<0; h++)
+                      memcpy(prevp+h*src_pitch, prevp0+h*prev_pitch, width);
+                }
+                    
+                if (next_pitch != src_pitch)
+                {
+                    nextp = (unsigned char *)ADM_alloc(height*src_pitch);
+                    int h;
+                    for (h=0; h<0; h++)
+                      memcpy(nextp+h*src_pitch, nextp0+h*next_pitch, width);
+                }
+                    
+                filter_plane(mode, dstp, dst_pitch, prevp, srcp, nextp, src_pitch, width, height, parity, tff, 0);
+                if (prev_pitch != src_pitch)
+                        ADM_dealloc(prevp);
+                if (next_pitch != src_pitch)
+                        ADM_dealloc(nextp);
+        }
+      vidCache->unlockAll();
+      
+      if (mode & 1) 
+      {
+            if(nextFrame&1)
+                image->Pts+= info.frameIncrement;
+      }
+      //printf("out PTs=%"PRIu64", nextFrame=%d,inc=%d\n",image->Pts,(int)nextFrame,(int)info.frameIncrement);
+      nextFrame++;
+      filter_end();
+      return 1;
+}
+
+
+void yadifFilter::filter_plane(int mode, uint8_t *dst, int dst_stride, const uint8_t *prev0, const uint8_t *cur0, const uint8_t *next0, int refs, int w, int h, int parity, int tff, int mmx)
+{
+        int df = 1;
+        int pix_3 = 3 * df;
+        int edge = 3 + MAX_ALIGN / df - 1;
+        memcpy(dst, cur0, w);
+        memcpy(dst + dst_stride, cur0 + refs, w);
+        for(int y=2; y<h-1; y++){
+            if(((y ^ parity) & 1)){
+                const uint8_t *prev= prev0 + y*refs;
+                const uint8_t *cur = cur0 + y*refs;
+                const uint8_t *next= next0 + y*refs;
+                uint8_t *dst2= dst + y*dst_stride;
+                
+                filter_line(dst2 + pix_3, prev + pix_3, cur + pix_3,   next + pix_3, 
+                             w - edge,
+                           y + 1 < h ? refs : -refs,
+                           y ? -refs : refs,
+                           parity ^ tff, mode);
+                filter_edges(dst2, prev, cur, next, 
+                             w,
+                            y + 1 < h ? refs : -refs,
+                            y ? -refs : refs,
+                            parity ^ tff, mode);                
+                
+            }else{
+                memcpy(dst + y*dst_stride, cur0 + y*refs, w);
+            }
+        }
+        memcpy(dst + (h-1)*dst_stride, cur0 + (h-1)*refs, w);
+
+}
+
+//--- ff ---
+#define CHECK(j)\
+    {   int score = FFABS(cur[mrefs - 1 + (j)] - cur[prefs - 1 - (j)])\
+                  + FFABS(cur[mrefs  +(j)] - cur[prefs  -(j)])\

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/CMakeLists.txt -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/CMakeLists.txt Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/vf_yadif.asm -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/vf_yadif.asm Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/yadif.conf -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/yadif.conf Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/yadif.h -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/yadif.h Changed

avidemux_2.7.3.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/yadif_desc.cpp -> avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/yadif_desc.cpp Changed

avidemux_2.7.4.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/yadif_json.cpp Added

avidemux_2.7.3.tar.gz/bootStrapCrossMingwQt5_mxe.sh -> avidemux_2.7.4.tar.gz/bootStrapCrossMingwQt5_mxe.sh Changed

@@ -6,6 +6,7 @@
 default_mxerootdir="/opt/mxe"
 mxerootdir="$default_mxerootdir"
 rebuild=0
+debug=0
 do_core=1
 do_qt=1
 do_cli=1
@@ -62,7 +63,11 @@
         export TOOLCHAIN_LOCATION=${MXE_ROOT}/usr
         export SDL2DIR=${MXE_ROOT}/usr/${MXE_TARGET}
         export PARAL="-j $(nproc)"
-        export INSTALL_DIR=${MINGW}/out/avidemux
+        if [ "x$debug" != "x1" ]; then
+            export INSTALL_DIR=${MINGW}/out/avidemux
+        else
+            export INSTALL_DIR=${MINGW}/out_debug/avidemux
+        fi
     fi
     export CROSS_PREFIX=$MXE_TARGET
     export PKG_CONFIG_PATH=$MINGW/lib/pkgconfig
@@ -84,6 +89,12 @@
     export BUILDDIR=$1
     export SOURCEDIR=$2
     export EXTRA=$3
+    GENERATOR="Unix Makefiles"
+    if [ "x$debug" = "x1" ]; then
+                DEBUG="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
+                BUILDDIR="${BUILDDIR}_debug"
+                GENERATOR="CodeBlocks - Unix Makefiles"
+    fi
     echo "Building $BUILDDIR from $SOURCEDIR (Extra=$EXTRA)"
     if [ "x$rebuild" != "x1" ]; then
         rm -Rf ./"$BUILDDIR"
@@ -104,10 +115,11 @@
     -DCMAKE_AR:STRING=${CROSS_PREFIX}-ar \
     -DCMAKE_RC_COMPILER:STRING=${CROSS_PREFIX}-windres \
     -DAVIDEMUX_TOP_SOURCE_DIR="$TOP" \
-    -G "Unix Makefiles" \
+    ${DEBUG} \
+    -G "${GENERATOR}" \
     $EXTRA \
     $SOURCEDIR || fail cmake
-    make $PARAL VERBOSE=1 >& /tmp/log$BUILDDIR || fail make
+    make $PARAL >& /tmp/log$BUILDDIR || fail "make, result in /tmp/log$BUILDDIR "
     make install || fail make_install
     # Only install  component=dev for dev package
     if [ "x$author_setup" = "x1" ]; then
@@ -121,6 +133,7 @@
     echo "  --help                : Print usage"
     echo "  --32                  : Build a 32 bit application (default)"
     echo "  --64                  : Build a 64 bit application"
+    echo "  --debug               : Switch debugging on"
     echo "  --mxe-root=DIR        : Use MXE installed in DIR (default: ${default_mxerootdir})"
     echo "  --rebuild             : Preserve existing build directories"
     echo "  --with-core           : Build core"
@@ -177,9 +190,12 @@
         echo "No avidemux.exe (${BITS} bit) found in ${INSTALL_DIR}, aborting"
         exit 1
     fi
-    echo "Preparing release package..."
+    echo "Preparing package..."
     cd $TOP
     PACKAGE_DIR="packaged_mingw_build_${BUILDDATE}"
+    if [ "x$debug" = "x1" ]; then
+        PACKAGE_DIR="packaged_mingw_debug_build_${BUILDDATE}"
+    fi
     if [ ! -e $PACKAGE_DIR ]; then
         mkdir $PACKAGE_DIR
     fi
@@ -236,6 +252,7 @@
     libwinpthread-*.dll \
     libx264-*.dll \
     libx265.dll \
+    libzstd.dll \
     SDL2.dll \
     ssleay32.dll \
     xvidcore.dll \

avidemux_2.7.3.tar.gz/cmake/admCheckMiscLibs.cmake -> avidemux_2.7.4.tar.gz/cmake/admCheckMiscLibs.cmake Changed

avidemux_2.7.3.tar.gz/cmake/admFFmpegVersion.cmake -> avidemux_2.7.4.tar.gz/cmake/admFFmpegVersion.cmake Changed

avidemux_2.7.3.tar.gz/cmake/admInstallDir.cmake -> avidemux_2.7.4.tar.gz/cmake/admInstallDir.cmake Changed

avidemux_2.7.3.tar.gz/cmake/admYasm_gcc.cmake -> avidemux_2.7.4.tar.gz/cmake/admYasm_gcc.cmake Changed

avidemux_2.7.3.tar.gz/cmake/avidemuxVersion.cmake -> avidemux_2.7.4.tar.gz/cmake/avidemuxVersion.cmake Changed

avidemux_2.7.3.tar.gz/cmake/osx/fonts.conf -> avidemux_2.7.4.tar.gz/cmake/osx/fonts.conf Changed

Changes of Revision 6