Request 3929 (accepted)

Overview

Request 3929 (accepted)

Update to version 2.7.0

Created by enzokiel over 7 years ago
In state accepted
Package maintainer: enzokiel

Submit avidemux3

Submit package home:enzokiel:...hes:Multimedia / avidemux3 to package Multimedia / avidemux3

avidemux3.changes Changed

@@ -1,4 +1,27 @@
 -------------------------------------------------------------------
+Mon Aug 14 17:18:32 UTC 2017 - joerg.lorenzen@ki.tng.de
+
+- Update to version 2.7.0
+  + Core:FFmpeg switched to the 3.3.x branch
+  + Editing:Fixed frame computation bug that led to bad cutting
+    (euma)
+  + i18n:Korean translation (sheppaul)
+  + win32:Put log files into the local folder (achim71)
+  + Jobs:Fix name of the executable search
+  + UI:Steplessly zoom paused video when the window is resized
+    (euma)
+  + UI:Added Ctrl+Shift+C shortcut to copy the current PTS to
+    clipboard (euma)
+  + Filter:eq2: UI improvements (euma)
+  + Decoding:Fix VP9 decoding
+  + Filter:Using rubber bands for crop too (me+euma)
+  + Build:Redone packaging on macOS
+  + Decoding:HEVC decoding via DXVA2 blacklisted on win32, active
+    on win64
+  + New Filter:ADM ivtc
+  + Audio:Distinguish between AC3 and EAC3 when importing
+
+-------------------------------------------------------------------
 Sun Apr 30 11:40:23 UTC 2017 - joerg.lorenzen@ki.tng.de
 
 - Update to version 2.6.20

avidemux3.spec Changed

@@ -30,7 +30,7 @@
 
 Name:           avidemux3
 Summary:        Graphical video editing and transcoding tool
-Version:        2.6.20
+Version:        2.7.0
 Release:        1
 Url:            http://avidemux.sourceforge.net/
 Source0:        avidemux_%{version}.tar.gz
@@ -312,7 +312,6 @@
 %dir %{_libdir}/ADM_plugins6/pluginSettings/x264
 %dir %{_libdir}/ADM_plugins6/pluginSettings/x264/3
 %dir %{_libdir}/ADM_plugins6/scriptEngines
-%dir %{_libdir}/ADM_plugins6/videoDecoders
 %dir %{_libdir}/ADM_plugins6/videoEncoders
 %dir %{_libdir}/ADM_plugins6/videoFilters
 %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_a52.so
@@ -379,7 +378,6 @@
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/fast.json
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/iPhone.json
 %{_libdir}/ADM_plugins6/scriptEngines/libADM_script_tinyPy.so
-%{_libdir}/ADM_plugins6/videoDecoders/libADM_vd_vpx.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffDv.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffFlv1.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg2.so
@@ -393,6 +391,7 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ascii.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_avsfilter.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_addBorders.so
+%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_admIvtc.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_black.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_changeFps.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_colorYuv.so

avidemux-package_version.patch Changed

@@ -1,6 +1,6 @@
-diff -uNr avidemux_2.6.15/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp avidemux_2.6.15.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
---- avidemux_2.6.15/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2016-11-21 22:37:49.257218473 +0100
-+++ avidemux_2.6.15.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2016-11-21 22:36:25.446870560 +0100
+diff -uNr avidemux_2.7.0/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp avidemux_2.7.0.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
+--- avidemux_2.7.0/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2017-08-14 19:48:01.481407444 +0200
++++ avidemux_2.7.0.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2017-08-14 20:01:48.190879204 +0200
 @@ -143,7 +143,7 @@
      QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath();
  #else
@@ -10,21 +10,21 @@
  #endif
  
      QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode));
-diff -uNr avidemux_2.6.15/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.6.15.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
---- avidemux_2.6.15/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2016-11-21 22:37:47.297257101 +0100
-+++ avidemux_2.6.15.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2016-11-21 22:36:23.558907783 +0100
+diff -uNr avidemux_2.7.0/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.7.0.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
+--- avidemux_2.7.0/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2017-08-14 19:48:01.433408213 +0200
++++ avidemux_2.7.0.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2017-08-14 20:01:48.022882248 +0200
 @@ -103,14 +103,14 @@
      if(isPortable)
      {
          std::string i18n=pluginDir;
--        i18n+=std::string("/../../share/avidemux6/")+flavor+std::string("/i18n/");
-+        i18n+=std::string("/../../share/avidemux3/")+flavor+std::string("/i18n/");
+-        i18n+=std::string("/../../share/avidemux6/")+flavor+std::string("/i18n");
++        i18n+=std::string("/../../share/avidemux3/")+flavor+std::string("/i18n");
          ADM_i18nDir=canonize(i18n);
          ADM_info("Relative to install i18n mode : <%s>\n",ADM_i18nDir.c_str());
          // 181n
      }else
      {        
-         std::string partialPath=flavor+std::string("/i18n/");
+         std::string partialPath=flavor+std::string("/i18n");
 -        char *ppath=ADM_getInstallRelativePath("share","avidemux6",partialPath.c_str());
 +        char *ppath=ADM_getInstallRelativePath("share","avidemux3",partialPath.c_str());
          ADM_i18nDir=std::string(ppath);
@@ -39,9 +39,9 @@
  
      strcat(ADM_basedir, ADM_DIR_NAME);
      strcat(ADM_basedir, ADM_SEPARATOR);
-diff -uNr avidemux_2.6.15/avidemux_core/ADM_core/src/ADM_folder_mac.cpp avidemux_2.6.15.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp
---- avidemux_2.6.15/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2016-11-21 22:37:47.301257022 +0100
-+++ avidemux_2.6.15.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2016-11-21 22:36:23.562907703 +0100
+diff -uNr avidemux_2.7.0/avidemux_core/ADM_core/src/ADM_folder_mac.cpp avidemux_2.7.0.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp
+--- avidemux_2.7.0/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2017-08-14 19:48:01.433408213 +0200
++++ avidemux_2.7.0.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2017-08-14 20:01:48.022882248 +0200
 @@ -124,7 +124,7 @@
      strcpy(ADM_basedir, homeEnv);
      AddSeparator(ADM_basedir);
@@ -51,19 +51,22 @@
  
      strcat(ADM_basedir, ADM_DIR_NAME);
      strcat(ADM_basedir, ADM_SEPARATOR);
-@@ -145,7 +145,7 @@
- {    
+@@ -146,9 +146,9 @@
      
-     std::string partialPath=flavor+std::string("/i18n/");
+     std::string partialPath=flavor+std::string("/i18n");
+ #ifdef CREATE_BUNDLE
+-    char *ppath=ADM_getInstallRelativePath("../Resources/share","avidemux6",partialPath.c_str());
++    char *ppath=ADM_getInstallRelativePath("../Resources/share","avidemux3",partialPath.c_str());
+ #else
 -    char *ppath=ADM_getInstallRelativePath("../share","avidemux6",partialPath.c_str());
 +    char *ppath=ADM_getInstallRelativePath("../share","avidemux3",partialPath.c_str());
+ #endif
      std::string r=std::string(ppath);
      delete [] ppath;
-     ppath=NULL;
-diff -uNr avidemux_2.6.15/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp avidemux_2.6.15.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
---- avidemux_2.6.15/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2016-11-21 22:37:44.681308658 +0100
-+++ avidemux_2.6.15.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2016-11-21 22:36:20.930959596 +0100
-@@ -260,7 +260,7 @@
+diff -uNr avidemux_2.7.0/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp avidemux_2.7.0.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
+--- avidemux_2.7.0/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2017-08-14 19:48:01.357409430 +0200
++++ avidemux_2.7.0.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2017-08-14 20:01:47.582890218 +0200
+@@ -265,7 +265,7 @@
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1,
  			(string("Executing ") + string(name) + string("...")).c_str());
  
@@ -72,9 +75,9 @@
  
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1, "Done");
  
-diff -uNr avidemux_2.6.15/cmake/se_plugin.cmake avidemux_2.6.15.new/cmake/se_plugin.cmake
---- avidemux_2.6.15/cmake/se_plugin.cmake	2016-11-21 22:37:51.125181659 +0100
-+++ avidemux_2.6.15.new/cmake/se_plugin.cmake	2016-11-21 22:36:27.354832942 +0100
+diff -uNr avidemux_2.7.0/cmake/se_plugin.cmake avidemux_2.7.0.new/cmake/se_plugin.cmake
+--- avidemux_2.7.0/cmake/se_plugin.cmake	2017-08-14 19:47:33.749847944 +0200
++++ avidemux_2.7.0.new/cmake/se_plugin.cmake	2017-08-14 20:01:14.587487760 +0200
 @@ -15,7 +15,7 @@
  if (WIN32)
      set(helpDir "${CMAKE_INSTALL_PREFIX}/help/${_engineName}")
@@ -84,17 +87,17 @@
  endif (WIN32)
  
      install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}" COMPONENT plugins)
-diff -uNr avidemux_2.6.15/cmake/sql/update.sh avidemux_2.6.15.new/cmake/sql/update.sh
---- avidemux_2.6.15/cmake/sql/update.sh	2016-11-21 22:37:50.877186546 +0100
-+++ avidemux_2.6.15.new/cmake/sql/update.sh	2016-11-21 22:36:27.106837831 +0100
+diff -uNr avidemux_2.7.0/cmake/sql/update.sh avidemux_2.7.0.new/cmake/sql/update.sh
+--- avidemux_2.7.0/cmake/sql/update.sh	2017-08-14 19:48:19.685114476 +0200
++++ avidemux_2.7.0.new/cmake/sql/update.sh	2017-08-14 20:02:01.410639682 +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.6.15/cmake/Ts.cmake avidemux_2.6.15.new/cmake/Ts.cmake
---- avidemux_2.6.15/cmake/Ts.cmake	2016-11-21 22:37:50.249198923 +0100
-+++ avidemux_2.6.15.new/cmake/Ts.cmake	2016-11-21 22:36:26.486850055 +0100
+diff -uNr avidemux_2.7.0/cmake/Ts.cmake avidemux_2.7.0.new/cmake/Ts.cmake
+--- avidemux_2.7.0/cmake/Ts.cmake	2017-08-14 19:47:33.737848134 +0200
++++ avidemux_2.7.0.new/cmake/Ts.cmake	2017-08-14 20:01:14.567488123 +0200
 @@ -28,7 +28,7 @@
          IF(WIN32)
                  SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_qslider.cpp Deleted

@@ -1,105 +0,0 @@
-
-/***************************************************************************
-Custom slider
-***************************************************************************/
-
-/***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include "ADM_inttype.h"
-#include <QPainter>
-#include <QSlider>
-#include "ADM_qslider.h"
-#include "ADM_assert.h"
-/**
-    \fn ADM_QSlider
-*/
-
-ADM_QSlider::ADM_QSlider(QWidget *parent) : QSlider(parent)
-{
-   totalDuration= markerATime= markerBTime =0;
-	
-}
-/**
-    \fn paintEvent
-*/
-void ADM_QSlider::paintEvent(QPaintEvent *event)
-{
-	QSlider::paintEvent(event);	
-
-	uint64_t a = markerATime, b = markerBTime;
-
-	if (markerATime > markerBTime)
-	{
-		b = markerATime;
-		a = markerBTime; 
-	}
-
-	if (totalDuration > 0LL && (a != 0 || b != totalDuration))
-	{
-		int left  = (int)(((double)a * width()) / (double)totalDuration);
-		int right = (int)(((double)b * width()) / (double)totalDuration);
-
-		QPainter painter(this);
-
-		painter.setPen(Qt::blue);
-		painter.drawRect(left, 1, right - left, height() - 3);
-		painter.end();
-	}
-}
-/**
-    \fn setMarkerA
-*/
-
-void ADM_QSlider::setMarkerA(uint64_t frameIndex)
-{
-	setMarkers(frameIndex, markerBTime);
-}
-/**
-    \fn setMarkerB
-*/
-void ADM_QSlider::setMarkerB(uint64_t frameIndex)
-{
-	setMarkers(markerATime, frameIndex);
-}
-/**
-    \fn setMarkers
-*/
-void ADM_QSlider::setMarkers(uint64_t frameIndexA, uint64_t frameIndexB)
-{
-	if (frameIndexA > totalDuration)
-		printf("[ADM_QSlider] Marker A is out of bounds (%" PRIu64", %" PRIu64")\n", markerATime, totalDuration);
-	else if (frameIndexB > totalDuration)
-		printf("[ADM_QSlider] Marker B is out of bounds (%" PRIu64", %" PRIu64")\n", markerBTime, totalDuration);
-	else
-	{
-		markerATime = frameIndexA;
-		markerBTime = frameIndexB;
-
-		repaint();
-	}
-}
-/**
-        \fn setTotalDuration
-*/
-void ADM_QSlider::setTotalDuration(uint64_t duration)
-{
-	totalDuration = duration;
-	repaint();
-}
-/*
-    \fn Intercept Event
- */
-void ADM_QSlider::wheelEvent(QWheelEvent *e)
-{
-    //printf("Wheel : %d\n",e->delta());
-    emit sliderAction(e->delta());
-}
-//EOF

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_qslider.h Deleted

@@ -1,43 +0,0 @@
-
-/***************************************************************************
-Custom slider
-***************************************************************************/
-
-/***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************/
-
-#pragma once
-#include "QWheelEvent"
-#include "QSlider"
-#include "ADM_inttype.h"
-
-/**
-    \class ADM_QSlider
-
-*/
-class ADM_QSlider : public QSlider
-{
-    Q_OBJECT
-protected:
-	uint64_t totalDuration, markerATime, markerBTime;
-	void paintEvent(QPaintEvent *event);
-
-public:
-	ADM_QSlider(QWidget *parent = 0); 
-
-	void setMarkerA(uint64_t frameIndex);
-	void setMarkerB(uint64_t frameIndex);
-	void setMarkers(uint64_t frameIndexA, uint64_t frameIndexB);
-	void setTotalDuration(uint64_t duration);
-        void wheelEvent(QWheelEvent *e);
-signals:
-        void sliderAction(int value);        
-};
-
-

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreImage/include/ADM_mmxMacros.h Deleted

@@ -1,706 +0,0 @@
-/*	mmx.h
-
-	MultiMedia eXtensions GCC interface library for IA32.
-
-	To use this library, simply include this header file
-	and compile with GCC.  You MUST have inlining enabled
-	in order for mmx_ok() to work; this can be done by
-	simply using -O on the GCC command line.
-
-	Compiling with -DMMX_TRACE will cause detailed trace
-	output to be sent to stderr for each mmx operation.
-	This adds lots of code, and obviously slows execution to
-	a crawl, but can be very useful for debugging.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY
-	EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
-	LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR ANY PARTICULAR PURPOSE.
-
-	1997-99 by H. Dietz and R. Fisher
-
- Notes:
-	It appears that the latest gas has the pand problem fixed, therefore
-	  I'll undefine BROKEN_PAND by default.
-*/
-
-#ifndef _MMX_H
-#define _MMX_H
-
-
-/*	Warning:  at this writing, the version of GAS packaged
-	with most Linux distributions does not handle the
-	parallel AND operation mnemonic correctly.  If the
-	symbol BROKEN_PAND is defined, a slower alternative
-	coding will be used.  If execution of mmxtest results
-	in an illegal instruction fault, define this symbol.
-*/
-#undef	BROKEN_PAND
-
-
-/*	The type of an value that fits in an MMX register
-	(note that long long constant values MUST be suffixed
-	 by LL and unsigned long long values by ULL, lest
-	 they be truncated by the compiler)
-*/
-typedef	union {
-	long long		q;	/* Quadword (64-bit) value */
-	unsigned long long	uq;	/* Unsigned Quadword */
-	int			d[2];	/* 2 Doubleword (32-bit) values */
-	unsigned int		ud[2];	/* 2 Unsigned Doubleword */
-	short			w[4];	/* 4 Word (16-bit) values */
-	unsigned short		uw[4];	/* 4 Unsigned Word */
-	char			b[8];	/* 8 Byte (8-bit) values */
-	unsigned char		ub[8];	/* 8 Unsigned Byte */
-	float			s[2];	/* Single-precision (32-bit) value */
-} __attribute__ ((aligned (8))) mmx_t;	/* On an 8-byte (64-bit) boundary */
-
-
-
-/*	Function to test if multimedia instructions are supported...
-*/
-inline extern int
-mm_support(void)
-{
-	/* Returns 1 if MMX instructions are supported,
-	   3 if Cyrix MMX and Extended MMX instructions are supported
-	   5 if AMD MMX and 3DNow! instructions are supported
-	   0 if hardware does not support any of these
-	*/
-	register int rval = 0;
-
-	__asm__ __volatile__ (
-		/* See if CPUID instruction is supported ... */
-		/* ... Get copies of EFLAGS into eax and ecx */
-		"pushf\n\t"
-		"popl %%eax\n\t"
-		"movl %%eax, %%ecx\n\t"
-
-		/* ... Toggle the ID bit in one copy and store */
-		/*     to the EFLAGS reg */
-		"xorl $0x200000, %%eax\n\t"
-		"push %%eax\n\t"
-		"popf\n\t"
-
-		/* ... Get the (hopefully modified) EFLAGS */
-		"pushf\n\t"
-		"popl %%eax\n\t"
-
-		/* ... Compare and test result */
-		"xorl %%eax, %%ecx\n\t"
-		"testl $0x200000, %%ecx\n\t"
-		"jz NotSupported1\n\t"		/* CPUID not supported */
-
-
-		/* Get standard CPUID information, and
-		       go to a specific vendor section */
-		"movl $0, %%eax\n\t"
-		"cpuid\n\t"
-
-		/* Check for Intel */
-		"cmpl $0x756e6547, %%ebx\n\t"
-		"jne TryAMD\n\t"
-		"cmpl $0x49656e69, %%edx\n\t"
-		"jne TryAMD\n\t"
-		"cmpl $0x6c65746e, %%ecx\n"
-		"jne TryAMD\n\t"
-		"jmp Intel\n\t"
-
-		/* Check for AMD */
-		"\nTryAMD:\n\t"
-		"cmpl $0x68747541, %%ebx\n\t"
-		"jne TryCyrix\n\t"
-		"cmpl $0x69746e65, %%edx\n\t"
-		"jne TryCyrix\n\t"
-		"cmpl $0x444d4163, %%ecx\n"
-		"jne TryCyrix\n\t"
-		"jmp AMD\n\t"
-
-		/* Check for Cyrix */
-		"\nTryCyrix:\n\t"
-		"cmpl $0x69727943, %%ebx\n\t"
-		"jne NotSupported2\n\t"
-		"cmpl $0x736e4978, %%edx\n\t"
-		"jne NotSupported3\n\t"
-		"cmpl $0x64616574, %%ecx\n\t"
-		"jne NotSupported4\n\t"
-		/* Drop through to Cyrix... */
-
-
-		/* Cyrix Section */
-		/* See if extended CPUID level 80000001 is supported */
-		/* The value of CPUID/80000001 for the 6x86MX is undefined
-		   according to the Cyrix CPU Detection Guide (Preliminary
-		   Rev. 1.01 table 1), so we'll check the value of eax for
-		   CPUID/0 to see if standard CPUID level 2 is supported.
-		   According to the table, the only CPU which supports level
-		   2 is also the only one which supports extended CPUID levels.
-		*/
-		"cmpl $0x2, %%eax\n\t"
-		"jne MMXtest\n\t"	/* Use standard CPUID instead */
-
-		/* Extended CPUID supported (in theory), so get extended
-		   features */
-		"movl $0x80000001, %%eax\n\t"
-		"cpuid\n\t"
-		"testl $0x00800000, %%eax\n\t"	/* Test for MMX */
-		"jz NotSupported5\n\t"		/* MMX not supported */
-		"testl $0x01000000, %%eax\n\t"	/* Test for Ext'd MMX */
-		"jnz EMMXSupported\n\t"
-		"movl $1, %0:\n\n\t"		/* MMX Supported */
-		"jmp Return\n\n"
-		"EMMXSupported:\n\t"
-		"movl $3, %0:\n\n\t"		/* EMMX and MMX Supported */
-		"jmp Return\n\t"
-
-
-		/* AMD Section */
-		"AMD:\n\t"
-
-		/* See if extended CPUID is supported */
-		"movl $0x80000000, %%eax\n\t"
-		"cpuid\n\t"
-		"cmpl $0x80000000, %%eax\n\t"
-		"jl MMXtest\n\t"	/* Use standard CPUID instead */
-
-		/* Extended CPUID supported, so get extended features */
-		"movl $0x80000001, %%eax\n\t"
-		"cpuid\n\t"
-		"testl $0x00800000, %%edx\n\t"	/* Test for MMX */
-		"jz NotSupported6\n\t"		/* MMX not supported */
-		"testl $0x80000000, %%edx\n\t"	/* Test for 3DNow! */
-		"jnz ThreeDNowSupported\n\t"
-		"movl $1, %0:\n\n\t"		/* MMX Supported */
-		"jmp Return\n\n"
-		"ThreeDNowSupported:\n\t"
-		"movl $5, %0:\n\n\t"		/* 3DNow! and MMX Supported */
-		"jmp Return\n\t"
-
-
-		/* Intel Section */
-		"Intel:\n\t"
-
-		/* Check for MMX */
-		"MMXtest:\n\t"
-		"movl $1, %%eax\n\t"
-		"cpuid\n\t"
-		"testl $0x00800000, %%edx\n\t"	/* Test for MMX */
-		"jz NotSupported7\n\t"		/* MMX Not supported */
-		"movl $1, %0:\n\n\t"		/* MMX Supported */
-		"jmp Return\n\t"
-
-		/* Nothing supported */
-		"\nNotSupported1:\n\t"
-		"#movl $101, %0:\n\n\t"
-		"\nNotSupported2:\n\t"
-		"#movl $102, %0:\n\n\t"
-		"\nNotSupported3:\n\t"
-		"#movl $103, %0:\n\n\t"
-		"\nNotSupported4:\n\t"
-		"#movl $104, %0:\n\n\t"
-		"\nNotSupported5:\n\t"
-		"#movl $105, %0:\n\n\t"
-		"\nNotSupported6:\n\t"
-		"#movl $106, %0:\n\n\t"
-		"\nNotSupported7:\n\t"
-		"#movl $107, %0:\n\n\t"
-		"movl $0, %0:\n\n\t"
-
-		"Return:\n\t"
-		: "=a" (rval)
-		: /* no input */
-		: "eax", "ebx", "ecx", "edx"
-	);
-
-	/* Return */
-	return(rval);
-}
-
-/*	Function to test if mmx instructions are supported...
-*/
-inline extern int
-mmx_ok(void)
-{
-	/* Returns 1 if MMX instructions are supported, 0 otherwise */
-	return ( mm_support() & 0x1 );
-}
-
-
-/*	Helper functions for the instruction macros that follow...
-	(note that memory-to-register, m2r, instructions are nearly
-	 as efficient as register-to-register, r2r, instructions;
-	 however, memory-to-memory instructions are really simulated
-	 as a convenience, and are only 1/3 as efficient)
-*/
-#ifdef	MMX_TRACE
-
-/*	Include the stuff for printing a trace to stderr...
-*/
-
-#include <stdio.h>
-
-#define	mmx_i2r(op, imm, reg) \
-	{ \
-		mmx_t mmx_trace; \
-		mmx_trace.uq = (imm); \
-		printf(#op "_i2r(" #imm "=0x%08x%08x, ", \
-			mmx_trace.d[1], mmx_trace.d[0]); \
-		__asm__ __volatile__ ("movq %%" #reg ", %0" \
-				      : "=X" (mmx_trace) \
-				      : /* nothing */ ); \
-		printf(#reg "=0x%08x%08x) => ", \
-			mmx_trace.d[1], mmx_trace.d[0]); \
-		__asm__ __volatile__ (#op " %0, %%" #reg \
-				      : /* nothing */ \
-				      : "X" (imm)); \
-		__asm__ __volatile__ ("movq %%" #reg ", %0" \
-				      : "=X" (mmx_trace) \
-				      : /* nothing */ ); \
-		printf(#reg "=0x%08x%08x\n", \
-			mmx_trace.d[1], mmx_trace.d[0]); \
-	}
-
-#define	mmx_m2r(op, mem, reg) \
-	{ \
-		mmx_t mmx_trace; \
-		mmx_trace = (mem); \
-		printf(#op "_m2r(" #mem "=0x%08x%08x, ", \
-			mmx_trace.d[1], mmx_trace.d[0]); \
-		__asm__ __volatile__ ("movq %%" #reg ", %0" \
-				      : "=X" (mmx_trace) \
-				      : /* nothing */ ); \
-		printf(#reg "=0x%08x%08x) => ", \
-			mmx_trace.d[1], mmx_trace.d[0]); \
-		__asm__ __volatile__ (#op " %0, %%" #reg \
-				      : /* nothing */ \
-				      : "X" (mem)); \
-		__asm__ __volatile__ ("movq %%" #reg ", %0" \
-				      : "=X" (mmx_trace) \
-				      : /* nothing */ ); \
-		printf(#reg "=0x%08x%08x\n", \
-			mmx_trace.d[1], mmx_trace.d[0]); \
-	}
-
-#define	mmx_r2m(op, reg, mem) \
-	{ \
-		mmx_t mmx_trace; \
-		__asm__ __volatile__ ("movq %%" #reg ", %0" \
-				      : "=X" (mmx_trace) \
-				      : /* nothing */ ); \
-		printf(#op "_r2m(" #reg "=0x%08x%08x, ", \
-			mmx_trace.d[1], mmx_trace.d[0]); \
-		mmx_trace = (mem); \
-		printf(#mem "=0x%08x%08x) => ", \
-			mmx_trace.d[1], mmx_trace.d[0]); \
-		__asm__ __volatile__ (#op " %%" #reg ", %0" \
-				      : "=X" (mem) \
-				      : /* nothing */ ); \
-		mmx_trace = (mem); \
-		printf(#mem "=0x%08x%08x\n", \
-			mmx_trace.d[1], mmx_trace.d[0]); \
-	}
-
-#define	mmx_r2r(op, regs, regd) \
-	{ \
-		mmx_t mmx_trace; \
-		__asm__ __volatile__ ("movq %%" #regs ", %0" \
-				      : "=X" (mmx_trace) \
-				      : /* nothing */ ); \
-		printf(#op "_r2r(" #regs "=0x%08x%08x, ", \
-			mmx_trace.d[1], mmx_trace.d[0]); \
-		__asm__ __volatile__ ("movq %%" #regd ", %0" \
-				      : "=X" (mmx_trace) \
-				      : /* nothing */ ); \
-		printf(#regd "=0x%08x%08x) => ", \
-			mmx_trace.d[1], mmx_trace.d[0]); \
-		__asm__ __volatile__ (#op " %" #regs ", %" #regd); \
-		__asm__ __volatile__ ("movq %%" #regd ", %0" \
-				      : "=X" (mmx_trace) \
-				      : /* nothing */ ); \
-		printf(#regd "=0x%08x%08x\n", \
-			mmx_trace.d[1], mmx_trace.d[0]); \
-	}
-
-#define	mmx_m2m(op, mems, memd) \
-	{ \
-		mmx_t mmx_trace; \
-		mmx_trace = (mems); \
-		printf(#op "_m2m(" #mems "=0x%08x%08x, ", \
-			mmx_trace.d[1], mmx_trace.d[0]); \
-		mmx_trace = (memd); \
-		printf(#memd "=0x%08x%08x) => ", \
-			mmx_trace.d[1], mmx_trace.d[0]); \
-		__asm__ __volatile__ ("movq %0, %%mm0\n\t" \
-				      #op " %1, %%mm0\n\t" \
-				      "movq %%mm0, %0" \
-				      : "=X" (memd) \
-				      : "X" (mems)); \
-		mmx_trace = (memd); \
-		printf(#memd "=0x%08x%08x\n", \
-			mmx_trace.d[1], mmx_trace.d[0]); \
-	}
-
-#else
-
-/*	These macros are a lot simpler without the tracing...
-*/
-
-#define	mmx_i2r(op, imm, reg) \
-	__asm__ __volatile__ (#op " %0, %%" #reg \
-			      : /* nothing */ \
-			      : "X" (imm) )
-
-#define	mmx_m2r(op, mem, reg) \
-	__asm__ __volatile__ (#op " %0, %%" #reg \
-			      : /* nothing */ \
-			      : "X" (mem))
-
-#define	mmx_r2m(op, reg, mem) \
-	__asm__ __volatile__ (#op " %%" #reg ", %0" \
-			      : "=X" (mem) \
-			      : /* nothing */ )
-
-#define	mmx_r2r(op, regs, regd) \
-	__asm__ __volatile__ (#op " %" #regs ", %" #regd)
-
-#define	mmx_m2m(op, mems, memd) \
-	__asm__ __volatile__ ("movq %0, %%mm0\n\t" \
-			      #op " %1, %%mm0\n\t" \
-			      "movq %%mm0, %0" \
-			      : "=X" (memd) \
-			      : "X" (mems))
-
-#endif
-
-
-/*	1x64 MOVe Quadword
-	(this is both a load and a store...
-	 in fact, it is the only way to store)
-*/
-#define	movq_m2r(var, reg)	mmx_m2r(movq, var, reg)
-#define	movq_r2m(reg, var)	mmx_r2m(movq, reg, var)
-#define	movq_r2r(regs, regd)	mmx_r2r(movq, regs, regd)
-#define	movq(vars, vard) \
-	__asm__ __volatile__ ("movq %1, %%mm0\n\t" \
-			      "movq %%mm0, %0" \
-			      : "=X" (vard) \
-			      : "X" (vars))
-
-
-/*	1x32 MOVe Doubleword
-	(like movq, this is both load and store...
-	 but is most useful for moving things between
-	 mmx registers and ordinary registers)
-*/
-#define	movd_m2r(var, reg)	mmx_m2r(movd, var, reg)
-#define	movd_r2m(reg, var)	mmx_r2m(movd, reg, var)
-#define	movd_r2r(regs, regd)	mmx_r2r(movd, regs, regd)
-#define	movd(vars, vard) \
-	__asm__ __volatile__ ("movd %1, %%mm0\n\t" \
-			      "movd %%mm0, %0" \
-			      : "=X" (vard) \
-			      : "X" (vars))
-
-
-/*	2x32, 4x16, and 8x8 Parallel ADDs
-*/
-#define	paddd_m2r(var, reg)	mmx_m2r(paddd, var, reg)
-#define	paddd_r2r(regs, regd)	mmx_r2r(paddd, regs, regd)
-#define	paddd(vars, vard)	mmx_m2m(paddd, vars, vard)
-
-#define	paddw_m2r(var, reg)	mmx_m2r(paddw, var, reg)
-#define	paddw_r2r(regs, regd)	mmx_r2r(paddw, regs, regd)
-#define	paddw(vars, vard)	mmx_m2m(paddw, vars, vard)
-
-#define	paddb_m2r(var, reg)	mmx_m2r(paddb, var, reg)
-#define	paddb_r2r(regs, regd)	mmx_r2r(paddb, regs, regd)
-#define	paddb(vars, vard)	mmx_m2m(paddb, vars, vard)
-
-
-/*	4x16 and 8x8 Parallel ADDs using Saturation arithmetic
-*/
-#define	paddsw_m2r(var, reg)	mmx_m2r(paddsw, var, reg)
-#define	paddsw_r2r(regs, regd)	mmx_r2r(paddsw, regs, regd)
-#define	paddsw(vars, vard)	mmx_m2m(paddsw, vars, vard)
-
-#define	paddsb_m2r(var, reg)	mmx_m2r(paddsb, var, reg)
-#define	paddsb_r2r(regs, regd)	mmx_r2r(paddsb, regs, regd)
-#define	paddsb(vars, vard)	mmx_m2m(paddsb, vars, vard)
-
-
-/*	4x16 and 8x8 Parallel ADDs using Unsigned Saturation arithmetic
-*/
-#define	paddusw_m2r(var, reg)	mmx_m2r(paddusw, var, reg)
-#define	paddusw_r2r(regs, regd)	mmx_r2r(paddusw, regs, regd)
-#define	paddusw(vars, vard)	mmx_m2m(paddusw, vars, vard)
-
-#define	paddusb_m2r(var, reg)	mmx_m2r(paddusb, var, reg)
-#define	paddusb_r2r(regs, regd)	mmx_r2r(paddusb, regs, regd)
-#define	paddusb(vars, vard)	mmx_m2m(paddusb, vars, vard)
-
-
-/*	2x32, 4x16, and 8x8 Parallel SUBs
-*/
-#define	psubd_m2r(var, reg)	mmx_m2r(psubd, var, reg)
-#define	psubd_r2r(regs, regd)	mmx_r2r(psubd, regs, regd)
-#define	psubd(vars, vard)	mmx_m2m(psubd, vars, vard)
-
-#define	psubw_m2r(var, reg)	mmx_m2r(psubw, var, reg)
-#define	psubw_r2r(regs, regd)	mmx_r2r(psubw, regs, regd)
-#define	psubw(vars, vard)	mmx_m2m(psubw, vars, vard)
-
-#define	psubb_m2r(var, reg)	mmx_m2r(psubb, var, reg)
-#define	psubb_r2r(regs, regd)	mmx_r2r(psubb, regs, regd)
-#define	psubb(vars, vard)	mmx_m2m(psubb, vars, vard)
-
-
-/*	4x16 and 8x8 Parallel SUBs using Saturation arithmetic
-*/
-#define	psubsw_m2r(var, reg)	mmx_m2r(psubsw, var, reg)
-#define	psubsw_r2r(regs, regd)	mmx_r2r(psubsw, regs, regd)
-#define	psubsw(vars, vard)	mmx_m2m(psubsw, vars, vard)
-
-#define	psubsb_m2r(var, reg)	mmx_m2r(psubsb, var, reg)
-#define	psubsb_r2r(regs, regd)	mmx_r2r(psubsb, regs, regd)
-#define	psubsb(vars, vard)	mmx_m2m(psubsb, vars, vard)
-
-
-/*	4x16 and 8x8 Parallel SUBs using Unsigned Saturation arithmetic
-*/
-#define	psubusw_m2r(var, reg)	mmx_m2r(psubusw, var, reg)
-#define	psubusw_r2r(regs, regd)	mmx_r2r(psubusw, regs, regd)
-#define	psubusw(vars, vard)	mmx_m2m(psubusw, vars, vard)
-
-#define	psubusb_m2r(var, reg)	mmx_m2r(psubusb, var, reg)
-#define	psubusb_r2r(regs, regd)	mmx_r2r(psubusb, regs, regd)
-#define	psubusb(vars, vard)	mmx_m2m(psubusb, vars, vard)
-
-
-/*	4x16 Parallel MULs giving Low 4x16 portions of results
-*/
-#define	pmullw_m2r(var, reg)	mmx_m2r(pmullw, var, reg)
-#define	pmullw_r2r(regs, regd)	mmx_r2r(pmullw, regs, regd)
-#define	pmullw(vars, vard)	mmx_m2m(pmullw, vars, vard)
-
-
-/*	4x16 Parallel MULs giving High 4x16 portions of results
-*/
-#define	pmulhw_m2r(var, reg)	mmx_m2r(pmulhw, var, reg)
-#define	pmulhw_r2r(regs, regd)	mmx_r2r(pmulhw, regs, regd)
-#define	pmulhw(vars, vard)	mmx_m2m(pmulhw, vars, vard)
-
-
-/*	4x16->2x32 Parallel Mul-ADD
-	(muls like pmullw, then adds adjacent 16-bit fields
-	 in the multiply result to make the final 2x32 result)
-*/
-#define	pmaddwd_m2r(var, reg)	mmx_m2r(pmaddwd, var, reg)
-#define	pmaddwd_r2r(regs, regd)	mmx_r2r(pmaddwd, regs, regd)
-#define	pmaddwd(vars, vard)	mmx_m2m(pmaddwd, vars, vard)
-
-
-/*	1x64 bitwise AND
-*/
-#ifdef	BROKEN_PAND
-#define	pand_m2r(var, reg) \
-	{ \
-		mmx_m2r(pandn, (mmx_t) -1LL, reg); \
-		mmx_m2r(pandn, var, reg); \
-	}
-#define	pand_r2r(regs, regd) \
-	{ \
-		mmx_m2r(pandn, (mmx_t) -1LL, regd); \
-		mmx_r2r(pandn, regs, regd) \
-	}
-#define	pand(vars, vard) \
-	{ \
-		movq_m2r(vard, mm0); \
-		mmx_m2r(pandn, (mmx_t) -1LL, mm0); \
-		mmx_m2r(pandn, vars, mm0); \
-		movq_r2m(mm0, vard); \
-	}
-#else
-#define	pand_m2r(var, reg)	mmx_m2r(pand, var, reg)
-#define	pand_r2r(regs, regd)	mmx_r2r(pand, regs, regd)
-#define	pand(vars, vard)	mmx_m2m(pand, vars, vard)
-#endif
-
-
-/*	1x64 bitwise AND with Not the destination
-*/
-#define	pandn_m2r(var, reg)	mmx_m2r(pandn, var, reg)
-#define	pandn_r2r(regs, regd)	mmx_r2r(pandn, regs, regd)
-#define	pandn(vars, vard)	mmx_m2m(pandn, vars, vard)
-
-
-/*	1x64 bitwise OR
-*/
-#define	por_m2r(var, reg)	mmx_m2r(por, var, reg)
-#define	por_r2r(regs, regd)	mmx_r2r(por, regs, regd)
-#define	por(vars, vard)	mmx_m2m(por, vars, vard)
-
-
-/*	1x64 bitwise eXclusive OR
-*/
-#define	pxor_m2r(var, reg)	mmx_m2r(pxor, var, reg)
-#define	pxor_r2r(regs, regd)	mmx_r2r(pxor, regs, regd)
-#define	pxor(vars, vard)	mmx_m2m(pxor, vars, vard)
-
-
-/*	2x32, 4x16, and 8x8 Parallel CoMPare for EQuality
-	(resulting fields are either 0 or -1)
-*/
-#define	pcmpeqd_m2r(var, reg)	mmx_m2r(pcmpeqd, var, reg)
-#define	pcmpeqd_r2r(regs, regd)	mmx_r2r(pcmpeqd, regs, regd)
-#define	pcmpeqd(vars, vard)	mmx_m2m(pcmpeqd, vars, vard)
-
-#define	pcmpeqw_m2r(var, reg)	mmx_m2r(pcmpeqw, var, reg)
-#define	pcmpeqw_r2r(regs, regd)	mmx_r2r(pcmpeqw, regs, regd)
-#define	pcmpeqw(vars, vard)	mmx_m2m(pcmpeqw, vars, vard)
-
-#define	pcmpeqb_m2r(var, reg)	mmx_m2r(pcmpeqb, var, reg)
-#define	pcmpeqb_r2r(regs, regd)	mmx_r2r(pcmpeqb, regs, regd)
-#define	pcmpeqb(vars, vard)	mmx_m2m(pcmpeqb, vars, vard)
-
-
-/*	2x32, 4x16, and 8x8 Parallel CoMPare for Greater Than
-	(resulting fields are either 0 or -1)
-*/
-#define	pcmpgtd_m2r(var, reg)	mmx_m2r(pcmpgtd, var, reg)
-#define	pcmpgtd_r2r(regs, regd)	mmx_r2r(pcmpgtd, regs, regd)
-#define	pcmpgtd(vars, vard)	mmx_m2m(pcmpgtd, vars, vard)
-
-#define	pcmpgtw_m2r(var, reg)	mmx_m2r(pcmpgtw, var, reg)
-#define	pcmpgtw_r2r(regs, regd)	mmx_r2r(pcmpgtw, regs, regd)
-#define	pcmpgtw(vars, vard)	mmx_m2m(pcmpgtw, vars, vard)
-
-#define	pcmpgtb_m2r(var, reg)	mmx_m2r(pcmpgtb, var, reg)
-#define	pcmpgtb_r2r(regs, regd)	mmx_r2r(pcmpgtb, regs, regd)
-#define	pcmpgtb(vars, vard)	mmx_m2m(pcmpgtb, vars, vard)
-
-
-/*	1x64, 2x32, and 4x16 Parallel Shift Left Logical
-*/
-#define	psllq_i2r(imm, reg)	mmx_i2r(psllq, imm, reg)
-#define	psllq_m2r(var, reg)	mmx_m2r(psllq, var, reg)
-#define	psllq_r2r(regs, regd)	mmx_r2r(psllq, regs, regd)
-#define	psllq(vars, vard)	mmx_m2m(psllq, vars, vard)
-
-#define	pslld_i2r(imm, reg)	mmx_i2r(pslld, imm, reg)
-#define	pslld_m2r(var, reg)	mmx_m2r(pslld, var, reg)
-#define	pslld_r2r(regs, regd)	mmx_r2r(pslld, regs, regd)
-#define	pslld(vars, vard)	mmx_m2m(pslld, vars, vard)
-
-#define	psllw_i2r(imm, reg)	mmx_i2r(psllw, imm, reg)
-#define	psllw_m2r(var, reg)	mmx_m2r(psllw, var, reg)
-#define	psllw_r2r(regs, regd)	mmx_r2r(psllw, regs, regd)
-#define	psllw(vars, vard)	mmx_m2m(psllw, vars, vard)
-
-
-/*	1x64, 2x32, and 4x16 Parallel Shift Right Logical
-*/
-#define	psrlq_i2r(imm, reg)	mmx_i2r(psrlq, imm, reg)
-#define	psrlq_m2r(var, reg)	mmx_m2r(psrlq, var, reg)
-#define	psrlq_r2r(regs, regd)	mmx_r2r(psrlq, regs, regd)
-#define	psrlq(vars, vard)	mmx_m2m(psrlq, vars, vard)
-
-#define	psrld_i2r(imm, reg)	mmx_i2r(psrld, imm, reg)
-#define	psrld_m2r(var, reg)	mmx_m2r(psrld, var, reg)
-#define	psrld_r2r(regs, regd)	mmx_r2r(psrld, regs, regd)
-#define	psrld(vars, vard)	mmx_m2m(psrld, vars, vard)
-
-#define	psrlw_i2r(imm, reg)	mmx_i2r(psrlw, imm, reg)
-#define	psrlw_m2r(var, reg)	mmx_m2r(psrlw, var, reg)
-#define	psrlw_r2r(regs, regd)	mmx_r2r(psrlw, regs, regd)
-#define	psrlw(vars, vard)	mmx_m2m(psrlw, vars, vard)
-
-
-/*	2x32 and 4x16 Parallel Shift Right Arithmetic
-*/
-#define	psrad_i2r(imm, reg)	mmx_i2r(psrad, imm, reg)
-#define	psrad_m2r(var, reg)	mmx_m2r(psrad, var, reg)
-#define	psrad_r2r(regs, regd)	mmx_r2r(psrad, regs, regd)
-#define	psrad(vars, vard)	mmx_m2m(psrad, vars, vard)
-
-#define	psraw_i2r(imm, reg)	mmx_i2r(psraw, imm, reg)
-#define	psraw_m2r(var, reg)	mmx_m2r(psraw, var, reg)
-#define	psraw_r2r(regs, regd)	mmx_r2r(psraw, regs, regd)
-#define	psraw(vars, vard)	mmx_m2m(psraw, vars, vard)
-
-
-/*	2x32->4x16 and 4x16->8x8 PACK and Signed Saturate
-	(packs source and dest fields into dest in that order)
-*/
-#define	packssdw_m2r(var, reg)	mmx_m2r(packssdw, var, reg)
-#define	packssdw_r2r(regs, regd) mmx_r2r(packssdw, regs, regd)
-#define	packssdw(vars, vard)	mmx_m2m(packssdw, vars, vard)
-
-#define	packsswb_m2r(var, reg)	mmx_m2r(packsswb, var, reg)
-#define	packsswb_r2r(regs, regd) mmx_r2r(packsswb, regs, regd)
-#define	packsswb(vars, vard)	mmx_m2m(packsswb, vars, vard)
-
-
-/*	4x16->8x8 PACK and Unsigned Saturate
-	(packs source and dest fields into dest in that order)
-*/
-#define	packuswb_m2r(var, reg)	mmx_m2r(packuswb, var, reg)
-#define	packuswb_r2r(regs, regd) mmx_r2r(packuswb, regs, regd)
-#define	packuswb(vars, vard)	mmx_m2m(packuswb, vars, vard)
-
-
-/*	2x32->1x64, 4x16->2x32, and 8x8->4x16 UNPaCK Low
-	(interleaves low half of dest with low half of source
-	 as padding in each result field)
-*/
-#define	punpckldq_m2r(var, reg)	mmx_m2r(punpckldq, var, reg)
-#define	punpckldq_r2r(regs, regd) mmx_r2r(punpckldq, regs, regd)
-#define	punpckldq(vars, vard)	mmx_m2m(punpckldq, vars, vard)
-
-#define	punpcklwd_m2r(var, reg)	mmx_m2r(punpcklwd, var, reg)
-#define	punpcklwd_r2r(regs, regd) mmx_r2r(punpcklwd, regs, regd)
-#define	punpcklwd(vars, vard)	mmx_m2m(punpcklwd, vars, vard)
-
-#define	punpcklbw_m2r(var, reg)	mmx_m2r(punpcklbw, var, reg)
-#define	punpcklbw_r2r(regs, regd) mmx_r2r(punpcklbw, regs, regd)
-#define	punpcklbw(vars, vard)	mmx_m2m(punpcklbw, vars, vard)
-
-
-/*	2x32->1x64, 4x16->2x32, and 8x8->4x16 UNPaCK High
-	(interleaves high half of dest with high half of source
-	 as padding in each result field)
-*/
-#define	punpckhdq_m2r(var, reg)	mmx_m2r(punpckhdq, var, reg)
-#define	punpckhdq_r2r(regs, regd) mmx_r2r(punpckhdq, regs, regd)
-#define	punpckhdq(vars, vard)	mmx_m2m(punpckhdq, vars, vard)
-
-#define	punpckhwd_m2r(var, reg)	mmx_m2r(punpckhwd, var, reg)
-#define	punpckhwd_r2r(regs, regd) mmx_r2r(punpckhwd, regs, regd)
-#define	punpckhwd(vars, vard)	mmx_m2m(punpckhwd, vars, vard)
-
-#define	punpckhbw_m2r(var, reg)	mmx_m2r(punpckhbw, var, reg)
-#define	punpckhbw_r2r(regs, regd) mmx_r2r(punpckhbw, regs, regd)
-#define	punpckhbw(vars, vard)	mmx_m2m(punpckhbw, vars, vard)
-
-
-/*	Empty MMx State
-	(used to clean-up when going from mmx to float use
-	 of the registers that are shared by both; note that
-	 there is no float-to-mmx operation needed, because
-	 only the float tag word info is corruptible)
-*/
-#ifdef	MMX_TRACE
-
-#define	emms() \
-	{ \
-		printf("emms()\n"); \
-		__asm__ __volatile__ ("emms"); \
-	}
-
-#else
-
-#define	emms()			__asm__ __volatile__ ("emms")
-
-#endif
-
-#endif
-

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreImage/src/ADM_interlaceUtil.cpp Deleted

@@ -1,225 +0,0 @@
-/***************************************************************************
-                          ADM_interlaced.cpp  -  description
-                             -------------------
-
-	This piece of code count how many interlaced part we detected in the frame
-	The method is from smartdeinterlacer
-	Works only on luma (as chroma is 2:2 downsampled)
-
-    begin                : Wed Dec 18 2002
-    copyright            : (C) 2002 by mean
-    email                : fixounet@free.fr
-
-Benchmark:
-		ASM 3-version 	: 20 ms
-		C Version 		: 25 ms
-Skip factor=2
-
-		ASM 3-version 	: 7 ms
-		C Version 		: 8 ms
-
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "ADM_default.h"
-
-//#include "ADM_editor/ADM_edit.hxx"
-#include "ADM_videoFilter.h"
-
-//#define MMX_TRACE
-#warning remove mmxmacro and debug asm
-//#define ASM_ILACING
-
-
-#include "ADM_mmxMacros.h"
-
-
-
-
-#define SKIP_FACTOR 2   // 2^SKIPFACTOR=SKIP_LINEAR+1
-#define SKIP_LINEAR   3
-
- #define MATCH_THRESH (60*60)
- #define QMATCH_THRESH ((uint64_t)(MATCH_THRESH>>2))
-
-
-/*
-	This macro compute the number of pixel where c-p * c-n > threshold and add the result to mm7
-	There will be an overflow if more than 50 % of the video is like that but we can safely assume
-		that would be rare
-
-		mm0 contains 4 bytes of c
-		mm1 contains 4 bytes of p
-		mm2 contains 4 bytes of n
-*/
-
-#if defined(ADM_CPU_X86) && defined(ASM_ILACING)
-
-static uint32_t      ADMVideo_interlaceCount_MMX( uint8_t *src ,uint32_t w, uint32_t h);
-static uint8_t * FUNNY_MANGLE(_l_p)  =NULL;
-static uint8_t * FUNNY_MANGLE(_l_c) =NULL;
-static uint8_t * FUNNY_MANGLE(_l_n) =NULL;
-
-static int64_t FUNNY_MANGLE(_l_h)
-
-static mmx_t _lthresh,_added,_lwrd;
-static mmx_t  FUNNY_MANGLE(_total) ;
-static mmx_t _l255;
-static mmx_t _l0;
-
-#define COMPUTE \
-punpcklbw_r2r(mm5,mm0);  /*c  expand 4 bytes -> 4 word */ \
-punpcklbw_r2r(mm5,mm1);  /*p*/ \
-punpcklbw_r2r(mm5,mm2); /* n*/ \
-movq_r2r(mm0,mm3);		/* mm3 also c*/ \
-psubw_r2r(mm1,mm0) ; /* mm0=mm0-mm1 =  c-p*/ \
-psubw_r2r(mm2,mm3) ; /* mm3=mm3-mm2 =  c-n*/ \
-psraw_i2r(1,mm0); /* to protect from overflow*/ \
-psraw_i2r(1,mm3);\
-pmullw_r2r(mm0,mm3); /* mm3=(c-p)*(c-n) / 4;*/ \
-pcmpgtw_r2r(mm4,mm3); /* keep only > size*/ \
-psrlw_i2r(15,mm3); 	/* keep only one bit*/ \
-pmaddwd_r2r(mm3,mm3);\
-movq_r2r(mm3,mm0);\
-psrlq_i2r(32,mm0);\
-paddw_r2r(mm3,mm0); /* we got the total of match in mm0*/ \
-pand_r2r(mm6,mm0); /* and we keep the last word*/ \
-paddd_r2r(mm0,mm7);
-
-
-#endif
-static uint32_t      ADMVideo_interlaceCount_C( uint8_t *src ,uint32_t w, uint32_t h);
-/*
-	Returns the # of interlacing effects on 1/4 of the image
-*/
-
-uint32_t      ADMVideo_interlaceCount( uint8_t *src ,uint32_t w, uint32_t h)
-{
-#if defined(ADM_CPU_X86) && defined(ASM_ILACING)  
-        if(CpuCaps::hasMMX())
-                return ADMVideo_interlaceCount_MMX(src,w,h);
-        else
-#endif
-        return ADMVideo_interlaceCount_C(src,w,h);
-
-}
-
-#if defined(ADM_CPU_X86) && defined(ASM_ILACING)  
-uint32_t      ADMVideo_interlaceCount_MMX( uint8_t *src ,uint32_t w, uint32_t h)
-{
-uint32_t m=0,y,x;
-
-_total.uq=0LL;
-//_l255.uq=0xffffffffffffffffLL;
-//_l0.uq=0LL;
-_lwrd.uq=0xffffLL;
-uint32_t stride=w*SKIP_LINEAR;
-	_l_p=src;
-	_l_c=src+w;
-	_l_n=src+w+w;
-	_l_h=w;
-	_lthresh.uq=QMATCH_THRESH+(QMATCH_THRESH<<16)+
-				(QMATCH_THRESH<<32)+(QMATCH_THRESH<<48);
-
-movq_m2r(_lwrd,mm6);
-movq_m2r(_lthresh,mm4);
-pxor_r2r(mm5,mm5);
-pxor_r2r(mm7,mm7);
-
-	for(y=h>>SKIP_FACTOR;  y >2 ; y--)
-		{
-			__asm__ __volatile__(
-                                "push "REG_bx"\n\t"
-				"mov "Mangle(_l_c)",	"REG_ax"\n\t"
-				"mov "Mangle(_l_p)",	"REG_bx"\n\t"
-				"mov "Mangle(_l_n)",	"REG_cx"\n\t"
-				"mov "Mangle(_l_h)",	"REG_dx"\n\t"
-				"8: \n\t"
-				"movd ("REG_ax"),	%%mm0\n\t"
-				"movd ("REG_bx"),	%%mm1\n\t"
-				"movd ("REG_cx"),	%%mm2\n\t"
-				:
-				:
-				: "eax",  "ecx", "edx"
-				);
-				COMPUTE
-
-			__asm__ __volatile__(
-				"add $4,		"REG_ax"\n\t"
-				"add $4	,	"REG_bx"\n\t"
-				"add $4,		"REG_cx"\n\t"
-				"sub $1,		"REG_dx"\n\t"
-				"jnz 		8b\n\t"
-                                "pop "REG_bx"\n\t"
-				:
-				:
-				: "eax", "ecx", "edx"
-				);
-
-
-				_l_p+=(1+SKIP_LINEAR)*w;
-				_l_c+=(1+SKIP_LINEAR)*w;
-				_l_n+=(1+SKIP_LINEAR)*w;
-
-
-		}
-		// retrieve mm7 containg the total
-
-		__asm__ __volatile__(
-		"mov 	$"Mangle(_total)",		"REG_ax"\n\t"
-		"movd 	%%mm7,	("REG_ax")\n\t"
-		"emms\n\t"
-		:
-		:
-		: "eax"
-		);
-		m=(uint32_t)_total.uw[0];
-
-                 return m;
-}
-#endif
-// C version
-uint32_t      ADMVideo_interlaceCount_C( uint8_t *src ,uint32_t w, uint32_t h)
-{
-uint32_t m=0,y,x;
-
-			uint8_t *p,*n,*c;
-			int j;
-			c=src + w;
-			n=src + w+w;
-			p=src ;
-
-
-			for(y=h>>SKIP_FACTOR;  y >2 ; y--)
-					{
-           				for(x=w;x>0;x--)
-								{
-								j=(int)*p-(int)*c;
-								j*=(int)*n-(int)*c;
-							//	printf("p %d c %d  n %d j %d\n",*p,*c,*n , j);
-                             					if(  j >MATCH_THRESH)
-								{
-								m++;
-							//	*c=*p=*n=0xff;
-								}
-
-										p++;c++;n++;
-								}
-								p+=(SKIP_LINEAR)*w;
-								c+=(SKIP_LINEAR)*w;
-								n+=(SKIP_LINEAR)*w;
-
-					}
-
-                 return m;
-}
-
-

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreImage/src/ADM_vidFieldASM.cpp Deleted

@@ -1,219 +0,0 @@
-/***************************************************************************
-                          ADM_vidDeintASM.cpp  -  description
-                             -------------------
-    begin                : Tue Jan 7 2003
-    copyright            : (C) 2003 by mean
-    email                : fixounet@free.fr
-
-    Slighlty faster ASM deinterlace
-    Blend later	
-
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "ADM_default.h"
-
-#include "ADM_videoFilter.h"
-
-#include"ADM_vidField.h"
-
-#ifdef ADM_CPU_X86
-//	#define DEBUG_DEINT 1
-//	#define MMX_TRACE 1
-	#include "ADM_mmxMacros.h"
-
- void myDeintASM(void);
-
- static int32_t _l_w,_l_h,FUNNY_MANGLE(_l_all);
- static uint8_t * FUNNY_MANGLE(_l_p) , * FUNNY_MANGLE(_l_c) ,* FUNNY_MANGLE(_l_n);
- static uint8_t * FUNNY_MANGLE(_l_e) , * FUNNY_MANGLE(_l_e2);
-#define EXPAND(x) (x)+((x)<<16)+((x)<<32) +((x)<<48)
-static mmx_t _mmTHRESH1;
-static mmx_t _mmTHRESH2;
-
-#define COMPUTE_MMX \
-punpcklbw_r2r(mm5,mm0);  /*c  expand 4 bytes -> 4 word */ \
-punpcklbw_r2r(mm5,mm1);  /*p*/ \
-punpcklbw_r2r(mm5,mm2); /* n*/ \
-movq_r2r(mm0,mm3);		/* mm3 also c*/ \
-psubw_r2r(mm1,mm0) ; /* mm0=mm0-mm1 =  c-p*/ \
-psubw_r2r(mm2,mm3) ; /* mm3=mm3-mm2 =  c-n*/ \
-psraw_i2r(1,mm0); /* to protect from overflow*/ \
-psraw_i2r(1,mm3);\
-pmullw_r2r(mm0,mm3); /* mm3=(c-p)*(c-n) / 4;*/ \
-movq_r2r(mm3,mm0) ; /* mm0 also c-p*c-n */ \
-pcmpgtw_r2r(mm4,mm3); /* keep only > size*/ \
-pcmpgtw_r2r(mm6,mm0); /* keep only > size*/ \
-packsswb_r2r(mm5,mm0); \
-packsswb_r2r(mm5,mm3);
-
-#endif
-
-void ADMVideoFields::hasMotion_C(uint8_t *p,uint8_t *c,
-								uint8_t *n,
-								uint8_t *e,
-								uint8_t *e2
-								)
-{
-int32_t val,x,y;
-//printf("\nC \n");
-// other line
-       	for(y=_info.height-2;y>0;y--)
-        	{
-               for(x=_info.width;x>0;x--)
-               		{
-                   		val= (*p-*c)*(*n-*c);
-                        if(val>(int32_t)(_param->motion_trigger*_param->motion_trigger))
-                        	{
-                          	*e=0xff;
-                         }
-                         if(val>(int32_t)(_param->blend_trigger*_param->blend_trigger))
-                         	*e2=0xff;
-                         p++;c++;n++;e++;e2++;
-                      }
-           }
-}
-#ifdef ADM_CPU_X86
-void ADMVideoFields::hasMotion_MMX(uint8_t *p,uint8_t *c,
-									uint8_t *n,
-									uint8_t *e,
-									uint8_t *e2
-									)
-{
-
-
-			 	_mmTHRESH1.uq=EXPAND((uint64_t ) ((_param->motion_trigger*_param->motion_trigger)>>2) );
-				_mmTHRESH2.uq=EXPAND((uint64_t ) ((_param->blend_trigger*_param->blend_trigger)>>2) );
-
-			_l_h=_info.height-2;
-			_l_w=_info.width>>2;
-			_l_all=_l_h*_l_w;
-			_l_p=p;
-			_l_c=c;
-			_l_n=n;
-			_l_e=e;
-			_l_e2=e2;
-//			printf("\n MMX \n");
-
-			pxor_r2r(mm5,mm5);
-			movq_m2r(_mmTHRESH1,mm4);
-			movq_m2r(_mmTHRESH2,mm6);
-			myDeintASM();
-}
-#if !defined(DEBUG_DEINT)
-void myDeintASM(void)
-{
-                    __asm__ __volatile__ (
-                            "push "REG_bx"\n\t" // Dont clobber ebx for macOsX
-                            "mov "Mangle(_l_c)",	"REG_ax"\n\t"
-                            "mov "Mangle(_l_p)",	"REG_bx"\n\t"
-                            "mov "Mangle(_l_n)",	"REG_cx"\n\t"
-                            "mov "Mangle(_l_all)",	"REG_si"\n\t"
-                            "7:"
-                            "movd ("REG_ax"),	%%mm0\n\t"
-                            "movd ("REG_bx"),	%%mm1\n\t"
-                            "movd ("REG_cx"),	%%mm2\n\t"
-                            :
-                            :
-                            : "eax","ecx","edx","esi" 
-                            );
-
-                            COMPUTE_MMX; // Doint it like that should be safe as there should be no extra code inserted (...)
-
-                            /* store result in e, e2 */
-
-                    __asm__ __volatile__(
-                            "mov 	"Mangle(_l_e)",	"REG_dx"\n\t"
-                            "movd	%%mm3,("REG_dx")\n\t"
-
-                            "mov 	"Mangle(_l_e2)",	"REG_dx"\n\t"
-                            "movd	%%mm0,("REG_dx")\n\t"
-
-                            "add 	$4,	"REG_ax"\n\t"
-                            "add 	$4,	"REG_bx"\n\t"
-                            "add 	$4,	"REG_cx"\n\t"
-                            "add 	$4,	"Mangle(_l_e)"\n\t"
-                            "add 	$4,	"Mangle(_l_e2)"\n\t"
-                            "sub 	$1,	"REG_si"\n\t"
-                            "jnz 7b\n\t"
-                            "pop "REG_bx"\n\t" // Dont clobber ebx for macOsX
-                            :
-                            :
-                            : "eax", "ecx","edx","esi"
-                            );
-	   emms();
-
-}
-#else
-/*************************************************
-***************DEBUG*************************
-**************************************************
-**************************************************/
-
-
-void myDeintASM(void)
-{
-
-int32_t x,y;
-	printf("\n using  MMX debug\n");
-
-       	for(y=_l_h;y>0;y--)
-        	{
-		for(x=_l_w;x>0;x--)
-               		{
-
-			__asm__ __volatile__ (
-				"mov _l_c,	"REG_ax"\n\t"
-				"mov _l_p,	"REG_bx"\n\t"
-				"mov _l_n,	"REG_cx"\n\t"
-				"mov _l_w,	"REG_si"\n\t"
-				"movd ("REG_ax"),	%%mm0\n\t"
-				"movd ("REG_bx"),	%%mm1\n\t"
-				"movd ("REG_cx"),	%%mm2\n\t"
-				:
-				:
-				: "eax", "ebx", "ecx", "edx","esi"
-				);
-			emms();
-				COMPUTE_MMX;
-			emms();
-				/* store result in e, e2 */
-
-			__asm__ __volatile__(
-				"mov 	_l_e,	"REG_dx"\n\t"
-				"movd	%%mm3,("REG_dx")\n\t"
-				//"movd	%%mm3,(%%eax)\n\t"
-
-				"mov 	_l_e2,	"REG_dx"\n\t"
-				"movd	%%mm0,("REG_dx")\n\t"
-
-				:
-				:
-				: "eax","edx","esi"
-				);
-
-			emms();
-
-
-			 _l_e+=4;
-			 _l_e2+=4;
-			 _l_c+=4;
-			 _l_p+=4;
-			 _l_n+=4;
-
-           } // end for x
-	  }
-	   emms();
-}
-
-
-#endif
-#endif

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2 Deleted

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include Deleted

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/ADM_coreD3D.h Deleted

@@ -1,40 +0,0 @@
-/***************************************************************************
-    \file             : ADM_coreDxva2.cpp
-    \brief            : Wrapper around dxva functions
-    \author           : (C) 2016 by mean fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#pragma once
-#include "ADM_coreDxva2_export.h"
-#include "ADM_image.h"
-#include "ADM_windowInfo.h"
-
-#define CINTERFACE
-#ifdef _WIN32_WINNT
-#undef _WIN32_WINNT
-#endif
-#define _WIN32_WINNT 0x0600
-#define COBJMACROS
-#include <d3d9.h>
-
-/**
-    \class admVdpau
-*/
-class ADM_COREVIDEOCODEC6_EXPORT admD3D
-{
-public:
-        static bool init(GUI_WindowInfo *x);
-        static bool isOperationnal(void);
-        static bool cleanup(void);
-        static IDirect3DDevice9 *getDevice();
-        static IDirect3D9       *getHandle();
-};

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/ADM_coreDxva2.h Deleted

@@ -1,64 +0,0 @@
-/***************************************************************************
-    \file             : ADM_coreDxva2.cpp
-    \brief            : Wrapper around dxva functions
-    \author           : (C) 2016 by mean fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#pragma once
-#include "ADM_image.h"
-#include "ADM_windowInfo.h"
-#include "ADM_coreD3D.h"
-#include "dxva2api.h"
-#include "ADM_coreDxva2_export.h"
-extern "C"
-{
- #include "libavcodec/avcodec.h"
-}
-/**
- */
-class ADM_COREVIDEOCODEC6_EXPORT admDx2Surface
-{
-public:
-                          admDx2Surface(void *parent,int alignment);
-                          ~admDx2Surface();
-    void                 *parent;
-    LPDIRECT3DSURFACE9    surface;
-    IDirectXVideoDecoder *decoder;
-    ADMColorScalerSimple *color10Bits; // To be optimized, it's the same for all images from the same source
-    bool                  surfaceToAdmImage(ADMImage *out);
-    int                   refCount;
-public:
-    bool                  addRef();
-    bool                  removeRef();
-protected:
-    int                   alignment;
-} ;
-/**
-    \class admVdpau
-*/
-class ADM_COREVIDEOCODEC6_EXPORT admDxva2
-{
-public:
-        static bool init(GUI_WindowInfo *x);
-        static bool isOperationnal(void);
-        static bool cleanup(void);
-        static bool supported(AVCodecID codec,int bits);
-        static IDirectXVideoDecoder *createDecoder(AVCodecID codec,int width, int height,int numSurface, LPDIRECT3DSURFACE9 *surface,int align,int bits);
-        static bool destroyDecoder(IDirectXVideoDecoder *decoder);
-        static DXVA2_ConfigPictureDecode *getDecoderConfig(AVCodecID codec,int bits);
-        static bool allocateD3D9Surface(int num,int width, int height,void *array,int align,int bits=8);
-        static bool destroyD3DSurface(int num,void *surfaces);
-        static bool decoderAddRef(IDirectXVideoDecoder *decoder);
-        static bool decoderRemoveRef(IDirectXVideoDecoder *decoder);
-};
-
-bool ADM_COREVIDEOCODEC6_EXPORT admDxva2_exitCleanup(void);

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/src Deleted

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/src/ADM_coreD3D.cpp Deleted

@@ -1,202 +0,0 @@
-/***************************************************************************
-    \file             : ADM_coreDXVA2.cpp
-    \brief            : Wrapper around DXVA2 functions
-    \author           : (C) 2016 by mean fixounet@free.fr
-
-        This code is strongly derived from ffmpeg_dxva2 from ffmpeg
-
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#define CINTERFACE
-#include "ADM_default.h"
-
-#ifdef USE_DXVA2
-
-#if 1
-#define aprintf printf
-#define DUMP_GUID
-#else
-#define aprintf(...) {}
-#endif
-
-
-
-#include "ADM_dynamicLoading.h"
-#include <map>
-
-#define CINTERFACE
-#ifdef _WIN32_WINNT
-#undef _WIN32_WINNT
-#endif
-#define _WIN32_WINNT 0x0600
-#define DXVA2API_USE_BITFIELDS
-#define COBJMACROS
-#include <d3d9.h>
-#include <dxva2api.h>
-#include "../include/ADM_coreD3D.h"
-
-typedef IDirect3D9* WINAPI pDirect3DCreate9(UINT);
-
-static bool                  coreD3DWorking=false;
-
-static ADM_LibWrapper        d3dDynaLoader;
-
-static pDirect3DCreate9      *createD3D = NULL;
-
-static IDirect3D9            *d3d9        =NULL;
-static IDirect3DDevice9      *d3d9device  =NULL;
-
-
-#include <initguid.h>
-/**
- */
-
-/**
- */
-static bool ADM_FAILED(HRESULT hr)
-{
-    int r=(int)hr;
-    if(r<0)
-    {
-        ADM_warning("Failed with error code=0x%x\n",r);
-        return true;
-    }
-    return false;
-}
-
-/**
- * \fn init
- * \brief initialize the low level common part of dxva2
- */
-bool admD3D::init(GUI_WindowInfo *x)
-{
-    UINT adapter = D3DADAPTER_DEFAULT;
-    D3DDISPLAYMODE        d3ddm;
-    D3DPRESENT_PARAMETERS d3dpp = {0};
-    HWND windowID=(HWND)x->systemWindowId;
-
-    HRESULT hr;
-    unsigned int resetToken = 0;
-    ADM_info("Probing for D3D support\n");
-    // Load d3d9 dll
-    if(false==d3dDynaLoader.loadLibrary("d3d9.dll"))
-    {
-        ADM_warning("Dxva2: Cannot load d3d9.dll\n"); // memleak
-        goto failInit;
-    }
-    // Load d3d9 dll
-    createD3D=(pDirect3DCreate9 *)d3dDynaLoader.getSymbol("Direct3DCreate9");
-    if(!createD3D)
-    {
-        ADM_warning("Dxva2: Cannot get symbol  Direct3DCreate9\n");
-        goto failInit;
-    }
-    d3d9 = createD3D(D3D_SDK_VERSION);
-    if(!d3d9)
-    {
-        ADM_warning("Dxva2: Cannot gcreate d3d9\n");
-        goto failInit;
-    }
-    ADM_info("D3D library loaded, creating instance\n");
-    IDirect3D9_GetAdapterDisplayMode(d3d9, adapter, &d3ddm);
-    d3dpp.Windowed         = TRUE;
-    d3dpp.BackBufferWidth  = 640;
-    d3dpp.BackBufferHeight = 480;
-    d3dpp.BackBufferCount  = 0;
-    d3dpp.BackBufferFormat = d3ddm.Format;
-    d3dpp.SwapEffect       = D3DSWAPEFFECT_DISCARD;
-    d3dpp.Flags            = D3DPRESENTFLAG_VIDEO;
-
-    hr = IDirect3D9_CreateDevice(d3d9,
-                                adapter,
-                                D3DDEVTYPE_HAL,
-                                windowID,
-                                 D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_MULTITHREADED | D3DCREATE_FPU_PRESERVE,
-                                 &d3dpp, &d3d9device);
-    if(ADM_FAILED(hr))
-    {
-        ADM_warning("D3D:Cannot create d3d9 device\n");
-        goto failInit;
-    }
-
-    coreD3DWorking=true;
-    ADM_info("D3D:d3d core successfully initialized\n");
-
-    return true;
-failInit:
-      ADM_warning("D3D:D3D init failed\n");
-      return false;
-}
-
-
-/**
-    \fn isOperationnal
-*/
-bool admD3D::isOperationnal(void)
-{
-    if(!coreD3DWorking)
-      ADM_warning("This binary has no working D3D support\n");
-    return coreD3DWorking;
-}
-/**
- */
-bool admD3D::cleanup(void)
-{
-    ADM_warning("This binary has no DXVA2 support\n");
-
-    if (d3d9device)
-    {
-        IDirect3DDevice9_Release(d3d9device);
-        d3d9device  =NULL;
-    }
-
-    if (d3d9)
-    {
-        IDirect3D9_Release(d3d9);
-        d3d9        =NULL;
-    }
-    coreD3DWorking=false;
-
-    // small memleak  d3dDynaLoader;
-    // small memleak dxva2DynaLoader;
-    return true;
-}
-/**
-
-*/
-IDirect3DDevice9 *admD3D::getDevice()
-{
-
-        return d3d9device;
-}
-
-/**
-
-*/
-IDirect3D9       *admD3D::getHandle()
-{
-        return d3d9;
-}
-
-
-/**
- * \fn admLibVa_exitCleanup
- */
-bool admD3d_exitCleanup()
-{
-    ADM_info("D3D cleanup begin\n");
-    admD3D::cleanup();
-    ADM_info("admD3D cleanup end\n");
-    return true;
-}
-
-#endif
-// EOF

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/src/ADM_coreDxva2.cpp Deleted

@@ -1,706 +0,0 @@
-/***************************************************************************
-    \file             : ADM_coreDXVA2.cpp
-    \brief            : Wrapper around DXVA2 functions
-    \author           : (C) 2016 by mean fixounet@free.fr
-
-        This code is strongly derived from ffmpeg_dxva2 from ffmpeg
-
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#define CINTERFACE
-#include "ADM_default.h"
-#include "../include/ADM_coreD3D.h"
-#ifdef USE_DXVA2
-
-#if 1
-#define aprintf printf
-#define DUMP_GUID
-#else
-#define aprintf(...) {}
-#endif
-
-
-
-#include "ADM_dynamicLoading.h"
-#include <map>
-
-#include "../include/ADM_coreDxva2.h"
-
-typedef IDirect3D9* WINAPI pDirect3DCreate9(UINT);
-typedef HRESULT     WINAPI pCreateDeviceManager9(UINT *, IDirect3DDeviceManager9 **);
-
-static bool                  coreDxva2Working=false;
-
-static ADM_LibWrapper        dxva2DynaLoader;
-
-static pCreateDeviceManager9 *createDeviceManager = NULL;
-
-static IDirect3DDevice9            *d3d9device  =NULL;
-static IDirect3DDeviceManager9     *d3d9devmgr  =NULL;
-static IDirectXVideoDecoderService *decoder_service=NULL;
-static HANDLE                       deviceHandle=INVALID_HANDLE_VALUE;
-
-#include <initguid.h>
-DEFINE_GUID(IID_IDirectXVideoDecoderService, 0xfc51a551,0xd5e7,0x11d9,0xaf,0x55,0x00,0x05,0x4e,0x43,0xff,0x02);
-
-DEFINE_GUID(DXVA2_ModeMPEG2_VLD,      0xee27417f, 0x5e28,0x4e65,0xbe,0xea,0x1d,0x26,0xb5,0x08,0xad,0xc9);
-DEFINE_GUID(DXVA2_ModeMPEG2and1_VLD,  0x86695f12, 0x340e,0x4f04,0x9f,0xd3,0x92,0x53,0xdd,0x32,0x74,0x60);
-DEFINE_GUID(DXVA2_ModeH264_E,         0x1b81be68, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
-DEFINE_GUID(DXVA2_ModeH264_F,         0x1b81be69, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
-DEFINE_GUID(DXVADDI_Intel_ModeH264_E, 0x604F8E68, 0x4951,0x4C54,0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6);
-DEFINE_GUID(DXVA2_ModeVC1_D,          0x1b81beA3, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
-DEFINE_GUID(DXVA2_ModeVC1_D2010,      0x1b81beA4, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
-DEFINE_GUID(DXVA2_ModeHEVC_VLD_Main,  0x5b11d51b, 0x2f4c,0x4452,0xbc,0xc3,0x09,0xf2,0xa1,0x16,0x0c,0xc0);
-DEFINE_GUID(DXVA2_ModeVP9_VLD_Profile0, 0x463707f8, 0xa1d0,0x4585,0x87,0x6d,0x83,0xaa,0x6d,0x60,0xb8,0x9e);
-DEFINE_GUID(DXVA2_NoEncrypt,          0x1b81beD0, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
-DEFINE_GUID(DXVA2_ModeHEVC_VLD_Main10,0x107af0e0, 0xef1a,0x4d19,0xab,0xa8,0x67,0xa1,0x63,0x07,0x3d,0x13);
-DEFINE_GUID(GUID_NULL,                0x00000000, 0x0000,0x0000,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00);
-/**
- */
-typedef struct dxva2_mode
-{
-  const GUID     *guid;
-  enum AVCodecID codec;
-  int            bitsPerChannel;
-} dxva2_mode;
-/**
- */
-static int ALIGN(int x,int align)
-{
-    int y= ((x+(align-1)) &(~(align-1)));
-    aprintf("Align %d,%d => %d\n",x,align,y);
-    return y;
-}
-
-/**
- */
-static const dxva2_mode dxva2_modes[] =
-{
-    /* MPEG-2 */
-    { &DXVA2_ModeMPEG2_VLD,      AV_CODEC_ID_MPEG2VIDEO ,8},
-    { &DXVA2_ModeMPEG2and1_VLD,  AV_CODEC_ID_MPEG2VIDEO ,8},
-
-    /* H.264 */
-    { &DXVA2_ModeH264_F,         AV_CODEC_ID_H264 ,8},
-    { &DXVA2_ModeH264_E,         AV_CODEC_ID_H264 ,8},
-    /* Intel specific H.264 mode */
-    { &DXVADDI_Intel_ModeH264_E, AV_CODEC_ID_H264 ,8},
-
-    /* VC-1 / WMV3 */
-    { &DXVA2_ModeVC1_D2010,      AV_CODEC_ID_VC1  ,8},
-    { &DXVA2_ModeVC1_D2010,      AV_CODEC_ID_WMV3 ,8},
-    { &DXVA2_ModeVC1_D,          AV_CODEC_ID_VC1  ,8},
-    { &DXVA2_ModeVC1_D,          AV_CODEC_ID_WMV3 ,8},
-
-    /* HEVC/H.265 */
-    { &DXVA2_ModeHEVC_VLD_Main,   AV_CODEC_ID_HEVC ,8},
-    { &DXVA2_ModeHEVC_VLD_Main10, AV_CODEC_ID_HEVC ,10},
-
-    /* VP8/9 */
-    { &DXVA2_ModeVP9_VLD_Profile0,AV_CODEC_ID_VP9 ,8},
-
-    { NULL,                      (AVCodecID)0 ,0},
-};
-typedef struct
-{
-     enum AVCodecID  codec;
-     bool            enabled;
-     DXVA2_VideoDesc desc;
-     DXVA2_ConfigPictureDecode pictureDecode;
-           GUID      device_guid;
-           GUID      guid;
-}Dxv2SupportMap;
-
-static Dxv2SupportMap dxva2H265={AV_CODEC_ID_HEVC,false};
-static Dxv2SupportMap dxva2H264={AV_CODEC_ID_H264,false};
-static Dxv2SupportMap dxva2H265_10Bits={AV_CODEC_ID_HEVC,false};
-
-/**
-  \fn dxvaBitsToFormat
-  \brief returns D3D format depending on bits per component
-*/
-static D3DFORMAT dxvaBitsToFormat(int bits)
-{
-  switch(bits)
-  {
-    case 8: return (D3DFORMAT)MKTAG('N','V','1','2');break;
-    case 10:return (D3DFORMAT)MKTAG('P','0','1','0');break;
-    default:
-        ADM_assert(0); break;
-  }
-  return (D3DFORMAT)MKTAG('N','V','1','2');
-}
-/**
- */
-static void dumpGUID(const char *name,const GUID &guid)
-{
-    printf("%s :\n",name);
-    printf("0x%lx 0x%lx 0x%lx ",guid.Data1,guid.Data2,guid.Data3);
-    for(int i=0;i<8;i++) printf(" %02x ",guid.Data4[i]);
-    printf("\n");
-}
-
-/**
- */
-static bool ADM_FAILED(HRESULT hr)
-{
-    int r=(int)hr;
-    if(r<0)
-    {
-        ADM_warning("Failed with error code=0x%x\n",r);
-        return true;
-    }
-    return false;
-}
-/**
-  \fn checkDecoder
-  \brief check if the decoder advertised is actually working
-*/
-static bool checkDecoderConfiguration(  const GUID *guid,Dxv2SupportMap *context)
-{
-    HRESULT hr;
-    unsigned int cfg_count = 0, best_score = 0;
-    DXVA2_ConfigPictureDecode *cfg_list = NULL;
-    bool   found=false;
-    const D3DFORMAT target_format = (const D3DFORMAT) MKTAG('N','V','1','2');
-
-    // initialize desc with dummy values
-    context->desc.SampleWidth=1920;
-    context->desc.SampleHeight=1080;
-    context->desc.Format=target_format;
-
-    hr = IDirectXVideoDecoderService_GetDecoderConfigurations(decoder_service, *guid, &(context->desc), NULL, &cfg_count, &cfg_list);
-    if (ADM_FAILED(hr)) {
-        ADM_warning("Unable to retrieve decoder configurations\n");
-        return false;
-    }
-
-    for (int i = 0; i < cfg_count; i++)
-    {
-        DXVA2_ConfigPictureDecode *cfg = &cfg_list[i];
-
-        unsigned score;
-        if (cfg->ConfigBitstreamRaw == 1)
-        {
-            ADM_info("\t has raw bistream\n");
-            score = 1;
-        }
-        else if (context->codec == AV_CODEC_ID_H264 && cfg->ConfigBitstreamRaw == 2)
-        {
-            ADM_info("\t has h264 raw bistream2\n");
-            score = 2;
-        }
-        else
-            continue;
-        if (IsEqualGUID(cfg->guidConfigBitstreamEncryption, DXVA2_NoEncrypt))
-        {
-            ADM_info("\t has no encrypt\n");
-            score += 16;
-        }
-        if (score > best_score)
-        {
-            best_score    = score;
-            context->pictureDecode = *cfg;
-            found=true;
-            ADM_info("\t best score\n");
-        }
-    }
-    CoTaskMemFree(cfg_list);
-
-    if (! found )
-    {
-        ADM_warning( "No valid decoder configuration available\n");
-        return false;
-    }
-    return true;
-}
-/**
- * \fn lookupCodec
- * \brief find and populate the configuration for a given codec
- */
-static bool lookupCodec(const char *codecName,Dxv2SupportMap *context,unsigned int guid_count,GUID *guid_list, int bitsPerComponent)
-{
-    HRESULT hr;
-    D3DFORMAT target_format = (D3DFORMAT) 0;
-
-    for (int i = 0; dxva2_modes[i].guid; i++)
-    {
-        D3DFORMAT *target_list = NULL;
-        unsigned target_count = 0;
-        const dxva2_mode *mode = &dxva2_modes[i];
-        if (mode->codec != context->codec)
-            continue;
-        int j;
-        for (j = 0; j < guid_count; j++)
-        {
-            if (IsEqualGUID( *(mode->guid), guid_list[j]))
-                break;
-        }
-#ifdef DUMP_GUID
-    dumpGUID("Potential device_guid",*(mode->guid));
-#endif
-
-        if (j == guid_count)
-            continue;
-
-        hr = IDirectXVideoDecoderService_GetDecoderRenderTargets(decoder_service,*( mode->guid), &target_count, &target_list);
-        if (ADM_FAILED(hr))
-        {
-            continue;
-        }
-        D3DFORMAT tgt;
-        tgt=dxvaBitsToFormat(bitsPerComponent);
-        for (j = 0; j < target_count; j++)
-        {
-            const D3DFORMAT format = target_list[j];
-            if (format ==tgt)
-            {
-                target_format = format;
-                break;
-            }
-        }
-
-        CoTaskMemFree(target_list);
-        if (target_format)
-        {
-            if(checkDecoderConfiguration(mode->guid,context)) // does it work ?
-            {
-              context->device_guid = *(mode->guid);
-              break;
-            }
-        }
-    }
-
-    // Did we find a working one ?
-    if (IsEqualGUID(context->device_guid, GUID_NULL))
-    {
-        ADM_info("No decoder device for codec %s found\n",codecName);
-        return false;
-    }
-
-    //--
-
-    ADM_info("DXVA2 support for  %s found\n",codecName);
-    context->enabled=true;
-    return true;
-}
-/**
- * \fn init
- * \brief initialize the low level common part of dxva2
- */
-bool admDxva2::init(GUI_WindowInfo *x)
-{
-   if(!admD3D::isOperationnal())
-   {
-     ADM_warning("No D3D, skipping DXVA2\n");
-     return false;
-   }
-   if(!admD3D::getDevice())
-   {
-     ADM_warning("No D3D device, skipping DXVA2\n");
-     return false;
-   }
-    UINT adapter = D3DADAPTER_DEFAULT;
-    D3DDISPLAYMODE        d3ddm;
-    D3DPRESENT_PARAMETERS d3dpp = {0};
-
-    HRESULT hr;
-    unsigned int resetToken = 0;
-
-    // Load dxva2 dll
-    if(false==dxva2DynaLoader.loadLibrary("dxva2.dll"))
-    {
-        ADM_warning("Dxva2: Cannot load dxva2.dll\n");
-        goto failInit;
-    }
-
-    createDeviceManager=(pCreateDeviceManager9 *)dxva2DynaLoader.getSymbol("DXVA2CreateDirect3DDeviceManager9");
-    if(!createDeviceManager)
-    {
-        ADM_warning("Dxva2: Cannot get symbol  createDeviceManager\n");
-        goto failInit;
-    }
-    hr = createDeviceManager(&resetToken, &d3d9devmgr);
-    if (ADM_FAILED(hr))
-    {
-        ADM_warning( "Failed to create Direct3D device manager\n");
-        goto failInit;
-    }
-    hr = IDirect3DDeviceManager9_ResetDevice(d3d9devmgr, admD3D::getDevice(), resetToken);
-    if (ADM_FAILED(hr))
-    {
-        ADM_warning( "Failed to bind Direct3D device to device manager\n");
-        goto failInit;
-    }
-    ADM_info("Dxva2 init step1\n");
-    hr = IDirect3DDeviceManager9_OpenDeviceHandle(d3d9devmgr, &deviceHandle);
-    if (ADM_FAILED(hr)) {
-         ADM_warning("Failed to open device handle\n");
-        goto failInit;
-    }
-
-    hr = IDirect3DDeviceManager9_GetVideoService(d3d9devmgr, deviceHandle, (REFIID )IID_IDirectXVideoDecoderService, (void **)&decoder_service);
-    if (ADM_FAILED(hr)) {
-        ADM_warning("Failed to create IDirectXVideoDecoderService\n");
-        goto failInit;
-    }
-
-    coreDxva2Working=true;
-    ADM_info("Dxva2 core successfully initialized\n");
-    ADM_info("Decoder service=%p\n",decoder_service);
-    // Look up what is supported
-    {
-        unsigned int guid_count = 0;
-        GUID *guid_list = NULL;
-
-        hr = IDirectXVideoDecoderService_GetDecoderDeviceGuids(decoder_service, &guid_count, &guid_list);
-        if (ADM_FAILED(hr)) {
-            ADM_warning("Failed to retrieve decoder device GUIDs\n");
-            goto failInit;
-        }
-        lookupCodec("H264",&dxva2H264,guid_count,guid_list,8);
-        lookupCodec("H265",&dxva2H265,guid_count,guid_list,8);
-        lookupCodec("H265",&dxva2H265_10Bits,guid_count,guid_list,10);
-        CoTaskMemFree(guid_list);
-    }
-    ADM_info("Scanning supported format done\n");
-    return true;
-failInit:
-    // cleanup
-    cleanup();
-    return false;
-}
-/**
- */
-bool admDxva2::allocateD3D9Surface(int num,int w, int h,void *array,int surface_alignment,int bits)
-{
-    HRESULT hr;
-    LPDIRECT3DSURFACE9 *surfaces=(LPDIRECT3DSURFACE9 *)array;
-    int width=ALIGN(w,surface_alignment);
-    int height=ALIGN(h,surface_alignment);
-    D3DFORMAT fmt;
-    fmt=dxvaBitsToFormat(bits);
-
-     hr = IDirectXVideoDecoderService_CreateSurface(decoder_service,
-                                                   width,
-                                                   height,
-                                                   num - 1,
-                                                   fmt, D3DPOOL_DEFAULT, 0,
-                                                   DXVA2_VideoDecoderRenderTarget,
-                                                   surfaces, NULL);
-     if(ADM_FAILED(hr))
-     {
-         ADM_warning("Cannot allocate D3D9 surfaces");
-         return false;
-     }
-     ADM_info("%d surfaces allocated \n",num);
-     return true;
-}
-/**
- */
-bool admDxva2::destroyD3DSurface(int num, void *zsurfaces)
-{
-    LPDIRECT3DSURFACE9 *surfaces=(LPDIRECT3DSURFACE9 *)zsurfaces;
-    for(int i=0;i<num;i++)
-    {
-         if (surfaces[i])
-         {
-                IDirect3DSurface9_Release(surfaces[i]);
-                surfaces[i]=NULL;
-         }
-    }
-    return true;
-}
-
-/**
-    \fn isOperationnal
-*/
-bool admDxva2::isOperationnal(void)
-{
-    ADM_warning("This binary has no working DXVA2 support\n");
-    return coreDxva2Working;
-}
-/**
- */
-bool admDxva2::cleanup(void)
-{
-    ADM_warning("This binary has no DXVA2 support\n");
-
-    if (decoder_service)
-    {
-        IDirectXVideoDecoderService_Release(decoder_service);
-        decoder_service=NULL;
-    }
-    if (d3d9devmgr && deviceHandle != INVALID_HANDLE_VALUE)
-    {
-        IDirect3DDeviceManager9_CloseDeviceHandle(d3d9devmgr, deviceHandle);
-        deviceHandle=INVALID_HANDLE_VALUE;
-    }
-
-    if (d3d9devmgr)
-    {
-        IDirect3DDeviceManager9_Release(d3d9devmgr);
-        d3d9devmgr  =NULL;
-    }
-
-    if (d3d9device)
-    {
-        IDirect3DDevice9_Release(d3d9device);
-        d3d9device  =NULL;
-    }
-
-
-    coreDxva2Working=false;
-
-    // small memleak  d3dDynaLoader;
-    // small memleak dxva2DynaLoader;
-    return true;
-}
-/**
- *
- */
-bool        admDxva2::supported(AVCodecID codec,int bits)
-{
-#define SUPSUP(a,b,c) if(codec==a && bits==c) return (b.enabled) ;
-    SUPSUP(AV_CODEC_ID_H264,dxva2H264,8)
-    SUPSUP(AV_CODEC_ID_HEVC,dxva2H265,8)
-    SUPSUP(AV_CODEC_ID_HEVC,dxva2H265_10Bits,10)
-    return false;
-}
-/**
- * \fn getDecoderConfig
- */
-DXVA2_ConfigPictureDecode *admDxva2::getDecoderConfig(AVCodecID codec,int bits)
-{
-    Dxv2SupportMap *cmap;
-    switch(codec)
-    {
-        case AV_CODEC_ID_H264: cmap=&dxva2H264;break;
-        case AV_CODEC_ID_H265:
-              if(10==bits)
-                cmap=&dxva2H265_10Bits;
-              else
-                cmap=&dxva2H265;
-              break;
-        default:
-            ADM_assert(0);
-            break;
-    }
-    if(!cmap->enabled)
-    {
-        ADM_warning("This decoder is not enabled\n");
-        ADM_assert(0);
-    }
-    return &(cmap->pictureDecode);
-}
-
-/**
- * \fn createDecoder
- */
-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);
-    switch(codec)
-    {
-        case AV_CODEC_ID_H264:
-                ADM_info("Creating decoder DXVA2/H264/8 Bits\n");
-                cmap=&dxva2H264;
-                break;
-        case AV_CODEC_ID_H265:
-                if(bits==10)
-                {
-                    ADM_info("Creating decoder DXVA2/H264/10 Bits\n");
-                    cmap=&dxva2H265_10Bits;
-                }
-                else
-                {
-                    ADM_info("Creating decoder DXVA2/H264/8 Bits\n");
-                    cmap=&dxva2H265;
-                }
-                break;
-        default:
-            ADM_assert(0);
-            break;
-    }
-    if(!cmap->enabled)
-    {
-        ADM_warning("This decoder is not enabled\n");
-        ADM_assert(0);
-    }
-    HRESULT hr;
-    IDirectXVideoDecoder *decoder=NULL;
-#ifdef DUMP_GUID
-    dumpGUID("device_guid",cmap->device_guid);
-    dumpGUID("       guid",cmap->guid);
-    printf("Decoder service = %p\n",decoder_service);
-
-#endif
-    // update with real values
-    cmap->desc.SampleWidth=paddedWidth; // does not work with multiple video ?
-    cmap->desc.SampleHeight=paddedHeight;
-    //
-    hr = IDirectXVideoDecoderService_CreateVideoDecoder(decoder_service,
-                                                         (cmap->device_guid),
-                                                         &(cmap->desc),
-                                                         &(cmap->pictureDecode),
-                                                         surface,
-                                                         numSurface,
-                                                         &decoder);
-     if(ADM_FAILED(hr))
-     {
-         ADM_warning("Cannot create decoder\n");
-         return NULL;
-     }
-     return decoder;
-}
-/**
- * \fn createDecoder
- */
-bool admDxva2::destroyDecoder(IDirectXVideoDecoder *decoder)
-{
-    IDirectXVideoDecoder_Release(decoder);
-    return true;
-}
-
-/**
- * \fn admLibVa_exitCleanup
- */
-bool admDxva2_exitCleanup()
-{
-    ADM_info("Dxva2 cleanup begin\n");
-    admDxva2::cleanup();
-    ADM_info("Dxva2 cleanup end\n");
-    return true;
-}
-/**
- * \fn ctor
- */
-admDx2Surface::admDx2Surface(void *par,int alig)
-{
-    parent=par;
-    alignment=alig;
-    surface=NULL;
-    decoder=NULL;
-    refCount=0;
-    color10Bits=NULL;
-}
-/**
- * \fn dtor
- */
-admDx2Surface::~admDx2Surface()
-{
-    parent=NULL;
-    surface=NULL;
-    decoder=NULL;
-    if(color10Bits)
-    {
-        delete color10Bits;
-        color10Bits=NULL;
-    }
-}
-/**
- * \fn addRef
- */
-bool admDx2Surface::addRef()
-{
-    IDirect3DSurface9_AddRef(surface);
-    return true;
-}
-/**
- * \fn removeRef
- */
-bool admDx2Surface::removeRef()
-{
-     IDirect3DSurface9_Release(surface); // ???
-     return true;
-}
-
-
-/**
- * \fn ADM_DXVA2_readBack
- */
-bool  admDx2Surface::surfaceToAdmImage( ADMImage *out)
-{
-    D3DSURFACE_DESC    surfaceDesc;
-    D3DLOCKED_RECT     LockedRect;
-    HRESULT            hr;
-    int bits=8;
-    bool r=true;
-    IDirect3DSurface9_GetDesc(surface, &surfaceDesc);
-    if(surfaceDesc.Format==(D3DFORMAT)MKTAG('P','0','1','0'))
-    {
-      bits=10;
-    }
-    aprintf("Surface to admImage = %p\n",surface);
-    hr = IDirect3DSurface9_LockRect(surface, &LockedRect, NULL, D3DLOCK_READONLY);
-    if (ADM_FAILED(hr))
-    {
-        ADM_warning("Unable to lock DXVA2 surface\n");
-        return false;
-    }
-    aprintf("Retrieving image pitch=%d width=%d height=%d\n",LockedRect.Pitch,out->GetWidth(PLANAR_Y), out->GetHeight(PLANAR_Y));
-
-    uint8_t *data=(uint8_t*)LockedRect.pBits;
-    int sourcePitch=LockedRect.Pitch;
-    switch(bits)
-    {
-      case 8:   out->convertFromNV12(data,data+sourcePitch*ALIGN(out->GetHeight(PLANAR_Y),alignment), sourcePitch, sourcePitch);
-                break;
-      case 10:
-              {
-              if(!color10Bits)
-                    color10Bits=new ADMColorScalerSimple(out->GetWidth(PLANAR_Y),out->GetHeight(PLANAR_Y),ADM_COLOR_NV12_10BITS,ADM_COLOR_YV12);
-              ADMImageRef ref(out->GetWidth(PLANAR_Y),out->GetHeight(PLANAR_Y));
-              ADMImageRefWrittable target(out->GetWidth(PLANAR_Y),out->GetHeight(PLANAR_Y));
-              ref._planes[0]=data;
-              ref._planeStride[0]=sourcePitch;
-              ref._planes[1]=data+((surfaceDesc.Height)*sourcePitch);
-              ref._planeStride[1]=sourcePitch;
-              ref._planes[2]=NULL;
-              ref._planeStride[2]=0;
-              // U &  V are inverted...
-              for(int i=0;i<3;i++)
-              {
-                  int j=i;
-                  if(j) j=j^3;
-                  target._planes[j]=out->GetWritePtr((ADM_PLANE)i);
-                  target._planeStride[j]=out->_planeStride[i];
-              }
-              color10Bits->convertImage(&ref,&target);
-              }
-              break;
-
-      default: ADM_warning("Unsupported bit depth");break;
-    }
-    IDirect3DSurface9_UnlockRect(surface);
-    return r;
-}
-
-/**
- */
-bool admDxva2::decoderAddRef(IDirectXVideoDecoder *decoder)
-{
-    HRESULT            hr=IDirectXVideoDecoder_AddRef(decoder);
-    return true;
-}
-/**
- */
-bool admDxva2::decoderRemoveRef(IDirectXVideoDecoder *decoder)
-{
-    HRESULT            hr=IDirectXVideoDecoder_Release(decoder);
-    return true;
-}
-
-
-#endif
-// EOF

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/src/CMakeLists.txt Deleted

avidemux_2.6.20.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-3.0.7.tar.bz2 Deleted

avidemux_2.6.20.tar.gz/avidemux_core/ffmpeg_package/patches/0001-configure-Don-t-require-nonfree-for-nvenc.patch Deleted

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_atom.cpp.orig Deleted

@@ -1,198 +0,0 @@
-/***************************************************************************
-                          ADM_Atom  -  description
-                             -------------------
-
-	Helper class to deal with atom
-
-    begin                : Mon Jul 21 2003
-    copyright            : (C) 2001 by mean
-    email                : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-#include "ADM_assert.h"
-#include "ADM_default.h"
-#include "ADM_editor/ADM_Video.h"
-
-#include "fourcc.h"
-#include "ADM_atom.h"
-#include "ADM_osSupport/ADM_debugID.h"
-#define MODULE_NAME MODULE_3GP
-#include "ADM_osSupport/ADM_debug.h"
-
-adm_atom::adm_atom(adm_atom *atom)
-{
-	_fd=atom->_fd;
-	_atomStart=ftell(_fd);
-	_atomSize=read32();
-	_atomFCC=read32();
-	// Gross hack for some (buggy ?) movie
-	if(!_atomSize)
-	{
-		printf("3GP:Workaround: detected wrong sized atom!\nTrying to continue\n");
-		_atomStart+=4;
-		_atomSize-=4;
-		fseek(_fd,_atomStart,SEEK_SET);
-		_atomSize=read32();
-		_atomFCC=read32();
-	}
-#ifdef ATOM_DEBUG
-	dumpAtom();
-#endif
-}
-/**
-    \fn duplicate constructor
-    \brief returns a copy of the current atom
-*/
-adm_atom::adm_atom(adm_atom *atom,int duplicate)
-{
-   memcpy(this,atom,sizeof(adm_atom));
-}
-adm_atom::adm_atom(FILE *fd )
-{
-uint32_t orgpos;
-	_fd=fd;
-        orgpos=ftello(fd);
-	fseek(_fd,0,SEEK_END);
-	_atomFCC=fourCC::get((uint8_t *)"MOVI");
-	_atomSize=ftell(_fd);//-orgpos;
-
-	fseek(_fd,orgpos,SEEK_SET);
-	_atomStart=0;
-#ifdef ATOM_DEBUG
-	dumpAtom();
-#endif
-#ifdef _3G_LOGO
-        printf("Starting at %x  atom ",_atomStart);
-        fourCC::printBE(_atomFCC);
-        printf("\n");
-#endif
-
-}
-uint8_t adm_atom::skipBytes( uint32_t nb )
-{
-uint32_t pos;
-	fseek(_fd,nb,SEEK_CUR);
-	pos=ftell(_fd);
-	if(pos>_atomStart+_atomSize+1) ADM_assert(0);	
-	return 1;
-}
-
-uint8_t adm_atom::read( void )
-{
-	uint8_t a1;
-
-		a1=fgetc(_fd);
-	return a1;
-
-}
-
-uint16_t adm_atom::read16( void )
-{
-	uint8_t a1,a2;
-
-		a1=fgetc(_fd);
-		a2=fgetc(_fd);
-	return (a1<<8)+(a2);
-
-}
-
-
-uint32_t adm_atom::read32( void )
-{
-	uint8_t a1,a2,a3,a4;
-
-		a1=fgetc(_fd);
-		a2=fgetc(_fd);
-		a3=fgetc(_fd);
-		a4=fgetc(_fd);
-	return (a1<<24)+(a2<<16)+(a3<<8)+(a4);
-
-}
-
-uint32_t adm_atom::getFCC( void )
-{
-	return _atomFCC;
-}
-uint32_t adm_atom::getSize( void )
-{
-	return _atomSize-8;
-}
-uint32_t adm_atom::getRemainingSize( void )
-{
-        int64_t pos=ftello(_fd);
-        
-        return _atomStart+_atomSize-pos;
-}
-
-uint8_t adm_atom::readPayload( uint8_t *whereto, uint32_t rd)
-{
-	uint32_t pos;
-
-	pos=ftell(_fd);
-	if(pos+rd>_atomSize+_atomStart)
-	{
-		printf("\n Going out of atom's bound!! (%ld  / %ld )\n",pos+rd,_atomSize+_atomStart);
-		dumpAtom();
-		exit(0);
-	}
-	uint32_t i;
-	i=fread(whereto,rd,1,_fd);
-	if(i!=1)
-	{
-		printf("\n oops asked %lu got %lu \n",rd,i);
-	return 0;
-	}
-	return 1;
-
-}
-uint8_t adm_atom::dumpAtom( void )
-{
-
-	aprintf("Atom :");
-	fourCC::print(_atomFCC);
-	aprintf(" starting at pos %lu, size %lu\n",_atomStart,_atomSize);
-	return 1;
-
-}
-
-uint8_t adm_atom::skipAtom( void )
-{
-	fseek(_fd,_atomStart+_atomSize,SEEK_SET);
-#ifdef _3G_LOGO
-        printf("Branching to %x ending atom ",_atomStart+_atomSize);
-        fourCC::printBE(_atomFCC);
-        printf("\n");
-#endif
-	return 1;
-
-
-}
-uint8_t adm_atom::isDone( void )
-{
-	uint32_t pos=ftell(_fd);
-
-	if(pos>=(_atomStart+_atomSize)) return 1;
-	return 0;
-
-}
-
-
-
-
-//EOF
-

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp.orig Deleted

@@ -1,416 +0,0 @@
-/***************************************************************************
-                          ADMMP4p.cpp  -  description
-                             -------------------
-	
-		Read quicktime/mpeg4 file format found in 3gpp file.
-		They are limited to SQCIF/QCIF video size and can
-		only contains
-			video : h263 or mpeg4 
-			audio : AMR or AAC
-
-
-		For the mpeg4, the VOL headers are stored in esds atom
-		and not in the first image
-		Idem for MJPG and SVQ3
-
-		The usual tree structure of a 3gp file is
-
-		- ftyp
-		- mdat
-		- moov
-			xxx
-			trak
-				tkhd (duration / ...)
-			mdia
-				hdlr (type)
-				minf
-					stsd header for audio/video
-					stbl index to datas
-
-	We ignore other chunk as they are not vital for our aim
-	and just keep moov/mdia/minf/stsd/stbl stuff
-
-Generic
-*********
-http://developer.apple.com/documentation/QuickTime/QTFF/QTFFChap2/chapter_3_section_5.html#//apple_ref/doc/uid/DontLinkBookID_69-CH204-BBCJEIIA
-
-version 2 media descriptor :
-****************************** http://developer.apple.com/documentation/QuickTime/Conceptual/QT7Win_Update_Guide/Chapter03/chapter_3_section_1.html#//apple_ref/doc/uid/TP40002476-CH314-BBCDGGBB
-
-
-
-    begin                : Tue Jul  2003
-    copyright            : (C) 2003/2006 by mean
-    email                : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-#include "ADM_assert.h"
-#include "ADM_default.h"
-#include "ADM_editor/ADM_Video.h"
-
-#include "fourcc.h"
-#include "ADM_mp4.h"
-
-#include "ADM_codecs/ADM_codec.h"
-
-#include "ADM_video/ADM_videoInfoExtractor.h"
-
-#include "ADM_osSupport/ADM_debugID.h"
-#define MODULE_NAME MODULE_3GP
-#include "ADM_osSupport/ADM_debug.h"
-
-//#define MP4_VERBOSE
-#define MAX_CHUNK_SIZE (3*1024)
-
-uint32_t ADM_UsecFromFps1000(uint32_t fps1000);
-//****************************************************
-MP4Track::MP4Track(void)
-{
-    extraDataSize=0;
-    extraData=NULL;
-    index=NULL;
-    nbIndex=0;
-    id=0;
-    memset(&_rdWav,0,sizeof(_rdWav));
-
-}
-MP4Track::~MP4Track()
-{
-    if(extraData) delete [] extraData;
-    if(index)   delete [] index;
- 
-    index=NULL;
-    extraData=NULL;
-    
-}
-//****************************************************
-uint8_t MP4Header::setFlag(uint32_t frame,uint32_t flags)
-{
-    UNUSED_ARG(frame);
-    UNUSED_ARG(flags);
-    
-    VDEO.index[frame].intra=flags;
-    return 0;
-}
-
-uint32_t MP4Header::getFlags(uint32_t frame,uint32_t *flags)
-{
-        if(frame>= (uint32_t)_videostream.dwLength) return 0;
-        *flags=VDEO.index[frame].intra;
-  
-        return 1;
-}
-
-
-uint8_t  MP4Header::getFrameNoAlloc(uint32_t framenum,ADMCompressedImage *img)
-{
-    if(framenum>=VDEO.nbIndex)
-    {
-      return 0; 
-    }
-    uint32_t offset=VDEO.index[framenum].offset; //+_mdatOffset;
-
-
-    fseeko(_fd,offset,SEEK_SET);
-    fread(img->data, VDEO.index[framenum].size, 1, _fd);
-    img->dataLength=VDEO.index[framenum].size;
-    return 1;
-}
-MP4Header::~MP4Header()
-{
-    close();
-
-}
-uint8_t    MP4Header::close( void )
-{
-      if(_fd)
-              {
-              fclose(_fd);
-              }
-            _fd=NULL;
-      return 1;
-}
-//
-//	Set default save value
-//
-
-MP4Header::MP4Header(void)
-{
-        _fd=NULL;
-        nbAudioTrack=0;
-        _currentAudioTrack=0;
-        _reordered=0;
-        _videoScale=1;
-        _videoFound=0;
-}
-uint8_t	MP4Header::getAudioStream(AVDMGenericAudioStream **audio)
-{  
-    if(nbAudioTrack) 
-    {
-        *audio=_audioTracks[_currentAudioTrack];
-    }  else 
-        *audio=NULL;
-    return 1;
-};
-WAVHeader 	*MP4Header::getAudioInfo(void )
-{ 	
-	if(!nbAudioTrack)
-		return NULL; 
-       
-        return _audioTracks[_currentAudioTrack]->getInfo();
-} ;
-uint8_t   MP4Header::getExtraHeaderData(uint32_t *len, uint8_t **data)
-{
-uint32_t old;
-        *len=0;*data=NULL;
-        if(_tracks[0].extraDataSize)
-        {
-            *len= VDEO.extraDataSize;
-            *data=VDEO.extraData;
-        }
-        return 1;
-}
-//______________________________________
-//
-// Open and recursively read the atoms
-// until we got the information we want
-// i.e. :
-//	index for audio and video track
-//	esds for mpeg4
-//	size / codec used 
-//
-// We don't care about sync atom and all
-// other stuff which are pretty useless on
-// 3gp file anyway.
-//______________________________________
-uint8_t    MP4Header::open(const char *name)
-{
-        printf("** opening 3gpp files **");	
-        _fd=fopen(name,"rb");
-        if(!_fd)
-        {
-                printf("\n cannot open %s \n",name);
-                return 0;
-        }
-#define CLR(x)              memset(& x,0,sizeof(  x));
-
-        CLR( _videostream);
-        CLR(  _mainaviheader);
-
-        _videostream.dwScale=1000;
-        _videostream.dwRate=10000;
-        _mainaviheader.dwMicroSecPerFrame=100000;;     // 10 fps hard coded
-        
-        adm_atom *atom=new adm_atom(_fd);
-        // Some mp4/mov files have the data at the end but do start properly
-        // detect and workaround...
-        // Check it is not mdat start(ADM_memcpy_0)     
-        uint8_t check[4];
-        fseeko(_fd,4,SEEK_SET);
-        fread(check,4,1,_fd);
-        fseeko(_fd,0,SEEK_SET);
-        if(check[0]=='m' && check[1]=='d' &&check[2]=='a' && check[3]=='t')
-        {
-                        uint32_t of;
-                                        printf("Data first, header later...\n");
-                                        of=atom->read32();
-                                        if(of==1)
-                                        {
-                                          atom->read32();
-                                          atom->read32();
-                                          of=atom->read32();
-                                        }
-                                        fseeko(_fd,of,SEEK_SET);        
-                                        printf("Header starts at %x\n",of);
-                                        delete atom;
-                                        atom=new adm_atom(_fd);
-        }
-        //**************
-        
-        if(!lookupMainAtoms((void*) atom))
-        {
-          printf("Cannot find needed atom\n");
-          fclose(_fd);
-		  delete atom;
-          return 0;
-        }
-        
-        delete atom;
-
-	      _isvideopresent=1;
-	      _isaudiopresent=0;
-    	     
-              _videostream.fccType=fourCC::get((uint8_t *)"vids");
-              _video_bih.biBitCount=24;
-              _videostream.dwInitialFrames= 0;
-              _videostream.dwStart= 0;
-
-	printf("\n");
-	
-       
-        if(!VDEO.index) 
-        {
-                printf("No index!\n");
-                return 0;
-        }
-
-        // If it is mpeg4 and we have extra data
-        // Decode vol header to get the real width/height
-        // The mpeg4/3GP/Mov header is often misleading
-
-        if(fourCC::check(_videostream.fccHandler,(uint8_t *)"DIVX"))
-        {
-            if(VDEO.extraDataSize)
-            {
-                uint32_t w,h,ti;
-                if(extractMpeg4Info(VDEO.extraData,VDEO.extraDataSize,&w,&h,&ti))
-                {
-                    printf("MP4 Corrected size : %lu x %lu\n",w,h);
-                    _video_bih.biWidth=_mainaviheader.dwWidth=w ;
-                    _video_bih.biHeight=_mainaviheader.dwHeight=h;                               
-                }
-            }else { printf("No extradata to probe\n");}
-        
-        }
-        else
-        {
-
-        /*
-            Same story for H263 : Analyze 1st frame to get the real width/height
-        */
-            if(fourCC::check(_videostream.fccHandler,(uint8_t *)"H263"))
-            {
-                uint32_t w,h,sz;
-                uint8_t *bfer=NULL;
-                sz=VDEO.index[0].size;
-                if(sz)
-                {
-                        bfer=new uint8_t[sz];
-                        ADMCompressedImage img;
-                        img.data=bfer;
-                        if(getFrameNoAlloc(0,&img))
-                        {
-                        if(extractH263Info(bfer,sz,&w,&h))
-                        {
-                            printf("H263 Corrected size : %lu x %lu\n",w,h);
-                            _video_bih.biWidth=_mainaviheader.dwWidth=w ;
-                            _video_bih.biHeight=_mainaviheader.dwHeight=h;                               
-                        }
-                        else
-                        {
-                                  printf("H263 COULD NOT EXTRACT SIZE, using : %lu x %lu\n",
-                                      _video_bih.biWidth,  _video_bih.biHeight);
-                        }
-                        }
-                        delete [] bfer;
-                }
-            }
-        }
-        /*
-                Now build audio tracks
-        */
-        if(nbAudioTrack) _isaudiopresent=1; // Still needed ?
-        for(int audio=0;audio<nbAudioTrack;audio++)
-        {
-            _audioTracks[audio]=new MP4Audio(name,&(_tracks[1+audio]));   
-            
-        }
-        fseek(_fd,0,SEEK_SET);
-        printf("3gp/mov file successfully read..\n");
-        return 1;
-}
-
-//
-//	That tag are coded like this
-//	Each 8 bits is in fact a 7 Bits part while b7=1
-// 	So we concanate them while possible
-uint32_t MP4Header::readPackedLen(adm_atom *tom )
-{
-	uint32_t len=0;
-	uint8_t	 b=0;
-
-	do
-	{
-	b=tom->read();
-	len=len<<7;
-	len+=b&0x7f;
-	}while(b&0x80);
-	return len;
-}
-uint32_t              MP4Header::ptsDtsDelta(uint32_t frame)
-{
-   if(frame >= _videostream.dwLength) return 0;
-   return VDEO.index[frame].deltaPtsDts;
-}
-uint8_t MP4Header::getFrameSize (uint32_t frame, uint32_t * size){
-  if(frame >= _videostream.dwLength) return 0;
-  *size = VDEO.index[frame].size;
-  return 1;
-}
-  uint8_t   MP4Header::changeAudioStream(uint32_t newstream)
-{
-        if(newstream>nbAudioTrack) return 0;
-        _currentAudioTrack=newstream;
-        return 1;
-}
-uint32_t     MP4Header::getCurrentAudioStreamNumber(void) 
-{ 
-    return _currentAudioTrack;
-}
- uint8_t   MP4Header::getAudioStreamsInfo(uint32_t *nbStreams, audioInfo **infos)
-{
-        *nbStreams=nbAudioTrack;
-        if(nbAudioTrack)
-        {
-            *infos=new audioInfo[nbAudioTrack];
-            for(int i=0;i<nbAudioTrack;i++)
-            {
-                WAV2AudioInfo(&(_tracks[i+1]._rdWav),&((*infos)[i]));
-            }
-                
-             //   (*infos)[i]=_tracks[i+1]._rdWav.encoding;
-        }
-        return 1;
-}
-uint8_t                 MP4Header::isReordered( void )
-{ 
-        return _reordered;
-}
-/***************************************/
-uint8_t MP4Header::reorder( void )
-{
-
-        if( _reordered) return 1;
-        printf("Reordering...\n");
-#define INDEX_TMPL        MP4Index
-#define INDEX_ARRAY_TMPL  (VDEO.index)
-#define FRAMETYPE_TMPL    intra
-  
-#include "ADM_video/ADM_reorderTemplate.cpp"
-
-#undef INDEX_TMPL       
-#undef INDEX_ARRAY_TMPL 
-#undef FRAMETYPE_TMPL   
-        VDEO.nbIndex= _mainaviheader.dwTotalFrames;
-        // last frame cannot be B frame
-        index[last].intra&=~AVI_B_FRAME;
-          _reordered=ret;
-        return ret;
-
-}
-//EOF

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig Deleted

@@ -1,1298 +0,0 @@
-/***************************************************************************
-
-    copyright            : (C) 2007 by mean
-    email                : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-
-#include <math.h>
-
-#include "ADM_default.h"
-#include "ADM_Video.h"
-
-#include "fourcc.h"
-#include "ADM_mp4.h"
-#include "DIA_coreToolkit.h"
-#include "ADM_getbits.h"
-#include "ADM_coreUtils.h"
-#include "ADM_mp4Tree.h"
-#include "ADM_vidMisc.h"
-
-#if 1
-#define aprintf(...) {}
-#else
-#define aprintf printf
-#endif
-
-#define TRACK_OTHER 0
-#define TRACK_AUDIO 1
-#define TRACK_VIDEO 2
-
-// 14496-1 / 8.2.1
-typedef enum
-{
-	Tag_InitialObjDesc	=0x02,
-	Tag_ES_Desc		=0x03,
-	Tag_DecConfigDesc 	=0x04,
-	Tag_DecSpecificInfo 	=0x05
-}MP4_Tag;
-
-//extern char* ms2timedisplay(uint32_t ms);
-/**
-    \fn refineAudio
-    \brief update track descriptor with additional info. For example # of channels...
-*/
-bool MP4Header::refineAudio(WAVHeader *header,uint32_t extraLen,uint8_t *extraData)
-{
-const uint8_t aacChannels[8] = {0, 1, 2, 3, 4, 5, 6, 8};
-
-        if(header->encoding!=WAV_AAC) return true;
-        if(extraLen<2) return true;
-        ADM_info("Audio track is AAC, checking it...\n");
-        getBits bits(extraLen,extraData);
-        int objType=bits.get(5);
-        int fqIndex=bits.get(4);
-            if(fqIndex==15) 
-            {
-                    bits.get(12);
-                    bits.get(12);
-            }
-        int channels=bits.get(4);
-        if(channels>7)
-        {
-            ADM_warning("Channel index is too big..\n");
-            return false;
-        }
-        int nbChannels=aacChannels[channels];
-        if(header->channels!=nbChannels)
-        {
-            ADM_warning("Channel mismatch, mp4 says %d, AAC says %d, updating...\n",header->channels,nbChannels);
-            header->channels=nbChannels;
-        }
-        return true;
-        
-}
-/**
-      \fn    LookupMainAtoms
-      \brief Search main atoms to ease job for other part
-*/
-uint8_t     MP4Header::lookupMainAtoms(void *ztom)
-{
-
-  adm_atom *tom=(adm_atom *)ztom;
-  adm_atom *moov;
-  ADMAtoms id;
-  uint32_t container;
-  printf("Analyzing file and atoms\n");
-  if(!ADM_mp4SimpleSearchAtom(tom, ADM_MP4_MOOV,&moov))
-  {
-       ADM_warning("Cannot locate moov atom\n");
-       return 0;
-  }
-  ADM_assert(moov);
-  while(!moov->isDone())
-  {
-    adm_atom son(moov);
-    if(!ADM_mp4SearchAtomName(son.getFCC(), &id,&container))
-    {
-      aprintf("Found atom %s unknown\n",fourCC::tostringBE(son.getFCC()));
-    }
-    else
-    {
-      switch( id)
-      {
-        case ADM_MP4_MVHD: parseMvhd(&son);break;
-        case ADM_MP4_TRACK:
-            if(!parseTrack(&son))
-            {
-                printf("Parse Track failed\n");
-            } ;
-            break;
-        default :
-                aprintf("atom %s not handled\n",fourCC::tostringBE(son.getFCC()));
-                break;
-      }
-
-
-    }
-    son.skipAtom();
-  }
-  delete moov;
-  printf("Done finding main atoms\n");
-  return 1;
-}
-/**
-      \fn parseMvhd
-      \brief Parse mvhd header
-*/
-void MP4Header::parseMvhd(void *ztom)
-{
-	adm_atom *tom = (adm_atom*)ztom;
-	int version = tom->read();
-
-	tom->skipBytes(3);	// flags
-
-	if (version == 1)
-		tom->skipBytes(16);
-	else
-		tom->skipBytes(8);
-
-	int scale = tom->read32();
-	uint64_t duration = (version == 1) ? tom->read64() : tom->read32();
-
-	_videoScale = scale;
-
-	printf("Warning: scale is not in ms %"PRIu32"!\n", _videoScale);
-
-	if (_videoScale)
-	{
-		duration = 1000 * duration; // In ms
-		duration /= _videoScale;
-	}
-	else
-		_videoScale = 1000;
-
-	//printf("Movie duration: %s\n", ms2timedisplay(duration));
-
-	_movieDuration = duration;
-}
-
-/**
-      \fn parseMvhd
-      \brief Parse mvhd header
-*/
-uint8_t MP4Header::parseTrack(void *ztom)
-{
-  adm_atom *tom=(adm_atom *)ztom;
-  ADMAtoms id;
-  uint32_t container;
-  uint32_t w,h;
-  uint32_t trackType=TRACK_OTHER;
-
-  printf("Parsing Track\n");
-   while(!tom->isDone())
-  {
-     adm_atom son(tom);
-     if(!ADM_mp4SearchAtomName(son.getFCC(), &id,&container))
-     {
-       aprintf("Found atom %s unknown\n",fourCC::tostringBE(son.getFCC()));
-       son.skipAtom();
-       continue;
-     }
-     aprintf("\tProcessing atom %s \n",fourCC::tostringBE(son.getFCC()));
-     switch(id)
-     {
-       case ADM_MP4_TKHD:
-              {
-				  int version = son.read();
-
-				  son.skipBytes(3);
-
-				  if (version == 1)
-					  tom->skipBytes(16);
-				  else
-					  tom->skipBytes(8);
-
-				  aprintf("Track Id: %"PRIu32"\n", son.read32());
-				  son.skipBytes(4);
-
-				  uint64_t duration = (version == 1) ? son.read64() : son.read32();
-
-				  aprintf( "Duration: %"PRIu32" (ms)\n", (duration * 1000) / _videoScale);
-				  son.skipBytes(8);
-				  son.skipBytes(8);
-				  son.skipBytes(36);
-
-				  w = son.read32() >> 16;
-				  h = son.read32() >> 16;
-
-				  aprintf("tkhd: %ld %ld\n", w, h);
-				  break;
-              }
-        case ADM_MP4_MDIA:
-        {
-            parseMdia(&son,&trackType,w,h);
-            break;
-        }
-        case ADM_MP4_EDTS:
-        {
-            ADM_info("EDTS atom found\n");
-            parseEdts(&son);
-            break;
-        }
-       default:
-          ADM_info("Unprocessed atom :%s\n",fourCC::tostringBE(son.getFCC()));
-     }
-     son.skipAtom();
-  }
-  return 1;
-}
-/**
-      \fn parseMdia
-      \brief Parse mdia header
-*/
-uint8_t MP4Header::parseMdia(void *ztom,uint32_t *trackType,uint32_t w, uint32_t h)
-{
-  adm_atom *tom=(adm_atom *)ztom;
-  ADMAtoms id;
-  uint32_t container;
-  uint32_t trackScale=_videoScale;
-  uint64_t trackDuration;
-  *trackType=TRACK_OTHER;
-  uint8_t r=0;
-  printf("<<Parsing Mdia>>\n");
-  while(!tom->isDone())
-  {
-     adm_atom son(tom);
-     if(!ADM_mp4SearchAtomName(son.getFCC(), &id,&container))
-     {
-       aprintf("[MDIA]Found atom %s unknown\n",fourCC::tostringBE(son.getFCC()));
-       son.skipAtom();
-       continue;
-     }
-     switch(id)
-     {
-       case ADM_MP4_MDHD:
-       {
-		   int version = son.read();
-
-		   son.skipBytes(3); // flags
-
-		   if (version == 1)
-			   son.skipBytes(16);
-		   else
-			   son.skipBytes(8);
-
-		   trackScale = son.read32();
-
-		   aprintf( "MDHD, Trackscale in mdhd: %u\n", trackScale);
-
-		   if (!trackScale)
-			   trackScale = 600; // default
-
-		   uint64_t duration = (version == 1) ? son.read64() : son.read32();
-
-		   aprintf( "MDHD, duration in mdhd: %u (unscaled)\n", duration);
-		   duration = (duration * 1000.) / trackScale;
-		   aprintf( "MDHD, duration in mdhd: %u (scaled ms)\n", duration);
-		   trackDuration = duration;
-//		   printf("MDHD, Track duration: %s, trackScale: %u\n", ms2timedisplay((1000 * duration) / trackScale), trackScale);
-
-		   break;
-       }
-       case ADM_MP4_HDLR:
-       {
-            uint32_t type;
-
-                son.read32();
-                son.read32();
-                type=son.read32();
-                printf("[HDLR]\n");
-                switch(type)
-                {
-                default:
-                       *trackType=TRACK_OTHER;
-                       printf("Found other type track\n");
-                       break;
-                case MKFCCR('v','i','d','e')://'vide':
-                        *trackType=TRACK_VIDEO;
-                        printf("hdlr video found \n ");
-                        _movieDuration=trackDuration;
-                        _videoScale=trackScale;
-                        break;
-                case MKFCCR('s','o','u','n'): //'soun':
-                        *trackType=TRACK_AUDIO;
-                        printf("hdlr audio found \n ");
-                        break;
-                case MKFCCR('u','r','l',' ')://'url ':
-                    {
-                        int s;
-                        son.read32();
-                        son.read32();
-                        son.read32();
-                        s=son.read();
-                        char *str=new char[s+1];
-                        son.readPayload((uint8_t *)str,s);
-                        str[s]=0;
-                        printf("Url : <%s>\n",str);
-                        delete [] str;
-                      }
-                      break;
-
-                }
-                break;
-       }
-       case ADM_MP4_MINF:
-       {
-            // We are only interested in stbl
-
-            while(!son.isDone())
-            {
-              adm_atom grandson(&son);
-              if(!ADM_mp4SearchAtomName(grandson.getFCC(), &id,&container))
-              {
-                aprintf("[MINF]Found atom %s unknown\n",fourCC::tostringBE(son.getFCC()));
-                grandson.skipAtom();
-                continue;
-              }
-              if(id==ADM_MP4_STBL)
-              {
-                   if(! parseStbl(&grandson,*trackType, w, h,trackScale))
-                   {
-                      printf("STBL failed\n");
-                      return 0;
-                   }
-                   r=1;
-              }
-              grandson.skipAtom();
-        }
-       }
-       break;
-        default:
-            aprintf("** atom  NOT HANDLED [%s] \n",fourCC::tostringBE(son.getFCC()));
-     }
-
-     son.skipAtom();
-  }
-  return r;
-}
-
-/**
-        \fn parseEdts
-        \brief parse sample table. this is the most important function.
-*/
-uint8_t       MP4Header::parseEdts(void *ztom)
-{
-  adm_atom *tom=(adm_atom *)ztom;
-  ADMAtoms id;
-  uint32_t container;
-
-  ADM_info("Parsing Edts>>\n");
-  while(!tom->isDone())
-  {
-     adm_atom son(tom);
-     if(!ADM_mp4SearchAtomName(son.getFCC(), &id,&container))
-     {
-       aprintf("[EDTS]Found atom %s unknown\n",fourCC::tostringBE(son.getFCC()));
-       son.skipAtom();
-       continue;
-     }
-    switch(id)
-    {
-       case ADM_MP4_ELST:
-       {
-              ADM_info("ELST atom found\n");
-              son.skipBytes(4);
-              uint32_t nb=son.read32();
-              ADM_info("Found %"PRIu32" entries in list:\n",nb);
-              for(int i=0;i<nb;i++)
-                {
-                    uint32_t editDuration=son.read32();
-                    uint32_t mediaTime=son.read32();
-                    uint32_t playbackSpeed=son.read32();
-                    ADM_info("Duration : %"PRIu32", mediaTime:%"PRIu32" speed=%"PRIu32"\n",editDuration,mediaTime,playbackSpeed);
-                }
-              son.skipAtom();
-              break;
-        
-       }
-       break;
-        default:
-            aprintf("** atom  NOT HANDLED [%s] \n",fourCC::tostringBE(son.getFCC()));
-     }
-   }
-   
-   tom->skipAtom();
-   return true;
-}
-/**
-        \fn parseStbl
-        \brief parse sample table. this is the most important function.
-*/
-uint8_t       MP4Header::parseStbl(void *ztom,uint32_t trackType,uint32_t w,uint32_t h,uint32_t trackScale)
-{
-  adm_atom *tom=(adm_atom *)ztom;
-  ADMAtoms id;
-  uint32_t container;
-  MPsampleinfo  info;
-
-
-  memset(&info,0,sizeof(info));
-
-
-  printf("<<Parsing Stbl>>\n");
-  while(!tom->isDone())
-  {
-     adm_atom son(tom);
-     if(!ADM_mp4SearchAtomName(son.getFCC(), &id,&container))
-     {
-       aprintf("[STBL]Found atom %s unknown\n",fourCC::tostringBE(son.getFCC()));
-       son.skipAtom();
-       continue;
-     }
-     switch(id)
-     {
-       case ADM_MP4_STSS:  // Sync sample atom (i.e. keyframes)
-       {
-          son.read32();
-          info.nbSync=son.read32();
-          printf("Stss:%u\n",info.nbSync);
-          if(info.nbSync)
-          {
-                  info.Sync=new uint32_t[info.nbSync];
-                  for(int i=0;i<info.nbSync;i++)
-                  {
-                          info.Sync[i]=son.read32();
-                  }
-          }
-          break;
-
-       }
-       case ADM_MP4_STTS:
-            {
-                printf("stts:%"PRIu32"\n",son.read32()); // version & flags
-                info.nbStts=son.read32();
-                printf("Time stts atom found (%"PRIu32")\n",info.nbStts);
-                printf("Using myscale %"PRIu32"\n",trackScale);
-                info.SttsN=new uint32_t[info.nbStts];
-                info.SttsC=new uint32_t[info.nbStts];
-                //double dur;
-                for(int i=0;i<info.nbStts;i++)
-                {
-
-                        info.SttsN[i]=son.read32();
-                        info.SttsC[i]=son.read32();
-                        aprintf("stts: count:%u size:%u (unscaled)\n",info.SttsN[i],info.SttsC[i]);
-                        //dur*=1000.*1000.;; // us
-                        //dur/=myScale;
-                }
-            }
-            break;
-       case ADM_MP4_STSC:
-            {
-                son.read32();
-                info.nbSc=son.read32();
-                info.Sc=new uint32_t[info.nbSc];
-                info.Sn=new uint32_t[info.nbSc];
-                for(int j=0;j<info.nbSc;j++)
-                {
-
-                        info.Sc[j]=son.read32();
-                        info.Sn[j]=son.read32();
-                        son.read32();
-                        aprintf("\t sc  %d : sc start:%u sc count: %u\n",j,info.Sc[j],info.Sn[j]);
-                }
-
-            }
-            break;
-       case ADM_MP4_STSZ:
-          {
-            uint32_t n;
-              son.read32();
-              n=son.read32();
-              info.nbSz=son.read32();
-              info.SzIndentical=0;
-              printf("%"PRIu32" frames /%"PRIu32" nbsz..\n",n,info.nbSz);
-              if(n)
-                      {
-                            aprintf("\t\t%"PRIu32" frames of the same size %"PRIu32" , n=%"PRIu32"\n",
-                                info.nbSz,info.SzIndentical,n);
-                            info.SzIndentical=n;
-                            info.Sz=NULL;
-                      }
-              else
-              {
-                      info.Sz=new uint32_t[info.nbSz];
-                      for(int j=0;j<info.nbSz;j++)
-                      {
-                                      info.Sz[j]=son.read32();
-                      }
-              }
-          }
-          break;
-           case ADM_MP4_CTTS: // Composition time to sample
-            {
-                uint32_t n,i,j,k,v;
-
-                  printf("ctts:%"PRIu32"\n",son.read32()); // version & flags
-                  n=son.read32();
-                  if(n==1) // all the same , ignore
-                  {
-                    break;
-                  }
-                  aprintf("Found %d ctts elements\n",n);
-                uint32_t *values=new uint32_t [n];
-                uint32_t *count=new uint32_t [n];
-                for(i=0;i<n;i++)
-                {
-                    count[i]=son.read32();
-                    values[i]=son.read32();
-                }
-                uint32_t sum=0;
-                for(i=0;i<n;i++)
-                {
-                    sum+=count[i];
-                }
-                info.Ctts=new uint32_t[sum+1]; // keep a safe margin
-
-                for(i=0;i<n;i++)
-                {
-                    if(i<20)
-                    {
-                        aprintf("Ctts: nb: %u (%x) val:%u (%x)\n",count[i],count[i],values[i],values[i]);
-                    }
-                    for(k=0;k<count[i];k++)
-                    {
-                        info.Ctts[info.nbCtts++]=values[i];
-                    }
-                }
-                delete [] values;
-                delete [] count;
-                if(!info.nbCtts)
-                {
-                    delete [] info.Ctts;
-                    info.Ctts=NULL;
-                    printf("Destroying Ctts, seems invalid\n");
-                }
-                ADM_assert(info.nbCtts<sum+1);
-                printf("Found %u elements\n",info.nbCtts);
-            }
-            break;
-       case ADM_MP4_STCO:
-       {
-		   son.skipBytes(4);
-
-		   info.nbCo = son.read32();
-		   printf("\t\tnbCo: %u\n", info.nbCo);
-
-		   info.Co = new uint64_t[info.nbCo];
-
-		   for(int j = 0; j < info.nbCo; j++)
-		   {
-			   info.Co[j] = son.read32();
-			   aprintf( "Chunk offset: %u / %u : %"PRIu64"\n", j, info.nbCo - 1, info.Co[j]);
-		   }
-       }
-       break;
-       case ADM_MP4_STCO64:
-       {
-		   son.skipBytes(4);
-
-		   info.nbCo = son.read32();
-		   printf("\t\tnbCo: %u\n", info.nbCo);
-
-		   info.Co = new uint64_t[info.nbCo];
-
-		   for(int j = 0; j< info.nbCo; j++)
-		   {
-			   info.Co[j] = son.read64();
-			   aprintf( "Chunk offset: %u / %u : %"PRIu64"\n", j, info.nbCo - 1, info.Co[j]);
-		   }
-       }
-       break;
-       case ADM_MP4_STSD:
-       {
-                son.read32(); // flags & version
-                int nbEntries=son.read32();
-                int left;
-                aprintf("[STSD]Found %d entries\n",nbEntries);
-                for(int i=0;i<nbEntries;i++)
-                {
-                   int entrySize=son.read32();
-                   int entryName=son.read32();
-                   left=entrySize-8;
-                   if(i || (trackType==TRACK_VIDEO && _videoFound) || (trackType==TRACK_OTHER))
-                   {
-                    son.skipBytes(left);
-                    printf("[STSD] ignoring %s, size %u\n",fourCC::tostringBE(entryName),entrySize);
-                    if(trackType==TRACK_OTHER) printf("[STSD] because track=other\n");
-                    continue;
-                   }
-                   switch(trackType)
-                   {
-                     case TRACK_VIDEO:
-                     {
-                          uint32_t lw=0,lh=0;
-                                printf("[STSD] VIDEO %s, size %u\n",fourCC::tostringBE(entryName),entrySize);
-                                son.skipBytes(8);  // reserved etc..
-                                left-=8;
-                                son.read32(); // version/revision
-                                left-=4;
-                                printf("[STSD] vendor %s\n",fourCC::tostringBE(son.read32()));
-                                left-=4;
-
-                                son.skipBytes(8); // spatial qual etc..
-                                left-=8;
-
-                                printf("[STSD] width :%u\n",lw=son.read16());
-                                printf("[STSD] height :%u\n",lh=son.read16());
-                                left-=4;
-
-                                son.skipBytes(8); // Resolution
-                                left-=8;
-
-                                printf("[STSD] datasize :%u\n",son.read32());
-                                left-=4;
-
-                                printf("[STSD] FrameCount :%u\n",son.read16());
-                                left-=4;
-
-                                // Codec name
-                                uint32_t u32=son.read();
-                                if(u32>31) u32=31;
-                                printf("Codec string :%d <",u32);
-                                for(int i=0;i<u32;i++) printf("%c",son.read());
-                                printf(">\n");
-                                son.skipBytes(32-1-u32);
-                                left-=32;
-                                //
-                                if(left>=4)
-                                {
-                                    son.read32();
-                                    left-=4; //Depth & color Id
-                                }else left=0;
-                                //
-                                printf("LEFT:%d\n",left);
-
-                                if(left>8)
-                                {
-//                                  decodeVideoAtom(&son);
-                                }
-                                //
-#define commonPart(x)             _videostream.fccHandler=_video_bih.biCompression=fourCC::get((uint8_t *)#x);
-
-                                 _video_bih.biWidth=_mainaviheader.dwWidth=lw ;
-                                  _video_bih.biHeight=_mainaviheader.dwHeight=lh;
-                                  _video_bih.biCompression=_videostream.fccHandler;
-
-                                //
-                                switch(entryName)
-                                {
-                                  case MKFCCR('h','d','v','5'): // hdv5
-                                  {
-                                        commonPart(MPEG);
-                                        adm_atom hdv5(&son);
-                                        printf("Reading hdv5, got %s\n",fourCC::tostringBE(hdv5.getFCC()));
-                                          
-                                        left=0;
-                                  }
-                                    break;
-                                  case MKFCCR('m','j','p','b'):  //mjpegb
-                                  {
-                                        commonPart(MJPB);
-                                        left=0;
-                                  }
-                                  break;
-                                  case MKFCCR('S','V','Q','1'):  //mjpegb
-                                 {
-                                       commonPart(SVQ1);
-                                       left=0;
-                                 }
-                                  break;
-
-                                  case MKFCCR('m','j','p','a'):  //mjpegb
-                                 {
-                                       commonPart(MJPG);
-                                       left=0;
-                                 }
-                                  break;
-                                case MKFCCR('s','2','6','3'):  //s263 d263
-                                  {
-                                        commonPart(H263);
-                                         adm_atom d263(&son);
-                                         printf("Reading s253, got %s\n",fourCC::tostringBE(d263.getFCC()));
-                                          left=0;
-                                  }
-                                  break;
-                                   case MKFCCR('m','p','4','v'):  //mp4v
-                                  {
-                                        commonPart(DIVX);
-                                         adm_atom esds(&son);
-                                         printf("Reading esds, got %s\n",fourCC::tostringBE(esds.getFCC()));
-                                         if(esds.getFCC()==MKFCCR('e','s','d','s'))
-                                              decodeEsds(&esds,TRACK_VIDEO);
-                                          left=0;
-                                  }
-                                        break;
-                                  case MKFCCR('S','V','Q','3'):
-                                  {//'SVQ3':
-                                    // For SVQ3, the codec needs it to begin by SVQ3
-                                    // We go back by 4 bytes to get the 4CC
-                                            printf("SVQ3 atom found\n");
-                                            VDEO.extraDataSize=left+4;
-                                            VDEO.extraData=new uint8_t[ VDEO.extraDataSize ];
-                                            if(!son.readPayload(VDEO.extraData+4,VDEO.extraDataSize-4 ))
-                                            {
-                                              GUI_Error_HIG(QT_TRANSLATE_NOOP("mp4demuxer","Problem reading SVQ3 headers"), NULL);
-                                            }
-                                            VDEO.extraData[0]='S';
-                                            VDEO.extraData[1]='V';
-                                            VDEO.extraData[2]='Q';
-                                            VDEO.extraData[3]='3';
-                                            printf("SVQ3 Header size : %"PRIu32"",_videoExtraLen);
-                                            commonPart(SVQ3);
-                                            left=0;
-                                  }
-                                            break;
-                                  case MKFCCR('d','v','c',' ') : //'dvc ':
-                                  case MKFCCR('d','v','c','p'): //'dvcp':
-                                          commonPart(DVSD);
-                                          break;
-                                  case MKFCCR('c','v','i','d'): //'cvid'
-                                          commonPart(cvid);
-                                          break;
-                                  case MKFCCR('h','2','6','3'): //'dv':
-                                          commonPart(H263);
-                                          break;
-                                  case MKFCCR('M','J','P','G'): //'jpeg':
-                                  case MKFCCR('j','p','e','g'): //'jpeg':
-                                  case MKFCCR('A','V','D','J'): //'jpeg':
-                                          commonPart(MJPG);
-                                          break;
-                                  case MKFCCR('a','v','c','1'): // avc1
-                                          {
-                                          commonPart(H264);
-                                          // There is a avcC atom just after
-                                          // configuration data for h264
-nextAtom:
-                                          adm_atom avcc(&son);
-                                          printf("Reading avcC, got %s\n",fourCC::tostringBE(avcc.getFCC()));
-                                          switch(avcc.getFCC())
-                                          {
-                                              case MKFCCR('a','v','c','C'): break;
-                                              default:
-                                              case MKFCCR('c','o','l','r'):  // Color atom
-                                              case MKFCCR('p','a','s','p'):
-                                              case MKFCCR('c','l','a','p'):
-                                                  avcc.skipAtom();
-                                                  goto nextAtom;
-                                                  break;
-                                          }
-                                          int len,offset;
-                                          VDEO.extraDataSize=avcc.getRemainingSize();
-                                          VDEO.extraData=new uint8_t [VDEO.extraDataSize];
-                                          avcc.readPayload(VDEO.extraData,VDEO.extraDataSize);
-                                          printf("avcC size:%d\n",VDEO.extraDataSize);
-                                    // Dump some info
-                                        #define MKD8(x) VDEO.extraData[x]
-                                        #define MKD16(x) ((MKD8(x)<<8)+MKD8(x+1))
-                                        #define MKD32(x) ((MKD16(x)<<16)+MKD16(x+2))
-
-                                            printf("avcC Revision             :%x\n", MKD8(0));
-                                            printf("avcC AVCProfileIndication :%x\n", MKD8(1));
-                                            printf("avcC profile_compatibility:%x\n", MKD8(2));
-                                            printf("avcC AVCLevelIndication   :%x\n", MKD8(3));
-
-                                            printf("avcC lengthSizeMinusOne   :%x\n", MKD8(4));
-                                            printf("avcC NumSeq               :%x\n", MKD8(5));
-                                            len=MKD16(6);
-                                            printf("avcC sequenceParSetLen    :%x ",len );
-                                            offset=8;
-                                            mixDump(VDEO.extraData+offset,len);
-
-                                            offset=8+len;
-                                            printf("\navcC numOfPictureParSets  :%x\n", MKD8(offset++));
-                                            len=MKD16(offset);
-                                            offset++;
-                                            printf("avcC Pic len              :%x\n",len);
-                                            mixDump(VDEO.extraData+offset,len);
-                                            left=0;
-                                            }
-                                            break;
-                                  default:
-                                            if(left>10)
-                                            {
-                                                adm_atom avcc(&son);
-                                                printf("Reading , got %s\n",fourCC::tostringBE(avcc.getFCC()));
-                                                left=0;
-
-                                            }
-                                            break;
-                                } // Entry name
-                     }
-                     break;
-                     case TRACK_AUDIO:
-                     {
-                        uint32_t channels,bpp,encoding,fq,packSize;
-
-                                // Put some defaults
-                                ADIO.encoding=1234;
-                                ADIO.frequency=44100;
-                                ADIO.byterate=128000>>3;
-                                ADIO.channels=2;
-                                ADIO.bitspersample=16;
-
-                                printf("[STSD] AUDIO <%s>, 0x%08x, size %u\n",fourCC::tostringBE(entryName),entryName,entrySize);
-                                son.skipBytes(8);  // reserved etc..
-                                left-=8;
-
-                                int atomVersion=son.read16();  // version
-                                left-=2;
-                                printf("[STSD]Revision       :%d\n",atomVersion);
-                                son.skipBytes(2);  // revision
-                                left-=2;
-
-                                printf("[STSD]Vendor         : %s\n",fourCC::tostringBE(son.read32()));
-                                left-=4;
-
-                                ADIO.channels=channels=son.read16(); // Channel
-                                left-=2;
-                                printf("[STSD]Channels       :%d\n",ADIO.channels);
-                                ADIO.bitspersample=bpp=son.read16(); // version/revision
-                                left-=2;
-                                printf("[STSD]Bit per sample :%d\n",bpp);
-
-                                encoding=son.read16(); // version/revision
-                                left-=2;
-                                printf("[STSD]Encoding       :%d\n",encoding);
-
-                                packSize=son.read16(); // Packet Size
-                                left-=2;
-                                printf("[STSD]Packet size    :%d\n",encoding);
-
-
-                                fq=ADIO.frequency=son.read16();
-                                printf("[STSD]Fq:%u\n",fq);
-                                if(ADIO.frequency<6000) ADIO.frequency=48000;
-                                printf("[STSD]Fq       :%d\n",ADIO.frequency); // Bps
-                                        son.skipBytes(2); // Fixed point
-                                left-=4;
-                                printf("Bytes left : %d\n",left);
-                                info.samplePerPacket=1;
-                                info.bytePerPacket=1;
-                                info.bytePerFrame=1;
-
-                                switch(atomVersion)
-                                {
-                                        case 0:break;
-                                case 1 :
-                                        {                                    
-                                            info.samplePerPacket=son.read32();
-                                            info.bytePerPacket=son.read32();
-                                            info.bytePerFrame=son.read32();
-                                                #define ADM_NOT_NULL(x)          if(!info.x) info.x=1;
-                                            printf("[STSD] Sample per packet %u\n",info.samplePerPacket);
-                                            printf("[STSD] Bytes per packet  %u\n",info.bytePerPacket);
-                                            printf("[STSD] Bytes per frame   %u\n",info.bytePerFrame);
-                                            printf("[STSD] Bytes per sample   %u\n",son.read32());
-                                            ADM_NOT_NULL(samplePerPacket);  
-                                            ADM_NOT_NULL(bytePerPacket);
-                                            ADM_NOT_NULL(bytePerFrame);
-
-                                            left-=16;
-                                        }
-                                        break;
-                                case 2:
-                                        {
-                                          son.skipBytes(4);
-                                          son.skipBytes(4);son.skipBytes(4); // sample rate
-                                          int nbChan=son.read32();
-                                          printf("Channels = %d\n",nbChan);
-                                          son.skipBytes(4); // 0x7f000
-                                          son.skipBytes(4); // bits per coded channel
-                                          son.skipBytes(4); // lpcm flags
-                                          son.skipBytes(4); // byte per frame
-                                          son.skipBytes(4); // sample per frame
-                                          left-=4*8;
-                                        }
-                                          break;
-                                }
-                                printf("[STSD] chan:%u bpp:%u encoding:%u fq:%u (left %u)\n",channels,bpp,encoding,fq,left);
-#define audioCodec(x) ADIO.encoding=WAV_##x;
-                                switch(entryName)
-                                {
-                                    case MKFCCR('a','c','-','3'):
-                                    case MKFCCR('s','a','c','3'):
-                                            audioCodec(AC3);
-                                            ADIO.byterate=128000>>3;
-                                            break;
-
-                                    case MKFCCR('t','w','o','s'):
-                                            audioCodec(LPCM);
-                                            ADIO.byterate=ADIO.frequency*ADIO.bitspersample*ADIO.channels/8;
-                                            if(info.bytePerPacket<2)
-                                            {
-                                                info.bytePerPacket=2;
-                                                info.bytePerFrame=2*ADIO.channels;
-                                                
-                                                ADM_info("[MP4] Overriding bytePer packet with %d\n",info.bytePerPacket);
-                                            }
-                                            break;
-
-                                    case MKFCCR('u','l','a','w'):
-                                            audioCodec(ULAW);
-                                            ADIO.byterate=ADIO.frequency;
-                                            info.bytePerFrame=ADIO.channels;
-                                            break;
-                                    case MKFCCR('s','o','w','t'):
-                                            audioCodec(PCM);
-                                            ADIO.byterate=ADIO.frequency*ADIO.bitspersample*ADIO.channels/8;
-                                            if(info.bytePerPacket<2)
-                                            {
-                                                info.bytePerPacket=2;
-                                                info.bytePerFrame=2*ADIO.channels;
-                                                
-                                                ADM_info("[MP4] Overriding bytePer packet with %d\n",info.bytePerPacket);
-                                            }
-
-                                            break;
-                                    case MKFCCR('.','m','p','3'): //.mp3
-                                            audioCodec(MP3);
-                                            ADIO.byterate=128000>>3;
-                                            break;
-                                    case MKFCCR('r','a','w',' '):
-                                            audioCodec(8BITS_UNSIGNED);
-                                            ADIO.byterate=ADIO.frequency*ADIO.channels;
-                                            break;
-                                    case MKFCCR('s','a','m','r'):
-                                    {
-                                            audioCodec(AMRNB);
-                                            ADIO.frequency=8000;
-                                            ADIO.channels=1;
-                                            ADIO.bitspersample=16;
-                                            ADIO.byterate=12000/8;
-                                            if(left>10)
-                                            {
-                                               adm_atom amr(&son);
-                                              printf("Reading wave, got %s\n",fourCC::tostringBE(amr.getFCC()));
-                                              left=0;
-                                            }
-                                    }
-                                            break;
-                                    case MKFCCR('Q','D','M','2'):
-                                        {
-                                            int64_t sz;
-                                              audioCodec(QDM2);
-                                              sz=son.getRemainingSize();
-                                              _tracks[1+nbAudioTrack].extraDataSize=sz;
-                                              _tracks[1+nbAudioTrack].extraData=new uint8_t[sz];
-                                              son.readPayload(_tracks[1+nbAudioTrack].extraData,sz);
-                                              left=0;
-                                        }
-                                        break;
-                                    
-                                
-                                    case MKFCCR('m','s',0,0x55): // why 55 ???
-                                    case MKFCCR('m','s',0,0x11): // why 11 ???
-                                    case MKFCCR('m','p','4','a'):
-                                    {
-                                              if(entryName==MKFCCR('m','s',0,0x11))
-                                                        audioCodec(MSADPCM)
-                                                else
-                                                        audioCodec(AAC);
-                                            if(left>10)
-                                            {
-                                              while(!son.isDone())
-                                              {
-                                                adm_atom wave(&son);
-                                                printf("> got %s atom\n",fourCC::tostringBE(wave.getFCC()));
-                                                switch(wave.getFCC())
-                                                {
-                                                case MKFCCR('c','h','a','n'):
-                                                           printf("Found channel layout atom, skipping\n");
-                                                           break;
-                                                case MKFCCR('w','a','v','e'):
-                                                  {
-                                                     // mp4a
-                                                     //   wave
-                                                     //     frma
-                                                     //     mp4a
-                                                     //     esds
-                                                     while(!wave.isDone())
-                                                     {
-                                                         adm_atom item(&wave);
-                                                         printf("parsing wave, got %s,0x%x\n",fourCC::tostringBE(item.getFCC()),
-                                                                      item.getFCC());
-                                                         
-                                                         switch(item.getFCC())
-                                                         {
-                                                           case MKFCCR('f','r','m','a'):
-                                                              {
-                                                              uint32_t codecid=item.read32();
-                                                              printf("frma Codec Id :%s\n",fourCC::tostringBE(codecid));
-                                                              }
-                                                              break;
-                                                           case MKFCCR('m','s',0,0x55):
-                                                           case MKFCCR('m','s',0,0x11):
-                                                            {
-                                                              // We have a waveformat here
-                                                              printf("[STSD]Found MS audio header:\n");
-                                                              ADIO.encoding=ADM_swap16(item.read16());
-                                                              ADIO.channels=ADM_swap16(item.read16());
-                                                              ADIO.frequency=ADM_swap32(item.read32());
-                                                              ADIO.byterate=ADM_swap32(item.read32());
-                                                              ADIO.blockalign=ADM_swap16(item.read16());
-                                                              ADIO.bitspersample=ADM_swap16(item.read16());
-                                                              printWavHeader(&(ADIO));
-
-                                                            }
-                                                           break;
-                                                            case MKFCCR('m','p','4','a'):
-                                                              break;
-                                                            case MKFCCR('e','s','d','s'):
-                                                              {
-                                                                   decodeEsds(&item,TRACK_AUDIO);
-                                                                   break;
-                                                              }
-                                                              break;
-                                                           default:
-                                                             break;
-                                                         }
-
-                                                         item.skipAtom();
-
-                                                     }  // Wave iddone
-                                                     left=0;
-                                                     
-                                                  }  // if ==wave
-                                                  break;
-                                              case MKFCCR('e','s','d','s'):
-                                                          {
-                                                               decodeEsds(&wave,TRACK_AUDIO);
-                                                               break;
-                                                          }
-                                              default:
-                                                  printf("UNHANDLED ATOM : %s\n",fourCC::tostringBE(wave.getFCC()));
-                                                  break;
-                                              }
-                                              wave.skipAtom();
-                                             } // while
-                                            } // if left > 10
-                                            left=0;
-                                    }
-                                            break; // mp4a
-
-                                }
-                    // all audio part read for current track, if it is AAC and we have extrdata, check the channels...
-                      refineAudio(&(ADIO),_tracks[1+nbAudioTrack].extraDataSize,_tracks[1+nbAudioTrack].extraData);
-                     }
-                          break;
-                     default:
-                          ADM_assert(0);
-                   }
-                   son.skipBytes(left);
-                }
-       }
-              break;
-       default:
-          printf("[STBL]Skipping atom %s\n",fourCC::tostringBE(son.getFCC()));
-     }
-     son.skipAtom();
-  }
-  uint8_t r=0;
-  uint32_t nbo=0;
-  switch(trackType)
-  {
-    case TRACK_VIDEO:
-        {
-          if(_tracks[0].index)
-          {
-              printf("Already got a video track\n");
-              return 1;
-          }
-          r=indexify(&(_tracks[0]),trackScale,&info,0,&nbo);
-
-          _videostream.dwLength= _mainaviheader.dwTotalFrames=_tracks[0].nbIndex;
-          // update fps
-          float f=_videostream.dwLength;
-          if(_movieDuration) f=1000000.*f/_movieDuration;
-              else  f=25000;
-          _videostream.dwRate=(uint32_t)floor(f+0.49);
-           _mainaviheader.dwMicroSecPerFrame=ADM_UsecFromFps1000(_videostream.dwRate);
-          // if we have a sync atom ???
-          if(info.nbSync)
-          {
-            // Mark keyframes
-            for(int i=0;i<info.nbSync;i++)
-            {
-              uint32_t sync=info.Sync[i];
-              if(sync) sync--;
-              _tracks[0].index[sync].intra=AVI_KEY_FRAME;
-            }
-          }
-          else
-          { // All frames are kf
-            for(int i=0;i<_tracks[0].nbIndex;i++)
-            {
-              _tracks[0].index[i].intra=AVI_KEY_FRAME;
-            }
-          }
-          // Now do the CTTS thing
-          if(info.Ctts)
-          {
-            updateCtts(&info);
-          }else 
-          {
-                // No ctts, dts=pts
-                for(int i=0;i<_videostream.dwLength;i++)
-                {
-                     _tracks[0].index[i].pts= _tracks[0].index[i].dts;
-                }
-          }
-          VDEO.index[0].intra=AVI_KEY_FRAME;
-        }
-          break;
-    case TRACK_AUDIO:
-          printf("Cur audio track :%u\n",nbAudioTrack);
-#if 0
-          if(info.SzIndentical ==1 && (ADIO.encoding==WAV_LPCM || ADIO.encoding==WAV_PCM ))
-            {
-              printf("Overriding size %"PRIu32" -> %"PRIu32"\n", info.SzIndentical,info.SzIndentical*2*ADIO.channels);
-              info.SzIndentical=info.SzIndentical*2*ADIO.channels;
-            }
-
-
-            if(info.SzIndentical ==1 && (ADIO.encoding==WAV_ULAW ))
-            {
-              printf("Overriding size %"PRIu32" -> %"PRIu32"\n", info.SzIndentical,info.SzIndentical*ADIO.channels);
-              info.SzIndentical=info.SzIndentical*ADIO.channels;
-            }
-#endif
-            r=indexify(&(_tracks[1+nbAudioTrack]),trackScale,&info,1,&nbo);
-            printf("Indexed audio, nb blocks:%u\n",nbo);
-            if(r)
-            {
-                nbo=_tracks[1+nbAudioTrack].nbIndex;
-                if(nbo)
-                    _tracks[1+nbAudioTrack].nbIndex=nbo;
-                else
-                    _tracks[1+nbAudioTrack].nbIndex=info.nbSz;
-                printf("Indexed audio, nb blocks:%u (final)\n",_tracks[1+nbAudioTrack].nbIndex);
-                _tracks[1+nbAudioTrack].scale=trackScale;
-                nbAudioTrack++;
-            }
-
-            break;
-    case TRACK_OTHER:
-        r=1;
-        break;
-  }
-  return r;
-}
-/**
-      \fn decodeEsds
-      \brief Decode esds atom
-*/
-uint8_t MP4Header::decodeEsds(void *ztom,uint32_t trackType)
-{
-adm_atom *tom=(adm_atom *)ztom;
-int tag,l;
-            // in case of mpeg4 we only take
-            // the mpeg4 vol header
-            printf("[MP4]Esds atom found\n");
-
-            tom->skipBytes(4);
-            tag=0xff;
-            while(tag!=Tag_DecSpecificInfo && !tom->isDone())
-            {
-                    tag=tom->read();
-                    l=readPackedLen(tom);
-                    printf("\t Tag : %u Len : %u\n",tag,l);
-                    switch(tag)
-                    {
-                            case Tag_ES_Desc:
-                                    printf("\t ES_Desc\n");
-                                    tom->skipBytes(3);
-                                    break;
-                            case Tag_DecConfigDesc:
-                            {
-                                    uint8_t objectTypeIndication=tom->read();
-                                    printf("\tDecConfigDesc : Tag %u\n",objectTypeIndication);
-                                    if(trackType==TRACK_AUDIO && ADIO.encoding==WAV_AAC)
-                                    {
-                                      switch(objectTypeIndication)
-                                      {
-                                          case 0x69:
-                                          case 0x6b:
-                                          case 0x6d:
-											  ADIO.encoding=WAV_MP3;
-											  break;
-                                          case 226:ADIO.encoding=WAV_AC3;break;
-                                          break;
-
-                                      }
-                                    }
-                                    tom->skipBytes(1+3+4+4);
-                                    break;
-                            }
-                            case Tag_DecSpecificInfo:
-                                    printf("\t DecSpecicInfo\n");
-                                    switch(trackType)
-                                    {
-                                        case TRACK_VIDEO: // Video
-                                            if(!VDEO.extraDataSize)
-                                            {
-                                                    VDEO.extraDataSize=l;
-                                                    VDEO.extraData=new uint8_t[l];
-                                                    fread(VDEO.extraData,VDEO.extraDataSize,1,_fd);
-                                            }
-                                            break;
-                                        case TRACK_AUDIO:
-                                            printf("Esds for audio\n");
-                                            _tracks[1+nbAudioTrack].extraDataSize=l;
-                                            _tracks[1+nbAudioTrack].extraData=new uint8_t[l];
-                                            fread(_tracks[1+nbAudioTrack].extraData,
-                                            _tracks[1+nbAudioTrack].extraDataSize,1,_fd);
-                                            printf("\t %d bytes of extraData\n",(int)l);
-                                            break;
-                                        default: printf("Unknown track type for esds %d\n",trackType);
-                                    }
-                            }
-            }
-
-    tom->skipAtom();
-    return 1;
-}
-/**
-    \fn updateCtts
-    \brief compute deltaPtsDts from ctts, needed to create valid mp4 when copying
-*/
-uint8_t MP4Header::updateCtts(MPsampleinfo *info )
-{
-    uint32_t scope=info->nbCtts;
-    float f;
-    if(scope>_videostream.dwLength) scope=_videostream.dwLength;
-    ADM_info("[MP4]**************** Updating CTTS **********************\n");
-    for(int i=0;i<scope;i++)
-    {
-        f=(int32_t)info->Ctts[i];
-        f/=_videoScale;
-        f*=1000000; // us
-        f+=_tracks[0].index[i].dts;
-        _tracks[0].index[i].pts=(uint64_t)f;
-        aprintf(" Frame :%d DTS=%s",i,ADM_us2plain(_tracks[0].index[i].dts));
-        aprintf(" PTS=%s\n",ADM_us2plain(_tracks[0].index[i].pts));
-    }
-
-  return 1;
-}
-//***********************************
-MPsampleinfo::MPsampleinfo(void)
-{
-  memset(this,0,sizeof( MPsampleinfo));
-}
-MPsampleinfo::~MPsampleinfo()
-{
-#define MPCLEAR(x) {if(x) delete [] x;x=NULL;}
-      MPCLEAR (Co);
-      MPCLEAR (Sz);
-      MPCLEAR (Sc);
-      MPCLEAR (Sn);
-      MPCLEAR (SttsN);
-      MPCLEAR (SttsC);
-      MPCLEAR (Sync);
-      MPCLEAR (Ctts);
-}
-
-// EOF
-
-

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig Deleted

@@ -1,361 +0,0 @@
-/***************************************************************************
-/*
-    
-    copyright            : (C) 2007 by mean
-    email                : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-#include "ADM_assert.h"
-#include "ADM_default.h"
-#include "ADM_editor/ADM_Video.h"
-
-#include "fourcc.h"
-#include "ADM_mp4.h"
-#include "DIA_coreToolkit.h"
-
-#include "ADM_osSupport/ADM_debugID.h"
-#define MODULE_NAME MODULE_3GP
-#include "ADM_osSupport/ADM_debug.h"
-
-uint32_t sample2byte(WAVHeader *hdr,uint32_t sample);
-
-#define MAX_CHUNK_SIZE (4*1024)
-/**
-        \fn indexify
-        \brief build the index from the stxx atoms
-*/
-uint8_t	MP4Header::indexify(
-                          MP4Track *track,   
-                          uint32_t trackScale,
-                         MPsampleinfo *info,
-                         uint32_t isAudio,
-                         uint32_t *outNbChunk)
-
-{
-
-uint32_t i,j,cur;
-
-        printf("Build Track index\n");
-	*outNbChunk=0;
-	aprintf("+_+_+_+_+_+\n");
-	aprintf("co : %lu sz: %lu sc: %lu co[0]%lu \n",info->nbCo,info->nbSz,info->nbSc,info->Co[0]);
-	aprintf("+_+_+_+_+_+\n");
-
-	ADM_assert(info->Sc);
-	ADM_assert(info->Sn);
-	ADM_assert(info->Co);
-	if(!info->SzIndentical)
-        {
-          ADM_assert(info->Sz);
-        }
-        //*********************************************************
-	// in that case they are all the same size, i.e.audio
-        //*********************************************************
-	if(info->SzIndentical && isAudio)// in that case they are all the same size, i.e.audio
-	{
-          
-          
-          uint32_t totalBytes=info->SzIndentical*info->nbSz;
-          printf("All the same size : %u (total size %u bytes)\n",info->SzIndentical,totalBytes);
-              //
-              // Each chunk contains N samples=N bytes
-              int samplePerChunk[info->nbCo];
-              memset(samplePerChunk,0,info->nbCo*sizeof(int));
-              int total=0;
-              for( i=0;i<info->nbSc;i++)
-              {
-
-                  for(int j=info->Sc[i]-1;j<info->nbCo;j++)
-                  {
-                    uint32_t mx;
-                        adm_printf(ADM_PRINT_VERY_VERBOSE,"For chunk %lu , %lu samples\n",j,info->Sn[i]);
-                        samplePerChunk[j]=info->Sn[i];
-                  }
-              }
-              /**/
-              for(i=0;i<info->nbCo;i++)
-                total+=samplePerChunk[i];
-              
-              printf("Total size in sample : %u\n",total);
-              printf("Sample size          : %u\n",info->SzIndentical);
-              track->index=new MP4Index[info->nbCo];
-              memset(track->index,0,info->nbCo*sizeof(MP4Index));
-              track->nbIndex=info->nbCo;;
-              int max=0;
-              totalBytes=0;
-              if(info->SzIndentical!=1)
-              {
-                 for(i=0;i<info->nbCo;i++)
-                    {
-                        uint32_t sz;
-                        track->index[i].offset=info->Co[i];
-                        sz=samplePerChunk[i];
-                        /* Sz is in sample, convert it to bytes */
-                        sz=sz*info->SzIndentical;
-                        /* */
-                        track->index[i].size=sz;
-                        track->index[i].time=0; // No seek
-                        if(sz>MAX_CHUNK_SIZE)
-                        {
-                            max+=sz/MAX_CHUNK_SIZE;
-                        }
-                        
-                        totalBytes+=track->index[i].size;
-                    }
-              }
-              else
-              {
-                    for(i=0;i<info->nbCo;i++)
-                    {
-                        uint32_t sz;
-      #define PACK_SIZE info->bytePerFrame // perPacket ??
-                        
-                        track->index[i].offset=info->Co[i];
-                        sz=samplePerChunk[i];
-                        /* Sz is in sample, convert it to bytes */
-                        sz/=info->samplePerPacket;
-                        if(sz*info->samplePerPacket!=samplePerChunk[i])
-                        {
-                          printf("Warning sample per packet not divider of sample per chunk (per packet :%u , chunk :%u)\n",
-                                    info->samplePerPacket, samplePerChunk[i]); 
-                        }
-                        sz*=PACK_SIZE;
-                        /* */
-                        track->index[i].size=sz;
-                        track->index[i].time=0; // No seek
-                        if(sz>MAX_CHUNK_SIZE)
-                        {
-                            max+=sz/MAX_CHUNK_SIZE;
-                        }
-                        
-                        totalBytes+=track->index[i].size;
-                    }
-              }
-              printf("Found %u bytes\n",totalBytes);
-              // Now time to update the time...
-              // Normally they have all the same duration
-              if(info->nbStts!=1) printf("WARNING: Same size, different duration\n");
-
-              float sampleDuration,totalDuration=0;
-              
-                sampleDuration=info->SttsC[0];
-                sampleDuration*=1000.*1000.;
-                sampleDuration/=trackScale;    // Duration of one sample
-                for(i=0;i<info->nbCo;i++)
-                {
-                        track->index[i].time=(uint64_t)floor(totalDuration);
-                        totalDuration+=sampleDuration*samplePerChunk[i];
-                        adm_printf(ADM_PRINT_VERY_VERBOSE,"Audio chunk : %lu time :%lu\n",i,track->index[i].time);
-                }
-                if(max && isAudio) // We have some big chunks we need to split them
-                {
-                      // rebuild a new index
-                      printf("We have %u chunks but it should be split into \n",info->nbCo);
-                      printf("around %u chunks. adjusting..(SzIdentical %u)\n",info->nbCo+max,info->SzIndentical);
-                      uint32_t newNbCo=track->nbIndex+max*2; // *2 is enough, should be.
-                      uint32_t w=0;
-                      uint32_t one_go;
-
-                        one_go=MAX_CHUNK_SIZE/info->SzIndentical;
-                        one_go=one_go*info->SzIndentical;
-                        printf("One go :%u\n",one_go);
-                     MP4Index *newindex=new MP4Index[newNbCo];
-
-                    int64_t time_increment=(int64_t)((one_go/info->SzIndentical)*sampleDuration);  // Nb sample*duration of one sample
-                    for(i=0;i<track->nbIndex;i++)
-                    {
-                      uint32_t sz;
-                          sz=track->index[i].size;
-                          if(sz<MAX_CHUNK_SIZE)
-                          {
-                              memcpy(&(newindex[w]),&(track->index[i]),sizeof(MP4Index));
-                              w++;
-                              continue;
-                          }
-                          // We have to split it...
-                          int part=0;
-                          while(sz>one_go)
-                          {
-                                newindex[w].offset=track->index[i].offset+part*one_go;
-                                newindex[w].size=one_go;
-                                newindex[w].time=track->index[i].time+part*time_increment; 
-                                ADM_assert(w<newNbCo);
-                                w++;
-                                part++;
-                                sz-=one_go;
-                          }
-                          // The last one...
-                                newindex[w].offset=track->index[i].offset+part*one_go;
-                                newindex[w].size=sz;
-                                newindex[w].time=track->index[i].time+part*time_increment+((time_increment*sz)/one_go); 
-                                w++;
-                    }
-                    delete [] track->index;
-                    track->index=newindex;
-                    track->nbIndex=w;
-                    total=0;
-                    for(int i=0;i<track->nbIndex;i++)
-                        total+=track->index[i].size;
-                    printf("After split, we have %u bytes\n",total);
-                }
-          printf("Index done\n");
-          return 1;
-      }
-          // Else we build an index per sample
-          //
-	
-		
-	// We have different packet size
-	// Probably video
-        track->index=new MP4Index[info->nbSz];
-        memset(track->index,0,info->nbSz*sizeof(MP4Index));
-
-        if(info->SzIndentical) // Video, all same size (DV ?)
-        {
-            adm_printf(ADM_PRINT_VERY_VERBOSE,"\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;
-                    
-            }
-          }
-          else // Different size
-          {
-            for(i=0;i<info->nbSz;i++)
-            {
-                    track->index[i].size=info->Sz[i];
-                    adm_printf(ADM_PRINT_VERY_VERBOSE,"\t size : %d : %u\n",i,info->Sz[i]);
-            }
-          }
-	// if no sample to chunk we map directly
-	// first build the # of sample per chunk table
-        uint32_t totalchunk=0,max=0;
-
-        // Search the maximum
-        for(i=0;i<info->nbSc-1;i++)
-        {
-                totalchunk+=(info->Sc[i+1]-info->Sc[i])*info->Sn[i];
-        }
-        totalchunk+=(info->nbCo-info->Sc[info->nbSc-1]+1)*info->Sn[info->nbSc-1];
-
-        adm_printf(ADM_PRINT_VERY_VERBOSE,"#of chunk %d max per chunk %d Max # of sample %d\n",info->nbCo,max,totalchunk);
-
-        uint32_t chunkCount[totalchunk+1];
-	for(i=0;i<info->nbSc;i++)
-	{
-		for(j=info->Sc[i]-1;j<info->nbCo;j++)
-		{
-			chunkCount[j]=info->Sn[i];
-                        ADM_assert(j<=totalchunk);
-		}
-		adm_printf(ADM_PRINT_VERY_VERBOSE,"(%d) sc: %lu sn:%lu\n",i,info->Sc[i],info->Sn[i]);
-	}
-/*			for(j=0;j<nbSc;j++)
-			{
-				aprintf("\n count number : %d - %lu\n",j,Sn[j]);
-			}*/
-	// now we have for each chunk the number of sample in it
-	cur=0;
-	for(j=0;j<info->nbCo;j++)
-	{
-		int tail=0;
-		adm_printf(ADM_PRINT_VERY_VERBOSE,"--starting at %lu , %lu to go\n",info->Co[j],chunkCount[j]);
-		for(uint32_t k=0;k<chunkCount[j];k++)
-		{
-                        track->index[cur].offset=info->Co[j]+tail;
-                        tail+=track->index[cur].size;
-                        adm_printf(ADM_PRINT_VERY_VERBOSE," sample : %d offset : %lu\n",cur,track->index[cur].offset);
-			adm_printf(ADM_PRINT_VERY_VERBOSE,"Tail : %lu\n",tail);
-			cur++;
-		}
-
-
-	}
-        
-        
-        track->nbIndex=cur;;
-	
-	
-	// Now deal with duration
-	// the unit is us FIXME, probably said in header
-	// we put each sample duration in the time entry
-	// then sum them up to get the absolute time position
-
-        uint32_t nbChunk=track->nbIndex;
-	if(info->nbStts)		//uint32_t nbStts,	uint32_t *SttsN,uint32_t SttsC,
-	{
-		uint32_t start=0;
-		if(info->nbStts>1)
-		{
-			for(uint32_t i=0;i<info->nbStts;i++)
-			{
-				for(uint32_t j=0;j<info->SttsN[i];j++)
-				{
-                                        track->index[start].time=(uint64_t)info->SttsC[i];
-					start++;
-					ADM_assert(start<=nbChunk);
-				}	
-			}
-		}
-		else
-		{
-			// All same duration
-			for(uint32_t i=0;i<nbChunk;i++)
-                                track->index[i].time=(uint64_t)info->SttsC[0]; // this is not an error!
-		
-		}
-		// now collapse
-		uint64_t total=0;
-		float    ftot;
-		uint32_t thisone;
-		
-		for(uint32_t i=0;i<nbChunk;i++)
-		{
-                        thisone=track->index[i].time;
-			ftot=total;
-			ftot*=1000.*1000.;
-			ftot/=trackScale;
-                        track->index[i].time=(uint64_t)floor(ftot);
-			total+=thisone;
-                        adm_printf(ADM_PRINT_VERY_VERBOSE,"Audio chunk : %lu time :%lu\n",i,track->index[i].time);
-		}
-		// Time is now built, it is in us
-	
-	
-	}
-	else // there is not ssts
-	{
-          GUI_Error_HIG(QT_TRANSLATE_NOOP("mp4demuxer","No stts table"), NULL);
-		ADM_assert(0);	
-	}
-        printf("Index done\n");
-	return 1;
-}
-/**
-      \fn sample2byte
-      \brief Convert the # of samples into the # of bytes needed
-*/
-uint32_t sample2byte(WAVHeader *hdr,uint32_t sample)
-{
-  float f;
-        f=hdr->frequency; // 1 sec worth of data
-        f=sample/f;       // in seconds
-        f*=hdr->byterate; // in byte
-    return (uint32_t)floor(f);
-}
-// EOF

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4audio.cpp.orig Deleted

@@ -1,227 +0,0 @@
-/***************************************************************************
-                          ADM_3gpAudio.cpp  -  description
-                             -------------------
-
-	Provide access to the audio track embedded in 3gp file
-	It can be either AMR NB/WB/ AAC
-	The most common being AMR NB
-
- ***************************************************************************
-
-    begin                : Tue Jul 23 2003
-    copyright            : (C) 2002/2005 by mean
-    email                : fixounet@free.fr
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-#include "ADM_default.h"
-#include "ADM_editor/ADM_Video.h"
-#include "fourcc.h"
-#include "ADM_mp4.h"
-//_______________________________________________________
-//
-//
-//_______________________________________________________
-
-// MP4Audio::MP4Audio(_3gpIndex *idx, uint32_t nbchunk, FILE * fd,WAVHeader *incoming,uint32_t extraLen,uint8_t *extraData,uint32_t duration)
-MP4Audio::MP4Audio(const char *name,MP4Track *track)
-{
-	_nb_chunks=track->nbIndex;
-	_fd=fopen(name,"rb");
-        ADM_assert(_fd);
-	_current_index=0;
-	_abs_position=0;
-	_rel_position=0;
-	_pos=0;
-	_index=track->index;
-
-	_extraLen=track->extraDataSize;
-	_extraData=track->extraData;
-	
-	_wavheader=new WAVHeader;
-        memcpy(_wavheader,&(track->_rdWav),sizeof(WAVHeader));
-	
-
-	_destroyable=1;	
-	strcpy(_name,"3gp audio");	
-	// compute length
-	_length=0;
-	for(uint32_t i=0;i<_nb_chunks;i++)
-		{
-			_length+=track->index[i].size;
-		}
-	printf("\n [MP4 audio] : %lu bytes (%lu chunks)\n",_length,_nb_chunks);
-
-	printf("Byterate     :%d\n",_wavheader->byterate);
-	printf("Frequency :%d\n",_wavheader->frequency);
-	printf("Encoding   :%d\n",_wavheader->encoding);
-	printf("Channels   :%d\n",_wavheader->channels);
-	printf("Extra data :%lu\n",_extraLen);
-        if(_nb_chunks)
-            _audioDuration=_index[_nb_chunks-1].time;
-       // _wavheader->frequency=48000;
-    	goToTime(0);
-}
- uint8_t	MP4Audio::goToTime(uint32_t mstime)
-{
-uint64_t target=mstime;
-		target*=1000; // us
-		if(target>_index[_nb_chunks-1].time)
-		{
-			printf("3GP: going out of time asked %lu : avail %lu\n",mstime,_index[_nb_chunks-1].time/1000);
-			_current_index=_nb_chunks-1;
-			return 1;
-		}
-		for(uint32_t i=0;i<_nb_chunks;i++)
-		{
-			if(_index[i].time >= target)
-			{
-				_current_index=i;
-				printf("3gp Go to time succeeded chunk :%lu time ask:%lu time get:%lu\n",i,mstime,
-						_index[i].time/1000);
-				return 1;
-			}
-		
-		}
-		printf("3GP: gototime Failed\n");
-		return 0;
-}
-//_______________________________________________________
-//
-//
-//_______________________________________________________
-uint8_t MP4Audio::goTo(uint32_t newoffset)
-{
-   ADM_assert(0);
-    return 1;
-}
-//______________________________________
-uint8_t MP4Audio::getPacket(uint8_t *dest, uint32_t *len, uint32_t *samples)
-{
-
-uint32_t r=0;
-double delta;
-	if(_current_index>=_nb_chunks)  
-        {
-              printf("MP4Audio : index max :%u/%u\n",_current_index,_nb_chunks);
-              return 0;
-        }
-	  fseeko(_fd,_index[_current_index].offset,SEEK_SET);
-	  r=fread(dest,1,_index[_current_index].size,_fd);
-          if(!r)
-          {
-            printf("[MP4 Audio] Cannot read \n"); 
-          }
-          else
-          {
-            
-          }
-	  if(_current_index==_nb_chunks-1)
-	  {
-	  	
-                // Assume the last sample is the same size as the previous one
-	  	//*samples=1024;
-                delta=_index[_nb_chunks-1].time;
-                
-                if(_audioDuration>delta)
-                {
-                        delta=_audioDuration-delta;
-                        delta/=1000;
-                        // delta is the duration of the current chunk in us
-                        delta*=_wavheader->frequency;
-                        delta/=1000.; // mss -> second
-                        *samples=(uint32_t)floor(delta);
-                }else *samples=1024;
-                printf("[MP4Audio]: Last sample %d current chunk %d nb chunk %d\n",
-                                *samples,_current_index,_nb_chunks);
-                
-	  }
-	  else
-	  {
-	  	
-		delta=_index[_current_index+1].time-_index[_current_index].time;
-		
-		// delta is the duration of the current chunk in us
-		delta*=_wavheader->frequency;
-		delta/=1000.*1000.; // us -> second
-		*samples=(uint32_t)floor(delta);
-	     
-	  }
-#if 0
-          printf("[MP4Audio]Read %u bytes\n", r);
-            printf("MP4Audio : index  :%u/%u sample : %u\n",_current_index,_nb_chunks,*samples);
-#endif
-	  _current_index++;
-	  *len=r;
-	  
-	  
-	  return 1;
-}
-//_______________________________________________________
-//
-//
-//_______________________________________________________
-
-uint8_t	MP4Audio::extraData(uint32_t *l,uint8_t **d)
-{
-	if(_extraLen && _extraData)
-	{
-		*l=_extraLen;
-		*d=_extraData;
-		return 1;
-	
-	}
-	*l=0;
-	*d=NULL;
-	return 0;
-}
-
-//_______________________________________________________
-//
-//
-//_______________________________________________________
-uint32_t MP4Audio::read(uint32_t len,uint8_t *buffer)
-{
-    uint32_t size,samples;
-    if(!getPacket(buffer,&size,&samples)) return 0;
-    return size;
-    
-
-}
-//_______________________________________________________
-//
-//
-//_______________________________________________________
-
-
-MP4Audio::~MP4Audio()
-{
-	// nothing special to do...
-	delete _wavheader;
-	_wavheader=NULL;
-        if(_fd)
-        {
-            fclose(_fd);
-            _fd=NULL;
-        }
-}
-//_______________________________________________________
-uint8_t MP4Audio::getNbChunk(uint32_t *ch)
-{
-	*ch=_nb_chunks;
-	return 1;
-}

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoEncoder/libva Deleted

avidemux_2.6.20.tar.gz/cmake/CMakeASM_YASMInformation.cmake Deleted

@@ -1,65 +0,0 @@
-# Borrowed from x265
-set(ASM_DIALECT "_YASM")
-set(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS asm)
-
-if(ADM_CPU_X86_64)
-    list(APPEND ASM_FLAGS -DARCH_X86_64=1)
-    if(ENABLE_PIC)
-        list(APPEND ASM_FLAGS -DPIC)
-    endif()
-    if(APPLE)
-        set(ARGS -f macho64 -m amd64 -DPREFIX)
-    elseif(UNIX AND NOT CYGWIN)
-        set(ARGS -f elf64 -m amd64)
-    else()
-        set(ARGS -f win64 -m amd64)
-    endif()
-else()
-    list(APPEND ASM_FLAGS -DARCH_X86_64=0)
-    if(APPLE)
-        set(ARGS -f macho -DPREFIX)
-    elseif(UNIX AND NOT CYGWIN)
-        set(ARGS -f elf32)
-    else()
-        set(ARGS -f win32 -DPREFIX)
-    endif()
-endif()
-
-if(GCC)
-    list(APPEND ASM_FLAGS -DHAVE_ALIGNED_STACK=1)
-else()
-    list(APPEND ASM_FLAGS -DHAVE_ALIGNED_STACK=0)
-endif()
-
-if(HIGH_BIT_DEPTH)
-    list(APPEND ASM_FLAGS -DHIGH_BIT_DEPTH=1 -DBIT_DEPTH=10)
-else()
-    list(APPEND ASM_FLAGS -DHIGH_BIT_DEPTH=0 -DBIT_DEPTH=8)
-endif()
-
-list(APPEND ASM_FLAGS "${CMAKE_ASM_YASM_FLAGS}")
-
-if(CMAKE_BUILD_TYPE MATCHES Release)
-    list(APPEND ASM_FLAGS "${CMAKE_ASM_YASM_FLAGS_RELEASE}")
-elseif(CMAKE_BUILD_TYPE MATCHES Debug)
-    list(APPEND ASM_FLAGS "${CMAKE_ASM_YASM_FLAGS_DEBUG}")
-elseif(CMAKE_BUILD_TYPE MATCHES MinSizeRel)
-    list(APPEND ASM_FLAGS "${CMAKE_ASM_YASM_FLAGS_MINSIZEREL}")
-elseif(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
-    list(APPEND ASM_FLAGS "${CMAKE_ASM_YASM_FLAGS_RELWITHDEBINFO}")
-endif()
-
-set(YASM_FLAGS ${ARGS} ${ASM_FLAGS} PARENT_SCOPE)
-string(REPLACE ";" " " CMAKE_ASM_YASM_COMPILER_ARG1 "${ARGS}")
-
-# This section exists to override the one in CMakeASMInformation.cmake
-# (the default Information file). This removes the <FLAGS>
-# thing so that your C compiler flags that have been set via
-# set_target_properties don't get passed to yasm and confuse it.
-if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT)
-    string(REPLACE ";" " " STR_ASM_FLAGS "${ASM_FLAGS}")
-    set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> ${STR_ASM_FLAGS} -o <OBJECT> <SOURCE>")
-endif()
-
-include(CMakeASMInformation)
-set(ASM_DIALECT)

avidemux_2.6.20.tar.gz/cmake/CMakeDetermineASM_YASMCompiler.cmake Deleted

avidemux_2.6.20.tar.gz/cmake/CMakeTestASM_YASMCompiler.cmake Deleted

avidemux_2.6.20.tar.gz/cmake/osx/Info.plist Deleted

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleDisplayName</key>
-	<string>Avidemux2.6.app</string>
-	<key>CFBundleExecutable</key>
-	<string>Avidemux2.6.app</string>
-	<key>CFBundleGetInfoString</key>
-	<string>Avidemux 2.6 Copyright 2001-2015 Mean</string>
-	<key>CFBundleIconFile</key>
-	<string>appIcon.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>Avidemux.org</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Avidemux2.6.app</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>Avidemux 2.6.xx</string>
-	<key>CFBundleSignature</key>
-	<string>Avid</string>
-	<key>LSEnvironment</key>
-	<dict/>
-	<key>LSHasLocalizedDisplayName</key>
-	<false/>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.5</string>
-	<key>LSUIElement</key>
-	<false/>
-	<key>NSAppleScriptEnabled</key>
-	<false/>
-	<key>NSHumanReadableCopyright</key>
-	<string>Avidemux 2.6.x Copyright 2001-2015 Mean</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-</dict>
-</plist>

avidemux_2.6.20.tar.gz/README -> avidemux_2.7.0.tar.gz/README Changed

avidemux_2.7.0.tar.gz/attic Added

avidemux_2.7.0.tar.gz/attic/bootStrapCrossMac106.sh Changed

avidemux_2.7.0.tar.gz/attic/bootStrapCrossMingw_w32Qt5.sh Changed

avidemux_2.7.0.tar.gz/attic/bootStrapCrossMingw_w32Qt5_clang.sh Changed

avidemux_2.7.0.tar.gz/attic/bootStrapCrossMingw_w32Qt5_mxe.sh Changed

avidemux_2.7.0.tar.gz/attic/bootStrapCrossMingw_w64Qt5.sh Changed

avidemux_2.7.0.tar.gz/attic/bootStrapOsx.bash Changed

avidemux_2.7.0.tar.gz/attic/bootStrapOsx_EC.bash Changed

avidemux_2.7.0.tar.gz/attic/bootStrapOsx_SL.bash Changed

avidemux_2.7.0.tar.gz/attic/bootStrapOsx_qt5.bash Changed

avidemux_2.6.20.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_dialog/alert_none.cpp -> avidemux_2.7.0.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_dialog/alert_none.cpp Changed

avidemux_2.6.20.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_gui2/gui_none.cpp -> avidemux_2.7.0.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_gui2/gui_none.cpp Changed

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

avidemux_2.6.20.tar.gz/avidemux/common/ADM_audioFilter/src/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_audioFilter/src/CMakeLists.txt Changed

avidemux_2.6.20.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_dolby.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_dolby.cpp Changed

@@ -22,6 +22,13 @@
 
 #include "audiofilter_dolby.h"
 #include "audiofilter_dolby_table.h"
+#include <math.h>
+
+#if defined( ADM_CPU_X86)
+extern "C"     void adm_dolby_asm_sse2(float *src1,float *src2,float *sum, int count);
+void           testDolbyAsm();
+#endif
+
 
 bool ADMDolbyContext::skip=false;
 
@@ -138,11 +145,7 @@
    float *src2=coef;          // that one is always aligned to a 16 bytes boundary
     int mod16=(1+NZEROS)>>2;
     int left=(1+NZEROS)&3;
-#ifdef _MSC_VER
-    float sum16[4]={0,0,0,0}; // VS2015
-#else
-	static float __attribute__((__aligned__(16))) sum16[4] = { 0,0,0,0 };
-#endif
+    static float ASM_ALIGNED(16) sum16[4] = { 0,0,0,0 };
     float sum = 0;
     for(int i=0;i<mod16;i++)
     {
@@ -172,25 +175,11 @@
      float *src2=coef;          // that one is always aligned to a 16 bytes boundary
     int mod16=(1+NZEROS)>>2;
     int left=(1+NZEROS)&3;
-    static float __attribute__ ((__aligned__ (16))) sum16[4];
+    static float ASM_ALIGNED(16)  sum16[4];
     
+    adm_dolby_asm_sse2(src1,src2,sum16,mod16);    
     float sum = 0;
-     __asm__(
-                        "xorps          %%xmm2,%%xmm2     \n" // carry
-                        "1: \n"
-                        "movaps         (%0),%%xmm0  \n" // src1
-                        "movaps         (%1),%%xmm1  \n" // src2
-                        "mulps          %%xmm1,%%xmm0 \n" // src1*src2
-                        "addps          %%xmm0,%%xmm2 \n" // sum+=src1*src2
-                        "add           $16,%0      \n"
-                        "add           $16,%1      \n"
-                        "sub           $1,%3      \n"
-                        "jnz             1b        \n"
-                        "movaps        %%xmm2,(%2)        \n"
 
-                : : "r" (src1),"r" (src2),"r"(sum16),"r"(mod16)
-                );
-   
     
 	for (int i = 0; i <left; i++)
 		sum += (*src1++)*(*src2++);
@@ -240,7 +229,7 @@
         if(skip) return isamp;
         setValue(xv_left,posLeft,isamp / GAIN);
 #ifdef ADM_CPU_X86
-        if(CpuCaps::hasSSE())
+        if(CpuCaps::hasSSE2())
         {
             int mod=posLeft&3;
             int of2=posLeft-mod;
@@ -268,7 +257,7 @@
         if(skip) return isamp;
         setValue(xv_right,posRight,isamp / GAIN);
 #ifdef ADM_CPU_X86
-        if(CpuCaps::hasSSE())
+        if(CpuCaps::hasSSE2())
         {
             int mod=posRight&3;
             int of2=posRight-mod;
@@ -284,3 +273,35 @@
 		posRight = 0;
 	return -sum;
 }
+
+#if defined( ADM_CPU_X86)
+void testDolbyAsm()
+{
+    float samples[512];
+    for(int i=0;i<512;i++) samples[i]=((float)i)/512.;
+    
+    float sum1 = ADMDolbyContext::DolbyShift_convolutionAlignSSE(samples,xcoeffs);
+    float sum2 = ADMDolbyContext::DolbyShift_convolution(0,samples,xcoeffs);
+    
+    ADM_info("SSE = %f, C = %f\n",sum1,sum2);
+    if(fabs(sum1-sum2)>0.0001)
+    {
+        ADM_error("FAILED at line %d\n",__LINE__);
+        exit(-1);
+    }
+    
+    for(int i=16;i<512+16;i++) 
+        samples[i-16]=((float)((i*4)&511))/512.;
+    sum1 = ADMDolbyContext::DolbyShift_convolutionAlignSSE(samples,xcoeffs);
+    sum2 = ADMDolbyContext::DolbyShift_convolution(0,samples,xcoeffs);
+    
+    ADM_info("SSE = %f, C = %f\n",sum1,sum2);
+    if(fabs(sum1-sum2)>0.0001)
+    {
+        ADM_error("FAILED at line %d\n",__LINE__);
+        exit(-1);
+    }
+    ADM_info("** PASS **\n");
+    
+}
+#endif

avidemux_2.7.0.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_dolby_asm.asm Added

@@ -0,0 +1,39 @@
+;
+;
+%define private_prefix adm
+%define public_prefix  adm
+
+%include "admx86util.asm"
+;  : "r" (src1),"r" (src2),"r"(sum16),"r"(mod16)
+;  __asm__(
+;                        "xorps          %%xmm2,%%xmm2     \n" // carry
+;                        "1: \n"
+;                        "movaps         (%0),%%xmm0  \n" // src1
+;                        "movaps         (%1),%%xmm1  \n" // src2
+;                        "mulps          %%xmm1,%%xmm0 \n" // src1*src2
+;                        "addps          %%xmm0,%%xmm2 \n" // sum+=src1*src2
+;                        "add           $16,%0      \n"
+;                        "add           $16,%1      \n"
+;                        "sub           $1,%3      \n"
+;                        "jnz             1b        \n"
+;                        "movaps        %%xmm2,(%2)        \n"
+;
+;                : : "r" (src1),"r" (src2),"r"(sum16),"r"(mod16)
+;                );
+   
+section .text
+INIT_XMM sse2 ; SSE2 ?
+cglobal dolby_asm, 4,4,4, src1, src2, sum, l
+        xorps            m2,m2, m2
+.again:
+        movaps           m0,   [src1q]
+        movaps           m1,   [src2q]
+        mulps            m0,   m1
+        addps            m2,   m0
+        add              src1q,16
+        add              src2q,16
+        sub              ld,   1
+        jnz             .again
+        movaps          [sumq],m2
+        RET
+

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

@@ -49,6 +49,17 @@
 
 std::vector<MenuEntry> myMenuFile(_myMenuFile, _myMenuFile + sizeof(_myMenuFile) / sizeof(_myMenuFile[0]));
 
+static const MenuEntry _myMenuRecent[] = {
+            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL},
+#ifdef __APPLE__
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Clear recent items"), NULL,ACT_CLEAR_RECENT,NULL,"Ctrl+Shift+Backspace"}
+#else
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Clear recent items"), NULL,ACT_CLEAR_RECENT,NULL,"Ctrl+Shift+Delete"}
+#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"},
@@ -56,7 +67,11 @@
             {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"},
+#ifdef __APPLE__
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Delete"),             NULL,ACT_Delete     ,NULL,"Backspace"},
+#else
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Delete"),             NULL,ACT_Delete     ,NULL,"Delete"},
+#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"},

avidemux_2.6.20.tar.gz/avidemux/common/ADM_editor/include/ADM_edAudioTrackFromVideo.h -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/include/ADM_edAudioTrackFromVideo.h Changed

avidemux_2.6.20.tar.gz/avidemux/common/ADM_editor/src/ADM_edSearch.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/src/ADM_edSearch.cpp Changed

@@ -132,7 +132,7 @@
     {
         if(!seg)
         {
-            ADM_warning(" No previous previous keyfr for frameTime %" PRIu64" in ref %" PRIu32" seg:%" PRIu32" nkTime %" PRIu64" refTime:%" PRIu64" ms startTime=%" PRIu64" r=%d\n",
+            ADM_warning("No previous keyframe for frameTime %" PRIu64" in ref %" PRIu32" seg: %" PRIu32" nkTime %" PRIu64" refTime: %" PRIu64" ms startTime=%" PRIu64" r=%d\n",
                             *frameTime,ref,seg,nkTime/1000,refTime/1000,s->_refStartTimeUs/1000,r);
             return false;
         }
@@ -220,7 +220,7 @@
     return false;
 }
 /** 
- * \fn getFrameNumberBeforePts
+ * \fn getFrameNumBeforePtsOrBefore
  * \brief Search the framenumber that has a valid PTS = what's given or  before
  *         it can be equal to refTime
  * @param v
@@ -232,44 +232,96 @@
 {
     uint32_t nbFrame = v->_nb_video_frames;
     uint64_t pts, dts;
-    uint32_t curFrame=nbFrame >> 1;
-    uint32_t splitMoval = curFrame >> 1;
-    pivotPrintf("Looking for frame with a pts   %s\n",ADM_us2plain(refTime));
+    uint32_t curFrame = nbFrame >> 1;
+    uint32_t splitMoval = (curFrame + 1) >> 1;
+    uint32_t minFrame = 0;
+    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;
-        do {
-                pts=ADM_NO_PTS;
-                worked = v->_aviheader->getPtsDts(curFrame,&pts,&dts);
-                if (worked && pts != ADM_NO_PTS) 
+        uint32_t skipped = 0;
+        uint32_t tmpFrame = curFrame;
+        do
+        {
+            pts = ADM_NO_PTS;
+            worked = v->_aviheader->getPtsDts(tmpFrame,&pts,&dts);
+            if(worked && pts != ADM_NO_PTS)
+                break; // found
+            tmpFrame--;
+            if(!tmpFrame)
+            {
+                ADM_warning("The whole segment is corrupted. Aborting the search");
+                return false;
+            }
+            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; // ...go back to the frame where we first encountered corrupted video...
+            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                
-                curFrame--;
-                if (!curFrame)
+                tmpFrame++;
+                if(tmpFrame == nbFrame)
                 {
-                        ADM_warning("The whole segment is corrupted. Abort the search");
-                        return false;
+                    ADM_warning("The whole segment is corrupted. Aborting the search");
+                    return false;
                 }
-        } while(true);
+                skipped++;
+            } while(true);
+            if(skipped)
+            {
+                pivotPrintf("skipped %" PRIu32" frames seeking forward\n",skipped);
+                if(pts > refTime)
+                {
+                    ADM_warning("The video at the specified time in ref is corrupted. Aborting seek");
+                    return false;
+                }else
+                {
+                    minFrame = tmpFrame;
+                }
+            }
+            curFrame = tmpFrame;
+        }
         pivotPrintf("SplitMoval=%d\n",splitMoval);
-        if(pts==refTime)
-            break;
-        if (!splitMoval) 
+        if(!splitMoval)
             break;        
-        pivotPrintf("Pivot time is %d, %s\n",curFrame,ADM_us2plain(pts));
+        pivotPrintf("Pivot frame is %" PRIu32" at %s\n",curFrame,ADM_us2plain(pts));
         if (pts >= refTime)
+        {
+            if (curFrame <= splitMoval + minFrame)
+            {
+                curFrame = minFrame;
+            }else
+            {
                 curFrame -= splitMoval;
-        else
-                curFrame += splitMoval;
+            }
+        }else
+        {
+            curFrame += splitMoval;
+            if(curFrame >= nbFrame)
+                curFrame = nbFrame - 1;
+        }
+        if(splitMoval > 1)
+            splitMoval++;
         splitMoval >>= 1;
         pivotPrintf("Split=%d\n",splitMoval);        
     } while(refTime != pts);
 
-    pivotPrintf("-Matching frame is %d, time is  %s\n",curFrame,ADM_us2plain(pts));
-    if (pts > refTime && curFrame)
-            curFrame--;
-    frameNumber=curFrame;
+    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;
 }
 /**

avidemux_2.6.20.tar.gz/avidemux/common/ADM_editor/src/ADM_edVideoCopy.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/src/ADM_edVideoCopy.cpp Changed

@@ -332,10 +332,19 @@
 // we add a bit of timeIncrement to compensate for rounding
         if(_nextFrameDts!=ADM_NO_PTS)
         {
-            if(_nextFrameDts>(signedDts+(int64_t)(vid->timeIncrementInUs/10)))
+            if(_nextFrameDts>(signedDts+(int64_t)(vid->timeIncrementInUs/3)))
             {
-                ADM_error("Frame %d DTS is going back in time : expected:%s ",(int)vid->lastSentFrame, ADM_us2plain(_nextFrameDts));
-                ADM_error("\t got:%s (%ld vs %ld)\n", ADM_us2plain(signedDts),_nextFrameDts,signedDts);
+                double delta=_nextFrameDts-signedDts;
+                delta=fabs(delta);
+                ADM_error("Frame %d DTS is going back in time: expected: %s : %d\n",
+                          (int)vid->lastSentFrame,
+                          ADM_us2plain(_nextFrameDts),
+                          (_nextFrameDts));
+                ADM_error("and got %s : %d, timeIncrement=%d us, delta=%d\n",
+                          ADM_us2plain(signedDts),
+                          signedDts,(int)vid->timeIncrementInUs,
+                          (int)delta);
+                
                 goto againGet;
             }
         }

avidemux_2.6.20.tar.gz/avidemux/common/ADM_editor/src/ADM_segment.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/src/ADM_segment.cpp Changed

avidemux_2.6.20.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioPacket.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioPacket.cpp Changed

@@ -40,7 +40,7 @@
 //#define AUDIOSEG 	_segments[_audioseg]._reference
 //#define SEG 		_segments[seg]._reference
 
-
+static bool warned = false;
 
 #if 1
 #define vprintf(...) {}
@@ -62,6 +62,11 @@
         _SEGMENT *seg=parent->_segments.getSegment(_audioSeg);
         ADM_audioStreamTrack *trk=getTrackAtVideoNumber(seg->_reference);
         //
+        if(!trk)
+        {
+            ADM_warning("No next segment audio\n");
+            return false;
+        }
         ADM_Audiocodec *codec=NULL;
         if(trk)
             if(trk->codec)
@@ -87,36 +92,42 @@
 */
 bool ADM_edAudioTrackFromVideo::refillPacketBuffer(void)
 {
-   packetBufferSize=0; 
-   uint64_t dts;
-   _SEGMENT *seg=parent->_segments.getSegment(_audioSeg);
-   static bool endOfAudio=false;
-   if(!seg) return false;
+    packetBufferSize=0;
+    uint64_t dts;
+    _SEGMENT *seg=parent->_segments.getSegment(_audioSeg);
+    static bool endOfAudio=false;
+    if(!seg) return false;
 
-   if(lastDts>=seg->_startTimeUs+seg->_durationUs)
-     {
-       ADM_info("Consumed all data from this audio segment\n");
-       switchToNextAudioSegment();
-       seg=parent->_segments.getSegment(_audioSeg);
-       if(!seg) return false;
-     }
+    if(lastDts>=seg->_startTimeUs+seg->_durationUs)
+    {
+        if(!warned)
+        {
+            ADM_info("Consumed all data from this audio segment\n");
+            warned = true;
+        }
+        if(switchToNextAudioSegment())
+            warned = false;
+        seg=parent->_segments.getSegment(_audioSeg);
+        if(!seg) return false;
+    }
 
 
 
-   ADM_audioStreamTrack *trk=getTrackAtVideoNumber(seg->_reference);
-    if(!trk) return false;    
+    ADM_audioStreamTrack *trk=getTrackAtVideoNumber(seg->_reference);
+    if(!trk) return false;
 
     if(!getPacket(packetBuffer,&packetBufferSize,ADM_EDITOR_PACKET_BUFFER_SIZE,
                         &packetBufferSamples,&dts))
     {
-             if(endOfAudio==false)
-                ADM_warning("End of audio\n");
-             endOfAudio=true;
-             return false;
+        if(endOfAudio==false)
+            ADM_warning("End of audio\n");
+        endOfAudio=true;
+        return false;
     }
     // fixup dts
     packetBufferDts=dts;
     endOfAudio=false;
+    warned = false;
     return true;
 }
 
@@ -136,14 +147,34 @@
     bool r=trk->stream->getPacket(dest,len,sizeMax,samples,odts);
     if(r==false) 
     {
-            ADM_warning("AudioGetPacket failed, audioSegment=%d\n",(int)_audioSeg);
-            // if it fails, we have to switch segment
-            if(false==switchToNextAudioSegment())
+        if(msgRatelimit->done())
+        {
+            if(msgSuppressed)
+            {
+                ADM_warning("Audio getPacket failed, audioSegment=%d (message repeated %d times)\n",(int)_audioSeg,msgSuppressed+1);
+                msgSuppressed = 0;
+            }else
+            {
+                ADM_warning("Audio getPacket failed, audioSegment=%d\n",(int)_audioSeg);
+            }
+        }else
+        {
+            msgSuppressed++;
+        }
+        // if it fails, we have to switch segment
+        if(false==switchToNextAudioSegment())
+        {
+            if(msgRatelimit->done())
             {
                 ADM_warning("..and this is the last segment\n");
-                return false;
+                msgRatelimit->reset();
             }
-            goto zgain;
+            return false;
+        }
+        goto zgain;
+    }else
+    {
+        msgSuppressed = 0;
     }
 
     // Rescale odts
@@ -175,6 +206,7 @@
     }
     //ADM_info("Time : %s\n",ADM_us2plain(*odts));
     //advanceDtsBySample(*samples);
+    msgSuppressed = 0;
     return true;
 }
 /**
@@ -243,9 +275,14 @@
 WAVHeader       *ADM_edAudioTrackFromVideo::getInfo(void)
 {
 
-  _SEGMENT *seg=parent->_segments.getSegment(_audioSeg);
+    _SEGMENT *seg=parent->_segments.getSegment(_audioSeg);
     ADM_audioStreamTrack *trk=getTrackAtVideoNumber(seg->_reference);
-    if(!trk) return NULL;
+    if(!trk) // this segment has no audio, try to get info from another one
+    {
+        trk=getTrackAtVideoNumber(0); // might be wrong, does not matter
+        if(!trk)
+            return NULL;
+    }
     return trk->stream->getInfo();
 }
 /**

avidemux_2.6.20.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioPcm.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioPcm.cpp Changed

avidemux_2.6.20.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackFromVideo.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackFromVideo.cpp Changed

avidemux_2.6.20.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp Changed

@@ -52,9 +52,9 @@
     {
         // Do we have non droppable b frame ?
         uint32_t bframeDelay;
-        if(true==video_body->getNonClosedGopDelay(ptsStart,&bframeDelay))
+        if(true==video_body->getNonClosedGopDelay(ptsStart,&bframeDelay) && bframeDelay)
         {
-            ADM_info("Some B frames are non droppable, increasing delat by %d us\n",bframeDelay);
+            ADM_info("Some B-frames are not droppable, increasing delay by %d us\n",bframeDelay);
             videoDelay+=bframeDelay;
         }
         else
@@ -71,7 +71,7 @@
         {
             videoDelay+=delta-ptsStart;
             dtsStart=0;
-            ADM_info("Dts is too early, delaying everything by %" PRIu64" ms\n",videoDelay/1000);
+            ADM_info("Dts is too early, delaying everything by %" PRIu64" us\n",videoDelay);
         }else
         {
             dtsStart=ptsStart-delta;
@@ -142,7 +142,7 @@
     image.data=out->data;
     if(false==video_body->getCompressedPicture(videoDelay,&image))
     {
-            ADM_warning(" Get packet failed ");
+            ADM_warning("Get packet failed\n");
             return false;
     }
     out->len=image.dataLength;

avidemux_2.6.20.tar.gz/avidemux/common/ADM_osSupport/ADM_crashHook.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_osSupport/ADM_crashHook.cpp Changed

avidemux_2.6.20.tar.gz/avidemux/common/ADM_preview.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_preview.cpp Changed

@@ -47,7 +47,7 @@
 static ADM_PREVIEW_MODE     previewMode=ADM_PREVIEW_NONE;
 
 static bool                 defered_display=false;  /* When 1, it means we are in playback mode */
-static renderZoom           zoom=ZOOM_1_1;
+static float                zoom=ZOOM_1_1;
 static ADMImage             *resized=NULL;
 static ADMImageResizer      *resizer=NULL;
 
@@ -86,9 +86,8 @@
       @param h : height
 */
 
-void admPreview::setMainDimension(uint32_t w, uint32_t h,renderZoom nzoom)
+void admPreview::setMainDimension(uint32_t w, uint32_t h, float nzoom)
 {
-  
   if(rdrImage) delete rdrImage;
   rdrImage=new ADMImageDefault(w,h);
   rdrPhysicalW=w;
@@ -125,7 +124,7 @@
 /**
     \fn getCurrentZoom
 */
-renderZoom admPreview::getCurrentZoom()
+float admPreview::getCurrentZoom(void)
 {
     return zoom;
 }
@@ -144,10 +143,10 @@
 /**
     \fn changePreviewZoom
 */
-void changePreviewZoom(renderZoom nzoom)
+void changePreviewZoom(float nzoom)
 {
     admPreview::stop();
-    ADM_info("Preview :: Change zoom %d->%d\n",zoom,nzoom);
+    ADM_info("Preview :: Change zoom %.4f->%.4f\n",zoom,nzoom);
     zoom=nzoom;
     renderDisplayResize(rdrPhysicalW,rdrPhysicalH,zoom);
     admPreview::start();

avidemux_2.6.20.tar.gz/avidemux/common/ADM_preview.h -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_preview.h Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2 Added

avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/include Added

avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreD3D.h Added

@@ -0,0 +1,50 @@
+/***************************************************************************
+    \file             : ADM_coreDxva2.cpp
+    \brief            : Wrapper around dxva functions
+    \author           : (C) 2016 by mean fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#pragma once
+
+#include "ADM_coreDxva2_export.h"
+#include "ADM_image.h"
+#include "ADM_windowInfo.h"
+
+#ifdef _WIN32_WINNT
+  #undef _WIN32_WINNT
+#endif
+#define _WIN32_WINNT 0x0600
+#define DXVA2API_USE_BITFIELDS
+#include <d3d9.h>
+
+/**
+    \class admVdpau
+*/
+class ADM_COREVIDEOCODEC6_EXPORT admD3D
+{
+public:
+    enum ADM_vendorID
+    {
+      VENDOR_UNKNOWN=0,
+      VENDOR_AMD=1,
+      VENDOR_NVIDIA=2,
+      VENDOR_INTEL=3
+    };
+public:
+        static bool init(GUI_WindowInfo *x);
+        static bool isOperationnal(void);
+        static bool cleanup(void);
+        static IDirect3DDevice9 *getDevice();
+        static IDirect3D9       *getHandle();
+        static bool              isDirect9Ex();
+        static ADM_vendorID      getVendorID();
+};

avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreD3DApi.h Added

avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreDxva2.h Added

@@ -0,0 +1,69 @@
+/***************************************************************************
+    \file             : ADM_coreDxva2.cpp
+    \brief            : Wrapper around dxva functions
+    \author           : (C) 2016 by mean fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#pragma once
+#include "ADM_image.h"
+#include "ADM_windowInfo.h"
+#include "ADM_coreD3D.h"
+#include "dxva2api.h"
+#include "ADM_coreDxva2_export.h"
+#include <vector>
+extern "C"
+{
+ #include "libavcodec/avcodec.h"
+}
+/**
+ */
+class ADM_COREVIDEOCODEC6_EXPORT admDx2Surface
+{
+public:
+                          admDx2Surface(void *parent,int alignment);
+                          ~admDx2Surface();
+    void                 *parent;
+    LPDIRECT3DSURFACE9    surface;
+    IDirectXVideoDecoder *decoder;
+    ADMColorScalerSimple *color10Bits; // To be optimized, it's the same for all images from the same source
+    bool                  surfaceToAdmImage(ADMImage *out);
+    int                   refCount;
+public:
+    bool                  addRef();
+    bool                  removeRef();
+    int                   width,height;
+    D3DFORMAT             format;
+    HANDLE                sharedHandle;
+    admDx2Surface         *duplicateForMe(IDirect3DDevice9 *);
+protected:
+    int                   alignment;
+} ;
+/**
+    \class admVdpau
+*/
+class ADM_COREVIDEOCODEC6_EXPORT admDxva2
+{
+public:
+        static bool init(GUI_WindowInfo *x);
+        static bool isOperationnal(void);
+        static bool cleanup(void);
+        static bool supported(AVCodecID codec,int bits);
+        static IDirectXVideoDecoder *createDecoder(AVCodecID codec,int width, int height,int numSurface, LPDIRECT3DSURFACE9 *surface,int align,int bits);
+        static bool destroyDecoder(IDirectXVideoDecoder *decoder);
+        static DXVA2_ConfigPictureDecode *getDecoderConfig(AVCodecID codec,int bits);
+        static bool destroyD3DSurface(int num,void *surfaces);
+        static bool decoderAddRef(IDirectXVideoDecoder *decoder);
+        static bool decoderRemoveRef(IDirectXVideoDecoder *decoder);
+        static bool allocateDecoderSurface(void *parent,int width, int height,int align,int num, LPDIRECT3DSURFACE9 *surfaces, std::vector<admDx2Surface *>&listOf,int bits=8);
+};
+
+bool ADM_COREVIDEOCODEC6_EXPORT admDxva2_exitCleanup(void);

avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreDxva2_export.h Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/src Added

avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreD3D.cpp Added

@@ -0,0 +1,326 @@
+/***************************************************************************
+    \file             : ADM_coreDXVA2.cpp
+    \brief            : Wrapper around DXVA2 functions
+    \author           : (C) 2016 by mean fixounet@free.fr
+
+        This code is strongly derived from ffmpeg_dxva2 from ffmpeg
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "ADM_coreD3DApi.h" // Must be the 1st included
+#include "ADM_default.h"
+#include "ADM_coreD3D.h"
+
+#ifdef USE_DXVA2
+
+#if 1
+#define aprintf printf
+#define DUMP_GUID
+#else
+#define aprintf(...) {}
+#endif
+
+
+
+#include "ADM_dynamicLoading.h"
+#include <map>
+
+#include <d3d9.h>
+#include <dxva2api.h>
+
+typedef IDirect3D9*   WINAPI pDirect3DCreate9(UINT);
+typedef HRESULT       WINAPI pDirect3DCreate9Ex(UINT,IDirect3D9Ex **);
+
+static bool                  coreD3DWorking=false;
+
+static ADM_LibWrapper        d3dDynaLoader;
+
+static pDirect3DCreate9      *createD3D    = NULL;
+static pDirect3DCreate9Ex    *createD3Dex  = NULL;
+
+static IDirect3D9            *d3d9         = NULL;
+static IDirect3D9Ex          *d3d9ex       = NULL;
+static IDirect3DDevice9      *d3d9device   = NULL;
+static IDirect3DDevice9Ex    *d3d9deviceex = NULL;
+static admD3D::ADM_vendorID  d3dVendorId  =  admD3D::VENDOR_UNKNOWN;
+
+static bool isD3D9Ex=false;
+
+
+#include <initguid.h>
+/**
+ */
+bool              admD3D::isDirect9Ex()
+{
+  return isD3D9Ex;
+}
+/**
+ */
+static bool ADM_FAILED(HRESULT hr)
+{
+    int r=(int)hr;
+    if(r<0)
+    {
+        ADM_warning("Failed with error code=0x%x\n",r);
+        return true;
+    }
+    return false;
+}
+static bool admD3D_initD3D9Ex(GUI_WindowInfo *x)
+{
+    UINT adapter = D3DADAPTER_DEFAULT;
+    D3DDISPLAYMODEEX      d3ddm;
+    D3DPRESENT_PARAMETERS d3dpp = {0};
+    HWND windowID=(HWND)x->systemWindowId;
+    IDirect3D9Ex *d3d9ex = NULL;
+    IDirect3DDevice9Ex *d3d9deviceex = NULL;
+
+    HRESULT hr;
+    unsigned int resetToken = 0;
+    ADM_info("Probing for D3D9EX support\n");
+    // Load d3d9 dll
+    if(false==d3dDynaLoader.loadLibrary("d3d9.dll"))
+    {
+        ADM_warning("Dxva2: Cannot load d3d9.dll\n"); // memleak
+        goto failInit9x;
+    }
+    // Load d3d9 dll
+    createD3Dex=(pDirect3DCreate9Ex *)d3dDynaLoader.getSymbol("Direct3DCreate9Ex");
+    if(!createD3Dex)
+    {
+        ADM_warning("Dxva2: Cannot get symbol  Direct3DCreate9Ex\n");
+        goto failInit9x;
+    }
+    hr= createD3Dex(D3D_SDK_VERSION,&d3d9ex);
+
+    if(ADM_FAILED(hr))
+    {
+        ADM_warning("Dxva2: Cannot gcreate d3d9ex\n");
+        goto failInit9x;
+    }
+    ADM_info("D3D library loaded in D3D9Ex mode, Checking Adapater display mode\n");
+    memset(&d3ddm,0,sizeof(d3ddm));
+    d3ddm.Size=sizeof(d3ddm);
+
+    hr=D3DCall(IDirect3D9Ex,GetAdapterDisplayModeEx,d3d9ex, adapter,
+                                &d3ddm,NULL);
+    if(ADM_FAILED(hr))
+    {
+        ADM_warning("GetAdapterDisplayModeEx failed\n");
+        return false;
+    }
+    ADM_info("Display is %d x %d, fmt=0x%x\n",d3ddm.Width,d3ddm.Height,d3ddm.Format);
+
+    D3DADAPTER_IDENTIFIER9 id;
+    hr=D3DCall(IDirect3D9,GetAdapterIdentifier,d3d9ex,  adapter, 0, &id);
+    if(ADM_FAILED(hr))
+    {
+        ADM_warning("GetAdapterIdentifier failed\n");
+        d3dVendorId=admD3D::VENDOR_UNKNOWN;
+    }else
+    {
+        ADM_info("D3D Device: %s Vendor: %x Device:%x Rev:%x\n", id.Description,id.VendorId, id.DeviceId, id.Revision );
+        switch(id.VendorId)
+        {
+        case  0x1002: d3dVendorId=admD3D::VENDOR_AMD;break;
+        case  0x10DE: d3dVendorId=admD3D::VENDOR_NVIDIA;break;
+        case  0x8086: d3dVendorId=admD3D::VENDOR_INTEL;break;
+        default:
+                      d3dVendorId=admD3D::VENDOR_UNKNOWN;
+                      break;
+        }
+    }
+
+
+
+    memset(&d3dpp,0,sizeof(d3dpp));
+    d3dpp.Windowed         = TRUE;
+    d3dpp.BackBufferWidth  = 640;
+    d3dpp.BackBufferHeight = 480;
+    d3dpp.BackBufferCount  = 0;
+    d3dpp.BackBufferFormat = d3ddm.Format;
+    d3dpp.SwapEffect       = D3DSWAPEFFECT_DISCARD;
+    d3dpp.Flags            = D3DPRESENTFLAG_VIDEO;
+
+    ADM_info("Creating Device9EX\n");
+    hr = D3DCall(IDirect3D9Ex,CreateDeviceEx,d3d9ex,
+                                adapter,
+                                D3DDEVTYPE_HAL,
+                                windowID,
+                                D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_MULTITHREADED | D3DCREATE_FPU_PRESERVE,
+                                &d3dpp,
+                                NULL,
+                                &d3d9deviceex);
+    if(ADM_FAILED(hr))
+    {
+        ADM_warning("D3D:Cannot create d3d9Ex device\n");
+        goto failInit9x;
+    }
+
+    coreD3DWorking=true;
+    ADM_info("D3D:d3d9Ex core successfully initialized\n");
+
+    d3d9=(IDirect3D9 *)d3d9ex;
+    d3d9device=(IDirect3DDevice9 *)d3d9deviceex;
+    isD3D9Ex=true;
+    return true;
+failInit9x:
+      ADM_warning("D3D:D3D init failed\n");
+      return false;
+}
+
+/**
+ * \fn init
+ * \brief initialize the low level common part of dxva2
+ */
+static bool admD3D_initD3D9(GUI_WindowInfo *x)
+{
+    UINT adapter = D3DADAPTER_DEFAULT;
+    D3DDISPLAYMODE        d3ddm;
+    D3DPRESENT_PARAMETERS d3dpp = {0};
+    HWND windowID=(HWND)x->systemWindowId;
+
+    HRESULT hr;
+    unsigned int resetToken = 0;
+    ADM_info("Probing for D3D support\n");
+    // Load d3d9 dll
+    if(false==d3dDynaLoader.loadLibrary("d3d9.dll"))
+    {
+        ADM_warning("Dxva2: Cannot load d3d9.dll\n"); // memleak
+        goto failInit;
+    }
+    // Load d3d9 dll
+    createD3D=(pDirect3DCreate9 *)d3dDynaLoader.getSymbol("Direct3DCreate9");
+    if(!createD3D)
+    {
+        ADM_warning("Dxva2: Cannot get symbol  Direct3DCreate9\n");
+        goto failInit;
+    }
+    d3d9 = createD3D(D3D_SDK_VERSION);
+    if(!d3d9)
+    {
+        ADM_warning("Dxva2: Cannot gcreate d3d9\n");
+        goto failInit;
+    }
+    ADM_info("D3D library loaded, creating instance\n");
+    memset(&d3ddm,0,sizeof(d3ddm));
+    memset(&d3dpp,0,sizeof(d3dpp));
+    D3DCall(IDirect3D9,GetAdapterDisplayMode,d3d9, adapter, &d3ddm);
+    d3dpp.Windowed         = TRUE;
+    d3dpp.BackBufferWidth  = 640;
+    d3dpp.BackBufferHeight = 480;
+    d3dpp.BackBufferCount  = 0;
+    d3dpp.BackBufferFormat = d3ddm.Format;
+    d3dpp.SwapEffect       = D3DSWAPEFFECT_DISCARD;
+    d3dpp.Flags            = D3DPRESENTFLAG_VIDEO;
+
+    hr = D3DCall(IDirect3D9,CreateDevice,d3d9,
+                                adapter,
+                                D3DDEVTYPE_HAL,
+                                windowID,
+                                D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_MULTITHREADED | D3DCREATE_FPU_PRESERVE,
+                                &d3dpp, &d3d9device);
+    if(ADM_FAILED(hr))
+    {
+        ADM_warning("D3D:Cannot create d3d9 device\n");
+        goto failInit;
+    }
+
+    coreD3DWorking=true;
+    ADM_info("D3D:d3d core successfully initialized\n");
+    isD3D9Ex=false;
+    return true;
+failInit:
+      ADM_warning("D3D:D3D init failed\n");
+      return false;
+}
+
+bool admD3D::init(GUI_WindowInfo *x)
+{
+  if(admD3D_initD3D9Ex(x)) return true;
+  if(admD3D_initD3D9(x)) return true;
+  ADM_info("-- D3D:d3d core failed to initialize\n");
+  return false;
+
+}
+/**
+    \fn isOperationnal
+*/
+bool admD3D::isOperationnal(void)
+{
+    if(!coreD3DWorking)
+      ADM_warning("This binary has no working D3D support\n");
+    return coreD3DWorking;
+}
+/**
+
+*/
+admD3D::ADM_vendorID      admD3D::getVendorID(void)
+{
+  return d3dVendorId;
+}
+
+/**
+ */
+bool admD3D::cleanup(void)
+{
+    ADM_warning("This binary has no DXVA2 support\n");
+
+    if (d3d9device)
+    {
+        //IDirect3DDevice9_Release(d3d9device);
+        D3DCallNoArg(IDirect3DDevice9,Release,d3d9device);
+        d3d9device  =NULL;
+    }
+
+    if (d3d9)
+    {
+        //IDirect3D9_Release(d3d9);
+        D3DCallNoArg(IDirect3D9,Release,d3d9);
+        d3d9        =NULL;
+    }
+    coreD3DWorking=false;
+
+    // small memleak  d3dDynaLoader;
+    // small memleak dxva2DynaLoader;
+    return true;
+}
+/**
+
+*/
+IDirect3DDevice9 *admD3D::getDevice()
+{
+
+        return d3d9device;
+}
+
+/**
+
+*/
+IDirect3D9       *admD3D::getHandle()
+{
+        return d3d9;
+}
+
+
+/**
+ * \fn admLibVa_exitCleanup
+ */
+bool admD3d_exitCleanup()
+{
+    ADM_info("D3D cleanup begin\n");
+    admD3D::cleanup();
+    ADM_info("admD3D cleanup end\n");
+    return true;
+}
+
+#endif
+// EOF

avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2.cpp Added

@@ -0,0 +1,767 @@
+/***************************************************************************
+    \file             : ADM_coreDXVA2.cpp
+    \brief            : Wrapper around DXVA2 functions
+    \author           : (C) 2016 by mean fixounet@free.fr
+
+        This code is strongly derived from ffmpeg_dxva2 from ffmpeg
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "ADM_coreD3DApi.h" // Must be the 1st included
+#include "ADM_default.h"
+#include "ADM_coreD3D.h"
+#ifdef USE_DXVA2
+
+#if 1
+#define aprintf printf
+#define DUMP_GUID
+#else
+#define aprintf(...) {}
+#endif
+
+
+
+#include "ADM_dynamicLoading.h"
+#include <map>
+
+#include "../include/ADM_coreDxva2.h"
+
+typedef IDirect3D9* WINAPI pDirect3DCreate9(UINT);
+typedef HRESULT     WINAPI pCreateDeviceManager9(UINT *, IDirect3DDeviceManager9 **);
+
+static bool                  coreDxva2Working=false;
+
+static ADM_LibWrapper        dxva2DynaLoader;
+
+static pCreateDeviceManager9 *createDeviceManager = NULL;
+
+static IDirect3DDevice9            *d3d9device  =NULL;
+static IDirect3DDeviceManager9     *d3d9devmgr  =NULL;
+static IDirectXVideoDecoderService *decoder_service=NULL;
+static HANDLE                       deviceHandle=INVALID_HANDLE_VALUE;
+
+#include <initguid.h>
+DEFINE_GUID(IID_IDirectXVideoDecoderService, 0xfc51a551,0xd5e7,0x11d9,0xaf,0x55,0x00,0x05,0x4e,0x43,0xff,0x02);
+
+DEFINE_GUID(DXVA2_ModeMPEG2_VLD,      0xee27417f, 0x5e28,0x4e65,0xbe,0xea,0x1d,0x26,0xb5,0x08,0xad,0xc9);
+DEFINE_GUID(DXVA2_ModeMPEG2and1_VLD,  0x86695f12, 0x340e,0x4f04,0x9f,0xd3,0x92,0x53,0xdd,0x32,0x74,0x60);
+DEFINE_GUID(DXVA2_ModeH264_E,         0x1b81be68, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeH264_F,         0x1b81be69, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVADDI_Intel_ModeH264_E, 0x604F8E68, 0x4951,0x4C54,0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6);
+DEFINE_GUID(DXVA2_ModeVC1_D,          0x1b81beA3, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeVC1_D2010,      0x1b81beA4, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeHEVC_VLD_Main,  0x5b11d51b, 0x2f4c,0x4452,0xbc,0xc3,0x09,0xf2,0xa1,0x16,0x0c,0xc0);
+DEFINE_GUID(DXVA2_ModeVP9_VLD_Profile0, 0x463707f8, 0xa1d0,0x4585,0x87,0x6d,0x83,0xaa,0x6d,0x60,0xb8,0x9e);
+DEFINE_GUID(DXVA2_NoEncrypt,          0x1b81beD0, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeHEVC_VLD_Main10,0x107af0e0, 0xef1a,0x4d19,0xab,0xa8,0x67,0xa1,0x63,0x07,0x3d,0x13);
+DEFINE_GUID(GUID_NULL,                0x00000000, 0x0000,0x0000,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00);
+/**
+ */
+typedef struct dxva2_mode
+{
+  const GUID     *guid;
+  enum AVCodecID codec;
+  int            bitsPerChannel;
+} dxva2_mode;
+/**
+ */
+static int ALIGN(int x,int align)
+{
+    int y= ((x+(align-1)) &(~(align-1)));
+    aprintf("Align %d,%d => %d\n",x,align,y);
+    return y;
+}
+
+/**
+ */
+static const dxva2_mode dxva2_modes[] =
+{
+    /* MPEG-2 */
+    { &DXVA2_ModeMPEG2_VLD,      AV_CODEC_ID_MPEG2VIDEO ,8},
+    { &DXVA2_ModeMPEG2and1_VLD,  AV_CODEC_ID_MPEG2VIDEO ,8},
+
+    /* H.264 */
+    { &DXVA2_ModeH264_F,         AV_CODEC_ID_H264 ,8},
+    { &DXVA2_ModeH264_E,         AV_CODEC_ID_H264 ,8},
+    /* Intel specific H.264 mode */
+    { &DXVADDI_Intel_ModeH264_E, AV_CODEC_ID_H264 ,8},
+
+    /* VC-1 / WMV3 */
+    { &DXVA2_ModeVC1_D2010,      AV_CODEC_ID_VC1  ,8},
+    { &DXVA2_ModeVC1_D2010,      AV_CODEC_ID_WMV3 ,8},
+    { &DXVA2_ModeVC1_D,          AV_CODEC_ID_VC1  ,8},
+    { &DXVA2_ModeVC1_D,          AV_CODEC_ID_WMV3 ,8},
+
+    /* HEVC/H.265 */
+    { &DXVA2_ModeHEVC_VLD_Main,   AV_CODEC_ID_HEVC ,8},
+    { &DXVA2_ModeHEVC_VLD_Main10, AV_CODEC_ID_HEVC ,10},
+
+    /* VP8/9 */
+    { &DXVA2_ModeVP9_VLD_Profile0,AV_CODEC_ID_VP9 ,8},
+
+    { NULL,                      (AVCodecID)0 ,0},
+};
+typedef struct
+{
+     enum AVCodecID  codec;
+     bool            enabled;
+     DXVA2_VideoDesc desc;
+     DXVA2_ConfigPictureDecode pictureDecode;
+           GUID      device_guid;
+           GUID      guid;
+}Dxv2SupportMap;
+
+static Dxv2SupportMap dxva2H265={AV_CODEC_ID_HEVC,false};
+static Dxv2SupportMap dxva2H264={AV_CODEC_ID_H264,false};
+static Dxv2SupportMap dxva2H265_10Bits={AV_CODEC_ID_HEVC,false};
+
+/**
+  \fn dxvaBitsToFormat
+  \brief returns D3D format depending on bits per component
+*/
+static D3DFORMAT dxvaBitsToFormat(int bits)
+{
+  switch(bits)
+  {
+    case 8: return (D3DFORMAT)MKTAG('N','V','1','2');break;
+    case 10:return (D3DFORMAT)MKTAG('P','0','1','0');break;
+    default:
+        ADM_assert(0); break;
+  }
+  return (D3DFORMAT)MKTAG('N','V','1','2');
+}
+/**
+ */
+static void dumpGUID(const char *name,const GUID &guid)
+{
+    printf("%s :\n",name);
+    printf("0x%lx 0x%lx 0x%lx ",guid.Data1,guid.Data2,guid.Data3);
+    for(int i=0;i<8;i++) printf(" %02x ",guid.Data4[i]);
+    printf("\n");
+}
+
+/**
+ */
+static bool ADM_FAILED(HRESULT hr)
+{
+    int r=(int)hr;
+    if(r<0)
+    {
+        ADM_warning("Failed with error code=0x%x\n",r);
+        return true;
+    }
+    return false;
+}
+/**
+  \fn checkDecoder
+  \brief check if the decoder advertised is actually working
+*/
+static bool checkDecoderConfiguration(  const GUID *guid,Dxv2SupportMap *context)
+{
+    HRESULT hr;
+    unsigned int cfg_count = 0, best_score = 0;
+    DXVA2_ConfigPictureDecode *cfg_list = NULL;
+    bool   found=false;
+    const D3DFORMAT target_format = (const D3DFORMAT) MKTAG('N','V','1','2');
+
+    // initialize desc with dummy values
+    context->desc.SampleWidth=1920;
+    context->desc.SampleHeight=1080;
+    context->desc.Format=target_format;
+
+    hr = D3DCall(IDirectXVideoDecoderService,GetDecoderConfigurations,decoder_service, *guid, &(context->desc), NULL, &cfg_count, &cfg_list);
+    if (ADM_FAILED(hr)) {
+        ADM_warning("Unable to retrieve decoder configurations\n");
+        return false;
+    }
+
+    for (int i = 0; i < cfg_count; i++)
+    {
+        DXVA2_ConfigPictureDecode *cfg = &cfg_list[i];
+
+        unsigned score;
+        if (cfg->ConfigBitstreamRaw == 1)
+        {
+            ADM_info("\t has raw bistream\n");
+            score = 1;
+        }
+        else if (context->codec == AV_CODEC_ID_H264 && cfg->ConfigBitstreamRaw == 2)
+        {
+            ADM_info("\t has h264 raw bistream2\n");
+            score = 2;
+        }
+        else
+            continue;
+        if (IsEqualGUID(cfg->guidConfigBitstreamEncryption, DXVA2_NoEncrypt))
+        {
+            ADM_info("\t has no encrypt\n");
+            score += 16;
+        }
+        if (score > best_score)
+        {
+            best_score    = score;
+            context->pictureDecode = *cfg;
+            found=true;
+            ADM_info("\t best score\n");
+        }
+    }
+    CoTaskMemFree(cfg_list);
+
+    if (! found )
+    {
+        ADM_warning( "No valid decoder configuration available\n");
+        return false;
+    }
+    return true;
+}
+/**
+ * \fn lookupCodec
+ * \brief find and populate the configuration for a given codec
+ */
+static bool lookupCodec(const char *codecName,Dxv2SupportMap *context,unsigned int guid_count,GUID *guid_list, int bitsPerComponent)
+{
+    HRESULT hr;
+    D3DFORMAT target_format = (D3DFORMAT) 0;
+
+    for (int i = 0; dxva2_modes[i].guid; i++)
+    {
+        D3DFORMAT *target_list = NULL;
+        unsigned target_count = 0;
+        const dxva2_mode *mode = &dxva2_modes[i];
+        if (mode->codec != context->codec)
+            continue;
+        int j;
+        for (j = 0; j < guid_count; j++)
+        {
+            if (IsEqualGUID( *(mode->guid), guid_list[j]))
+                break;
+        }
+#ifdef DUMP_GUID
+    dumpGUID("Potential device_guid",*(mode->guid));
+#endif
+
+        if (j == guid_count)
+            continue;
+
+        hr = D3DCall(IDirectXVideoDecoderService,GetDecoderRenderTargets,decoder_service,*( mode->guid), &target_count, &target_list);
+        if (ADM_FAILED(hr))
+        {
+            continue;
+        }
+        D3DFORMAT tgt;
+        tgt=dxvaBitsToFormat(bitsPerComponent);
+        for (j = 0; j < target_count; j++)
+        {
+            const D3DFORMAT format = target_list[j];
+            if (format ==tgt)
+            {
+                target_format = format;
+                break;
+            }
+        }
+
+        CoTaskMemFree(target_list);
+        if (target_format)
+        {
+            if(checkDecoderConfiguration(mode->guid,context)) // does it work ?
+            {
+              context->device_guid = *(mode->guid);
+              break;
+            }
+        }
+    }
+
+    // Did we find a working one ?
+    if (IsEqualGUID(context->device_guid, GUID_NULL))
+    {
+        ADM_info("No decoder device for codec %s found\n",codecName);
+        return false;
+    }
+
+    //--
+
+    ADM_info("DXVA2 support for  %s found\n",codecName);
+    context->enabled=true;
+    return true;
+}
+/**
+ * \fn init
+ * \brief initialize the low level common part of dxva2
+ */
+bool admDxva2::init(GUI_WindowInfo *x)
+{
+   if(!admD3D::isOperationnal())
+   {
+     ADM_warning("No D3D, skipping DXVA2\n");
+     return false;
+   }
+   if(!admD3D::getDevice())
+   {
+     ADM_warning("No D3D device, skipping DXVA2\n");
+     return false;
+   }
+    UINT adapter = D3DADAPTER_DEFAULT;
+    D3DDISPLAYMODE        d3ddm;
+    D3DPRESENT_PARAMETERS d3dpp = {0};
+
+    HRESULT hr;
+    unsigned int resetToken = 0;
+
+    // Load dxva2 dll
+    if(false==dxva2DynaLoader.loadLibrary("dxva2.dll"))
+    {
+        ADM_warning("Dxva2: Cannot load dxva2.dll\n");
+        goto failInit;
+    }
+
+    createDeviceManager=(pCreateDeviceManager9 *)dxva2DynaLoader.getSymbol("DXVA2CreateDirect3DDeviceManager9");
+    if(!createDeviceManager)
+    {
+        ADM_warning("Dxva2: Cannot get symbol  createDeviceManager\n");
+        goto failInit;
+    }
+    hr = createDeviceManager(&resetToken, &d3d9devmgr);
+    if (ADM_FAILED(hr))
+    {
+        ADM_warning( "Failed to create Direct3D device manager\n");
+        goto failInit;
+    }
+    hr = D3DCall(IDirect3DDeviceManager9,ResetDevice,d3d9devmgr, admD3D::getDevice(), resetToken);
+    if (ADM_FAILED(hr))
+    {
+        ADM_warning( "Failed to bind Direct3D device to device manager\n");
+        goto failInit;
+    }
+    ADM_info("Dxva2 init step1\n");
+    hr = D3DCall(IDirect3DDeviceManager9,OpenDeviceHandle,d3d9devmgr, &deviceHandle);
+    if (ADM_FAILED(hr)) {
+         ADM_warning("Failed to open device handle\n");
+        goto failInit;
+    }
+
+    hr = D3DCall(IDirect3DDeviceManager9,GetVideoService,d3d9devmgr, deviceHandle, (REFIID )IID_IDirectXVideoDecoderService, (void **)&decoder_service);
+    if (ADM_FAILED(hr)) {
+        ADM_warning("Failed to create IDirectXVideoDecoderService\n");
+        goto failInit;
+    }
+
+    coreDxva2Working=true;
+    ADM_info("Dxva2 core successfully initialized\n");
+    ADM_info("Decoder service=%p\n",decoder_service);
+    // Look up what is supported
+    {
+        unsigned int guid_count = 0;
+        GUID *guid_list = NULL;
+
+        hr = D3DCall(IDirectXVideoDecoderService,GetDecoderDeviceGuids,decoder_service, &guid_count, &guid_list);
+        if (ADM_FAILED(hr)) {
+            ADM_warning("Failed to retrieve decoder device GUIDs\n");
+            goto failInit;
+        }
+        lookupCodec("H264",&dxva2H264,guid_count,guid_list,8);
+        lookupCodec("H265",&dxva2H265,guid_count,guid_list,8);
+        lookupCodec("H265",&dxva2H265_10Bits,guid_count,guid_list,10);
+        CoTaskMemFree(guid_list);
+    }
+    ADM_info("Scanning supported format done\n");
+    return true;
+failInit:
+    // cleanup
+    cleanup();
+    return false;
+}
+/**
+ */
+admDx2Surface         *admDx2Surface::duplicateForMe(IDirect3DDevice9 *me)
+{
+#if 0
+    HRESULT hr;
+    LPDIRECT3DSURFACE9 surfaces=NULL;
+    HANDLE sh=NULL;
+    sh=this->sharedHandle;
+    if(!sh)
+        return NULL;
+    hr = D3DCall(IDirect3DDevice9Ex,CreateOffscreenPlainSurface,
+                                                   (IDirect3DDevice9Ex *)me,
+                                                   this->width,
+                                                   this->height,
+                                                   this->format, 
+                                                   D3DPOOL_DEFAULT, 
+                                                   &surfaces, &sh);
+    if(ADM_FAILED(hr))
+    {
+        ADM_warning("Cannot duplicate surface\n");
+        return NULL;
+     }
+    admDx2Surface *s=new admDx2Surface(this->parent,this->alignment);
+    s->width=this->width;
+    s->height=this->height;
+    s->parent=NULL;
+    s->sharedHandle=NULL;
+    s->surface=surfaces;
+    return s;
+#endif
+return NULL;
+}
+
+/**
+ */
+bool admDxva2::allocateDecoderSurface(void *parent,int w, int h,int align,int num, LPDIRECT3DSURFACE9 *surfaces, std::vector<admDx2Surface *>&listOf,int bits)
+{
+    HRESULT hr;
+    HANDLE sh=NULL;
+    int width=ALIGN(w,align);
+    int height=ALIGN(h,align);
+    D3DFORMAT fmt;
+    fmt=dxvaBitsToFormat(bits);
+
+    if(!admD3D::isDirect9Ex())
+    {
+    
+     hr = D3DCall(IDirectXVideoDecoderService,CreateSurface,decoder_service,
+                                                   width,
+                                                   height,
+                                                   num-1,
+                                                   fmt, D3DPOOL_DEFAULT, 0,
+                                                   DXVA2_VideoDecoderRenderTarget,
+                                                   surfaces, NULL);
+    }else
+    {
+     hr = D3DCall(IDirectXVideoDecoderService,CreateSurface,decoder_service,
+                                                   width,
+                                                   height,
+                                                   num-1,
+                                                   fmt, D3DPOOL_DEFAULT, 0,
+                                                   DXVA2_VideoDecoderRenderTarget,
+                                                   surfaces, &sh);
+        
+    }
+     if(ADM_FAILED(hr))
+     {
+         ADM_warning("Cannot allocate D3D9 surfaces");
+         return false;
+     }
+     ADM_info("Allocated surface %p with shared handle=%p\n",surfaces,sh);
+     for(int i=0;i<num;i++)
+     {
+         admDx2Surface *s=new admDx2Surface(parent,align);
+         s->surface=surfaces[i];
+         s->width=width;
+         s->height=height;
+         s->format=fmt;
+         s->sharedHandle=sh;
+         listOf.push_back(s);
+     }
+     return true;
+}
+/**
+ */
+bool admDxva2::destroyD3DSurface(int num, void *zsurfaces)
+{
+    LPDIRECT3DSURFACE9 *surfaces=(LPDIRECT3DSURFACE9 *)zsurfaces;
+    for(int i=0;i<num;i++)
+    {
+         if (surfaces[i])
+         {
+                D3DCallNoArg(IDirect3DSurface9,Release,surfaces[i]);
+                surfaces[i]=NULL;
+         }
+    }
+    return true;
+}
+
+/**
+    \fn isOperationnal
+*/
+bool admDxva2::isOperationnal(void)
+{
+    ADM_warning("This binary has no working DXVA2 support\n");
+    return coreDxva2Working;
+}
+/**
+ */
+bool admDxva2::cleanup(void)
+{
+    ADM_warning("This binary has no DXVA2 support\n");
+
+    if (decoder_service)
+    {
+        D3DCallNoArg(IDirectXVideoDecoderService,Release,decoder_service);
+        decoder_service=NULL;
+    }
+    if (d3d9devmgr && deviceHandle != INVALID_HANDLE_VALUE)
+    {
+        D3DCall(IDirect3DDeviceManager9,CloseDeviceHandle,d3d9devmgr, deviceHandle);
+        deviceHandle=INVALID_HANDLE_VALUE;
+    }
+
+    if (d3d9devmgr)
+    {
+        D3DCallNoArg(IDirect3DDeviceManager9,Release,d3d9devmgr);
+        d3d9devmgr  =NULL;
+    }
+
+    if (d3d9device)
+    {
+        D3DCallNoArg(IDirect3DDevice9,Release,d3d9device);
+        d3d9device  =NULL;
+    }
+
+
+    coreDxva2Working=false;
+
+    // small memleak  d3dDynaLoader;
+    // small memleak dxva2DynaLoader;
+    return true;
+}
+/**
+ *
+ */
+bool        admDxva2::supported(AVCodecID codec,int bits)
+{
+#define SUPSUP(a,b,c) if(codec==a && bits==c) return (b.enabled) ;
+    SUPSUP(AV_CODEC_ID_H264,dxva2H264,8)
+    SUPSUP(AV_CODEC_ID_HEVC,dxva2H265,8)
+    SUPSUP(AV_CODEC_ID_HEVC,dxva2H265_10Bits,10)
+    return false;
+}
+/**
+ * \fn getDecoderConfig
+ */
+DXVA2_ConfigPictureDecode *admDxva2::getDecoderConfig(AVCodecID codec,int bits)
+{
+    Dxv2SupportMap *cmap;
+    switch(codec)
+    {
+        case AV_CODEC_ID_H264: cmap=&dxva2H264;break;
+        case AV_CODEC_ID_H265:
+              if(10==bits)
+                cmap=&dxva2H265_10Bits;
+              else
+                cmap=&dxva2H265;
+              break;
+        default:
+            ADM_assert(0);
+            break;
+    }
+    if(!cmap->enabled)
+    {
+        ADM_warning("This decoder is not enabled\n");
+        ADM_assert(0);
+    }
+    return &(cmap->pictureDecode);
+}
+
+/**
+ * \fn createDecoder
+ */
+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);
+    switch(codec)
+    {
+        case AV_CODEC_ID_H264:
+                ADM_info("Creating decoder DXVA2/H264/8 Bits\n");
+                cmap=&dxva2H264;
+                break;
+        case AV_CODEC_ID_H265:
+                if(bits==10)
+                {
+                    ADM_info("Creating decoder DXVA2/H264/10 Bits\n");
+                    cmap=&dxva2H265_10Bits;
+                }
+                else
+                {
+                    ADM_info("Creating decoder DXVA2/H264/8 Bits\n");
+                    cmap=&dxva2H265;
+                }
+                break;
+        default:
+            ADM_assert(0);
+            break;
+    }
+    if(!cmap->enabled)
+    {
+        ADM_warning("This decoder is not enabled\n");
+        ADM_assert(0);
+    }
+    HRESULT hr;
+    IDirectXVideoDecoder *decoder=NULL;
+#ifdef DUMP_GUID
+    dumpGUID("device_guid",cmap->device_guid);
+    dumpGUID("       guid",cmap->guid);
+    printf("Decoder service = %p\n",decoder_service);
+
+#endif
+    // update with real values
+    cmap->desc.SampleWidth=paddedWidth; // does not work with multiple video ?
+    cmap->desc.SampleHeight=paddedHeight;
+    //
+    hr = D3DCall(IDirectXVideoDecoderService,CreateVideoDecoder,decoder_service,
+                                                         (cmap->device_guid),
+                                                         &(cmap->desc),
+                                                         &(cmap->pictureDecode),
+                                                         surface,
+                                                         numSurface,
+                                                         &decoder);
+     if(ADM_FAILED(hr))
+     {
+         ADM_warning("Cannot create decoder\n");
+         return NULL;
+     }
+     return decoder;
+}
+/**
+ * \fn createDecoder
+ */
+bool admDxva2::destroyDecoder(IDirectXVideoDecoder *decoder)
+{
+    D3DCallNoArg(IDirectXVideoDecoder,Release,decoder);
+    return true;
+}
+
+/**
+ * \fn admLibVa_exitCleanup
+ */
+bool admDxva2_exitCleanup()
+{
+    ADM_info("Dxva2 cleanup begin\n");
+    admDxva2::cleanup();
+    ADM_info("Dxva2 cleanup end\n");
+    return true;
+}
+/**
+ * \fn ctor
+ */
+admDx2Surface::admDx2Surface(void *par,int alig)
+{
+    parent=par;
+    alignment=alig;
+    surface=NULL;
+    decoder=NULL;
+    refCount=0;
+    color10Bits=NULL;
+    width=height=0;
+    format=D3DFMT_UNKNOWN;
+    sharedHandle=NULL;
+}
+/**
+ * \fn dtor
+ */
+admDx2Surface::~admDx2Surface()
+{
+    parent=NULL;
+    surface=NULL;
+    decoder=NULL;
+    if(color10Bits)
+    {
+        delete color10Bits;
+        color10Bits=NULL;
+    }
+}
+/**
+ * \fn addRef
+ */
+bool admDx2Surface::addRef()
+{
+    D3DCallNoArg(IDirect3DSurface9,AddRef,surface);
+    return true;
+}
+/**
+ * \fn removeRef
+ */
+bool admDx2Surface::removeRef()
+{
+     D3DCallNoArg(IDirect3DSurface9,Release,surface); // ???
+     return true;
+}
+
+
+/**
+ * \fn ADM_DXVA2_readBack
+ */
+bool  admDx2Surface::surfaceToAdmImage( ADMImage *out)
+{
+    D3DSURFACE_DESC    surfaceDesc;
+    D3DLOCKED_RECT     LockedRect;
+    HRESULT            hr;
+    int bits=8;
+    bool r=true;
+    D3DCall(IDirect3DSurface9,GetDesc,surface, &surfaceDesc);
+    if(surfaceDesc.Format==(D3DFORMAT)MKTAG('P','0','1','0'))
+    {
+      bits=10;
+    }
+    aprintf("Surface to admImage = %p\n",surface);
+    hr = D3DCall(IDirect3DSurface9,LockRect,surface, &LockedRect, NULL, D3DLOCK_READONLY);
+    if (ADM_FAILED(hr))
+    {
+        ADM_warning("Unable to lock DXVA2 surface\n");
+        return false;
+    }
+    aprintf("Retrieving image pitch=%d width=%d height=%d\n",LockedRect.Pitch,out->GetWidth(PLANAR_Y), out->GetHeight(PLANAR_Y));
+
+    uint8_t *data=(uint8_t*)LockedRect.pBits;
+    int sourcePitch=LockedRect.Pitch;
+    switch(bits)
+    {
+      case 8:   out->convertFromNV12(data,data+sourcePitch*ALIGN(out->GetHeight(PLANAR_Y),alignment), sourcePitch, sourcePitch);
+                break;
+      case 10:
+              {
+              if(!color10Bits)
+                    color10Bits=new ADMColorScalerSimple(out->GetWidth(PLANAR_Y),out->GetHeight(PLANAR_Y),ADM_COLOR_NV12_10BITS,ADM_COLOR_YV12);
+              ADMImageRef ref(out->GetWidth(PLANAR_Y),out->GetHeight(PLANAR_Y));
+              ADMImageRefWrittable target(out->GetWidth(PLANAR_Y),out->GetHeight(PLANAR_Y));
+              ref._planes[0]=data;
+              ref._planeStride[0]=sourcePitch;
+              ref._planes[1]=data+((surfaceDesc.Height)*sourcePitch);
+              ref._planeStride[1]=sourcePitch;
+              ref._planes[2]=NULL;
+              ref._planeStride[2]=0;
+              // U &  V are inverted...
+              for(int i=0;i<3;i++)
+              {
+                  int j=i;
+                  if(j) j=j^3;
+                  target._planes[j]=out->GetWritePtr((ADM_PLANE)i);
+                  target._planeStride[j]=out->_planeStride[i];
+              }
+              color10Bits->convertImage(&ref,&target);
+              }
+              break;
+
+      default: ADM_warning("Unsupported bit depth");break;
+    }
+    D3DCallNoArg(IDirect3DSurface9,UnlockRect,surface);
+    return r;
+}
+
+/**
+ */
+bool admDxva2::decoderAddRef(IDirectXVideoDecoder *decoder)
+{
+    HRESULT            hr=D3DCallNoArg(IDirectXVideoDecoder,AddRef,decoder);
+    return true;
+}
+/**
+ */
+bool admDxva2::decoderRemoveRef(IDirectXVideoDecoder *decoder)
+{
+    HRESULT            hr=D3DCallNoArg(IDirectXVideoDecoder,Release,decoder);
+    return true;
+}
+
+
+#endif
+// EOF

avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2_ff.c Changed

avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/src/CMakeLists.txt Added

avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/src/vlc_dxva.c Changed

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/CMakeLists.txt Changed

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/GUI_accelRender.h -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_accelRender.h Changed

@@ -23,18 +23,18 @@
                         uint32_t imageHeight;
                         uint32_t displayWidth;
                         uint32_t displayHeight;
-                        renderZoom currentZoom;
+                        float currentZoom;
 
-                        bool calcDisplayFromZoom(renderZoom zoom);
-                        bool baseInit(uint32_t w,uint32_t h,renderZoom zoom);
+                        bool calcDisplayFromZoom(float zoom);
+                        bool baseInit(uint32_t w, uint32_t h, float zoom);
        public:
                                 VideoRenderBase( void) {scaler=NULL;currentZoom=ZOOM_1_1;};
               virtual          ~VideoRenderBase() {if(scaler) delete scaler;scaler=NULL;}
-              virtual	bool    init(GUI_WindowInfo * window, uint32_t w, uint32_t h,renderZoom zoom)=0;
+              virtual	bool    init(GUI_WindowInfo * window, uint32_t w, uint32_t h, float zoom)=0;
               virtual	bool    stop(void)=0;
               virtual   bool    displayImage(ADMImage *pic)=0;
               virtual   bool    refresh(void) {return true;}
-              virtual   bool    changeZoom(renderZoom newzoom)=0;
+              virtual   bool    changeZoom(float newzoom)=0;
               virtual   bool    usingUIRedraw(void)=0;
               virtual   ADM_HW_IMAGE getPreferedImage(void ) {return ADM_HW_NONE;}
               virtual   const char *getName()=0;

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/GUI_dxva2Render.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_dxva2Render.cpp Changed

@@ -13,7 +13,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#define CINTERFACE
+#include "ADM_coreD3DApi.h"
 #include "config.h"
 #include "ADM_default.h"
 #include "DIA_coreToolkit.h"
@@ -29,7 +29,6 @@
 #include "../../qt4/ADM_userInterfaces/ADM_gui/T_preview.h"
 
 
-//#define REUSE_DEVICE 1
 
 #if 1
 #define aprintf printf
@@ -60,10 +59,10 @@
   public:
                              dxvaRender( void ) ;
               virtual       ~dxvaRender();
-              virtual	  bool init( GUI_WindowInfo *  window, uint32_t w, uint32_t h,renderZoom zoom);
+              virtual	  bool init( GUI_WindowInfo *window, uint32_t w, uint32_t h, float zoom);
               virtual	  bool stop(void);
               virtual   bool displayImage(ADMImage *pic);
-              virtual   bool changeZoom(renderZoom newZoom);
+              virtual   bool changeZoom(float newZoom);
               virtual   bool usingUIRedraw(void) {return false;};
               virtual   bool refresh(void) ;
                         const char *getName() {return "DXVA2";}
@@ -145,7 +144,7 @@
 /**
     \fn changeZoom
 */
-bool dxvaRender::changeZoom(renderZoom newZoom)
+bool dxvaRender::changeZoom(float newZoom)
 {
         ADM_info("changing zoom, dxva/d3D render.\n");
         calcDisplayFromZoom(newZoom);
@@ -159,7 +158,7 @@
 /**
     \fn changeZoom
 */
-bool dxvaRender::init( GUI_WindowInfo *  window, uint32_t w, uint32_t h,renderZoom zoom)
+bool dxvaRender::init( GUI_WindowInfo *window, uint32_t w, uint32_t h, float zoom)
 {
     ADM_info("Initializing dxva2/D3D render\n");
     info=*window;
@@ -173,7 +172,7 @@
         return false;
     }
 
-    if (ADM_FAILED(IDirect3D9_GetAdapterDisplayMode(d3dHandle,
+    if (ADM_FAILED(D3DCall(IDirect3D9,GetAdapterDisplayMode,d3dHandle,
                                                 D3DADAPTER_DEFAULT,
                                                 &displayMode)))
     {
@@ -183,7 +182,7 @@
 
     D3DCAPS9 deviceCapabilities;
     ADM_info("D3D Checking device capabilities\n");
-    if (ADM_FAILED(IDirect3D9_GetDeviceCaps(d3dHandle,
+    if (ADM_FAILED(D3DCall(IDirect3D9,GetDeviceCaps,d3dHandle,
                                         D3DADAPTER_DEFAULT,
                                         D3DDEVTYPE_HAL,
                                         &deviceCapabilities)))
@@ -200,7 +199,7 @@
       // Check if we support YV12
     D3DFORMAT fmt=displayMode.Format;
     D3DFORMAT yv12=(D3DFORMAT)MAKEFOURCC('Y','V','1','2');
-    if (ADM_FAILED(IDirect3D9_CheckDeviceFormatConversion(   d3dHandle, // adapter
+    if (ADM_FAILED(D3DCall(IDirect3D9,CheckDeviceFormatConversion, d3dHandle, // adapter
                                                          D3DADAPTER_DEFAULT, // device type
                                                          D3DDEVTYPE_HAL, // adapter format
                                                          yv12, // render target format
@@ -226,7 +225,7 @@
     videoWidget->useExternalRedraw(true); // deactivate Qt Double buffering
     videoWidget->setDrawer(this);
 
-    ADM_info("Dxva (D3D) init successful, dxva render. w=%d, h=%d,zoom=%d, displayWidth=%d, displayHeight=%d\n",(int)w,(int)h,(int)zoom,(int)displayWidth,(int)displayHeight);
+    ADM_info("Dxva (D3D) init successful, dxva render. w=%d, h=%d, zoom=%.4f, displayWidth=%d, displayHeight=%d\n",(int)w,(int)h,zoom,(int)displayWidth,(int)displayHeight);
     return true;
 }
 
@@ -239,7 +238,7 @@
   D3DVIEWPORT9 viewPort = {0, 0, displayWidth, displayHeight, 0, 1};
 
 
-    ADM_info("D3D (re)Setting up \n");
+     ADM_info("D3D (re)Setting up \n");
      D3DPRESENT_PARAMETERS presentationParameters;
      memset(&presentationParameters, 0, sizeof(presentationParameters));
      presentationParameters.Windowed               = TRUE;
@@ -254,34 +253,52 @@
      presentationParameters.BackBufferCount        = 1;
      presentationParameters.EnableAutoDepthStencil = FALSE;
 
+     if( admD3D::isDirect9Ex())
+     {
+        IDirect3DDevice9Ex *d3d9deviceex = NULL;
+                
+        if(ADM_FAILED(D3DCall(IDirect3D9Ex,CreateDeviceEx,  ((IDirect3D9Ex *)d3dHandle),
+                                         D3DADAPTER_DEFAULT,
+                                         D3DDEVTYPE_HAL,  presentationParameters.hDeviceWindow,
+                                         D3DCREATE_SOFTWARE_VERTEXPROCESSING,
+                                         &presentationParameters,NULL, &d3d9deviceex)))
+        {
+          ADM_warning("Failed to create D3D9Ex render device\n");
+          d3dDevice=NULL;
+        }
+        else
+        {
+           d3dDevice=(IDirect3DDevice9 *)d3d9deviceex;  
+           ADM_info("DXVA2Render : device created in D3D9Ex mode\n");
+        }
+     }
 
-#ifndef REUSE_DEVICE
-     if(ADM_FAILED(IDirect3D9_CreateDevice(  d3dHandle,
+     if(!d3dDevice) // fallback if D3D9Ex fails or not available
+     {
+       if(ADM_FAILED(D3DCall(IDirect3D9,CreateDevice,  d3dHandle,
                                          D3DADAPTER_DEFAULT,
                                          D3DDEVTYPE_HAL,  presentationParameters.hDeviceWindow,
                                          D3DCREATE_SOFTWARE_VERTEXPROCESSING,
                                          &presentationParameters, &d3dDevice)))
-     {
-        ADM_warning("Failed to create D3D device\n");
-        return false;
-    }
-#else
-      d3dDevice=admD3D::getDevice();
-#endif
+        {
+          ADM_warning("dxvaRender::Failed to create D3D render device\n");
+          return false;
+        }
+     }
 
       //
 
       D3DFORMAT yv12=(D3DFORMAT)MAKEFOURCC('Y','V','1','2');
 
       //
-       if( ADM_FAILED(IDirect3DDevice9_CreateOffscreenPlainSurface(
+       if( ADM_FAILED(D3DCall(IDirect3DDevice9,CreateOffscreenPlainSurface,
                  d3dDevice, displayWidth,displayHeight,
                  displayMode.Format, D3DPOOL_DEFAULT, &mySurface, NULL)))
        {
                   ADM_warning("D3D Cannot create surface\n");
                   return false;
        }
-       if( ADM_FAILED(IDirect3DDevice9_CreateOffscreenPlainSurface(
+       if( ADM_FAILED(D3DCall(IDirect3DDevice9,CreateOffscreenPlainSurface,
                  d3dDevice, imageWidth,imageHeight,
                  yv12, D3DPOOL_DEFAULT, &myYV12Surface, NULL)))
        {
@@ -289,23 +306,23 @@
                   return false;
        }
       // put some defaults
-      IDirect3DDevice9_SetRenderState(d3dDevice, D3DRS_SRCBLEND, D3DBLEND_ONE);
-      IDirect3DDevice9_SetRenderState(d3dDevice, D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
-      IDirect3DDevice9_SetRenderState(d3dDevice, D3DRS_ALPHAFUNC, D3DCMP_GREATER);
-      IDirect3DDevice9_SetRenderState(d3dDevice, D3DRS_ALPHAREF, (DWORD)0x0);
-      IDirect3DDevice9_SetRenderState(d3dDevice, D3DRS_LIGHTING, FALSE);
-      IDirect3DDevice9_SetSamplerState(d3dDevice, 0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
-      IDirect3DDevice9_SetSamplerState(d3dDevice, 0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
+      D3DCall(IDirect3DDevice9,SetRenderState,d3dDevice, D3DRS_SRCBLEND, D3DBLEND_ONE);
+      D3DCall(IDirect3DDevice9,SetRenderState,d3dDevice, D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
+      D3DCall(IDirect3DDevice9,SetRenderState,d3dDevice, D3DRS_ALPHAFUNC, D3DCMP_GREATER);
+      D3DCall(IDirect3DDevice9,SetRenderState,d3dDevice, D3DRS_ALPHAREF, (DWORD)0x0);
+      D3DCall(IDirect3DDevice9,SetRenderState,d3dDevice, D3DRS_LIGHTING, FALSE);
+      D3DCall(IDirect3DDevice9,SetSamplerState,d3dDevice, 0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
+      D3DCall(IDirect3DDevice9,SetSamplerState,d3dDevice, 0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
       //
 
 
-  if(ADM_FAILED(IDirect3DDevice9_SetViewport(d3dDevice, &viewPort)))
+  if(ADM_FAILED(D3DCall(IDirect3DDevice9,SetViewport,d3dDevice, &viewPort)))
   {
       ADM_warning("D3D Cannot set D3D viewport\n");
       return false;
   }
 
- scaler=new ADMColorScalerFull(ADM_CS_BICUBIC,imageWidth,imageHeight,displayWidth,displayHeight,
+  scaler=new ADMColorScalerFull(ADM_CS_BICUBIC,imageWidth,imageHeight,displayWidth,displayHeight,
           ADM_COLOR_YV12,
           ADM_COLOR_RGB32A
       );
@@ -337,21 +354,19 @@
     }
     if(mySurface)
     {
-        IDirect3DSurface9_Release(mySurface);
+        D3DCallNoArg(IDirect3DSurface9,Release,mySurface);
         mySurface=NULL;
     }
     if(myYV12Surface)
     {
-        IDirect3DSurface9_Release(myYV12Surface);
+        D3DCallNoArg(IDirect3DSurface9,Release,myYV12Surface);
         myYV12Surface=NULL;
     }
-#ifndef REUSE_DEVICE
     if(d3dDevice)
     {
-       IDirect3DDevice9_Release(d3dDevice);
+       D3DCallNoArg(IDirect3DDevice9,Release,d3dDevice);
        d3dDevice=NULL;
     }
-#endif
     if(videoBuffer)
     {
         delete [] videoBuffer;
@@ -366,19 +381,19 @@
  bool dxvaRender::refresh(void)
  {
    ADM_info("Refresh**\n");
-   #if 0
+#if 0
    if( ADM_FAILED(IDirect3DDevice9_Present(d3dDevice, &targetRect, 0, 0, 0)))
    {
         ADM_warning("D3D Present failed\n");
    }
 #else
-    IDirect3DDevice9_BeginScene(d3dDevice);
-    IDirect3DDevice9_EndScene(d3dDevice);   
-    if( ADM_FAILED(IDirect3DDevice9_Present(d3dDevice, &targetRect, 0, 0, 0)))
+    D3DCallNoArg(IDirect3DDevice9,BeginScene,d3dDevice);
+    D3DCallNoArg(IDirect3DDevice9,EndScene,d3dDevice);
+    if( ADM_FAILED(D3DCall(IDirect3DDevice9,Present,d3dDevice, &targetRect, 0, 0, 0)))
     {
         ADM_warning("D3D Present failed\n");
     }
-   #endif
+#endif
   return true;
  }
 /**
@@ -413,7 +428,7 @@
 static bool  ADMImage_To_yv12Surface(ADMImage *pic, IDirect3DSurface9 *surface)
 {
   D3DLOCKED_RECT     lock;;
-  if (ADM_FAILED(IDirect3DSurface9_LockRect(surface,&lock, NULL, 0)))
+  if (ADM_FAILED(D3DCall(IDirect3DSurface9,LockRect,surface,&lock, NULL, 0)))
   {
       ADM_warning("D3D Cannot lock surface\n");
       return false;
@@ -434,7 +449,7 @@
   dst+=(height/2)*(dStride/2);
   d3dBlit(pic, PLANAR_V,dst,dStride>>1,width>>1,height>>1);
 
-  if (ADM_FAILED(IDirect3DSurface9_UnlockRect(surface)))
+  if (ADM_FAILED(D3DCallNoArg(IDirect3DSurface9,UnlockRect,surface)))
   {
       ADM_warning("D3D Cannot unlock surface\n");
       return false;
@@ -448,7 +463,7 @@
 {
     D3DLOCKED_RECT     lock;
 
-    if (ADM_FAILED(IDirect3DSurface9_LockRect(surface,&lock, NULL, 0)))
+    if (ADM_FAILED(D3DCall(IDirect3DSurface9,LockRect,surface,&lock, NULL, 0)))
     {
         ADM_warning("D3D Cannot lock surface\n");
         return false;
@@ -558,57 +573,44 @@
 
   IDirect3DSurface9 *bBuffer;
   POINT point={0,0};
-  // 1 upload to myYV12 surface
-  if(ADM_FAILED(IDirect3DDevice9_UpdateSurface(d3dDevice,
-          surface->surface,   // src
-          &panScan,       // src rect
-          myYV12Surface, // dst
-          &point         // where to
-        )))
-        {
-            ADM_warning("Copying surface failed, switching to non accelerated path \n");
-            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);
-            return false;
-        }
- // upload....
-  if( ADM_FAILED(IDirect3DDevice9_GetBackBuffer(d3dDevice, 0, 0,
-                                            D3DBACKBUFFER_TYPE_MONO,
-                                            &bBuffer)))
+  // 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;
+      ADM_warning("D3D Cannot create backBuffer\n");
+      return false;
   }
 
-
-  // data are in YV12 surface, blit it to mySurface
-  // zoom and color conversion happen there
-
-  if (ADM_FAILED(IDirect3DDevice9_StretchRect(d3dDevice,
-                  myYV12Surface,
+  // 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");
-                  }
+  {
+    ADM_warning("StretchRec yv12 failed\n");
+    // 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);
+  }
   IDirect3DDevice9_BeginScene(d3dDevice);
   IDirect3DDevice9_EndScene(d3dDevice);
   if( ADM_FAILED(IDirect3DDevice9_Present(d3dDevice, &targetRect, 0, 0, 0)))
   {
     ADM_warning("D3D Present failed\n");
   }
-
   return true;
 }

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/GUI_libvaRender.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_libvaRender.cpp Changed

@@ -42,6 +42,11 @@
     mySurface[0]=mySurface[1]=NULL;;
     toggle=0;
     lastSurface=NULL;       
+#if 0    
+    currentFmt=VA_FOURCC_P010;
+#else    
+    currentFmt=VA_RT_FORMAT_YUV420;
+#endif            
 }
 /**
     \đn dtor
@@ -52,9 +57,34 @@
 }
 
 /**
+ * \fn realloc
+ * @param newFormat
+ * @return 
+ */
+bool libvaRender::realloc(int newFormat)
+{
+    cleanup();
+    currentFmt=newFormat;
+    for(int i=0;i<2;i++)
+    {
+        VASurfaceID surface=admLibVA::allocateSurface(imageWidth,imageHeight,currentFmt);
+        if(surface==VA_INVALID)
+        {
+             ADM_warning("[libva] cannot allocate surface\n");
+            return false;
+        }
+
+        mySurface[i]=new ADM_vaSurface(imageWidth,imageHeight);
+        mySurface[i]->surface=surface;
+    }    
+    return true;
+}
+
+
+/**
     \fn init
 */
-bool libvaRender::init( GUI_WindowInfo * window, uint32_t w, uint32_t h,renderZoom zoom)
+bool libvaRender::init( GUI_WindowInfo *window, uint32_t w, uint32_t h, float zoom)
 {
     ADM_info("[libva]Xv start\n");
     info=*window;
@@ -65,7 +95,7 @@
     }
     for(int i=0;i<2;i++)
     {
-        VASurfaceID surface=admLibVA::allocateSurface(w,h);
+        VASurfaceID surface=admLibVA::allocateSurface(w,h,currentFmt);
         if(surface==VA_INVALID)
         {
              ADM_warning("[libva] cannot allocate surface\n");
@@ -139,7 +169,7 @@
 /**
     \fn changeZoom
 */
-bool libvaRender::changeZoom(renderZoom newZoom)
+bool libvaRender::changeZoom(float newZoom)
 {
         ADM_info("[libva]changing zoom.\n");
         calcDisplayFromZoom(newZoom);

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/GUI_libvaRender.h -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_libvaRender.h Changed

@@ -24,19 +24,22 @@
       protected:
                             GUI_WindowInfo info;
                             ADM_vaSurface  *mySurface[2];
+                            int            currentFmt;
                         bool cleanup(void);
+                        bool realloc(int newFormat);
                         int  toggle;
       public:
                              libvaRender( void ) ;
                              ~libvaRender();
-              virtual	bool init( GUI_WindowInfo *  window, uint32_t w, uint32_t h,renderZoom zoom);
+              virtual	bool init( GUI_WindowInfo *window, uint32_t w, uint32_t h, float zoom);
               virtual	bool stop(void);				
               virtual   bool displayImage(ADMImage *pic);
-              virtual   bool changeZoom(renderZoom newzoom);
+              virtual   bool changeZoom(float newzoom);
               virtual   bool refresh(void);
               virtual   bool usingUIRedraw(void) {return false;}; // we can redraw by ourself
               virtual   ADM_HW_IMAGE getPreferedImage(void ) {return ADM_HW_LIBVA;}
                         const char *getName() {return "LibVA";}
+                       
 };

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/GUI_nullRender.h -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_nullRender.h Changed

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/GUI_qtGlRender.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_qtGlRender.cpp Changed

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/GUI_qtGlRender.h -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_qtGlRender.h Changed

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/GUI_render.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_render.cpp Changed

@@ -64,7 +64,7 @@
 
 static void         *draw=NULL;
 static uint32_t     phyW=0,phyH=0; /* physical window size */
-static renderZoom   lastZoom=ZOOM_1_1;
+static float        lastZoom=ZOOM_1_1;
 static uint8_t      _lock=0;
 
 static const UI_FUNCTIONS_T *HookFunc=NULL;
@@ -175,11 +175,11 @@
 
 */
 //----------------------------------------
-uint8_t renderDisplayResize(uint32_t w, uint32_t h,renderZoom zoom)
+uint8_t renderDisplayResize(uint32_t w, uint32_t h, float zoom)
 {
         bool create=false;
         enableDraw=false;
-        ADM_info("Render to %" PRIu32"x%" PRIu32" zoom=%d, old one =%d x %d, zoom=%d, render=%p\n",w,h,zoom,phyW,phyH,lastZoom,renderer);
+        ADM_info("Render to %" PRIu32"x%" PRIu32" zoom=%.4f, old one =%d x %d, zoom=%.4f, renderer=%p\n",w,h,zoom,phyW,phyH,lastZoom,renderer);
         // Check if something has changed...
         
         
@@ -207,18 +207,7 @@
         }
          // Resize widget to be the same as input after zoom
          lastZoom=zoom;
-         int mul;
-         switch(zoom)
-            {
-                    case ZOOM_1_4: mul=1;break;
-                    case ZOOM_1_2: mul=2;break;
-                    case ZOOM_1_1: mul=4;break;
-                    case ZOOM_2:   mul=8;break;
-                    case ZOOM_4:   mul=16;break;
-                    default : ADM_assert(0);break;
-    
-            }
-        MUI_updateDrawWindowSize(draw,(w*mul)/4,(h*mul)/4);
+        MUI_updateDrawWindowSize(draw,(uint32_t)((float)w*zoom),(uint32_t)((float)h*zoom));
         renderCompleteRedrawRequest();
         UI_purge();
         return 1;
@@ -419,30 +408,19 @@
 
 //***************************************
 /**
-    \fn bool calcDisplayFromZoom(renderZoom zoom);
+    \fn calcDisplayFromZoom
 */
-bool VideoRenderBase::calcDisplayFromZoom(renderZoom zoom)
+bool VideoRenderBase::calcDisplayFromZoom(float zoom)
 {
-        int mul;
-         switch(zoom)
-            {
-                    case ZOOM_1_4: mul=1;break;
-                    case ZOOM_1_2: mul=2;break;
-                    case ZOOM_1_1: mul=4;break;
-                    case ZOOM_2:   mul=8;break;
-                    case ZOOM_4:   mul=16;break;
-                    default : ADM_assert(0);break;
-    
-            }
-        displayWidth=(imageWidth*mul)/4;
-        displayHeight=(imageHeight*mul)/4;
-        return true;
+    displayWidth=(uint32_t)((float)imageWidth * zoom);
+    displayHeight=(uint32_t)((float)imageHeight * zoom);
+    return true;
 }
 
 /**
     \fn baseInit
 */
-bool VideoRenderBase::baseInit(uint32_t w,uint32_t h,renderZoom zoom)
+bool VideoRenderBase::baseInit(uint32_t w, uint32_t h, float zoom)
 {
         imageWidth=w;
         imageHeight=h;

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/GUI_render.h -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_render.h Changed

@@ -24,20 +24,14 @@
 #include "ADM_windowInfo.h"
 #include <string>
 
-typedef enum 
-{
-        ZOOM_1_4,
-        ZOOM_1_2,
-        ZOOM_1_1,
-        ZOOM_2,
-        ZOOM_4,
-        ZOOM_AUTO,
-        ZOOM_INVALID
-}renderZoom;
+#define ZOOM_AUTO -1.
+#define ZOOM_1_4   0.25
+#define ZOOM_1_2   0.5
+#define ZOOM_1_1   1.
 
 ADM_RENDER6_EXPORT uint8_t renderInit( void );
 ADM_RENDER6_EXPORT void    renderDestroy(void);
-ADM_RENDER6_EXPORT uint8_t renderDisplayResize(uint32_t w, uint32_t h,renderZoom zoom);
+ADM_RENDER6_EXPORT uint8_t renderDisplayResize(uint32_t w, uint32_t h, float zoom);
 uint8_t renderRefresh(void);
 ADM_RENDER6_EXPORT uint8_t renderExpose(void);
 ADM_RENDER6_EXPORT uint8_t renderUpdateImage(ADMImage *img);
@@ -63,6 +57,8 @@
 void UI_resize(uint32_t width, uint32_t height);
 bool UI_getNeedsResizingFlag(void);
 void UI_setNeedsResizingFlag(bool resize);
+void UI_setBlockZoomChangesFlag(bool block);
+void UI_resetZoomThreshold(void);
 
 /* The list of render engine we support. Warning the list is UI dependant, i.e. for example on macOsX, the GTK version can do Xv, but the QT4 one cannot */
 typedef enum

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/GUI_sdlRender.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_sdlRender.cpp Changed

@@ -55,10 +55,10 @@
   public:
                              sdlRenderImpl( void ) ;
               virtual        ~sdlRenderImpl();
-              virtual	bool init( GUI_WindowInfo *  window, uint32_t w, uint32_t h,renderZoom zoom);
+              virtual	bool init( GUI_WindowInfo *window, uint32_t w, uint32_t h, float zoom);
               virtual	bool stop(void);				
               virtual   bool displayImage(ADMImage *pic);
-              virtual   bool changeZoom(renderZoom newZoom);
+              virtual   bool changeZoom(float newZoom);
               virtual   bool usingUIRedraw(void) {return false;};
               virtual   bool refresh(void) ;
                         const char *getName() {return "SDL2i";}
@@ -183,7 +183,7 @@
  * @param zoom
  * @return 
  */
-bool sdlRender::init( GUI_WindowInfo *  window, uint32_t w, uint32_t h,renderZoom zoom)
+bool sdlRender::init( GUI_WindowInfo *window, uint32_t w, uint32_t h, float zoom)
 {
     sdlRenderImpl *im=(sdlRenderImpl *)impl;
     ADM_assert(im);
@@ -215,7 +215,7 @@
  * @param newZoom
  * @return 
  */
-bool  sdlRender::changeZoom(renderZoom newZoom)
+bool  sdlRender::changeZoom(float newZoom)
 {
     sdlRenderImpl *im=(sdlRenderImpl *)impl;
     ADM_assert(im);
@@ -282,7 +282,7 @@
 /**
     \fn init
 */
-bool sdlRenderImpl::init( GUI_WindowInfo * window, uint32_t w, uint32_t h,renderZoom zoom)
+bool sdlRenderImpl::init( GUI_WindowInfo *window, uint32_t w, uint32_t h, float zoom)
 {
     ADM_info("[SDL] Initializing video subsystem\n");
 
@@ -441,7 +441,7 @@
 /**
     \fn changeZoom
 */
-bool sdlRenderImpl::changeZoom(renderZoom newZoom)
+bool sdlRenderImpl::changeZoom(float newZoom)
 {
         ADM_info("[SDL]changing zoom, sdl render.\n");
         calcDisplayFromZoom(newZoom);

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/GUI_sdlRender.h -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_sdlRender.h Changed

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/GUI_simpleRender.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_simpleRender.cpp Changed

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/GUI_simpleRender.h -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_simpleRender.h Changed

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/GUI_simpleRenderStub.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_simpleRenderStub.cpp Changed

@@ -23,10 +23,10 @@
       public:
                              simpleRender( void ) ;
                              ~simpleRender();
-              virtual	bool init( GUI_WindowInfo *  window, uint32_t w, uint32_t h,renderZoom zoom);
+              virtual	bool init( GUI_WindowInfo *window, uint32_t w, uint32_t h, float zoom);
               virtual	bool stop(void);				
               virtual   bool displayImage(ADMImage *pic);
-              virtual   bool changeZoom(renderZoom newZoom);
+              virtual   bool changeZoom(float newZoom);
               virtual   bool refresh(void);
               virtual   bool usingUIRedraw(void) {return false;};
                   const char *getName() {return "Dummy";}
@@ -80,16 +80,16 @@
 /**
     \fn changeZoom
 */
-bool simpleRender::changeZoom(renderZoom newZoom)
+bool simpleRender::changeZoom(float newZoom)
 {
         return true;
 }
 /**
     \fn changeZoom
 */
-bool simpleRender::init( GUI_WindowInfo *  window, uint32_t w, uint32_t h,renderZoom zoom)
+bool simpleRender::init( GUI_WindowInfo *window, uint32_t w, uint32_t h, float zoom)
 {
-    ADM_info("init, simple render. w=%d, h=%d,zoom=%d\n",(int)w,(int)h,(int)zoom);
+    ADM_info("init, simple render. w=%d, h=%d, zoom=%.4f\n",(int)w,(int)h,zoom);
     return true;
 }

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/GUI_vdpauRender.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_vdpauRender.cpp Changed

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/GUI_vdpauRender.h -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_vdpauRender.h Changed

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/GUI_xvRender.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_xvRender.cpp Changed

avidemux_2.6.20.tar.gz/avidemux/common/ADM_render/GUI_xvRender.h -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_render/GUI_xvRender.h Changed

avidemux_2.6.20.tar.gz/avidemux/common/ADM_toolkit/automation.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_toolkit/automation.cpp Changed

@@ -38,9 +38,9 @@
 static void show_info(char *p);
 void call_scriptEngine(const char *scriptFile);
 static void call_quit(char *p) ;
-static void call_help(char *p) 	;
-static void call_setAudio(char *p) 	;
-static void call_audiocodec(char *p) 	;
+static void call_help(char *p)     ;
+static void call_setAudio(char *p)     ;
+static void call_audiocodec(char *p)     ;
 static void call_videocodec(char *p) ;
 static int searchReactionTable(char *string);
 static void call_slave(char *p);
@@ -60,8 +60,8 @@
 //_________________________________________________________________________
 
 typedef void (*one_arg_type)(char *arg);
-typedef	void (*two_arg_type)(char *arg,char *otherarg);
-typedef	void (*three_arg_type)(char *arg,char *otherarg,char *yetother);
+typedef    void (*two_arg_type)(char *arg,char *otherarg);
+typedef    void (*three_arg_type)(char *arg,char *otherarg,char *yetother);
 //_________________________________________________________________________
 
 typedef struct
@@ -222,14 +222,17 @@
     std::string root,ext;
     ADM_PathSplit(std::string(scriptFile),root,ext);
   
-	if (engines.size() == 1)
-	{
+    if (engines.size() == 1)
+    {
             A_parseScript(engines[0], scriptFile);
-	    A_Rewind();
-            UI_setMarkers(video_body->getMarkerAPts(),video_body->getMarkerBPts());
-        return;
-	}
-	
+            if(avifileinfo)
+            {
+            A_Rewind();
+                UI_setMarkers(video_body->getMarkerAPts(),video_body->getMarkerBPts());
+            }
+            return;
+    }
+    
     for (int i = 0; i < engines.size(); i++)
     {
         if (!engines[i]->defaultFileExtension().compare(ext))
@@ -241,7 +244,7 @@
         }
     }
 
-    ADM_warning("Unable to appropriate script engine for script file\n");	
+    ADM_warning("Unable to appropriate script engine for script file\n");    
 }
 /**
  * \fn call_quit
@@ -324,10 +327,10 @@
         printf("\n    --%s, %s ", reaction_table[i].string,reaction_table[i].help_string);
         switch(reaction_table[i].have_arg)
         {
-          case 0:	 printf(" ( no arg )");break;
-          case 1:	 printf(" (one arg )");break;
-          case 2:	 printf(" (two args )");break;
-          case 3:	 printf(" (three args) ");break;
+          case 0:     printf(" ( no arg )");break;
+          case 1:     printf(" (one arg )");break;
+          case 2:     printf(" (two args )");break;
+          case 3:     printf(" (three args) ");break;
           default: break;
         }
       }
@@ -427,7 +430,7 @@
    }
    else
    {
-   	printf("Nothing to get infos from\n");
+       printf("Nothing to get infos from\n");
    }
 }
 /**

avidemux_2.6.20.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp Changed

@@ -23,6 +23,7 @@
 #include "libavcodec/avcodec.h"
 #include "libavutil/pixfmt.h"
 #include "libavutil/pixdesc.h"
+#include "libavutil/hwcontext_dxva2.h"
 #define CONFIG_DXVA2 1
 #include "libavcodec/dxva2_internal.h"
 #include "libavcodec/dxva2.h"
@@ -60,7 +61,6 @@
     if(!prefs->get(FEATURES_DXVA2,&v)) v=false;
     return v;
 }
-
 /**
     \fn dxva2Probe
     \brief Try loading d3d and dxva2...
@@ -224,9 +224,21 @@
         switch(avctx->codec_id)  //AV_CODEC_ID_H265
         {
             FMT_V_CHECK(H264,H264)
-            FMT_V_CHECK(H265,H265)
-//            FMT_V_CHECK(VC1,VC1)
-//            FMT_V_CHECK(VP9,VP9)
+            case AV_CODEC_ID_H265:
+              {
+                    admD3D::ADM_vendorID vid=admD3D::getVendorID();
+                    if(vid==admD3D::VENDOR_INTEL)
+                    {
+                        ADM_warning("Intel blacklisted for H265 decoding \n");
+                    }
+                    else
+                    {
+                      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);
                 continue;
@@ -249,6 +261,18 @@
     return AV_PIX_FMT_NONE;
 }
 }
+/**
+ * \fn cleanupSurfaces
+ */
+static void cleanupSurfaces( std::vector<admDx2Surface *>&surfaces)
+{
+    int n=surfaces.size();
+    for(int i=0;i<n;i++)
+    {
+        delete surfaces[i];
+    }
+    surfaces.clear();
+}
 
 /**
  *
@@ -305,30 +329,33 @@
 
     // Allocate surfaces..
     int bits=dxvaBitDepthFromContext(avctx);
-    if(!admDxva2::allocateD3D9Surface(num_surfaces,avctx->coded_width,avctx->coded_height,surfaces,align,bits))
-    {
-        ADM_warning("Cannot allocate surfaces \n");
-        return ;
-    }
+    std::vector<admDx2Surface *>dmSurfaces;
+    bool er=false;
+    if(!admDxva2::allocateDecoderSurface(this,avctx->coded_width,avctx->coded_height,align,num_surfaces,surfaces,dmSurfaces, bits))
+        {
+                ADM_warning("Cannot allocate surfaces\n");
+                return ;
+        }
     dx_context->decoder=admDxva2::createDecoder(avctx->codec_id,avctx->coded_width, avctx->coded_height,num_surfaces,surfaces,align,bits);
     aprintf("Decoder=%p\n",dx_context->decoder);
     if(!dx_context->decoder)
     {
         ADM_warning("Cannot create decoder\n");
+        cleanupSurfaces(dmSurfaces);
         return ;
     }
     ADM_info("DXVA2 decoder created\n");
     // Populare queue with them
     for (int i=0;i<num_surfaces;i++)
     {
-        admDx2Surface *w=new admDx2Surface(this,align);
-        w->surface=surfaces[i];
+        admDx2Surface *w=dmSurfaces[i];
         w->decoder = dx_context->decoder;
         dxvaPool.freeSurfaceQueue.append(w);
         dxvaPool.allSurfaceQueue.append(w);
         aprintf("Appending surface %p->internal %p\n",w,w->surface);
     }
     //
+    dmSurfaces.clear();
     _context->hwaccel_context = dx_context;
     _context->get_buffer2     = ADM_DXVA2getBuffer;
     _context->draw_horiz_band = NULL;

avidemux_2.6.20.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp Changed

@@ -110,7 +110,10 @@
 {
     int widthToUse = (ctx->coded_width+ 1)  & ~1;
     int heightToUse= (ctx->coded_height+3)  & ~3;
-    VASurfaceID surface=admLibVA::allocateSurface(widthToUse,heightToUse);
+    int fmt=VA_RT_FORMAT_YUV420;
+    if(ctx->pix_fmt==AV_PIX_FMT_YUV420P10LE)
+        fmt=VA_RT_FORMAT_YUV420_10BPP;
+    VASurfaceID surface=admLibVA::allocateSurface(widthToUse,heightToUse,fmt);
     if(surface==VA_INVALID)
     {
             ADM_warning("Cannot allocate surface (%d x %d)\n",(int)widthToUse,(int)heightToUse);
@@ -581,7 +584,21 @@
        case AV_CODEC_ID_MPEG2VIDEO: profile= VAProfileMPEG2Main;break;
        case AV_CODEC_ID_H264: profile= VAProfileH264High;break;
 #ifdef LIBVA_HEVC_DEC       
-       case AV_CODEC_ID_H265: profile= VAProfileHEVCMain;break;;
+       case AV_CODEC_ID_H265: 
+           switch(avctx->pix_fmt)
+           {
+            case AV_PIX_FMT_YUV420P:
+                profile= VAProfileHEVCMain;
+                break;;
+            case AV_PIX_FMT_YUV420P10LE:
+                ADM_info("10 bits H265\n");
+                profile= VAProfileHEVCMain10;
+                break;
+           default:
+               ADM_warning("FF/LibVa: unknown colorspace %d\n",(int)avctx->pix_fmt);
+               return false;
+               break;
+           }
 #endif       
        case AV_CODEC_ID_VC1: profile= VAProfileVC1Advanced;break;
 #ifdef LIBVA_VP9_DEC

avidemux_2.6.20.tar.gz/avidemux/common/ADM_videoCodec/src/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux/common/ADM_videoCodec/src/CMakeLists.txt Changed

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

@@ -20,6 +20,7 @@
 #include "ADM_vidMisc.h"
 #include "partial.h"
 #include "partial_desc.cpp"
+#include "avi_vars.h"
 
 extern ADM_coreVideoFilter *ADM_vf_createFromTag(uint32_t tag, ADM_coreVideoFilter *last, CONFcouple *couples);
 extern uint32_t    ADM_vf_getTagFromInternalName(const char *name);
@@ -44,9 +45,9 @@
        virtual void         setCoupledConf(CONFcouple *couples);
        virtual bool         configure(void) ;                          /// Start graphical user interface
        virtual uint64_t     getAbsoluteStartTime(void)   ;              /// Return the absolute offset of the current frame. Used to display time of for filter
-       virtual bool         goToTime(uint64_t usSeek) {return true;}   /// Start graphical user interface
+       virtual bool         goToTime(uint64_t usSeek); // needed for seekable preview when reconfiguring a partialized filter
     };
-
+        friend class trampolineFilter;
 
 protected:
                 trampolineFilter *trampoline;
@@ -57,6 +58,7 @@
                 ADMImage     *intermediate;
                 bool         hasIntermediate;
                 uint32_t     intermediateFn;
+                bool         sonFilterPreview;
 
 
                 bool        isInRange(uint64_t tme);
@@ -96,6 +98,7 @@
 {
     trampoline=NULL;
     sonFilter=NULL;
+    sonFilterPreview=false;
     byPass=true;
 
     intermediate=new ADMImageDefault(in->getInfo()->width,in->getInfo()->height);
@@ -170,6 +173,8 @@
  */
 bool         partialFilter::getNextFrameForSon(uint32_t *fn,ADMImage *image)
 {
+  if(sonFilterPreview)
+      return previousFilter->getNextFrame(fn,image);
   if(!hasIntermediate)
     {
       ADM_warning("Partial filter requesting image, no image in store!!\n");
@@ -288,7 +293,9 @@
  */
 void partialFilter::reconfigureSon(void)
 {
+  sonFilterPreview=true;
   sonFilter->configure();
+  sonFilterPreview=false;
 }
 
 /**
@@ -341,6 +348,12 @@
     return previousFilter->getAbsoluteStartTime(); // never called
 }
 
+bool partialFilter::trampolineFilter::goToTime(uint64_t usSeek)
+{
+    partialFilter *p=(partialFilter *)previousFilter;
+    return p->previousFilter->goToTime(usSeek);
+}
+
 bool         partialFilter::trampolineFilter::getNextFrame(uint32_t *frameNumber,ADMImage *image)
 {
   partialFilter *p=(partialFilter *)previousFilter;
@@ -359,8 +372,17 @@
   int sonNbItems=couples->getSize();
   CONFcouple tmp(3+sonNbItems);
 
-  uint32_t start=1000;
-  uint32_t end=5000;
+  uint32_t start, end;
+  if(source->getInfo()->totalDuration == video_body->getVideoDuration())
+  {
+      start=video_body->getMarkerAPts()/1000;
+      end=video_body->getMarkerBPts()/1000;
+  }else
+  {
+      double f=(double)(source->getInfo()->totalDuration) / video_body->getVideoDuration();
+      start=(uint32_t)(video_body->getMarkerAPts() * f / 1000);
+      end=(uint32_t)(video_body->getMarkerBPts() * f / 1000);
+  }
 
   tmp.writeAsString("filterName",internalName);
   tmp.writeAsUint32 ("startBlack",start);

avidemux_2.6.20.tar.gz/avidemux/common/gui_action.names -> avidemux_2.7.0.tar.gz/avidemux/common/gui_action.names Changed

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

@@ -38,6 +38,7 @@
 #include "ADM_preview.h"
 #include "ADM_coreVideoEncoder.h"
 #include "ADM_videoEncoderApi.h"
+#include "ADM_muxerProto.h"
 #include "ADM_audioFilter/include/ADM_audioFilterInterface.h"
 
 #include "avi_vars.h"
@@ -47,10 +48,10 @@
 
 #include "ADM_edAudioTrackExternal.h"
 #include "ADM_threads.h"
-
+#include "ADM_muxerProto.h"
 admMutex singleThread;
 
-renderZoom currentZoom=ZOOM_1_1;
+float currentZoom=ZOOM_1_1;
 #include "DIA_audioTracks.h"
 //***********************************
 //******** A Function ***************
@@ -89,7 +90,7 @@
 extern void GUI_OpenApplicationLog();
 extern void GUI_OpenApplicationDataFolder();
 
-extern bool ADM_mux_configure(int index);
+//extern bool ADM_mux_configure(int index);
 void brokenAct(void);
 //
 //  Sub gui files...
@@ -171,33 +172,20 @@
         int actionId = (action - ACT_SCRIPT_ENGINE_FIRST) % 3;
 
         tempEngine = getScriptEngines()[engineIndex];
-#ifndef _WIN64
         std::string ext=tempEngine->defaultFileExtension();
-#endif
+
         switch (actionId)
         {
             case 0:
-#ifdef _WIN64
-                GUI_FileSelRead(QT_TRANSLATE_NOOP("adm","Select script to run"), RunScript);
-#else
                 GUI_FileSelReadExtension(QT_TRANSLATE_NOOP("adm","Select script to run"), ext.c_str(), RunScript);
-#endif
                 break;
 
             case 1:
-#ifdef _WIN64
-                GUI_FileSelRead(QT_TRANSLATE_NOOP("adm","Select script to debug"), DebugScript);
-#else
                 GUI_FileSelReadExtension(QT_TRANSLATE_NOOP("adm","Select script to debug"), ext.c_str(), DebugScript);
-#endif
                 break;
 
             case 2:
-#ifdef _WIN64
-                GUI_FileSelWrite(QT_TRANSLATE_NOOP("adm","Select script to save"), SaveScript);
-#else
                 GUI_FileSelWriteExtension(QT_TRANSLATE_NOOP("adm","Select script to save"), ext.c_str(), SaveScript);
-#endif
                 UI_refreshCustomMenu();
                 break;
         }
@@ -262,15 +250,28 @@
                             A_Resync();
                             return;
             }
+        case ACT_CLEAR_RECENT:
+            {
+                if(GUI_Question(QT_TRANSLATE_NOOP("adm","You are about to clear the list of recent files and projects. This can't be undone. Proceed?")))
+                {
+                    prefs->clear_lastfiles();
+                    prefs->clear_lastprojects();
+                    prefs->save();
+                    UI_updateRecentProjectMenu();
+                    UI_updateRecentMenu(); // the order matters here
+                }
+            }
+            return;
     case ACT_VIDEO_CODEC_CONFIGURE:
             videoEncoder6Configure();
             return;
     case ACT_ContainerConfigure:
-            {
+        {
+            if(!ADM_mx_getNbMuxers()) return;
             int index=UI_GetCurrentFormat();
             ADM_mux_configure(index);
             return;
-            }
+        }
     case ACT_VIDEO_CODEC_CHANGED:
         {
             int nw=UI_getCurrentVCodec();
@@ -415,8 +416,11 @@
         case ACT_ZOOM_1_1:
         case ACT_ZOOM_2_1:
         case ACT_ZOOM_4_1:
-                currentZoom=(renderZoom)((action-ACT_ZOOM_1_4)+ZOOM_1_4);
+                currentZoom=(float)(2<<(action-ACT_ZOOM_1_4))/8;
+                UI_setBlockZoomChangesFlag(true);
                 changePreviewZoom(currentZoom);
+                UI_setBlockZoomChangesFlag(false);
+                UI_resetZoomThreshold();
                 admPreview::samePicture();
                 break;
         case ACT_AUDIO_SELECT_TRACK:
@@ -542,12 +546,12 @@
               }
               video_body->getVideoInfo (avifileinfo);
               d=video_body->getVideoDuration()-d;
-              if(markA>=currentPts)
+              if(markA>currentPts)
               {
                   markA+=d;
                   markB+=d;
               }
-              if(markA<currentPts && currentPts<markB)
+              if(markA<=currentPts && currentPts<=markB)
               {
                   markB+=d;
               }
@@ -864,7 +868,7 @@
     }
 
   // Init renderer
-    admPreview::setMainDimension(avifileinfo->width, avifileinfo->height,ZOOM_AUTO);
+    admPreview::setMainDimension(avifileinfo->width, avifileinfo->height, ZOOM_AUTO);
   // Draw first frame
     GUI_setAllFrameAndTime();
     if(resetMarker)
@@ -987,6 +991,7 @@
  * @param mode
  * @return 
  */
+#define DEFAULT_SETTINGS_FILE ADM_getBaseDir()+std::string("defaultSettings.py")
 bool parseScript(IScriptEngine *engine, const char *name, IScriptEngine::RunMode mode)
 {
     bool ret;
@@ -1004,12 +1009,14 @@
         video_body->setProjectName(longname);
     }
 
-    prefs->set_lastprojectfile(longname);
+    if (std::string(longname) != DEFAULT_SETTINGS_FILE)
+    {
+        prefs->set_lastprojectfile(longname);
+        UI_updateRecentProjectMenu();
+    }
     delete [] longname;
     longname=NULL;
-    
-    
-    UI_updateRecentProjectMenu();
+
     // update main menu shift
     EditableAudioTrack *ed=video_body->getDefaultEditableAudioTrack();
     if(ed)
@@ -1066,7 +1073,7 @@
  * @param engine
  * @param name
  */
-#define DEFAULT_SETTINGS_FILE ADM_getBaseDir()+std::string("defaultSettings.py")
+
 void A_saveDefaultSettings()
 {
     IScriptEngine *engine=getPythonScriptEngine();
@@ -1101,12 +1108,12 @@
 {
   
     std::string defaultSettings=DEFAULT_SETTINGS_FILE;
-    if(ADM_fileExist(defaultSettings.c_str()))
-    {        
-        if(ADM_fileSize(defaultSettings.c_str())>5)
-        {
-                return A_runPythonScript( defaultSettings);
-        }
+    if(ADM_fileExist(defaultSettings.c_str()) && ADM_fileSize(defaultSettings.c_str())>5)
+    {
+        return A_runPythonScript( defaultSettings);
+    }else
+    { // default to MKV as output container instead of AVI if no user defined default settings exist
+        return video_body->setContainer("MKV",NULL);
     }
     return false;
 }
@@ -1478,7 +1485,7 @@
   if (avifileinfo)        // already opened ?
     {                // delete everything
       // if preview is on
-      admPreview::setMainDimension(0, 0,ZOOM_1_1);
+      admPreview::setMainDimension(0, 0, ZOOM_1_1);
       if(getPreviewMode()!=ADM_PREVIEW_NONE)
       {
         admPreview::stop();

avidemux_2.6.20.tar.gz/avidemux/common/gui_navigate.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/gui_navigate.cpp Changed

@@ -529,23 +529,31 @@
  */
 bool GUI_lastFrameBeforePts(uint64_t pts)
 {
-    uint64_t pts2=pts;
-    // Try to find a keyframe just before pts
-    if(video_body->getPKFramePTS(&pts2))
-    { // Starting from there, approach the last frame before pts
-        admPreview::deferDisplay(1);
-        GUI_GoToTime(pts2);
-        uint64_t tmp;
-        while(pts2<pts)
+    uint64_t tmp=pts;
+    uint64_t current=admPreview::getCurrentPts();
+    // Try to find a keyframe just before pts...
+    if(video_body->getPKFramePTS(&tmp))
+    {
+        bool r=true;
+        if(tmp<=current && pts>current) // within the same GOP, seeking forward
+            tmp=current; // no need to go back to the keyframe
+        else
+            r=video_body->goToTimeVideo(tmp);
+        // Starting from tmp, approach the last frame before pts
+        if(r)
         {
-            tmp=pts2;
-            admPreview::nextPicture();
-            tmp=admPreview::getCurrentPts();
-            if(tmp>pts) break; // otherwise we may overshoot
-            pts2=tmp;
+            admPreview::deferDisplay(1);
+            uint64_t inc=video_body->getFrameIncrement();
+            while(tmp+inc <= pts) // otherwise we may overshoot
+            {
+                admPreview::nextPicture();
+                tmp=admPreview::getCurrentPts();
+            }
+            admPreview::deferDisplay(0);
+            admPreview::samePicture();
+            GUI_setCurrentFrameAndTime();
+            return true;
         }
-        admPreview::deferDisplay(0);
-        return GUI_GoToTime(pts2);
     }
     return false;
 }

avidemux_2.6.20.tar.gz/avidemux/common/gui_play.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/gui_play.cpp Changed

avidemux_2.6.20.tar.gz/avidemux/common/gui_save.cpp -> avidemux_2.7.0.tar.gz/avidemux/common/gui_save.cpp Changed

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

avidemux_2.6.20.tar.gz/avidemux/gtk/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux/gtk/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux/osxInstaller Added

avidemux_2.7.0.tar.gz/avidemux/osxInstaller/CMakeLists.txt Added

@@ -0,0 +1,160 @@
+#
+
+cmake_minimum_required(VERSION 3.2)
+MESSAGE(STATUS  "* Start *")
+#
+set(BU_CHMOD_BUNDLE_ITEMS ON)
+SET(BU_COPY_FULL_FRAMEWORK_CONTENTS ON)
+#
+SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../../cmake" "${CMAKE_MODULE_PATH}")
+include(DeployQt5)
+include(admCheckQt5)
+include(avidemuxVersion)
+
+#
+SET(BUNDLE_NAME "Avidemux_${AVIDEMUX_VERSION}.app")
+SET(BUNDLE "${CMAKE_BINARY_DIR}/${BUNDLE_NAME}")
+SET(RESOURCES  "${BUNDLE}/Contents/Resources")
+SET(ORIGINAL  "${CMAKE_BINARY_DIR}/../Avidemux${AVIDEMUX_MAJOR_MINOR}.app")
+
+#
+
+macro(makeLink src dest pwd)
+  MESSAGE(STATUS " Creating symlink")
+  MESSAGE( STATUS " COMMAND ln -sf ${src} ${dest} COMMENT mklink ${src} -> ${dest}, pwd=${pwd}")
+  execute_process( COMMAND ln -sf ${src} ${dest} 
+                   WORKING_DIRECTORY ${pwd})
+endmacro()
+
+MESSAGE(STATUS  "* Checking QT5 *")
+#
+checkQt5()
+#
+# Copy the skeleton, other files will be pulled automatically
+#
+FILE(MAKE_DIRECTORY "${BUNDLE}")
+FILE(MAKE_DIRECTORY "${BUNDLE}/Contents")
+FILE(MAKE_DIRECTORY "${BUNDLE}/Contents/MacOS")
+FILE(MAKE_DIRECTORY "${BUNDLE}/Contents/Resources/")
+# 
+LIST(APPEND bundleDirs  "${BUNDLE}/Contents/Resources/lib")
+#
+
+#
+MESSAGE(STATUS "* Creating Skeleton *")
+FILE(COPY  "${ORIGINAL}/Contents/MacOS/Avidemux${AVIDEMUX_MAJOR_MINOR}" DESTINATION "${BUNDLE}/Contents/MacOS/")
+# Copy jobs and cli too
+FILE(COPY  "${ORIGINAL}/Contents/Resources/bin/avidemux_cli"          DESTINATION "${BUNDLE}/Contents/MacOS/")
+FILE(COPY  "${ORIGINAL}/Contents/Resources/bin/avidemux_jobs"         DESTINATION "${BUNDLE}/Contents/MacOS/")
+FILE(COPY  "${ORIGINAL}/Contents/Info.plist"                          DESTINATION "${BUNDLE}/Contents/")
+FILE(COPY  "${ORIGINAL}/Contents/Resources/lib"                       DESTINATION "${BUNDLE}/Contents/Resources/")
+
+
+makeLink("Resources/lib"  "." ${BUNDLE}/Contents/)
+#
+MESSAGE(STATUS "* Copying plugins *")
+#
+FILE(COPY  "${QT_PLUGINS_DIR}/platforms" DESTINATION "${CMAKE_BINARY_DIR}/${BUNDLE_NAME}/Contents/PlugIns/")
+# Update Qt plugins
+#
+file(GLOB  pluginList "${BUNDLE}/Contents/PlugIns/platforms/*.dylib")
+MESSAGE(STATUS "List of plugins ${pluginList}")
+FOREACH(plugin ${pluginList})
+        MESSAGE(STATUS "=> ${plugin}")
+        LIST(APPEND myPlugins ${plugin})
+ENDFOREACH(plugin ${pluginList})
+MESSAGE(STATUS ">>List of plugins to process ${myPlugins}")
+MESSAGE(STATUS " * plugin *")
+#
+# Update avidemux plugins
+# 
+MESSAGE(STATUS "* ADM plugins *")
+#
+MESSAGE(STATUS " * ADMplugin *")
+FILE(COPY "${BUNDLE}/Contents/lib/ADM_plugins6" DESTINATION "${BUNDLE}/Contents/MacOS/")
+file(GLOB  kind "${BUNDLE}/Contents/MacOS/ADM_plugins6/*")
+MESSAGE(STATUS "* -----<${kind}>-----  *")
+FOREACH(k ${kind})
+        MESSAGE(STATUS "* Processing ${k} *")
+        file(GLOB_RECURSE  kind_${k} "${k}/*.dylib")
+        MESSAGE(STATUS "\t ${kind_${k}}")
+        LIST(APPEND all_adm_plugin  ${kind_${k}})
+ENDFOREACH(k ${kind})
+#
+LIST(APPEND all ${myPlugins})
+LIST(APPEND all ${all_adm_plugin})
+MESSAGE(STATUS "Plugin to fix : ${all}")
+FIXUP_BUNDLE("${BUNDLE}" "${all}" "${bundleDirs}")
+# Now we can move the old libs
+MESSAGE(STATUS " * Cleanup * ")
+FILE(REMOVE_RECURSE  "${BUNDLE}/Contents/lib")
+FILE(REMOVE_RECURSE  "${BUNDLE}/Contents/Resources/lib")
+makeLink("MacOS"  "lib" ${BUNDLE}/Contents/)
+
+MESSAGE(STATUS "*  Wrapper script *")
+#
+
+# Create symlink
+SET(BIN     "${BUNDLE}/Contents/MacOS/")
+SET(ExeName "${BIN}/Avidemux${AVIDEMUX_MAJOR_MINOR}")
+FILE(RENAME "${ExeName}"  "${BIN}/avidemux")
+# Create wrapper executable
+FILE(WRITE  "${ExeName}" "#!/bin/sh\n")
+FILE(APPEND "${ExeName}" "DIR=`dirname $0`\n")
+FILE(APPEND "${ExeName}" "export FONTCONFIG_FILE=\"$DIR/../Resources/fonts/fonts.conf\"\n")
+FILE(APPEND "${ExeName}" "cd \"$DIR\" && ./avidemux \"$@\"\n")
+execute_process( COMMAND chmod +x "${ExeName}")
+
+# Create Qt.conf
+SET(QT_CONF "${BUNDLE}/Contents/Resources/qt.conf")
+FILE(WRITE  "${QT_CONF}" "[Paths]\n")
+FILE(APPEND "${QT_CONF}" "Plugins = PlugIns\n")
+
+# Copy fonts, i18n and icons
+FILE(COPY "${ORIGINAL}/Contents/Resources/share" DESTINATION "${RESOURCES}") 
+FILE(COPY "${ORIGINAL}/Contents/Resources/fonts" DESTINATION "${RESOURCES}") 
+FILE(COPY "${ORIGINAL}/Contents/Resources/avidemux.icns" DESTINATION "${RESOURCES}") 
+
+# Remove the copies of Qt lib in framework, we only keep "5"
+FILE(GLOB  frameworks "${BUNDLE}/Contents/Frameworks/*")
+MESSAGE(STATUS "Frameworks to clean : ${frameworks}")
+FOREACH(frame ${frameworks})
+        MESSAGE(STATUS "    Cleaning ${frame}")
+        FILE(REMOVE_RECURSE  "${frame}/Headers")
+        FILE(GLOB  qtop      "${frame}/Qt*")
+        FOREACH(q ${qtop})
+                MESSAGE(STATUS "  >${q}")
+                FILE(REMOVE    "${q}")
+        ENDFOREACH(q ${qtop})
+        FILE(REMOVE_RECURSE  "${frame}/Versions/Current")
+        FILE(REMOVE_RECURSE  "${frame}/Versions/5/Headers")
+        # Create symlinks ?
+ENDFOREACH(frame ${frameworks})
+
+#
+MESSAGE(STATUS "* Creating dmg *")
+# Call cpack to create the dmg using the dragndrop installer
+IF(NOT DMG_BASENAME)
+        SET(DMG_BASENAME "Avidemux ${AVIDEMUX_VERSION}")
+        IF(NOT RELEASE AND BUILD_REV)
+                SET(DMG_BASENAME "${DMG_BASENAME} ${BUILD_REV}")
+        ENDIF(NOT RELEASE AND BUILD_REV)
+ENDIF(NOT DMG_BASENAME)
+
+#
+SET(CPACK_GENERATOR         "DragNDrop")
+SET(CPACK_PACKAGE_NAME      "Avidemux")
+SET(CPACK_PACKAGE_VENDOR    "Mean")
+SET(CPACK_SOURCE_GENERATOR  "")
+SET(CPACK_PACKAGE_FILE_NAME "${DMG_BASENAME}")
+SET(CPACK_DMG_FORMAT        "UDBZ")
+SET(CPACK_DMG_VOLUME_NAME   "${CPACK_PACKAGE_FILE_NAME}")
+SET(CPACK_BINARY_DRAGNDROP  ON)
+SET(CPACK_PACKAGE_ICON      "${CMAKE_CURRENT_SOURCE_DIR}/avidemux_dmg.icns")
+INSTALL(DIRECTORY ${BUNDLE} DESTINATION .
+	         USE_SOURCE_PERMISSIONS)
+#
+include(CPack)
+
+MESSAGE(STATUS "* All done *")
+

avidemux_2.7.0.tar.gz/avidemux/osxInstaller/avidemux_dmg.icns Added

avidemux_2.7.0.tar.gz/avidemux/osxInstaller/avidemux_dmg3.png Added

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_UIs/include/ADM_toolkitQt.h -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_UIs/include/ADM_toolkitQt.h Changed

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h Changed

@@ -21,15 +21,15 @@
 #include "ADM_image.h"
 
 #include "ADM_coreVideoFilter6_export.h"
-
+#include "ADM_toolkitQt.h"
 
 #include <QWidget>
 #include <QDialog>
-#include <QSlider>
 #include <QFrame>
 #include <QTimer>
 #include <QDialog>
 #include <QLabel>
+#include <QRubberBand>
 
 #include "ADM_default.h"
 #include "ADM_rgb.h"
@@ -65,7 +65,6 @@
         void changeSize(uint32_t w, uint32_t h);
 };
 
-
 class flyControl;
 /**
     \class ADM_flyDialog
@@ -100,12 +99,12 @@
 
   public:
           void          *_cookie; // whatever, usually the ui_xxx component
-          QSlider       *_slider; // widget
+          ADM_QSlider   *_slider; // widget
           ADM_QCanvas   *_canvas; // Drawing zone
 
   public:
                             ADM_flyDialog(QDialog *parent,uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
-                                 ADM_QCanvas *canvas, QSlider *slider, ResizeMethod resizeMethod);
+                                 ADM_QCanvas *canvas, ADM_QSlider *slider, ResizeMethod resizeMethod);
           virtual           ~ADM_flyDialog(void);    
           void               recomputeSize(void);
           virtual bool       disableZoom(void);
@@ -132,7 +131,7 @@
   //virtual uint8_t  update(void)=0;
 
   virtual bool       setCurrentPts(uint64_t pts) {return true;};
-
+  virtual bool       bandResized(int x, int y, int w, int h) { return true; }
 
 
 // UI dependant part : They are implemented in ADM_flyDialogGtk/Qt/...
@@ -156,9 +155,10 @@
         virtual bool nextImage(void);
         virtual void backOneMinute(void);
         virtual void fwdOneMinute(void);
-        virtual void autoZoom(bool status);
         virtual void play(bool status);
-        virtual void timeout();  
+        virtual void timeout(void);
+        virtual void adjustCanvasPosition(void);
+        virtual void fitCanvasIntoView(uint32_t width, uint32_t height);
 };
 /**
  * \class ADM_flyDialogYuv
@@ -174,7 +174,7 @@
           virtual    void resetScaler(void);
 
                                 ADM_flyDialogYuv(QDialog *parent,uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
-                                ADM_QCanvas *canvas, QSlider *slider, 
+                                ADM_QCanvas *canvas, ADM_QSlider *slider,
                                 ResizeMethod resizeMethod);
             virtual             ~ADM_flyDialogYuv();
             virtual uint8_t    processYuv(ADMImage* in, ADMImage *out) =0;
@@ -182,7 +182,7 @@
 };
 
 /**
- * \class ADM_flyDialogYuv
+ * \class ADM_flyDialogRgb
  */
 class ADM_UIQT46_EXPORT ADM_flyDialogRgb: public  ADM_flyDialog
 {
@@ -197,7 +197,7 @@
           virtual    void resetScaler(void);
 
                             ADM_flyDialogRgb(QDialog *parent,uint32_t width, uint32_t height, 
-                                 ADM_coreVideoFilter *in,  ADM_QCanvas *canvas,  QSlider *slider, ResizeMethod resizeMethod);
+                                 ADM_coreVideoFilter *in,  ADM_QCanvas *canvas,  ADM_QSlider *slider, ResizeMethod resizeMethod);
            virtual          ~ADM_flyDialogRgb();
            virtual uint8_t  processRgb(uint8_t *in, uint8_t *out) =0;
 };
@@ -217,3 +217,38 @@
         bool eventFilter(QObject *obj, QEvent *event);
 };
 
+/**
+    \fn ADM_QRubberBand
+    \brief Override platform-dependent appearance of QRubberBand
+*/
+class ADM_UIQT46_EXPORT ADM_QRubberBand : public QRubberBand
+{
+public:
+        ADM_QRubberBand(QWidget *parent);
+        ~ADM_QRubberBand();
+private:
+        void paintEvent(QPaintEvent *event);
+};
+
+/**
+    \fn ADM_rubberControl
+    \brief http://stackoverflow.com/questions/19066804/implementing-resize-handles-on-qrubberband-is-qsizegrip-relevant
+*/
+class ADM_UIQT46_EXPORT ADM_rubberControl : public QWidget
+{
+public:
+        ADM_rubberControl(ADM_flyDialog *fly, QWidget *parent);
+        ADM_flyDialog *flyParent;
+        int nestedIgnore;
+
+public:
+        ADM_QRubberBand *rubberband;
+        void blockSignals(bool block)
+        {
+            rubberband->blockSignals(block);
+        }
+private:
+        void resizeEvent(QResizeEvent *);
+};
+
+//EOF

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_UIs/src/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_UIs/src/CMakeLists.txt Changed

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp Changed

@@ -20,7 +20,6 @@
 #include <QtCore/QEvent>
 #include <QtCore/QCoreApplication>
 #include <QGraphicsView>
-#include <QSlider>
 #include <QPushButton>
 #include <QRadioButton>
 #include <QHBoxLayout>
@@ -64,15 +63,9 @@
             pushButton_fwd1mn->setAutoRepeatDelay(1000);
 
             horizontalLayout_4->addWidget(pushButton_fwd1mn);
-
-            radioButton_autoZoom = new QRadioButton();
-            radioButton_autoZoom->setObjectName(QString("radioButton_autoZoom"));
-            radioButton_autoZoom->setChecked(true);
-
-            horizontalLayout_4->addWidget(radioButton_autoZoom);
             //
             labelTime=new QLabel();
-            labelTime->setText("00:00:00.000");
+            labelTime->setText("00:00:00.000 / 00:00:00.000");
             horizontalLayout_4->addWidget(labelTime);
             //
             QSpacerItem  *horizontalSpacer_4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
@@ -85,7 +78,6 @@
             pushButton_next->setText(QApplication::translate("seekablePreviewDialog", ">", 0));
             pushButton_fwd1mn->setText(QApplication::translate("seekablePreviewDialog", ">>", 0));
             pushButton_fwd1mn->setToolTip(QApplication::translate("seekablePreviewDialog", "Forward one minute", 0));
-            radioButton_autoZoom->setText(QApplication::translate("seekablePreviewDialog", "A&utoZoom", 0));    
          }
         void disableButtons()
         {
@@ -104,7 +96,6 @@
         QPushButton *pushButton_play;
         QPushButton *pushButton_next;
         QPushButton *pushButton_fwd1mn;
-        QRadioButton *radioButton_autoZoom;
         QLabel       *labelTime;
 };
 
@@ -251,15 +242,13 @@
  */
 bool        ADM_flyDialog::addControl(QHBoxLayout *horizontalLayout_4)
 {
-       
         _parent->setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum));
         _control=new flyControl(horizontalLayout_4);
         QObject::connect(_control->pushButton_next ,SIGNAL(clicked()),this,SLOT(nextImage()));
         QObject::connect(_control->pushButton_back1mn ,SIGNAL(clicked()),this,SLOT(backOneMinute()));
         QObject::connect(_control->pushButton_fwd1mn ,SIGNAL(clicked()),this,SLOT(fwdOneMinute()));
         QObject::connect(_control->pushButton_play ,SIGNAL(toggled(bool )),this,SLOT(play(bool)));
-        QObject::connect(_control->radioButton_autoZoom ,SIGNAL(toggled(bool )),this,SLOT(autoZoom(bool)));
-      
+
         return true;
 }
 
@@ -288,8 +277,10 @@
     }
     lastPts=_yuvBuffer->Pts;
     setCurrentPts(lastPts);
+    uint64_t duration=_in->getInfo()->totalDuration;
+    QString time=QString(ADM_us2plain(lastPts)) + QString(" / ") + QString(ADM_us2plain(duration));
     if(_control)
-        _control->labelTime->setText(ADM_us2plain(lastPts));
+        _control->labelTime->setText(time);
     // Process...   
     process();
     return display(_rgbByteBufferDisplay.at(0));
@@ -300,7 +291,7 @@
 */
 bool ADM_flyDialog::nextImage(void)
 {
-    QSlider  *slide=(QSlider *)_slider;
+    ADM_QSlider  *slide=(ADM_QSlider *)_slider;
     ADM_assert(slide);
     bool oldState=slide->blockSignals(true);
     bool r=nextImageInternal();
@@ -342,7 +333,6 @@
         _zoomH = uint32_t(_h * _zoom);
     }
     
-    
     ADM_info("xAutoZoom : base size= %d x %d\n",_usedWidth,_usedHeight);
     return true;
 }
@@ -381,7 +371,7 @@
 // i.e. yuv processing or RGB processing
 //************************************
   ADM_flyDialogYuv::ADM_flyDialogYuv(QDialog *parent,uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
-                                ADM_QCanvas *canvas, QSlider *slider, 
+                                ADM_QCanvas *canvas, ADM_QSlider *slider,
                                 ResizeMethod resizeMethod) : ADM_flyDialog(parent,width,height,in,canvas,slider,resizeMethod)
 {
        _control=NULL;
@@ -421,7 +411,7 @@
 }
 //*****************************************
 ADM_flyDialogRgb::ADM_flyDialogRgb(QDialog *parent,uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
-                                ADM_QCanvas *canvas, QSlider *slider, 
+                                ADM_QCanvas *canvas, ADM_QSlider *slider,
                                 ResizeMethod resizeMethod) : ADM_flyDialog(parent,width,height,in,canvas,slider,resizeMethod)
 {
     uint32_t size=_w*_h*4;
@@ -512,7 +502,7 @@
 */
 
   ADM_flyDialog::ADM_flyDialog(QDialog *parent ,uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
-                              ADM_QCanvas *canvas, QSlider *slider,  ResizeMethod resizeMethod)
+                              ADM_QCanvas *canvas, ADM_QSlider *slider,  ResizeMethod resizeMethod)
 {  
     ADM_assert(canvas);
     {
@@ -532,11 +522,14 @@
     _yuvBuffer=new ADMImageDefault(_w,_h);
     _usedWidth= _usedHeight=0;
     lastPts=0;
-   
-    
+
+    QGraphicsScene *sc=new QGraphicsScene(this);
+    sc->setBackgroundBrush(QBrush(Qt::darkGray, Qt::SolidPattern));
+    qobject_cast<QGraphicsView*>(_canvas->parentWidget())->setScene(sc);
+    qobject_cast<QFrame*>(_canvas->parentWidget())->setFrameStyle(QFrame::NoFrame);
+
     connect(&timer,SIGNAL(timeout()),this,SLOT(timeout()));
     timer.setSingleShot(true);
-    
 
     int incrementUs=getUnderlyingFilter()->getInfo()->frameIncrement;
 
@@ -557,7 +550,7 @@
 void ADM_flyDialog::postInit(uint8_t reInit)
 {
 	QWidget *graphicsView = ((ADM_QCanvas*)_canvas)->parentWidget();
-	QSlider  *slider=(QSlider *)_slider;
+	ADM_QSlider  *slider=(ADM_QSlider *)_slider;
 
 	if (reInit)
 	{
@@ -571,8 +564,59 @@
 
 	((ADM_QCanvas*)_canvas)->changeSize(_zoomW, _zoomH);
 	graphicsView->setMinimumSize(_zoomW, _zoomH);
-	graphicsView->resize(_zoomW, _zoomH);
 }
+
+/**
+    \fn adjustCanvasPosition
+    \brief center canvas within the viewport (graphicsView)
+*/
+void ADM_flyDialog::adjustCanvasPosition(void)
+{
+    uint32_t graphicsViewWidth = _canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = _canvas->parentWidget()->height();
+    uint32_t canvasWidth = _canvas->width();
+    uint32_t canvasHeight = _canvas->height();
+    int h = 0;
+    int v = 0;
+    if(graphicsViewWidth > canvasWidth)
+        h = (graphicsViewWidth - canvasWidth)/2;
+    if(graphicsViewHeight > canvasHeight)
+        v = (graphicsViewHeight - canvasHeight)/2;
+    if(h||v)
+        _canvas->move(h,v);
+}
+
+/**
+    \fn fitCanvasIntoView
+*/
+void ADM_flyDialog::fitCanvasIntoView(uint32_t width, uint32_t height)
+{
+    double ar = (double)_w / _h;
+    double viewAr = (double)width / height;
+
+    if(viewAr != ar)
+    {
+        uint32_t tmpZoomW = 0;
+        uint32_t tmpZoomH = 0;
+        if(viewAr > ar)
+        {
+            tmpZoomW = (uint32_t)((double)height * ar);
+            tmpZoomH = height;
+        }else
+        {
+            tmpZoomW = width;
+            tmpZoomH = (uint32_t)((double)width / ar);
+        }
+        _resizeMethod = RESIZE_AUTO;
+        _zoomW = tmpZoomW&0xfffffffe;
+        _zoomH = tmpZoomH&0xfffffffe;
+        _zoom = (float)_zoomW / _w;
+        updateZoom();
+        _canvas->changeSize(_zoomW, _zoomH);
+        sameImage();
+    }
+}
+
 /**
     \fn    calcZoomFactor
     \brief
@@ -587,8 +631,7 @@
     // zoom it ?
     if((zoom)>1)
     {
-        _computedZoom=floor(APPROXIMATE*(zoom))/APPROXIMATE;
-        ADM_info("AutoZoom %f ->%f \n",(float)zoom,(float)_computedZoom);
+        _computedZoom=1.; // never upscale automatically
         return _computedZoom;
     }
     double invertZoom=1/zoom;
@@ -621,7 +664,7 @@
 
 uint32_t ADM_flyDialog::sliderGet(void)
 {
-  QSlider  *slide=(QSlider *)_slider;
+  ADM_QSlider  *slide=(ADM_QSlider *)_slider;
   ADM_assert(slide);
   return slide->value();
   
@@ -633,7 +676,7 @@
 
 uint8_t     ADM_flyDialog::sliderSet(uint32_t value)
 {
-  QSlider  *slide=(QSlider *)_slider;
+  ADM_QSlider  *slide=(ADM_QSlider *)_slider;
   ADM_assert(slide);
   if(value>ADM_FLY_SLIDER_MAX) value=ADM_FLY_SLIDER_MAX;
   slide->setValue(value);
@@ -695,7 +738,7 @@
  */
 void ADM_flyDialog::play(bool state)
 {
-    QSlider *slide=(QSlider *)_slider;
+    ADM_QSlider *slide=(ADM_QSlider *)_slider;
     ADM_assert(slide);
     if(state)
     {
@@ -715,30 +758,15 @@
 }
 
 /**
- * 
- */
-void ADM_flyDialog::autoZoom(bool state)
-{
-    ADM_info("*** AUTO ZOOM = %d\n",(int)state);
-    if(!state)
-    {
-        disableZoom();
-        _canvas->setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum));
-        _parent->adjustSize();
-        
-    }else
-    {
-        enableZoom();
-        _parent->adjustSize();
-    }
-
-}
-
+    \fn timeout
+    \brief play filtered video
+*/
 void ADM_flyDialog::timeout()
 {
-    
     bool r=nextImage();
-    _control->labelTime->setText(ADM_us2plain(_yuvBuffer->Pts));
+    uint64_t duration=_in->getInfo()->totalDuration;
+    QString time=QString(ADM_us2plain(_yuvBuffer->Pts)) + QString(" / ") + QString(ADM_us2plain(duration));
+    _control->labelTime->setText(time);
     if(r)
     {
         int now=_clock.getElapsedMS();

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_UIs/src/T_QSlider.cpp Added

@@ -0,0 +1,77 @@
+
+/***************************************************************************
+Custom slider
+***************************************************************************/
+
+/***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************/
+#include <stdio.h>
+#include <stdlib.h>
+#include "ADM_inttype.h"
+#include <QSlider>
+#include <QStyleOptionSlider>
+#include <QMouseEvent>
+#include "ADM_toolkitQt.h"
+#include "ADM_assert.h"
+/**
+    \fn ADM_QSlider
+*/
+
+ADM_QSlider::ADM_QSlider(QWidget *parent) : QSlider(parent)
+{
+}
+
+/*
+    \fn mousePressEvent
+    \brief seek straight to the mouse position, code by https://stackoverflow.com/users/1777490/bitok
+    \      see https://stackoverflow.com/questions/11132597/qslider-mouse-direct-jump
+*/
+void ADM_QSlider::mousePressEvent(QMouseEvent *e)
+{
+    QStyleOptionSlider opt;
+    initStyleOption(&opt);
+    QRect sr = style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderHandle, this);
+
+    if (e->button() == Qt::LeftButton && !sr.contains(e->pos()))
+    {
+        int newVal;
+        if (orientation() == Qt::Horizontal)
+        {
+            double halfHandleWidth = (0.5 * sr.width()) + 0.5;
+            int adjPosX = e->x();
+            if (adjPosX < halfHandleWidth)
+                adjPosX = halfHandleWidth;
+            if (adjPosX > width() - halfHandleWidth)
+                adjPosX = width() - halfHandleWidth;
+            double newWidth = width() - (halfHandleWidth * 2);
+            double normalizedPosition = (adjPosX - halfHandleWidth) / newWidth;
+
+            newVal = minimum() + ((maximum() - minimum()) * normalizedPosition);
+        }else
+        {
+            double halfHandleHeight = (0.5 * sr.height()) + 0.5;
+            int adjPosY = height() - e->y();
+            if (adjPosY < halfHandleHeight)
+                adjPosY = halfHandleHeight;
+            if (adjPosY > height() - halfHandleHeight)
+                adjPosY = height() - halfHandleHeight;
+            double newHeight = height() - (halfHandleHeight * 2);
+            double normalizedPosition = (adjPosY - halfHandleHeight) / newHeight;
+
+            newVal = minimum() + (maximum() - minimum()) * normalizedPosition;
+        }
+
+        setValue(newVal);
+        e->accept();
+    }else
+    {
+        QSlider::mousePressEvent(e);
+    }
+}
+//EOF

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp Added

@@ -0,0 +1,89 @@
+/***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************///
+
+#include <QPainter>
+#include <QRubberBand>
+#include <QBoxLayout>
+#include <QSizeGrip>
+
+#include "ADM_default.h"
+#include "DIA_flyDialogQt4.h"
+
+ADM_QRubberBand::ADM_QRubberBand(QWidget *parent) : QRubberBand(QRubberBand::Rectangle, parent)
+{
+}
+
+ADM_QRubberBand::~ADM_QRubberBand()
+{
+}
+
+/**
+    \fn paintEvent
+    \brief Override platform-dependent appearance of QRubberBand
+*/
+void ADM_QRubberBand::paintEvent(QPaintEvent *event)
+{
+    QPainter painter(this);
+    QPen pen;
+    pen.setWidth(2);
+    QColor color(Qt::red);
+    pen.setColor(color);
+    painter.setPen(pen);
+    QRect adjustedRect = rect().adjusted(1,1,-1,-1);
+    painter.drawRect(adjustedRect);
+    color.setAlpha(80);
+    QBrush brush = QBrush(color, Qt::DiagCrossPattern);
+    adjustedRect = adjustedRect.adjusted(1,1,-1,-1);
+    painter.fillRect(adjustedRect, brush);
+    painter.end();
+}
+
+/**
+    \fn Ctor
+*/
+ADM_rubberControl::ADM_rubberControl(ADM_flyDialog *fly, QWidget *parent) : QWidget(parent)
+{
+    nestedIgnore=0;
+    flyParent=fly;
+    // tell QSizeGrip to resize this widget instead of top-level window
+    setWindowFlags(Qt::SubWindow);
+    QHBoxLayout *layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    QSizeGrip *grip1 = new QSizeGrip(this);
+    QSizeGrip *grip2 = new QSizeGrip(this);
+#ifdef __APPLE__
+    // work around grips not shown on macOS
+    grip1->setFixedSize(10,10);
+    grip2->setFixedSize(10,10);
+#endif
+    grip1->setVisible(true);
+    grip2->setVisible(true);
+    layout->addWidget(grip1, 0, Qt::AlignLeft | Qt::AlignTop);
+    layout->addWidget(grip2, 0, Qt::AlignRight | Qt::AlignBottom);
+    rubberband = new ADM_QRubberBand(this);
+    rubberband->move(0, 0);
+    rubberband->show();
+    show();
+}
+
+/**
+    \fn resizeEvent
+*/
+void ADM_rubberControl::resizeEvent(QResizeEvent *)
+{
+    int x, y, w, h;
+    x = pos().x();
+    y = pos().y();
+    w = size().width();
+    h = size().height();
+    rubberband->resize(size());
+    if(!nestedIgnore)
+        flyParent->bandResized(x, y, w, h);
+}
+//EOF

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_UIs/src/T_filesel.cpp -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_UIs/src/T_filesel.cpp Changed

@@ -19,6 +19,7 @@
 #include "DIA_factory.h"
 #include "DIA_fileSel.h"
 #include "ADM_dialogFactoryQt4.h"
+#include "ADM_last.h"
 
 extern const char *shortkey(const char *);
 #define MAX_SEL 2040
@@ -61,12 +62,13 @@
 { 
 	uint8_t r=0;
 	char buffer[MAX_SEL+1];
-        const char *txt="";
-	txt="";
+        //const char *txt="";
+	std::string lastFolder;
 	switch(fileMode)
 	{
 		case ADM_FILEMODE_READ:
-			r=FileSel_SelectRead(selectDesc,buffer,MAX_SEL,txt);
+			admCoreUtils::getLastReadFolder(lastFolder);
+			r=FileSel_SelectRead(selectDesc,buffer,MAX_SEL,lastFolder.c_str());
 			break;
 		case ADM_FILEMODE_WRITE:
 //#warning FIXME
@@ -94,11 +96,13 @@
 				}
 			}
 #endif
-			r=FileSel_SelectWrite(selectDesc,buffer,MAX_SEL,txt);
+			admCoreUtils::getLastWriteFolder(lastFolder);
+			r=FileSel_SelectWrite(selectDesc,buffer,MAX_SEL,lastFolder.c_str());
 			break;
 
 		case ADM_FILEMODE_DIR:
-			r=FileSel_SelectDir(selectDesc,buffer,MAX_SEL,txt);
+			admCoreUtils::getLastReadFolder(lastFolder);
+			r=FileSel_SelectDir(selectDesc,buffer,MAX_SEL,lastFolder.c_str());
 			break;
 		default:
 			ADM_assert(0);break;

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

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

@@ -27,9 +27,37 @@
 #include "pthread.h"
 
 #ifdef _WIN32
-int utf8StringToWideChar(const char *utf8String, int utf8StringLength, wchar_t *wideCharString);
+    int utf8StringToWideChar(const char *utf8String, int utf8StringLength, wchar_t *wideCharString);
+    #define MKCLI() "avidemux_cli.exe"
+    #define MKQT()  "avidemux.exe"
+    const string slash=string("\\");
+#else    
+    
+    #ifdef __APPLE__
+        #define MKQT()  admExecutable("avidemux")
+        #define MKCLI() admExecutable( "avidemux_cli")
+    #else
+        #define MKCLI() admExecutable("avidemux3_cli")
+        #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+            #define MKQT() admExecutable("avidemux3_qt5")
+        #else
+            #define MKQT() admExecutable("avidemux3_qt4")
+        #endif
+    #endif
+    const string slash=string("/");
 #endif
-
+/**
+ * 
+ * @param exeName
+ * @return 
+ */
+const char *admExecutable(const char *exeName)    
+{
+   static char fullName[2048]; // only use once per job, so "safe" to use static
+   sprintf(fullName,"%s%s%s",QCoreApplication::applicationDirPath().toStdString().c_str(),slash.c_str(),exeName);
+   return fullName;
+}
+    
 /**
     \fn spawnerBoomerang
     \brief Allow to do class -> plain C -> class 
@@ -161,15 +189,6 @@
     // 2- Spawn  child
     string ScriptFullPath;
     
-#ifdef _WIN32
-    #define MKCLI() "avidemux_cli.exe"
-    #define MKQT()  "avidemux.exe"
-    string slash=string("\\");
-#else
-    #define MKCLI() "avidemux3_cli"
-    #define MKQT() "avidemux3_qt4"
-    string slash=string("/");
-#endif
     
     ScriptFullPath=string(ADM_getJobDir())+slash+string(job.scriptName);
     const char *avidemuxVersion=MKCLI();
@@ -235,9 +254,9 @@
                                 break;
             }
         }
-        ADM_assert(dialog);
+        else
+            ADM_usleep(1000*1000); // Refresh once per sec
         QApplication::processEvents();
-        ADM_usleep(1000*1000); // Refresh once per sec
     }
     ADM_info("** End of slave process **\n");
     ADM_info("** End of slave process **\n");

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_openGL/src/ADM_openGlDownloadTexture.cpp -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_openGL/src/ADM_openGlDownloadTexture.cpp Changed

@@ -13,6 +13,15 @@
 #define TEX_V_OFFSET 0  
 #define TEX_A_OFFSET 3   
 
+#if defined( ADM_CPU_X86) 
+extern "C"
+{
+    void adm_glYUV444_Init_mmx();
+    void adm_glYUV444_luma_mmx(const uint8_t *src, uint8_t *dst, int count);
+    void adm_glYUV444_luma2_mmx(const uint8_t *src, uint8_t *dst, int count);
+}
+void admTestDownloadTexture();
+#endif
 
 typedef void typeGlYv444(const uint8_t *src,uint8_t *dst,const int width);
 typedef void typeGlYUV444(const uint8_t *src,uint8_t *dstY,uint8_t *dstU, uint8_t *dstV,const int width);
@@ -22,7 +31,7 @@
 
 /**
  * \fn glYUV444_ChromaC
- * \brief very stupid downsampler for U & V plane, one line is discarder
+ * \brief very stupid downsampler for U & V plane, one line is discarded
  * @param src
  * @param toU
  * @param toV
@@ -50,57 +59,21 @@
  * 
  */
 #ifdef ADM_CPU_X86
-static inline void glYUV444_MMXInit(void)
-{
-   static uint64_t __attribute__((used)) FUNNY_MANGLE(mask) = 0x00ff000000ff0000LL;
-
-    __asm__(" movq " Mangle(mask)", %%mm7\n" ::);
-}
-ADM_NO_OPTIMIZE static inline void glYUV444_MMX(const uint8_t *src2, uint8_t *dst2, const int width2)
+ADM_NO_OPTIMIZE static inline void glYUV444_MMX(const uint8_t *src, uint8_t *dst, const int width)
 {
-    uint8_t *src=(uint8_t *)src2;
-    uint8_t *dst=(uint8_t *)dst2;
-    int width=width2;
     int count=width/8;
-                    __asm__(
-                        "1:\n"
-                        "movq           (%0),%%mm0 \n"
-                        "pand           %%mm7,%%mm0\n"
-                        "movq           8(%0),%%mm1 \n"
-                        "pand           %%mm7,%%mm1\n"
-
-                        "movq           16(%0),%%mm2 \n"
-                        "pand           %%mm7,%%mm2\n"
-                        "movq           24(%0),%%mm3 \n"
-                        "pand           %%mm7,%%mm3\n"
-
-                        "packuswb       %%mm1,%%mm0\n"
-                        "packuswb       %%mm3,%%mm2\n"
-                        "psrlw          $8,%%mm0\n"
-                        "psrlw          $8,%%mm2\n"
-                        "packuswb       %%mm2,%%mm0\n"
-
-                        "movq           %%mm0,(%1)  \n"  
-                        "add            $32,%0      \n"
-                        "add            $8,%1       \n"
-                        "sub            $1,%2        \n"
-                        "jnz             1b         \n"
-                        
-                        : "=r"(src),"=r"(dst),"=r"(count)
-                        : "0"(src),"1"(dst),"2"(count)
-                        );
+    adm_glYUV444_luma_mmx(src,dst,count);                 
     if(width&7)
     {
-        count=width/8;
-        for(int i=count*8;i<width2;i++)
-            dst2[i]  = src2[i*4+TEX_Y_OFFSET];
+        for(int i=count*8;i<width;i++)
+            dst[i]  = src[i*4+TEX_Y_OFFSET];
     }
 }
 /**
  * 
  * @param src
  * @param dstY
- * @param dstU
+ * @param dstU  ** NOT USED AT THE MOMENT **
  * @param dstV
  * @param width
  */
@@ -109,41 +82,7 @@
     const uint8_t *src=src2;
     uint8_t *dstY=dstY2, *dstU=dstU2, *dstV=dstV2;
     int count=width/8;
-                    __asm__(
-                        "1:\n"
-                        "movq           (%0),%%mm0 \n"
-                        "pmov           %%mm0,%%mm4 \n"
-                        "pand           %%mm7,%%mm0\n"
-                        "movq           8(%0),%%mm1 \n"
-                        "pmov           %%mm1,%%mm5 \n"
-                        "pand           %%mm7,%%mm1\n"
-
-                        "movq           16(%0),%%mm2 \n"
-                        "pmov           %%mm2,%%mm6 \n"
-                        "pand           %%mm7,%%mm2\n"
-                        "movq           24(%0),%%mm3 \n"
-                        "packuswb       %%mm1,%%mm0\n"
-                        "pmov           %%mm3,%%mm1 \n" // We have a copy in MM4/MM5/MM6/MM1
-                        "pand           %%mm7,%%mm3\n"
-
-                        // Pack luma
-                        "packuswb       %%mm3,%%mm2\n"
-                        "psrlw          $8,%%mm0\n"
-                        "psrlw          $8,%%mm2\n"
-                        "packuswb       %%mm2,%%mm0\n"
-                        "movq           %%mm0,(%1)  \n"  
-                            
-                        // now do chroma, it is similar    
-                            
-                        // Next..
-                        "add            $32,%0      \n"
-                        "add            $8,%1       \n"
-                        "sub            $1,%2        \n"
-                        "jnz             1b         \n"
-                        
-                        :  "=r"(src),"=r"(dstY),"=r"(dstU),"=r"(dstV),"=r"(count)
-                        :  "0"(src),"1"(dstY),"2"(dstU),"3"(dstV),"4"(count)
-                        );
+    adm_glYUV444_luma2_mmx(src2,dstY2,count);
     if(width&7)
     {
         count=width/8;
@@ -197,7 +136,7 @@
 #ifdef ADM_CPU_X86
       if(1 && CpuCaps::hasMMX())
       {
-            glYUV444_MMXInit();
+            adm_glYUV444_Init_mmx();
             luma=glYUV444_MMX;
             lumaAndChroma=glYUV444_YUVMMX;
       }
@@ -227,8 +166,9 @@
        luma(src,toY,width);
        toY+=strideY;        
     }
+    
 #ifdef ADM_CPU_X86
-    __asm__( "emms\n"::  );
+    ADM_emms();    
 #endif
     yy=NULL;
     return true;
@@ -285,10 +225,10 @@
         int height=image->GetHeight(PLANAR_Y);
         typeGlYv444 *luma=glYUV444_C;
         typeGlYUV444 *lumaAndChroma=glYUV444_C_withChroma;
-    #ifdef ADM_CPU_X86
+#ifdef ADM_CPU_X86
           if(1 && CpuCaps::hasMMX())
           {
-                glYUV444_MMXInit();
+                adm_glYUV444_Init_mmx();
                 luma=glYUV444_MMX;
                 lumaAndChroma=glYUV444_YUVMMX;
           }
@@ -306,9 +246,9 @@
            toU+=strideU;
            toV+=strideV;
         }
-    #ifdef ADM_CPU_X86
-        __asm__( "emms\n"::  );
-    #endif
+#ifdef ADM_CPU_X86
+        ADM_emms();        
+#endif
         ADM_glExt::unmapBuffer(GL_PIXEL_PACK_BUFFER_ARB);
     }
     ADM_glExt::bindBuffer(GL_PIXEL_PACK_BUFFER_ARB,0);
@@ -382,4 +322,42 @@
     return downloadTexturesQt(image,fbo);
 }
 
+
+void admTestDownloadTexture()
+{
+    adm_glYUV444_Init_mmx();
+    uint8_t src[512*4+8],dst[512*4+8],dst2[512*4+8];
+    bool fail=false;
+    
+    for(int i=0;i<512*4+8;i++)
+    {
+        src[i]=i;
+        dst[i]=0;
+        dst2[i]=0;
+    }
+#define CHECK(x) \
+    glYUV444_C(src,dst,x); \
+    glYUV444_MMX(src,dst2,x); \
+    if(memcmp(dst,dst2,x)) \
+    { \
+        printf("Fail with width=%d at line %d\n",x,__LINE__); \
+        fail=true; \
+    } else\
+    printf(" OK with width =%d\n",x);
+    
+    CHECK(512);
+    CHECK(510);
+    CHECK(508);
+    CHECK(504);
+    if(fail)
+    {
+        printf("** FAIL **\n");
+        exit(-1);
+    }
+    else
+    {
+        printf("PASS \n");
+    }
+}
+
 // EOF

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_openGL/src/ADM_openGlDownload_asm.asm Added

@@ -0,0 +1,154 @@
+;
+;
+%define private_prefix adm
+%define public_prefix  adm
+
+%include "admx86util.asm"
+;
+;
+;#ifdef CAN_DO_INLINE_X86_ASM
+;static inline void glYUV444_MMXInit(void)
+;{
+;   static uint64_t __attribute__((used)) FUNNY_MANGLE(mask) = 0x00ff000000ff0000LL;
+;
+;    __asm__(" movq " Mangle(mask)", %%mm7\n" ::);
+;}
+;ADM_NO_OPTIMIZE static inline void glYUV444_MMX(const uint8_t *src2, uint8_t *dst2, const int width2)
+;{
+;    uint8_t *src=(uint8_t *)src2;
+;    uint8_t *dst=(uint8_t *)dst2;
+;    int width=width2;
+;    int count=width/8;
+;                    __asm__(
+;                        "1:\n"
+;                        "movq           (%0),%%mm0 \n"
+;                        "pand           %%mm7,%%mm0\n"
+;                        "movq           8(%0),%%mm1 \n"
+;                        "pand           %%mm7,%%mm1\n";
+;
+;                        "movq           16(%0),%%mm2 \n"
+;                        "pand           %%mm7,%%mm2\n"
+;                        "movq           24(%0),%%mm3 \n"
+;                        "pand           %%mm7,%%mm3\n"
+;;
+;                        "packuswb       %%mm1,%%mm0\n"
+;                        "packuswb       %%mm3,%%mm2\n"
+;                        "psrlw          $8,%%mm0\n"
+;                       "psrlw          $8,%%mm2\n"
+;                        "packuswb       %%mm2,%%mm0\n";;
+;
+;                        "movq           %%mm0,(%1)  \n"  
+;                        "add            $32,%0      \n"
+;                        "add            $8,%1       \n"
+;                        "sub            $1,%2        \n"
+;                        "jnz             1b         \n"
+;                        
+;                        : "=r"(src),"=r"(dst),"=r"(count)
+;                        : "0"(src),"1"(dst),"2"(count)
+;                        );
+SECTION_RODATA
+MASK:
+      dq 0x00ff000000ff0000
+section .text
+INIT_MMX mmx
+default rel
+cglobal glYUV444_Init
+        movq          m7,[MASK]
+        ret
+
+default abs
+INIT_MMX mmx
+cglobal glYUV444_luma, 3,4,4, src, dst, count
+.luma:
+   
+        movq           m0,[srcq]
+        pand           m0,m7
+        movq           m1,8[srcq]
+        pand           m1,m7
+
+
+        movq           m2,16[srcq]
+        pand           m2,m7
+        movq           m3,24[srcq]
+        pand           m3,m7
+
+        packuswb       m0,m1
+        packuswb       m2,m3
+        psrlw          m0,8
+        psrlw          m2,8
+        packuswb       m0,m2
+
+        movq           [dstq],m0
+        add            srcq,32
+        add            dstq,8
+        sub            countd,1
+        jnz             .luma
+        ret
+;"1:\n"
+;                        "movq           (%0),%%mm0 \n"
+;                        "pmov           %%mm0,%%mm4 \n"
+;;                        "pand           %%mm7,%%mm0\n"
+;                        "movq           8(%0),%%mm1 \n"
+;                        "pmov           %%mm1,%%mm5 \n"
+;;                        "pand           %%mm7,%%mm1\n"
+;
+;                        "movq           16(%0),%%mm2 \n"
+;                        "pmov           %%mm2,%%mm6 \n"
+;;                        "pand           %%mm7,%%mm2\n"
+;                        "movq           24(%0),%%mm3 \n";
+;                        "packuswb       %%mm1,%%mm0\n"
+;                        "pmov           %%mm3,%%mm1 \n" // We have a copy in MM4/MM5/MM6/MM1
+;                        "pand           %%mm7,%%mm3\n"
+;
+;                        // Pack luma
+;                        "packuswb       %%mm3,%%mm2\n"
+;                        "psrlw          $8,%%mm0\n"
+;                        "psrlw          $8,%%mm2\n"
+;                        "packuswb       %%mm2,%%mm0\n"
+;                        "movq           %%mm0,(%1)  \n"  
+;                            
+;                        // now do chroma, it is similar    
+;                            
+;                        // Next..
+;                        "add            $32,%0      \n"
+;                        "add            $8,%1       \n"
+;                        "sub            $1,%2        \n"
+;                        "jnz             1b         \n"
+;                        
+;                        :  "=r"(src),"=r"(dstY),"=r"(dstU),"=r"(dstV),"=r"(count)
+
+INIT_MMX mmx
+cglobal glYUV444_luma2, 3,4,4, src, dstY, count
+.chroma:
+        movq           m0,[srcq]
+        movq           m0,m4
+        pand           m0,m7
+        movq           m1,8[srcq]
+        movq           m5,m1
+        pand           m1,m7
+
+        movq           m2,16[srcq]
+        movq           m6,m2
+        pand           m2,m7
+        movq           m3,24[srcq]
+        packuswb       m0,m1
+        movq           m1,m3
+        pand           m3,m7
+
+        ; Pack luma
+        packuswb       m2,m3
+        psrlw          m0,8
+        psrlw          m2,8
+        packuswb       m0,m2
+        movq           [dstYq],m0
+
+        ; now do chroma, it is similar    
+
+        ; Next..
+        add            srcq,32
+        add            dstYq,8
+        sub            countd,1
+        jnz            .chroma        
+        ret                
+                        
+

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_openGL/src/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_openGL/src/CMakeLists.txt Changed

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/DIA_flyPreview.h -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/DIA_flyPreview.h Changed

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.cpp -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.cpp Changed

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/about.ui -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/about.ui Changed

@@ -1,10 +1,8 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>aboutDialog</class>
- <widget class="QDialog" name="aboutDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="aboutDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -12,33 +10,51 @@
     <height>235</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>About Avidemux</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
     <number>9</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
    </property>
    <item>
-    <layout class="QVBoxLayout" >
-     <property name="margin" >
+    <layout class="QVBoxLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="leftMargin">
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
      </property>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Fixed</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>4</height>
@@ -47,27 +63,27 @@
       </spacer>
      </item>
      <item>
-      <widget class="QLabel" name="label_5" >
-       <property name="text" >
+      <widget class="QLabel" name="label_5">
+       <property name="text">
         <string/>
        </property>
-       <property name="pixmap" >
-        <pixmap resource="about.qrc" >:/new/prefix1/resources/avidemux_icon.png</pixmap>
+       <property name="pixmap">
+        <pixmap resource="about.qrc">:/new/prefix1/resources/avidemux_icon.png</pixmap>
        </property>
-       <property name="alignment" >
+       <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Fixed</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>5</height>
@@ -76,8 +92,8 @@
       </spacer>
      </item>
      <item>
-      <widget class="QLabel" name="versionLabel" >
-       <property name="font" >
+      <widget class="QLabel" name="versionLabel">
+       <property name="font">
         <font>
          <pointsize>18</pointsize>
          <weight>75</weight>
@@ -87,17 +103,17 @@
          <strikeout>false</strikeout>
         </font>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Avidemux </string>
        </property>
-       <property name="alignment" >
+       <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="label_2" >
-       <property name="font" >
+      <widget class="QLabel" name="label_2">
+       <property name="font">
         <font>
          <weight>50</weight>
          <italic>false</italic>
@@ -106,27 +122,27 @@
          <strikeout>false</strikeout>
         </font>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Multi-platform Video Editor</string>
        </property>
-       <property name="alignment" >
+       <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="label_3" >
-       <property name="text" >
-        <string>© 2001 - 2016  Mean</string>
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>© 2001 - 2017  Mean</string>
        </property>
-       <property name="alignment" >
+       <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="label_4" >
-       <property name="font" >
+      <widget class="QLabel" name="label_4">
+       <property name="font">
         <font>
          <weight>50</weight>
          <italic>false</italic>
@@ -135,10 +151,10 @@
          <strikeout>false</strikeout>
         </font>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>http://www.avidemux.org</string>
        </property>
-       <property name="alignment" >
+       <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
       </widget>
@@ -147,13 +163,13 @@
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>5</height>
@@ -162,26 +178,35 @@
     </spacer>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="leftMargin">
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
      </property>
      <item>
-      <widget class="QPushButton" name="licenseButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="licenseButton">
+       <property name="text">
         <string>&amp;License</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>131</width>
          <height>31</height>
@@ -190,11 +215,11 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="okButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="okButton">
+       <property name="text">
         <string>OK</string>
        </property>
-       <property name="default" >
+       <property name="default">
         <bool>true</bool>
        </property>
       </widget>
@@ -203,13 +228,12 @@
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <tabstops>
   <tabstop>okButton</tabstop>
   <tabstop>licenseButton</tabstop>
  </tabstops>
  <resources>
-  <include location="about.qrc" />
+  <include location="about.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -218,11 +242,11 @@
    <receiver>aboutDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>278</x>
      <y>253</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>96</x>
      <y>254</y>
     </hint>

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

@@ -49,6 +49,8 @@
 #include "ADM_script2/include/ADM_script.h"
 
 #include <QMenu>
+#include <QPainter>
+#include <QKeyEvent>
 /*******************************************************/
 #define NB_TREE 8
 #define myFg 0xFF
@@ -62,11 +64,11 @@
 
 /*******************************************************/
 #define zprintf(...) {}
-//#define NO_DELEGATE
-#define LABEL_SECURITY_MARGIN 6
 
 extern ADM_Composer *video_body;
 
+int FilterItemDelegate::padding = 4;
+
 FilterItemEventFilter::FilterItemEventFilter(QWidget *parent) : QObject(parent) {}
 /**
  * 
@@ -108,6 +110,54 @@
     zprintf("Delegate : %p\n",this);
     filter = new FilterItemEventFilter(parent);
 }
+
+/**
+    \fn sizeHint
+*/
+QSize FilterItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
+{ // The code below is stolen from http://3adly.blogspot.de/2013/09/qt-custom-qlistview-delegate-with-word.html
+    if(!index.isValid())
+        return QSize();
+
+    QString filterNameText = index.data(FilterNameRole).toString();
+    QString descText = index.data(DescriptionRole).toString();
+
+    QFont filterNameFont = QApplication::font();
+    QFont descFont = QApplication::font();
+    int fontSize = descFont.pointSize();
+    if(fontSize > 0)
+    {
+        if(fontSize > 8)
+        {
+            if(fontSize > 9)
+            {
+                fontSize -= 2;
+            }else
+            {
+                fontSize--;
+            }
+            descFont.setPointSize(fontSize);
+        }
+    }else // i.e. the font size has been specified in pixels instead of points
+    {
+        fontSize = descFont.pixelSize();
+        if(fontSize > 10)
+        {
+            fontSize -= 2;
+            descFont.setPixelSize(fontSize);
+        }
+    }
+    filterNameFont.setBold(true);
+    QFontMetrics filterNameFm(filterNameFont);
+    QFontMetrics descFm(descFont);
+
+    QRect filterNameRect = filterNameFm.boundingRect(0, 0, option.rect.width() - padding * 2, 0, Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, filterNameText);
+    QRect descRect = descFm.boundingRect(0, 0, option.rect.width() - padding * 2, 0, Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, descText);
+
+    QSize size(option.rect.width(), filterNameRect.height() + descRect.height() +  padding * 3);
+    return size;
+}
+
 /**
  * 
  * @param painter
@@ -115,40 +165,88 @@
  * @param index
  */
 void FilterItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
-{
-    QAbstractItemView *view = qobject_cast<QAbstractItemView*>(parent());
-    QLabel *label;
+{ // The code below is stolen from http://3adly.blogspot.de/2013/09/qt-custom-qlistview-delegate-with-word.html
+    if(!index.isValid())
+        return;
+
+    painter->save();
+
+    QPen pen;
+    QColor fg, bg;
+    QPalette pal;
+    if(option.state & QStyle::State_Selected)
+    {
+        if(option.state & QStyle::State_HasFocus)
+        {
+            fg = pal.color(QPalette::HighlightedText);
+            bg = pal.color(QPalette::Highlight);
+        }else
+        {
+            fg = pal.color(QPalette::WindowText);
+            bg = pal.color(QPalette::Window);
+        }
+    }else
+    {
+        fg = pal.color(QPalette::Text);
+        bg = pal.color(QPalette::Base);
+    }
+    painter->fillRect(option.rect, bg);
+    pen.setColor(fg);
+    painter->setPen(pen);
 
-    int scrollbarWidth = qApp->style()->pixelMetric(QStyle::PM_ScrollBarExtent);
-    int width=qobject_cast<QWidget*>(view)->width();
-    width -= scrollbarWidth;
-    width -= LABEL_SECURITY_MARGIN;
+    QString filterNameText = index.data(FilterNameRole).toString();
+    QString descText = index.data(DescriptionRole).toString();
 
-    if (view->indexWidget(index) == 0)
+    QFont filterNameFont = QApplication::font();
+    QFont descFont = QApplication::font();
+    int fontSize = descFont.pointSize();
+    if(fontSize > 0)
     {
-            label = new QLabel();
-            label->installEventFilter(filter);
-            label->setAutoFillBackground(true);
-            label->setFocusPolicy(Qt::TabFocus);
-            label->setMargin(2);
-            label->setWordWrap(true);
-            label->setText(index.data().toString());
-            view->setIndexWidget(index, label);
+        if(fontSize > 8)
+        {
+            if(fontSize > 9)
+            {
+                fontSize -= 2;
+            }else
+            {
+                fontSize--;
+            }
+            descFont.setPointSize(fontSize);
+        }
+    }else // i.e. the font size has been specified in pixels instead of points
+    {
+        fontSize = descFont.pixelSize();
+        if(fontSize > 10)
+        {
+            fontSize -= 2;
+            descFont.setPixelSize(fontSize);
+        }
     }
+    filterNameFont.setBold(true);
+    QFontMetrics filterNameFm(filterNameFont);
+    QFontMetrics descFm(descFont);
+
+    QRect filterNameRect = filterNameFm.boundingRect(option.rect.left() + padding,
+                                     option.rect.top() + padding,
+                                     option.rect.width() - padding * 2,
+                                     0,
+                                     Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap,
+                                     filterNameText);
 
-    label = (QLabel*)view->indexWidget(index);
-    // If label width exceeds the width of the viewport, labels get sometimes painted
-    // over other widgets, especially bad on Windows, where they overlay scrollbars.
-    // Set the width to a fixed value small enough to avoid horizontal scrolling.
-    label->setFixedWidth(width);
+    QRect descRect = descFm.boundingRect(filterNameRect.left(),
+                                     filterNameRect.bottom() + padding,
+                                     option.rect.width() - padding * 2,
+                                     0,
+                                     Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap,
+                                     descText);
 
-    if (option.state & QStyle::State_Selected)
-            if (option.state & QStyle::State_HasFocus)
-                    label->setBackgroundRole(QPalette::Highlight);
-            else
-                    label->setBackgroundRole(QPalette::Window);
-    else
-            label->setBackgroundRole(QPalette::Base);
+    painter->setFont(filterNameFont);
+    painter->drawText(filterNameRect, Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, filterNameText);
+
+    painter->setFont(descFont);
+    painter->drawText(descRect, Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, descText);
+
+    painter->restore();
 }
 /**
     \fn preview
@@ -238,8 +336,8 @@
 }
 
 /**
-    \fn    Add
-    \brief Right click on an available filer
+    \fn removeAction
+    \brief active filter context menu item
 */
 void filtermainWindow::removeAction(void)
 {
@@ -263,8 +361,8 @@
     }
 }
 /**
-    \fn    Add
-    \brief Right click on an available filer
+    \fn configureAction
+    \brief active filter context menu item
 */
 void filtermainWindow::configureAction(void)
 {
@@ -382,58 +480,34 @@
 }
 
 /**
-    \fn calculateListItemHeight
- */
-int filtermainWindow::calculateListItemHeight(QListWidget *parent, QString text)
-{
-    QLabel *dummy=new QLabel();
-
-    int width=parent->frameSize().width();
-    int scrollbarWidth = qApp->style()->pixelMetric(QStyle::PM_ScrollBarExtent);
-    width -= scrollbarWidth;
-    width -= LABEL_SECURITY_MARGIN;
-    dummy->setFixedWidth(width);
-    dummy->setMargin(2);
-    dummy->setWordWrap(true);
-    dummy->setText(text);
-
-    QFont fnt=dummy->font();
-    QFontMetrics fm(fnt);
-    int height=fm.boundingRect(0, 0, width, dummy->height(), Qt::TextWordWrap | Qt::AlignLeft, text).height();
-    if(height < (fm.lineSpacing() * 2))
-        height=fm.lineSpacing() * 2;
-    height += 8; // the height might be insufficient at very small font sizes
-    delete dummy;
-    dummy=NULL;
-    return height;
-}
-
-/**
  * \fn displayFamily
  * @param family
  */
 void filtermainWindow::displayFamily(uint32_t family)
 {
-  ADM_assert(family<VF_MAX);
+    ADM_assert(family<VF_MAX);
 
-  uint32_t nb=ADM_vf_getNbFiltersInCategory((VF_CATEGORY)family);
-  ADM_info("Video filter Family :%u, nb %d\n",family,nb);
-  availableList->clear();
-  for (uint32_t i = 0; i < nb; i++)
+    uint32_t nb=ADM_vf_getNbFiltersInCategory((VF_CATEGORY)family);
+    ADM_info("Video filter Family :%u, nb %d\n",family,nb);
+    availableList->clear();
+    for (uint32_t i = 0; i < nb; i++)
     {
         const char *name,*desc;
         uint32_t major,minor,patch;
-          ADM_vf_getFilterInfo((VF_CATEGORY)family,i,&name, &desc,&major,&minor,&patch);
-          QString str = QString("<b>") + name + QString("</b><br>\n<small>") + desc + QString("</small>");
+        ADM_vf_getFilterInfo((VF_CATEGORY)family,i,&name, &desc,&major,&minor,&patch);
 
-          QListWidgetItem *item;
-          item=new QListWidgetItem(str,availableList,ALL_FILTER_BASE+i+family*100);
-          item->setSizeHint(QSize(availableList->frameSize().width(),calculateListItemHeight(availableList,str)));
-          availableList->addItem(item);
-     }
+        QString s1 = QString(name);
+        QString s2 = QString(desc);
 
-  if (nb)
-    availableList->setCurrentRow(0);
+        QListWidgetItem *item;
+        item=new QListWidgetItem(NULL,availableList,ALL_FILTER_BASE+i+family*100);
+        item->setData(FilterItemDelegate::FilterNameRole, s1);
+        item->setData(FilterItemDelegate::DescriptionRole, s2);
+        availableList->addItem(item);
+    }
+
+    if (nb)
+       availableList->setCurrentRow(0);
 }
 
 /**
@@ -468,7 +542,6 @@
 */
 void filtermainWindow::buildActiveFilterList(void)
 {
-
     activeList->clear();
     int nb=ADM_vf_getSize();
     printf("%d active filters\n",nb);
@@ -479,13 +552,17 @@
         const char *name= ADM_vf_getDisplayNameFromTag(instanceTag);
         const char *conf=instance->getConfiguration();
         printf("%d %s\n",i,name);
-        QString str = QString("<b>") + name + QString("</b><br>\n<small>") + conf + QString("</small>");
-        QListWidgetItem *item=new QListWidgetItem(str,activeList,ACTIVE_FILTER_BASE+i);
+
+        QString s1 = QString(name);
+        QString s2 = QString(conf);
+
+        QListWidgetItem *item=new QListWidgetItem(NULL,activeList,ACTIVE_FILTER_BASE+i);
+        item->setData(FilterItemDelegate::FilterNameRole, s1);
+        item->setData(FilterItemDelegate::DescriptionRole, s2);
         printf("Active item :%p\n",item);
-        item->setSizeHint(QSize(item->sizeHint().width(),calculateListItemHeight(activeList,str)));
+        item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled);
         activeList->addItem(item);
     }
-
 }
 
 /**
@@ -551,11 +628,11 @@
     contextMenu->actions().at(4)->setEnabled(canPartialize);
 }
 
-  /**
-  */
+/**
+    \brief ctor
+*/
 filtermainWindow::filtermainWindow(QWidget* parent) : QDialog(parent)
- {
-
+{
     ui.setupUi(this);
     setupFilters();
 
@@ -564,16 +641,15 @@
     
     printf("active : %p\n",activeList);
     
-#if 1 //def NO_DELEGATE    
     activeList->setSelectionMode(QAbstractItemView::SingleSelection);
     activeList->setDragEnabled(true);
     activeList->setDragDropMode(QAbstractItemView::InternalMove);
     activeList->setDropIndicatorShown(true);
-    activeList->viewport()->setAcceptDrops(true);
-    connect(activeList,SIGNAL(indexesMoved(const QModelIndexList &)),this,SLOT(indexesMoved(const QModelIndexList &)));
-#endif    
+    connect(activeList->model(),SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)),this,SLOT(rowsMovedSlot()));
+
+    availableList->setItemDelegate(new FilterItemDelegate(availableList));
     activeList->setItemDelegate(new FilterItemDelegate(activeList));
-    
+
     connect(ui.listFilterCategory,SIGNAL(itemDoubleClicked(QListWidgetItem *)),
                 this,SLOT(filterFamilyClick(QListWidgetItem *)));
     connect(ui.listFilterCategory,SIGNAL(itemClicked(QListWidgetItem *)),
@@ -585,9 +661,6 @@
     connect(ui.buttonClose, SIGNAL(clicked(bool)), this, SLOT(accept()));
     connect(ui.pushButtonPreview, SIGNAL(clicked(bool)), this, SLOT(preview(bool)));
 
-    qobject_cast<QAbstractScrollArea*>(availableList)->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    availableList->setItemDelegate(new FilterItemDelegate(availableList));
-
     displayFamily(0);
     buildActiveFilterList();
     setSelected(nb_active_filter - 1);
@@ -606,9 +679,11 @@
     activeList->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(activeList,SIGNAL(customContextMenuRequested(const QPoint &)),this,SLOT(activeListContextMenu(const QPoint &)));
 
- }
+    this->installEventFilter(this);
+}
+
 /**
-    \fn dtor
+    \brief dtor
 */
 filtermainWindow::~filtermainWindow()
 {
@@ -619,27 +694,82 @@
 }
 
 /**
-    \fn    Add
-    \brief Right click on an available filer
+    \fn eventFilter
+    \brief keyboard accessibility
+*/
+bool filtermainWindow::eventFilter(QObject* watched, QEvent* event)
+{
+    QKeyEvent *keyEvent;
+    if(event->type() == QEvent::KeyPress)
+    {
+        keyEvent = (QKeyEvent*)event;
+        switch (keyEvent->key())
+        {
+#ifndef __APPLE__
+            case Qt::Key_Delete:
+#else
+            case Qt::Key_Backspace:
+#endif
+                remove(true);
+                return true;
+            case Qt::Key_Return:
+                if(keyEvent->modifiers() & Qt::ControlModifier)
+                {
+                    accept();
+                    return true;
+                }
+                if(ui.listFilterCategory->hasFocus())
+                    filterFamilyClick(ui.listFilterCategory->currentRow());
+                else if(availableList->hasFocus())
+                    add(true);
+                else if(activeList->hasFocus())
+                    configure(true);
+                else
+                    accept();
+                return true;
+            default:
+                return false;
+        }
+    }
+    return QObject::eventFilter(watched, event);
+}
+
+/**
+    \fn addSlot
+    \brief context menu item of an available filter
 */
 void filtermainWindow::addSlot(void)
 {
     add(true);
 }
+
 /**
- * 
- * @return 
- */
-void filtermainWindow::indexesMoved(const QModelIndexList & indexes)
+    \fn rowsMovedSlot
+    \brief actually move filters upon reordering active list items using drag-n-drop
+*/
+void filtermainWindow::rowsMovedSlot(void)
 {
-    int n=indexes.size();
-    printf(" -- Moved with %d inputs\n",n);
-    for(int i=0;i<n;i++)
+    int moved = activeList->currentRow();
+    int itag = activeList->item(moved)->type();
+    ADM_assert(itag>=ACTIVE_FILTER_BASE);
+    itag -= ACTIVE_FILTER_BASE;
+    if(moved==itag) // this can't happen, can it?
+        return;
+    if(moved<itag)
     {
-        //indexes[i].
-        
+        for(int i=0; i<itag-moved; i++)
+        {
+            ADM_vf_moveFilterUp(itag-i);
+        }
+    }else
+    {
+        for(int i=0; i<moved-itag; i++)
+        {
+            ADM_vf_moveFilterDown(itag+i);
+        }
     }
 }
+
 /*******************************************************/
 
 int GUI_handleVFilter(void);

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

@@ -55,8 +55,11 @@
     FilterItemEventFilter *filter;
 
 public:
-         FilterItemDelegate(QWidget *parent = 0);
+    FilterItemDelegate(QWidget *parent = 0);
+    enum datarole { FilterNameRole = Qt::UserRole, DescriptionRole };
     void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
+    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
+    static int padding;
 };
 /**
  * \class filtermainWindow
@@ -96,8 +99,8 @@
     void removeAction(void);
     void configureAction(void);
     void activeListContextMenu(const QPoint &pos);
-    // Move filters around
-    void indexesMoved(const QModelIndexList & indexes);
+    // reorder active filters using drag-n-drop
+    void rowsMovedSlot(void);
 protected:
     int  getTagForActiveSelection();
 private:
@@ -105,6 +108,6 @@
     void displayFamily(uint32_t family);
     void setupFilters(void);
     void updateContextMenu(QMenu *contextMenu);
-    int  calculateListItemHeight(QListWidget *parent, QString text);
+    bool eventFilter(QObject* watched, QEvent* event);
 };

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp Changed

@@ -37,6 +37,10 @@
 	seekablePreview->sliderChanged();
 
 	connect(ui.horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(sliderChanged(int)));
+
+        show();
+        seekablePreview->adjustCanvasPosition();
+        canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
 }
 
 Ui_seekablePreviewWindow::~Ui_seekablePreviewWindow()
@@ -61,10 +65,9 @@
 	uint32_t canvasWidth = videoStream->getInfo()->width;
 	uint32_t canvasHeight = videoStream->getInfo()->height;
 
-	canvas = new ADM_QCanvas(ui.frame, canvasWidth, canvasHeight);
+	canvas = new ADM_QCanvas(ui.graphicsView, canvasWidth, canvasHeight);
 	canvas->show();
 	seekablePreview = new flySeekablePreview(this,canvasWidth, canvasHeight, videoStream, canvas, ui.horizontalSlider);	
-        setDuration(videoStream->getInfo()->totalDuration);
 	seekablePreview->sliderChanged();
 }
 /**
@@ -75,16 +78,7 @@
 {
 	return seekablePreview->sliderGet();
 }
-/**
-    \fn setDuration
-    \brief Set total duration
-*/
-bool      Ui_seekablePreviewWindow::setDuration(uint64_t duration)
-{
-    const char *s=ADM_us2plain(duration);
-    ui.label->setText(s);
-    return true;
-}
+
 /**
   * 
  * @param value
@@ -94,4 +88,15 @@
 	seekablePreview->sliderChanged();
 }
 
+
+void Ui_seekablePreviewWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    seekablePreview->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    seekablePreview->adjustCanvasPosition();
+}
+
 // EOF

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.h -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.h Changed

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/seekablePreview.ui -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/seekablePreview.ui Changed

@@ -23,65 +23,19 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
-      <widget class="QFrame" name="frame">
-       <property name="minimumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="frameShape">
-        <enum>QFrame::StyledPanel</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Raised</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_3">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
+      <widget class="QGraphicsView" name="graphicsView"/>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QSlider" name="horizontalSlider">
+      <widget class="ADM_QSlider" name="horizontalSlider">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>00:00:00.000</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
     </layout>
    </item>
    <item>
@@ -118,4 +72,11 @@
    </hints>
   </connection>
  </connections>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
 </ui>

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_mwNavSlider.cpp Added

@@ -0,0 +1,107 @@
+
+/***************************************************************************
+Custom slider
+***************************************************************************/
+
+/***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************/
+#include <stdio.h>
+#include <stdlib.h>
+#include "ADM_inttype.h"
+#include <QPainter>
+#include <QSlider>
+#include <QWheelEvent>
+#include "ADM_mwNavSlider.h"
+#include "ADM_assert.h"
+/**
+    \fn ADM_QSlider
+*/
+ADM_mwNavSlider::ADM_mwNavSlider(QWidget *parent) : ADM_QSlider(parent)
+{
+    totalDuration= markerATime= markerBTime =0;
+}
+/**
+    \fn paintEvent
+*/
+void ADM_mwNavSlider::paintEvent(QPaintEvent *event)
+{
+    QSlider::paintEvent(event);
+
+    uint64_t a = markerATime, b = markerBTime;
+
+    if (markerATime > markerBTime)
+    {
+        b = markerATime;
+        a = markerBTime;
+    }
+
+    if (totalDuration > 0LL && (a != 0 || b != totalDuration))
+    {
+        int left  = (int)(((double)a * width()) / (double)totalDuration);
+        int right = (int)(((double)b * width()) / (double)totalDuration);
+
+        QPainter painter(this);
+
+        painter.setPen(Qt::blue);
+        painter.drawRect(left, 1, right - left, height() - 3);
+        painter.end();
+    }
+}
+/**
+    \fn setMarkerA
+*/
+void ADM_mwNavSlider::setMarkerA(uint64_t frameIndex)
+{
+    setMarkers(frameIndex, markerBTime);
+}
+/**
+    \fn setMarkerB
+*/
+void ADM_mwNavSlider::setMarkerB(uint64_t frameIndex)
+{
+    setMarkers(markerATime, frameIndex);
+}
+/**
+    \fn setMarkers
+*/
+void ADM_mwNavSlider::setMarkers(uint64_t frameIndexA, uint64_t frameIndexB)
+{
+    if (frameIndexA > totalDuration)
+        printf("[ADM_QSlider] Marker A is out of bounds (%" PRIu64", %" PRIu64")\n", markerATime, totalDuration);
+    else if (frameIndexB > totalDuration)
+        printf("[ADM_QSlider] Marker B is out of bounds (%" PRIu64", %" PRIu64")\n", markerBTime, totalDuration);
+    else
+    {
+        markerATime = frameIndexA;
+        markerBTime = frameIndexB;
+
+        repaint();
+    }
+}
+/**
+    \fn setTotalDuration
+*/
+void ADM_mwNavSlider::setTotalDuration(uint64_t duration)
+{
+    totalDuration = duration;
+    repaint();
+}
+/*
+    \fn wheelEvent
+ */
+void ADM_mwNavSlider::wheelEvent(QWheelEvent *e)
+{
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+    //printf("Wheel : %d\n",e->delta());
+    emit sliderAction(e->delta());
+#else
+    emit sliderAction(e->angleDelta().ry());
+#endif
+}
+//EOF

avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_mwNavSlider.h Added

@@ -0,0 +1,39 @@
+
+/***************************************************************************
+Custom slider
+***************************************************************************/
+
+/***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************/
+
+#pragma once
+#include "ADM_toolkitQt.h"
+
+/**
+    \class ADM_mwNavSlider
+*/
+class ADM_mwNavSlider : public ADM_QSlider
+{
+    Q_OBJECT
+protected:
+    uint64_t totalDuration, markerATime, markerBTime;
+    void paintEvent(QPaintEvent *event);
+
+public:
+    ADM_mwNavSlider(QWidget *parent);
+
+    void setMarkerA(uint64_t frameIndex);
+    void setMarkerB(uint64_t frameIndex);
+    void setMarkers(uint64_t frameIndexA, uint64_t frameIndexB);
+    void setTotalDuration(uint64_t duration);
+    void wheelEvent(QWheelEvent *e);
+signals:
+    void sliderAction(int value);
+};
+

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/CMakeLists.txt Changed

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp Changed

@@ -16,9 +16,11 @@
 #include <QtCore/QMimeData>
 #include <QtCore/QUrl>
 #include <QKeyEvent>
+#include <QResizeEvent>
 #include <QGraphicsView>
 #include <QtCore/QDir>
 #include <QMessageBox>
+#include <QClipboard>
 #include "ADM_cpp.h"
 #define MENU_DECLARE
 #include "Q_gui2.h"
@@ -48,6 +50,9 @@
 #define ADM_SLIDER_REFRESH_PERIOD 500
 #define ADM_LARGE_SCALE     (10LL*1000LL)
 #define ADM_SCALE_INCREMENT (ADM_LARGE_SCALE/100LL)
+// if the dimensions of an autozoomed video are smaller than the available space,
+// don't adjust zoom unless the window has been enlarged beyond a threshold
+#define RESIZE_THRESHOLD 20
 
 #if defined(USE_SDL) && ( !defined(_WIN32) && !defined(__APPLE__))
     #define SDL_ON_LINUX
@@ -83,7 +88,7 @@
 int SliderIsShifted=0;
 static void setupMenus(void);
 static int shiftKeyHeld=0;
-static ADM_QSlider *slider=NULL;
+static ADM_mwNavSlider *slider=NULL;
 static int _upd_in_progres=0;
 static int currentFps = 0;
 static int frameCount = 0;
@@ -156,27 +161,10 @@
     QObject *obj = sender();
 
     if (obj == ui.comboBoxVideo)
-    {
-        bool b=false;
-        if(ui.comboBoxVideo->currentIndex())
-        {
-            b=true;
-        }
-        ui.pushButtonVideoConf->setEnabled(b);
-        ui.pushButtonVideoFilter->setEnabled(b);
         sendAction (ACT_VIDEO_CODEC_CHANGED) ;
-    }
     else if (obj == ui.comboBoxAudio)
-    {
-        bool b=false;
-        if(ui.comboBoxAudio->currentIndex())
-        {
-            b=true;
-        }
-        ui.pushButtonAudioConf->setEnabled(b);
-        ui.pushButtonAudioFilter->setEnabled(b);
         sendAction (ACT_AUDIO_CODEC_CHANGED) ;
-    }
+    setMenuItemsEnabledState();
 }
 /**
  * \fn sliderValueChanged
@@ -341,6 +329,18 @@
 }
 
 /**
+    \fn currentTimeToClipboard
+*/
+void MainWindow::currentTimeToClipboard(void)
+{
+    QString ct = QString();
+    ct = ui.currentTime->text();
+    QClipboard *clipboard = QApplication::clipboard();
+    clipboard->clear();
+    clipboard->setText(ct);
+}
+
+/**
     \fn ctor
 */
 MainWindow::MainWindow(const vector<IScriptEngine*>& scriptEngines) : _scriptEngines(scriptEngines), QMainWindow()
@@ -380,7 +380,7 @@
 
     // Slider
     slider=ui.horizontalSlider;
-        ADM_QSlider *qslider=(ADM_QSlider *)slider;
+        ADM_mwNavSlider *qslider=(ADM_mwNavSlider *)slider;
     slider->setMinimum(0);
     slider->setMaximum(ADM_LARGE_SCALE);
 #if 1
@@ -437,10 +437,6 @@
     // Build file,... menu
     addScriptEnginesToFileMenu(myMenuFile);
     addScriptShellsToToolsMenu(myMenuTool);
-    buildMyMenu();
-    buildCustomMenu(); // action lists are populated (i.e. buildActionLists() called) within buildCustomMenu()
-    buildButtonLists();
-    // Crash in some cases addScriptReferencesToHelpMenu();
 
     QString rFiles=QString::fromUtf8(QT_TRANSLATE_NOOP("qgui2","Recent Files"));
     QString rProjects=QString::fromUtf8(QT_TRANSLATE_NOOP("qgui2","Recent Projects"));
@@ -452,6 +448,11 @@
     connect(this->recentFiles, SIGNAL(triggered(QAction*)), this, SLOT(searchRecentFiles(QAction*)));
     connect(this->recentProjects, SIGNAL(triggered(QAction*)), this, SLOT(searchRecentProjects(QAction*)));
 
+    buildMyMenu();
+    buildCustomMenu(); // action lists are populated (i.e. buildActionLists() called) within buildCustomMenu()
+    buildButtonLists();
+    // Crash in some cases addScriptReferencesToHelpMenu();
+
     this->installEventFilter(this);
     slider->installEventFilter(this);
 
@@ -481,7 +482,14 @@
     widgetsUpdateTooltips();
 
     this->adjustSize();
-        QuiTaskBarProgress=createADMTaskBarProgress();
+
+    threshold = RESIZE_THRESHOLD;
+    actZoomCalled = false;
+    ignoreResizeEvent = true;
+    blockResizing = false;
+    blockZoomChanges = true;
+
+    QuiTaskBarProgress=createADMTaskBarProgress();
 }
 /**
     \fn searchToolBar
@@ -559,15 +567,29 @@
                         }else
                             a=insert->addAction(qs);
 #if defined(__APPLE__)
-			a->setMenuRole(QAction::NoRole);
+                        switch(m->event)
+                        {
+                            case(ACT_EXIT):
+                                a->setMenuRole(QAction::QuitRole);
+                                break;
+                            case(ACT_PREFERENCES):
+                                a->setMenuRole(QAction::PreferencesRole);
+                                break;
+                            case(ACT_ABOUT):
+                                a->setMenuRole(QAction::AboutRole);
+                                break;
+                            default:
+			                    a->setMenuRole(QAction::NoRole);
+			            }
 #endif 
                         m->cookie=(void *)a;
-                        if(swpud && m->shortCut=="Up")
-                            a->setShortcut(QKeySequence("Down"));
-                        else if(swpud && m->shortCut=="Down")
-                            a->setShortcut(QKeySequence("Up"));
-                        else if(m->shortCut)
+                        if(m->shortCut)
                         {
+                            if(swpud && !strcmp(m->shortCut,"Up"))
+                                a->setShortcut(Qt::Key_Down);
+                            else if(swpud && !strcmp(m->shortCut,"Down"))
+                                a->setShortcut(Qt::Key_Up);
+
                             if(alt)
                             {
                                 std::string sc="";
@@ -621,6 +643,9 @@
     connect( ui.menuFile,SIGNAL(triggered(QAction*)),this,SLOT(searchFileMenu(QAction*)));
     buildMenu(ui.menuFile, &myMenuFile[0], myMenuFile.size());
 
+    connect( ui.menuRecent,SIGNAL(triggered(QAction*)),this,SLOT(searchRecentMenu(QAction*)));
+    buildMenu(ui.menuRecent, &myMenuRecent[0], myMenuRecent.size());
+
     connect( ui.menuEdit,SIGNAL(triggered(QAction*)),this,SLOT(searchEditMenu(QAction*)));
     buildMenu(ui.menuEdit, &myMenuEdit[0], myMenuEdit.size());
 
@@ -663,7 +688,6 @@
     for(int i=1;i<6;i++)
         ActionsAvailableWhenFileLoaded.push_back(ui.menuFile->actions().at(i));        
 
-    ActionsAvailableWhenFileLoaded.push_back(ui.menuFile->actions().at(2)); // "Save"
     ActionsAvailableWhenFileLoaded.push_back(ui.menuFile->actions().at(9)); // "Information"
 
     for(int i=3;i<11;i++)
@@ -677,16 +701,18 @@
         ActionsAvailableWhenFileLoaded.push_back(ui.menuView->actions().at(i));
     }
 
-    for(int i=2;i<ui.toolBar->actions().size();i++)
-    { // disable "Save" and "Information" buttons in the toolbar if no video is loaded
+    ActionsAvailableWhenFileLoaded.push_back(ui.menuVideo->actions().at(1)); // post-processing
+
+    bool canSave=!!ADM_mx_getNbMuxers();
+    for(int i=3-canSave;i<ui.toolBar->actions().size();i++)
+    { // disable "Save" and "Information" buttons in the toolbar if no video is loaded, "Save" also if we've got zero muxers
         ActionsAvailableWhenFileLoaded.push_back(ui.toolBar->actions().at(i));
     }
 
 #define PUSH_FULL_MENU_LOADED(x,tailOffset) for(int i=0;i<ui.x->actions().size()-tailOffset;i++)    ActionsAvailableWhenFileLoaded.push_back(ui.x->actions().at(i));
 #define PUSH_FULL_MENU_PLAYBACK(x,tailOffset) for(int i=0;i<ui.x->actions().size()-tailOffset;i++)    ActionsDisabledOnPlayback.push_back(ui.x->actions().at(i));
 
-    PUSH_FULL_MENU_LOADED(menuVideo,0)
-    PUSH_FULL_MENU_LOADED(menuAudio,0)
+    PUSH_FULL_MENU_LOADED(menuAudio,2)
     PUSH_FULL_MENU_LOADED(menuAuto,0)
     PUSH_FULL_MENU_LOADED(menuGo,0)
 
@@ -716,6 +742,8 @@
         for(int i=0;i<recentProjects->actions().size();i++)
             ActionsDisabledOnPlayback.push_back(recentProjects->actions().at(i));
 
+    ActionsDisabledOnPlayback.push_back(ui.menuRecent->actions().back());
+
     // "Always available" below doesn't override the list of menu items disabled during playback
 
 #define PUSH_ALWAYS_AVAILABLE(menu,entry)   ActionsAlwaysAvailable.push_back( ui.menu->actions().at(entry));
@@ -792,6 +820,13 @@
     ADD_PUSHBUTTON_PLAYBACK(pushButtonTime)
     ADD_PUSHBUTTON_PLAYBACK(pushButtonJumpToMarkerA)
     ADD_PUSHBUTTON_PLAYBACK(pushButtonJumpToMarkerB)
+
+    ADD_PUSHBUTTON_PLAYBACK(pushButtonDecoderConf)
+    ADD_PUSHBUTTON_PLAYBACK(pushButtonVideoConf)
+    ADD_PUSHBUTTON_PLAYBACK(pushButtonVideoFilter)
+    ADD_PUSHBUTTON_PLAYBACK(pushButtonAudioConf)
+    ADD_PUSHBUTTON_PLAYBACK(pushButtonAudioFilter)
+    ADD_PUSHBUTTON_PLAYBACK(pushButtonFormatConfigure)
 }
 
 /**
@@ -817,6 +852,9 @@
         for(int i=0;i<npb;i++)
             PushButtonsDisabledOnPlayback[i]->setEnabled(false);
 
+        ui.checkBox_TimeShift->setEnabled(false);
+        ui.spinBox_TimeValue->setEnabled(false);
+
         return;
     }
 
@@ -836,6 +874,7 @@
     for(int i=0;i<npb;i++)
         PushButtonsAvailableWhenFileLoaded[i]->setEnabled(vid);
 
+    ui.menuFile->actions().at(2)->setEnabled(vid && !!ADM_mx_getNbMuxers()); // disable saving video if there are no muxers
     if(vid)
     {
         undo=video_body->canUndo();
@@ -859,6 +898,74 @@
 
     ui.toolButtonPlay->setIcon(QIcon(MKICON(player_play)));
     ui.menuGo->actions().at(0)->setIcon(QIcon(MKICON(player_play)));
+
+    bool haveRecentItems=false;
+    if(recentFiles && recentFiles->actions().size())
+        haveRecentItems=true;
+    if(recentProjects && recentProjects->actions().size())
+        haveRecentItems=true;
+    ui.menuRecent->actions().back()->setEnabled(haveRecentItems);
+
+    updateCodecWidgetControlsState();
+    // actions performed by the code above may result in a window resize event,
+    // which in turn may initiate unwanted zoom changes e.g. when stopping playback
+    // or loading a video with small dimensions, so ignore just this one resize event
+    ignoreResizeEvent = true;
+}
+
+/**
+    \fn updateCodecWidgetControlsState
+*/
+void MainWindow::updateCodecWidgetControlsState(void)
+{
+    bool b=false;
+    // currently only lavc provides some decoder options
+    if(avifileinfo && !strcmp(video_body->getVideoDecoderName(),"Lavcodec"))
+        b=true;
+    ui.pushButtonDecoderConf->setEnabled(b);
+    // take care of the "Decoder Options" item in the menu "Video"
+    ui.menuVideo->actions().at(0)->setEnabled(b);
+
+    b=false;
+    if(ui.comboBoxVideo->currentIndex())
+        b=true;
+    ui.pushButtonVideoConf->setEnabled(b);
+    if(avifileinfo)
+    {
+        ui.pushButtonVideoFilter->setEnabled(b);
+        // take care of the "Filter" item in the menu "Video" as well
+        ui.menuVideo->actions().at(2)->setEnabled(b);
+    }else
+    {
+        ui.pushButtonVideoFilter->setEnabled(false);
+        ui.menuVideo->actions().at(2)->setEnabled(false);
+    }
+
+    b=false;
+    if(avifileinfo && video_body->getDefaultEditableAudioTrack())
+    {
+        ui.menuAudio->actions().at(1)->setEnabled(true);
+        if(ui.comboBoxAudio->currentIndex())
+            b=true;
+    }else
+    {   // disable "Save Audio" item in the menu "Audio" if we have no audio tracks
+        ui.menuAudio->actions().at(1)->setEnabled(false);
+    }
+    ui.pushButtonAudioConf->setEnabled(b);
+    ui.pushButtonAudioFilter->setEnabled(b);
+    // take care of the "Filter" item in the menu "Audio"
+    ui.menuAudio->actions().at(2)->setEnabled(b);
+
+    // reenable the controls below unconditionally after playback
+    ui.checkBox_TimeShift->setEnabled(true);
+    ui.spinBox_TimeValue->setEnabled(true);
+    // disable the "Save" button in the toolbar and the "Configure" button for the output format if we have no muxers
+    b=false;
+    bool gotMuxers=(bool)ADM_mx_getNbMuxers();
+    if(avifileinfo && gotMuxers)
+        b=true;
+    ui.toolBar->actions().at(2)->setEnabled(b);
+    ui.pushButtonFormatConfigure->setEnabled(gotMuxers);
 }
 
 /**
@@ -1060,7 +1167,7 @@
 
 MKMENU(File)
 MKMENU(Edit)
-//MKMENU(Recent)
+MKMENU(Recent)
 MKMENU(View)
 MKMENU(Tool)
 MKMENU(Go)
@@ -1108,29 +1215,29 @@
                 switch (keyEvent->key())
                 {
                     case Qt::Key_Left:
-                        if (keyEvent->modifiers() == Qt::ShiftModifier)
+                        if ((keyEvent->modifiers() & Qt::ShiftModifier) && (keyEvent->modifiers() & Qt::ControlModifier))
+                            sendAction(ACT_Back4Seconds);
+                        else if (keyEvent->modifiers() & Qt::ShiftModifier)
                             sendAction(ACT_Back1Second);
-                        else if (keyEvent->modifiers() == Qt::ControlModifier)
+                        else if (keyEvent->modifiers() & Qt::ControlModifier)
                             sendAction(ACT_Back2Seconds);
-                        else if (keyEvent->modifiers() == (Qt::ControlModifier | Qt::ShiftModifier))
-                            sendAction(ACT_Back4Seconds);
                         else
                             sendAction(ACT_PreviousFrame);
 
                         return true;
                     case Qt::Key_Right:
-                        if (keyEvent->modifiers() == Qt::ShiftModifier) 
+                        if ((keyEvent->modifiers() & Qt::ShiftModifier) && (keyEvent->modifiers() & Qt::ControlModifier))
+                            sendAction(ACT_Forward4Seconds);
+                        else if (keyEvent->modifiers() & Qt::ShiftModifier)
                             sendAction(ACT_Forward1Second);
-                        else if (keyEvent->modifiers() == Qt::ControlModifier) 
+                        else if (keyEvent->modifiers() & Qt::ControlModifier)
                             sendAction(ACT_Forward2Seconds);
-                        else if (keyEvent->modifiers() == (Qt::ControlModifier | Qt::ShiftModifier)) 
-                            sendAction(ACT_Forward4Seconds);
                         else 
                             sendAction(ACT_NextFrame);
 
                         return true;
                     case Qt::Key_Up:
-                        if (keyEvent->modifiers() == Qt::ControlModifier)
+                        if (keyEvent->modifiers() & Qt::ControlModifier)
                         {
                             if(!swpud)
                                 sendAction(ACT_Forward1Mn);
@@ -1145,7 +1252,7 @@
                         }
                         return true;
                     case Qt::Key_Down:
-                        if (keyEvent->modifiers() == Qt::ControlModifier)
+                        if (keyEvent->modifiers() & Qt::ControlModifier)
                         {
                             if(!swpud)
                                 sendAction(ACT_Back1Mn);
@@ -1159,18 +1266,22 @@
                                 sendAction(ACT_PreviousKFrame);
                         }
                         return true;
+                    case Qt::Key_C:
+                        if ((keyEvent->modifiers() & Qt::ShiftModifier) && (keyEvent->modifiers() & Qt::ControlModifier))
+                            currentTimeToClipboard();
+                        return true;
                     case Qt::Key_Shift:
                         shiftKeyHeld = 1;
                         break;
 
                     case Qt::Key_PageUp:
-                                                if (keyEvent->modifiers() == Qt::ControlModifier)
+                                                if (keyEvent->modifiers() & Qt::ControlModifier)
                                                         sendAction(ACT_MarkA);
                                                 else
                                                         sendAction(ACT_GotoMarkA);
                                                 return true;
                     case Qt::Key_PageDown:
-                                                if (keyEvent->modifiers() == Qt::ControlModifier)
+                                                if (keyEvent->modifiers() & Qt::ControlModifier)
                                                         sendAction(ACT_MarkB);
                                                 else
                                                         sendAction(ACT_GotoMarkB);
@@ -1187,6 +1298,63 @@
 
             break;
         case QEvent::Resize:
+            if(watched == QuiMainWindows)
+            {
+                if(blockZoomChanges || playing || !avifileinfo)
+                    break;
+                if(ignoreResizeEvent)
+                {
+                    ignoreResizeEvent = false;
+                    break;
+                }
+                uint32_t reqw, reqh;
+                calcDockWidgetDimensions(reqw,reqh);
+
+                uint32_t availw = 1;
+                if(QuiMainWindows->width() > reqw)
+                    availw = QuiMainWindows->width() - reqw;
+                else
+                    break;
+
+                uint32_t availh = 1;
+                if(QuiMainWindows->height() > reqh)
+                    availh = QuiMainWindows->height() - reqh;
+                else
+                    break;
+
+                uint32_t w = avifileinfo->width;
+                uint32_t h = avifileinfo->height;
+                if(!w || !h)
+                    break;
+                // We've got the available space and the video resolution,
+                // now calculate the zoom to fit the video into this space.
+                float widthRatio = (float)availw / (float)w;
+                float heightRatio = (float)availh / (float)h;
+                float zoom = (widthRatio < heightRatio ? widthRatio : heightRatio);
+
+                // Detect if the zoom has been likely set automatically on loading a new video or
+                // changed using a keyboard shortcut. In this case imitate physical friction
+                // requiring the window to be resized beyond certain threshold first.
+                float oldzoom = admPreview::getCurrentZoom();
+                QSize os = static_cast<QResizeEvent*>(event)->oldSize();
+                if(zoom > oldzoom && actZoomCalled)
+                {
+                    if(QuiMainWindows->width() > os.width())
+                        threshold -= QuiMainWindows->width() - os.width();
+                    if(QuiMainWindows->height() > os.height())
+                        threshold -= QuiMainWindows->height() - os.height();
+                    if(threshold > 0)
+                        break;
+                    if(threshold < 0)
+                        threshold = 0;
+                }
+
+                blockResizing = true;
+                admPreview::setMainDimension(w,h,zoom);
+                actZoomCalled = false;
+                admPreview::samePicture(); // required at least for VDPAU
+                blockResizing = false;
+            }
             if (watched == ui.sliderPlaceHolder)
             {
                     thumbSlider->resize(ui.sliderPlaceHolder->width(), 16);
@@ -1276,6 +1444,69 @@
     }
 }
 
+/**
+    \fn calcDockWidgetDimensions
+    \brief calculate the total width and height occupied by the toolbar and the codec, navigation etc. dock widgets
+*/
+void MainWindow::calcDockWidgetDimensions(uint32_t &width, uint32_t &height)
+{
+    uint32_t reqw=18; // 2 x 9px margin
+    if(ui.codecWidget->isVisible())
+        reqw += ui.codecWidget->frameSize().width() + 6; // with codec widget visible a small extra margin is necessary
+    if(ui.toolBar->orientation()==Qt::Vertical && ui.toolBar->isVisible() && false==ui.toolBar->isFloating())
+        reqw += ui.toolBar->frameSize().width();
+    width = reqw;
+
+    uint32_t reqh=18; // 2 x 9px margin
+    if(ui.menubar->isVisible())
+        reqh += ui.menubar->height();
+    if(ui.toolBar->isVisible() && false==ui.toolBar->isFloating() && ui.toolBar->orientation()==Qt::Horizontal)
+        reqh += ui.toolBar->frameSize().height();
+    if(ui.navigationWidget->isVisible() || ui.selectionWidget->isVisible() || ui.volumeWidget->isVisible() || ui.audioMetreWidget->isVisible())
+       reqh += ui.navigationWidget->frameSize().height();
+    height = reqh;
+}
+
+/**
+    \fn setResizeThreshold
+*/
+void MainWindow::setResizeThreshold(int value)
+{
+    threshold = value;
+}
+
+/**
+    \fn setActZoomCalledFlag
+*/
+void MainWindow::setActZoomCalledFlag(bool called)
+{
+    actZoomCalled = called;
+}
+
+/**
+    \fn setBlockZoomChangesFlag
+*/
+void MainWindow::setBlockZoomChangesFlag(bool block)
+{
+    blockZoomChanges = block;
+}
+
+/**
+    \fn getBlockResizingFlag
+*/
+bool MainWindow::getBlockResizingFlag(void)
+{
+    return blockResizing;
+}
+
+/**
+    \fn setBlockResizingFlag
+*/
+void MainWindow::setBlockResizingFlag(bool block)
+{
+    blockResizing = block;
+}
+
 void MainWindow::previousIntraFrame(void)
 {
     if (ui.spinBox_TimeValue->hasFocus())
@@ -1357,22 +1588,12 @@
     global_argc=nargc;
     global_argv=nargv;
     ADM_renderLibInit(&UI_Hooks);
-        Q_INIT_RESOURCE(avidemux);
-    Q_INIT_RESOURCE(filter);
 
-#if defined(__APPLE__)
- printf("Setting qt plugin folder\n");
- QDir dir(QApplication::applicationDirPath());
- dir.cdUp();
- dir.cdUp();
- dir.cd("plugins");
- printf("New plugin path =%s\n",dir.absolutePath().toUtf8().constData());
- QApplication::setLibraryPaths(QStringList(dir.absolutePath()));
-#endif
     myApplication=new myQApplication (global_argc, global_argv);
     myApplication->connect(myApplication, SIGNAL(lastWindowClosed()), myApplication, SLOT(quit()));
-        myApplication->connect(myApplication, SIGNAL(aboutToQuit()), myApplication, SLOT(cleanup()));
-        
+    myApplication->connect(myApplication, SIGNAL(aboutToQuit()), myApplication, SLOT(cleanup()));
+    Q_INIT_RESOURCE(avidemux);
+    Q_INIT_RESOURCE(filter);
 
     loadTranslator();
 
@@ -1651,7 +1872,7 @@
         const char *name=ADM_mx_getDisplayName(i);
         WIDGET(comboBoxFormat)->addItem(name);
     }
-
+    WIDGET(pushButtonFormatConfigure)->setEnabled((bool)nbFormat);
 }
 /*
     Return % of scale (between 0 and 1)
@@ -1967,7 +2188,7 @@
     return true;
 }
 /**
-    \fn setDecodeName
+    \fn UI_setDecoderName
 */
 bool UI_setDecoderName(const char *name)
 {
@@ -2026,23 +2247,16 @@
  */
 void UI_resize(uint32_t w,uint32_t h)
 {
-    uint32_t reqw=18; // 2 x 9px margin
-    if(WIDGET(codecWidget)->isVisible())
-        reqw += WIDGET(codecWidget)->frameSize().width() + 6; // with codec widget visible a small extra margin is necessary
-    if(WIDGET(toolBar)->orientation()==Qt::Vertical && WIDGET(toolBar)->isVisible() && false==WIDGET(toolBar)->isFloating())
-        reqw += WIDGET(toolBar)->frameSize().width();
-
-    uint32_t reqh=18; // 2 x 9px margin
-    if(WIDGET(menubar)->isVisible())
-        reqh += WIDGET(menubar)->height();
-    if(WIDGET(toolBar)->isVisible() && false==WIDGET(toolBar)->isFloating() && WIDGET(toolBar)->orientation()==Qt::Horizontal)
-        reqh += WIDGET(toolBar)->frameSize().height();
-    if(WIDGET(navigationWidget)->isVisible() || WIDGET(selectionWidget)->isVisible() || WIDGET(volumeWidget)->isVisible() || WIDGET(audioMetreWidget)->isVisible())
-        reqh += WIDGET(navigationWidget)->frameSize().height();
-
+    if(((MainWindow *)QuiMainWindows)->getBlockResizingFlag())
+        return;
+    uint32_t reqw, reqh;
+    ((MainWindow *)QuiMainWindows)->calcDockWidgetDimensions(reqw,reqh);
     reqw += w;
     reqh += h;
+    UI_setBlockZoomChangesFlag(true);
     QuiMainWindows->resize(reqw,reqh);
+    UI_setBlockZoomChangesFlag(false);
+    ((MainWindow *)QuiMainWindows)->setResizeThreshold(RESIZE_THRESHOLD);
     ADM_info("Resizing the main window to %dx%d px\n",reqw,reqh);
 }
 
@@ -2063,6 +2277,23 @@
 }
 
 /**
+    \fn UI_setBlockZoomChangesFlag
+*/
+void UI_setBlockZoomChangesFlag(bool block)
+{
+    ((MainWindow *)QuiMainWindows)->setBlockZoomChangesFlag(block);
+}
+
+/**
+    \fn UI_resetZoomThreshold
+*/
+void UI_resetZoomThreshold(void)
+{
+    ((MainWindow *)QuiMainWindows)->setResizeThreshold(RESIZE_THRESHOLD);
+    ((MainWindow *)QuiMainWindows)->setActZoomCalledFlag(true);
+}
+
+/**
     \fn UI_setAudioTrackCount
 */
 void UI_setAudioTrackCount( int nb )

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.h -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.h Changed

@@ -10,7 +10,7 @@
 #include <QtCore/QTimer>
 #include <string>
 
-#include "ADM_qslider.h"
+#include "ADM_mwNavSlider.h"
 #include "T_thumbSlider.h"
 #include "ui_gui2.h"
 #include "gui_action.hxx"
@@ -97,6 +97,12 @@
 	void buildRecentProjectMenu(void);
 	void updateActionShortcuts(void);
         void volumeWidgetOperational(void);
+        void calcDockWidgetDimensions(uint32_t &width, uint32_t &height);
+        void setBlockZoomChangesFlag(bool block);
+        bool getBlockResizingFlag(void);
+        void setBlockResizingFlag(bool block);
+        void setResizeThreshold(int value);
+        void setActZoomCalledFlag(bool called);
         static void updateCheckDone(int version, const std::string &date, const std::string &downloadLink);
         static MainWindow *mainWindowSingleton;
 
@@ -164,6 +170,7 @@
     void thumbSlider_valueEmitted(int value);
 
     void searchFileMenu(QAction * action);
+    void searchRecentMenu(QAction * action);
     void searchEditMenu(QAction * action);
     void searchVideoMenu(QAction * action);
     void searchAudioMenu(QAction * action);
@@ -202,6 +209,7 @@
 	void buildRecentMenu(QMenu *menu,std::vector<std::string>files, QAction **actions);
         void buildActionLists(void);
         void buildButtonLists(void);
+        void updateCodecWidgetControlsState(void);
         void widgetsUpdateTooltips(void);
         void searchMenu(QAction * action,MenuEntry *menu, int nb);
 	void searchRecentFiles(QAction *action, QAction **actionList, int firstEventId);
@@ -213,5 +221,13 @@
 	void dropEvent(QDropEvent *event);
 	void openFiles(QList<QUrl>);
         void changeEvent(QEvent* event);
+        /* Zoom control */
+        bool blockResizing;
+        bool blockZoomChanges;
+        bool ignoreResizeEvent; // suppress unwanted zoom changes
+        bool actZoomCalled; // zoom was set to a pre-defined fraction by a menu action
+        int  threshold; // track how much the window was resized
+        /* allow to copy current pts to clipboard using a keyboard shortcut for convenience */
+        void currentTimeToClipboard(void);
 };
 #endif	// Q_gui2_h

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp Changed

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp Changed

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

@@ -23,8 +23,10 @@
 
 #include "prefs.h"
 #include "ADM_last.h"
+#include "ADM_script2/include/ADM_script.h"
 
 extern QWidget *QuiMainWindows;
+static IScriptEngine *tempEngine;
 
 namespace ADM_QT4_fileSel
 {
@@ -38,9 +40,8 @@
 }
 
 /**
-          \fn GUI_FileSelWrite (const char *label, char **name, uint32_t access) 
-          \brief Ask for a file for reading (access=0) or writing (access=1)
-        */
+ * \fn GUI_FileSelSelectWriteInternal
+ */
 static	void GUI_FileSelSelectWriteInternal(const char *label, const char *ext, char **name)
 {
     *name = NULL;		
@@ -48,21 +49,51 @@
     QString fileName,dot=QString(".");
     QString filterFile=QString(QT_TRANSLATE_NOOP("qfile","All files (*.*)"));
     bool doFilter = !!(ext && strlen(ext));
+    bool isProject=false;
     QFileDialog::Options opts;
     int extSize=1;
 
     if(doFilter)
     {
         extSize+=strlen(ext);
+        for(int i=0; i < getScriptEngines().size(); i++)
+        {
+            tempEngine = getScriptEngines()[i];
+            std::string dext = tempEngine->defaultFileExtension();
+            if(!dext.empty() && dext == std::string(ext))
+            {
+                isProject=true;
+                break;
+            }
+        }
     }
     //printf("Do filer=%d\n",(int)doFilter);
     bool lastReadAsTarget=false;
     prefs->get(FEATURES_USE_LAST_READ_DIR_AS_TARGET,&lastReadAsTarget);
     std::string lastFolder;
     if(!lastReadAsTarget)
-        admCoreUtils::getLastWriteFolder(lastFolder);
-    if(!lastFolder.size() || lastReadAsTarget)
+    {
+        if(!isProject)
+        {
+            admCoreUtils::getLastWriteFolder(lastFolder);
+        }else
+        {
+            admCoreUtils::getLastProjectWriteFolder(lastFolder);
+        }
+        if(!lastFolder.size())
+        {
+            if(!isProject)
+            {
+                admCoreUtils::getLastReadFolder(lastFolder);
+            }else
+            {
+                admCoreUtils::getLastProjectReadFolder(lastFolder);
+            }
+        }
+    }else
+    {
         admCoreUtils::getLastReadFolder(lastFolder);
+    }
     if (lastFolder.size())
     {
         QString outputPath = QFileInfo(QString::fromUtf8(lastFolder.c_str())).path();
@@ -83,10 +114,10 @@
         QString separator = QString("/");
         str = outputPath+separator+inputBaseName+outputExt;
 
-        /* LASTDIR may have gone; then do nothing and use current dir instead (implied) */
+        /* LASTDIR may have gone; then use the user's homedir instead */
         if (!QDir(outputPath).exists())
         {
-                str.clear();
+            str = QDir::homePath();
         }else
         {
             if(str==QString::fromUtf8(lastRead.c_str()))
@@ -94,6 +125,9 @@
                 str = outputPath+separator+inputBaseName+QString("_edit")+outputExt;
             }
         }
+    }else
+    {
+        str = QDir::homePath();
     }
 
     if(doFilter)
@@ -134,14 +168,19 @@
             return;
         }
     }
-    admCoreUtils::setLastWriteFolder( std::string(fileName.toUtf8().constData()));
+    if(!isProject)
+    {
+        admCoreUtils::setLastWriteFolder( std::string(fileName.toUtf8().constData()));
+    }else
+    {
+        admCoreUtils::setLastProjectWriteFolder( std::string(fileName.toUtf8().constData()));
+    }
 }
 
 
 /**
-          \fn GUI_FileSelWrite (const char *label, char **name, uint32_t access) 
-          \brief Ask for a file for reading (access=0) or writing (access=1)
-        */
+ * \fn GUI_FileSelSelectReadInternal
+ */
 static	void GUI_FileSelSelectReadInternal(const char *label, const char *ext, char **name)
 {
         *name = NULL;		
@@ -149,18 +188,42 @@
         QString fileName,dot=QString(".");
         QString filterFile=QString(QT_TRANSLATE_NOOP("qfile","All files (*.*)"));
         bool doFilter = !!(ext && strlen(ext));
+        bool isProject=false;
         QFileDialog::Options opts;
 
+        if(doFilter)
+        {
+            for(int i=0; i < getScriptEngines().size(); i++)
+            {
+                tempEngine = getScriptEngines()[i];
+                std::string dext = tempEngine->defaultFileExtension();
+                if(!dext.empty() && dext == std::string(ext))
+                {
+                    isProject=true;
+                    break;
+                }
+            }
+        }
+
         //printf("Do filer=%d\n",(int)doFilter);
         std::string lastFolder;
-        admCoreUtils::getLastReadFolder(lastFolder);
+        if(!isProject)
+        {
+            admCoreUtils::getLastReadFolder(lastFolder);
+        }else
+        {
+            admCoreUtils::getLastProjectReadFolder(lastFolder);
+        }
 
         if (lastFolder.size())
         {
                 str = QFileInfo(QString::fromUtf8(lastFolder.c_str())).path();
-                /* LASTDIR may have gone; then do nothing and use current dir instead (implied) */
+                /* LASTDIR may have gone; then use the user's homedir instead */
                 if (!QDir(str).exists())
-                        str.clear();
+                    str = QDir::homePath();
+        }else
+        {
+            str = QDir::homePath();
         }
 
         if(doFilter)
@@ -177,7 +240,13 @@
         if (fileName.isNull() ) return;
 
         *name=ADM_strdup(fileName.toUtf8().constData());
-        admCoreUtils::setLastReadFolder(std::string(fileName.toUtf8().constData()));
+        if(!isProject)
+        {
+            admCoreUtils::setLastReadFolder(std::string(fileName.toUtf8().constData()));
+        }else
+        {
+            admCoreUtils::setLastProjectReadFolder(std::string(fileName.toUtf8().constData()));
+        }
 }        
 
 void GUI_FileSelRead(const char *label, char **name)

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/gui2.ui -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/gui2.ui Changed

@@ -919,7 +919,7 @@
       <number>9</number>
      </property>
      <item>
-      <widget class="ADM_QSlider" name="horizontalSlider">
+      <widget class="ADM_mwNavSlider" name="horizontalSlider">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
@@ -1580,65 +1580,70 @@
    </attribute>
    <widget class="QWidget" name="dockWidgetContents_5">
     <layout class="QVBoxLayout" name="verticalLayout_4">
-     <property name="alignment">
-      <set>Qt::AlignHCenter</set>
-     </property>
      <item>
-      <widget class="QToolButton" name="toolButtonAudioToggle">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>22</width>
-         <height>22</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>...</string>
-       </property>
-       <property name="icon">
-        <iconset resource="avidemux.qrc">
-         <normaloff>:/new/prefix1/pics/arts.png</normaloff>:/new/prefix1/pics/arts.png</iconset>
-       </property>
-       <property name="checkable">
-        <bool>true</bool>
-       </property>
-       <property name="checked">
-        <bool>true</bool>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="volumeWidgetHorizLayout_1">
+       <item>
+        <widget class="QToolButton" name="toolButtonAudioToggle">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>22</width>
+           <height>22</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>...</string>
+         </property>
+         <property name="icon">
+          <iconset resource="avidemux.qrc">
+          <normaloff>:/new/prefix1/pics/arts.png</normaloff>:/new/prefix1/pics/arts.png</iconset>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
-      <widget class="QSlider" name="horizontalSlider_2">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>22</width>
-         <height>50</height>
-        </size>
-       </property>
-       <property name="maximum">
-        <number>100</number>
-       </property>
-       <property name="value">
-        <number>100</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="volumeWidgetHorizLayout_2">
+       <item>
+        <widget class="QSlider" name="horizontalSlider_2">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>22</width>
+           <height>50</height>
+          </size>
+         </property>
+         <property name="maximum">
+          <number>100</number>
+         </property>
+         <property name="value">
+          <number>100</number>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </widget>
@@ -1909,9 +1914,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>ADM_QSlider</class>
+   <class>ADM_mwNavSlider</class>
    <extends>QSlider</extends>
-   <header>ADM_qslider.h</header>
+   <header>ADM_mwNavSlider.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
@@ -1928,7 +1933,6 @@
   <tabstop>pushButtonFormatConfigure</tabstop>
   <tabstop>horizontalSlider</tabstop>
   <tabstop>toolButtonPlay</tabstop>
-  <tabstop>toolButtonStop</tabstop>
   <tabstop>toolButtonPreviousFrame</tabstop>
   <tabstop>toolButtonNextFrame</tabstop>
   <tabstop>toolButtonPreviousIntraFrame</tabstop>

avidemux_2.6.20.tar.gz/avidemux/qt4/ADM_userInterfaces/ui_support.cpp -> avidemux_2.7.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ui_support.cpp Changed

@@ -7,7 +7,9 @@
 #include <QDesktopServices>
 #include <QWidget>
 #include <QtCore/QString>
-
+#ifdef _WIN32
+#include <QFile>
+#endif
 #ifdef __APPLE__
 #include <Carbon/Carbon.h>
 #endif
@@ -215,10 +217,33 @@
 
 void GUI_OpenApplicationLog()
 {
-	QDesktopServices::openUrl(QUrl::fromLocalFile(QString(ADM_getBaseDir()) + "admlog.txt"));
+#ifdef _WIN32
+    QDesktopServices::openUrl(QUrl::fromLocalFile(QString(ADM_getLogDir()) + "admlog.txt"));
+#else
+    QDesktopServices::openUrl(QUrl::fromLocalFile(QString(ADM_getBaseDir()) + "admlog.txt"));
+#endif
 }
 
 void GUI_OpenApplicationDataFolder()
 {
-	QDesktopServices::openUrl(QUrl::fromLocalFile(QString(ADM_getBaseDir())));
+    QString baseDir = QString(ADM_getBaseDir());
+#ifdef __WIN32
+    QString logDir = QString(ADM_getLogDir());
+    if(logDir != baseDir)
+    {
+        QString src = logDir + QString("admlog.txt");
+        QString old = baseDir + QString("admlog_old.txt");
+        bool r = true;
+        if(QFile::exists(old))
+            r = QFile::remove(old);
+        QString dest = baseDir + QString("admlog.txt");
+        if(r && QFile::exists(dest))
+            QFile::copy(dest,old);
+        if(QFile::exists(dest) && !QFile::remove(dest))
+            ADM_warning("Could not delete %s to copy %s there\n",dest.toUtf8().constData(),src.toUtf8().constData());
+        else if(!QFile::copy(src,dest))
+            ADM_warning("Copying %s to %s failed\n",src.toUtf8().constData(),dest.toUtf8().constData());
+    }
+#endif
+    QDesktopServices::openUrl(QUrl::fromLocalFile(baseDir));
 }

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

@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 2.6)
-SET(AVIDEMUX_API_VERSION 2.6)
+cmake_minimum_required(VERSION 3.0)
+SET(AVIDEMUX_API_VERSION 2.7)
 SET(ADM_PROJECT Avidemux_qt4)
 
 MESSAGE("")
@@ -7,7 +7,8 @@
 MESSAGE("Configure for Avidemux Qt Started")
 MESSAGE("#########################################")
 MESSAGE("")
-
+#fedora 
+ADD_DEFINITIONS("-std=c++11")
 MESSAGE(STATUS "Checking for avidemux development files ..")
 
 IF(NOT FAKEROOT)
@@ -16,29 +17,24 @@
 	SET(AVIDEMUX_FAKEROOT "${FAKEROOT}/")
 endif(NOT FAKEROOT)
 
+
+IF(WIN32)
+        IF(MSVC) 
+                include(adm_win32_vs.cmake)
+        ELSEIF(MINGW)
+                include(adm_win32_mingw.cmake)
+        ENDIF(MINGW)
+ELSE(WIN32)
+        IF(APPLE)
+                include(adm_osx.cmake)
+        ELSE(APPLE)
+                include(adm_default.cmake)
+        ENDIF(APPLE)
+ENDIF(WIN32)
 #-----------------------------------
 # Set extra libs, system dependant
 #-----------------------------------
-# -- Windows --
-IF(WIN32)
-	IF(MSVC)
-			LIST(APPEND PlatformLibs  Qt5::WinMain)
-	ENDIF(MSVC)
-	IF(MINGW)
-		LIST(APPEND PlatformLibs   "-lm -lstdc++")
-		LIST(APPEND PlatformLibs   "winmm -mwindows -Wl,--export-all-symbols")
-	ENDIF (MINGW)
-# -- Windows --
-ELSE(WIN32) # OSx, linux, BSD
-		LIST(APPEND PlatformLibs   "-lm -lstdc++")
-		IF(APPLE)  # OSX
-				LIST(APPEND PlatformLibs  "-framework CoreServices -framework CoreAudio -framework AudioUnit -framework Carbon")
-				LIST(APPEND PlatformLibs  "-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
-		ELSE(APPLE)
-			LIST(APPEND PlatformLibs   "X11") # Linux, BSD
-		ENDIF(APPLE)
-ENDIF(WIN32)
-
+ADM_PREBUILD()
 #
 #
 SET(ADM_HEADER_DIR ${AVIDEMUX_FAKEROOT}${CMAKE_INSTALL_PREFIX}/include/avidemux/${AVIDEMUX_API_VERSION})
@@ -151,14 +147,9 @@
 # Executable
 ###########################################
 include_directories("${PTHREAD_INCLUDE_DIR}")
-IF(MSVC)
-		SET(EXEC_TYPE "WIN32")
-ENDIF(MSVC)
-ADD_EXECUTABLE(avidemux3_${QT_EXTENSION} ${EXEC_TYPE} ${ADM_EXE_SRCS})
-IF(MSVC)
-	set_target_properties(avidemux3_${QT_EXTENSION} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS")
-	set_target_properties(avidemux3_${QT_EXTENSION} PROPERTIES WIN32_EXECUTABLE True)
-ENDIF(MSVC)
+
+ADM_MAIN_APP()
+
 ###########################################
 # Construct common libraries
 ###########################################
@@ -184,7 +175,7 @@
 	ADM_filters${QT_LIBRARY_EXTENSION}
 	ADM_UI${QT_LIBRARY_EXTENSION}6
 	ADM_dialogQt4
-  ADM_update${QT_LIBRARY_EXTENSION}6
+        ADM_update${QT_LIBRARY_EXTENSION}6
 	ADM_internalVideoFilter6
 	ADM_UI${QT_LIBRARY_EXTENSION}6
 	ADM_gui${QT_LIBRARY_EXTENSION}
@@ -216,31 +207,6 @@
 ###########################################
 TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${PTHREAD_LIBRARIES})
 
-###########################################
-# OS Specific
-###########################################
-if (WIN32 OR APPLE)
-	set_property(TARGET avidemux3_${QT_EXTENSION} PROPERTY OUTPUT_NAME avidemux)
-endif (WIN32 OR APPLE)
-
-
-IF (APPLE)
-	IF (USE_SDL)
-		TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_libsdl)
-	ENDIF(USE_SDL)
-ENDIF (APPLE)
-#
-# Needed for cross compiling
-#
-if(CROSS)
-        TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_UI_${QT_LIBRARY_EXTENSION}6)
-        TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_UI_${QT_LIBRARY_EXTENSION}6)
-        TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_render6_${QT_LIBRARY_EXTENSION})
-        TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_coreUtils6)
-        TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_core6)
-        TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_core6)
-endif(CROSS)
-
 TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ${PlatformLibs})
 
 
@@ -251,17 +217,17 @@
 # i18n
 #
 ADD_SUBDIRECTORY(i18n)
+ADM_LINK_THREAD(avidemux3_${QT_EXTENSION})
 ###########################################
 # Install
 ###########################################
-ADM_LINK_THREAD(avidemux3_${QT_EXTENSION})
-ADM_INSTALL_BIN(avidemux3_${QT_EXTENSION})
 
 DISPLAY_SUMMARY_LIST()
 
+ADM_POSTBUILD()
 include(admPackager)
 admPackager(qt4Package)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/config/${QT_EXTENSION}/config.h DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/${QT_EXTENSION}" COMPONENT dev)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/config/${QT_EXTENSION}/config.h DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_API_VERSION}/${QT_EXTENSION}" COMPONENT dev)
 
 
 # install headers
@@ -269,19 +235,4 @@
 ADM_INSTALL_QT_INCLUDE_FOLDER("${CMAKE_CURRENT_SOURCE_DIR}/ADM_UIs/include/"  ADM_UIs)
 
 #
-IF(WIN32)
-        include(FindBourne)
-        IF(RELEASE)
-                configure_file(
-                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/ChangeLog.release 
-                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/ChangeLog.html
-                                COPYONLY)
-        ELSE(RELEASE)
-                execute_process(
-                        COMMAND ${BASH_EXECUTABLE} genlog.sh
-                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/
-                        )
-        ENDIF(RELEASE)
-ENDIF(WIN32)
-
 MESSAGE("")

avidemux_2.7.0.tar.gz/avidemux/qt4/Info.plist.in Added

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>Avidemux@S_VERSION@.app</string>
+	<key>CFBundleExecutable</key>
+	<string>Avidemux@S_VERSION@</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Avidemux @B_VERSION@ Copyright 2001-2015 Mean</string>
+	<key>CFBundleIconFile</key>
+	<string>avidemux.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>Avidemux.org</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Avidemux@S_VERSION@.app</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>Avidemux @B_VERSION@</string>
+	<key>CFBundleSignature</key>
+	<string>Avid</string>
+	<key>LSEnvironment</key>
+	<dict/>
+	<key>LSHasLocalizedDisplayName</key>
+	<false/>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.5</string>
+	<key>LSUIElement</key>
+	<false/>
+	<key>NSAppleScriptEnabled</key>
+	<false/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Avidemux @B_VERSION@ Copyright 2001-2015 Mean</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

avidemux_2.7.0.tar.gz/avidemux/qt4/adm_default.cmake Added

avidemux_2.7.0.tar.gz/avidemux/qt4/adm_osx.cmake Added

@@ -0,0 +1,42 @@
+#
+ #include(BundleUtilities)
+
+#
+SET(bundle avidemux3_${QT_EXTENSION})
+#
+MACRO(ADM_PREBUILD)
+        LIST(APPEND PlatformLibs   "-lm -lstdc++")
+        LIST(APPEND PlatformLibs  "-framework CoreServices -framework CoreAudio -framework AudioUnit -framework Carbon")
+        LIST(APPEND PlatformLibs  "-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
+ENDMACRO(ADM_PREBUILD)
+#
+MACRO(ADM_MAIN_APP)
+    SET(S_VERSION "${AVIDEMUX_MAJOR_MINOR}") # Short version
+    SET(B_VERSION "${AVIDEMUX_VERSION}") # Long version
+    IF(CREATE_BUNDLE)
+        ADD_EXECUTABLE(avidemux3_${QT_EXTENSION}  MACOSX_BUNDLE ${ADM_EXE_SRCS})
+        CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in ${CMAKE_BINARY_DIR}/Info.plist @ONLY)
+        SET( MACOSX_BUNDLE_INFO_STRING "Avidemux - version ${AVIDEMUX_MAJOR_MINOR}" )
+        SET( MACOSX_BUNDLE_BUNDLE_VERSION "${AVIDEMUX_MAJOR_MINOR}" )
+        SET( MACOSX_BUNDLE_ICON_FILE avidemux.icns )
+        SET_PROPERTY(TARGET avidemux3_${QT_EXTENSION} PROPERTY   MACOSX_BUNDLE_INFO_PLIST ${CMAKE_BINARY_DIR}/Info.plist)
+        SET_SOURCE_FILES_PROPERTIES(avidemux.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources )
+    ELSE(CREATE_BUNDLE)
+        ADD_EXECUTABLE(avidemux3_${QT_EXTENSION} ${ADM_EXE_SRCS})
+    ENDIF(CREATE_BUNDLE)
+    SET_PROPERTY(TARGET avidemux3_${QT_EXTENSION} PROPERTY OUTPUT_NAME Avidemux${AVIDEMUX_MAJOR_MINOR})
+    qt5_use_modules( avidemux3_${QT_EXTENSION}   Widgets Network)
+    IF (USE_SDL)
+       TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION}   ADM_libsdl)
+    ENDIF(USE_SDL)
+ENDMACRO(ADM_MAIN_APP)
+#
+MACRO(ADM_POSTBUILD)
+    IF(CREATE_BUNDLE)
+        SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/..)
+        INSTALL(TARGETS avidemux3_${QT_EXTENSION}  BUNDLE DESTINATION . COMPONENT RUNTIME)
+    ELSE(CREATE_BUNDLE)
+        ADM_INSTALL_BIN(avidemux3_${QT_EXTENSION})
+    ENDIF(CREATE_BUNDLE)
+ENDMACRO(ADM_POSTBUILD)
+

avidemux_2.7.0.tar.gz/avidemux/qt4/adm_win32_mingw.cmake Added

@@ -0,0 +1,45 @@
+MACRO(ADM_PREBUILD)
+        LIST(APPEND PlatformLibs   "-lm -lstdc++")
+        LIST(APPEND PlatformLibs   "winmm -mwindows -Wl,--export-all-symbols")
+ENDMACRO(ADM_PREBUILD)
+#
+MACRO(ADM_MAIN_APP)
+        
+        ADD_EXECUTABLE(avidemux3_${QT_EXTENSION} WIN32 ${ADM_EXE_SRCS})
+        set_property(TARGET avidemux3_${QT_EXTENSION} PROPERTY OUTPUT_NAME avidemux)
+
+        if(CROSS)
+                TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_UI_${QT_LIBRARY_EXTENSION}6)
+                TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_UI_${QT_LIBRARY_EXTENSION}6)
+                TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_render6_${QT_LIBRARY_EXTENSION})
+                TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_coreUtils6)
+                TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_core6)
+                TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_core6)
+        endif(CROSS)
+
+
+ENDMACRO(ADM_MAIN_APP)
+#
+MACRO(ADM_POSTBUILD)
+	ADM_INSTALL_BIN(avidemux3_${QT_EXTENSION})
+        include(FindBourne)
+        IF(RELEASE)
+                configure_file(
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/ChangeLog.release 
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/ChangeLog.html
+                                COPYONLY)
+                configure_file(
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/change.css.release
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/change.css
+                                COPYONLY)
+        ELSE(RELEASE)
+                execute_process(
+                        COMMAND ${BASH_EXECUTABLE} genlog.sh
+                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/
+                        )
+                configure_file(
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/change.css.devbuild
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/change.css
+                                COPYONLY)
+        ENDIF(RELEASE)
+ENDMACRO(ADM_POSTBUILD)

avidemux_2.7.0.tar.gz/avidemux/qt4/adm_win32_vs.cmake Added

@@ -0,0 +1,36 @@
+#
+MACRO(ADM_PREBUILD)
+      	LIST(APPEND PlatformLibs  Qt5::WinMain)
+ENDMACRO(ADM_PREBUILD)
+#
+MACRO(ADM_MAIN_APP)
+        ADD_EXECUTABLE(avidemux3_${QT_EXTENSION} WIN32 ${ADM_EXE_SRCS})
+        set_target_properties(avidemux3_${QT_EXTENSION} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS")
+	set_target_properties(avidemux3_${QT_EXTENSION} PROPERTIES WIN32_EXECUTABLE True)
+        set_property(TARGET avidemux3_${QT_EXTENSION} PROPERTY OUTPUT_NAME avidemux)
+ENDMACRO(ADM_MAIN_APP)
+#
+MACRO(ADM_POSTBUILD)
+	ADM_INSTALL_BIN(avidemux3_${QT_EXTENSION})
+        include(./installMsvcRunTime.cmake)
+        include(FindBourne)
+        IF(RELEASE)
+                configure_file(
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/ChangeLog.release 
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/ChangeLog.html
+                                COPYONLY)
+                configure_file(
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/change.css.release
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/change.css
+                                COPYONLY)
+        ELSE(RELEASE)
+                execute_process(
+                        COMMAND ${BASH_EXECUTABLE} genlog.sh
+                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/
+                        )
+                configure_file(
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/change.css.devbuild
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/change.css
+                                COPYONLY)
+        ENDIF(RELEASE)
+ENDMACRO(ADM_POSTBUILD)

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

@@ -1,1853 +1,1870 @@
 HEADERS = \
-../../../avidemux_core/ADM_coreMuxer/include/ADM_muxerInternal.h \ 
-../../../avidemux_core/ADM_coreMuxer/include/ADM_muxer.h \ 
-../../../avidemux_core/ADM_coreMuxer/include/ADM_muxerUtils.h \ 
-../../../avidemux_core/ADM_coreMuxer/include/ADM_coreMuxerFfmpeg.h \ 
-../../../avidemux_core/ADM_coreMuxer/include/ADM_coreMuxer6_export.h \ 
-../../../avidemux_core/ADM_coreMuxer/include/.ADM_muxer.h.swp \ 
-../../../avidemux_core/ADM_coreMuxer/include/ADM_muxerProto.h \ 
-../../../avidemux_core/ADM_coreJobs/include/sqlJobs.h \ 
-../../../avidemux_core/ADM_coreJobs/include/ADM_coreJobs_export.h \ 
-../../../avidemux_core/ADM_coreJobs/include/ADM_coreJobs.h \ 
-../../../avidemux_core/ADM_coreAudioCodec/include/ADM_audiocodec.h \ 
-../../../avidemux_core/ADM_coreAudioCodec/include/adm_ogg.h \ 
-../../../avidemux_core/ADM_coreAudioCodec/include/ADM_ad_plugin.h \ 
-../../../avidemux_core/ADM_coreAudioCodec/include/ADM_audiocodeclist.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_mpegstartcode.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmxPSPacket.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_indexer.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmxPacket.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxer.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/ADM_indexFile.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/ADM_coreDemuxerMpeg6_export.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerPS.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_io.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerEs.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerMSDVR.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerTS.h \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_identify.h \ 
-../../../avidemux_core/ADM_core/src/ADM_nvwa/static_assert.h \ 
-../../../avidemux_core/ADM_core/src/ADM_nvwa/debug_new.h \ 
-../../../avidemux_core/ADM_core/src/ADM_nvwa/fast_mutex.h \ 
-../../../avidemux_core/ADM_core/include/ADM_default.h \ 
-../../../avidemux_core/ADM_core/include/ADM_inttype.h \ 
-../../../avidemux_core/ADM_core/include/ADM_crashdump.h \ 
-../../../avidemux_core/ADM_core/include/ADM_files.h \ 
-../../../avidemux_core/ADM_core/include/ADM_mangle_gcc.h \ 
+../../../avidemux_core/ADM_core/include/ADM_assert.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_byteBuffer.h \ 
-../../../avidemux_core/ADM_core/include/ADM_crashdump_apple.h \ 
-../../../avidemux_core/ADM_core/include/ADM_ptrQueue.h \ 
-../../../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 \ 
+../../../avidemux_core/ADM_core/include/ADM_clock.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_core6_export.h \ 
-../../../avidemux_core/ADM_core/include/ADM_cpp.h \ 
-../../../avidemux_core/ADM_core/include/ADM_threads.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_coreTranslator.h \ 
+../../../avidemux_core/ADM_core/include/ADM_cpp.h \ 
+../../../avidemux_core/ADM_core/include/ADM_cpuCap.h \ 
+../../../avidemux_core/ADM_core/include/ADM_crashdump.h \ 
+../../../avidemux_core/ADM_core/include/ADM_crashdump_apple.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_crashdump_mingw.h \ 
-../../../avidemux_core/ADM_core/include/ADM_mangle.h \ 
-../../../avidemux_core/ADM_core/include/ADM_clock.h \ 
-../../../avidemux_core/ADM_core/include/ADM_assert.h \ 
-../../../avidemux_core/ADM_core/include/BVector.h \ 
-../../../avidemux_core/ADM_core/include/ADM_win32.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_crashdump_other.h \ 
+../../../avidemux_core/ADM_core/include/ADM_crashdump_unix.h \ 
+../../../avidemux_core/ADM_core/include/ADM_default.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_dynamicLoading.h \ 
-../../../avidemux_core/ADM_core/include/ADM_vidMisc.h \ 
+../../../avidemux_core/ADM_core/include/ADM_files.h \ 
+../../../avidemux_core/ADM_core/include/ADM_inttype.h \ 
+../../../avidemux_core/ADM_core/include/ADM_mangle.h \ 
+../../../avidemux_core/ADM_core/include/ADM_mangle_gcc.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_mangle_vs.h \ 
-../../../avidemux_core/ADM_core/include/ADM_cpuCap.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_memsupport.h \ 
 ../../../avidemux_core/ADM_core/include/ADM_misc.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecSettings.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoder6_export.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecContext.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_encoderConf.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderFFmpeg.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderInternal.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecSettings_desc.cpp.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderFFmpeg_param.h \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoder.h \ 
-../../../avidemux_core/ffmpeg_package/patches/libavutil_lfg.h.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_avcodec.h.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_ff_spsinfo.h.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_vdpau.h.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_golomb.h.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavutil_avutil.h.patch \ 
-../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter.h \ 
-../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter6_export.h \ 
-../../../avidemux_core/ADM_coreVideoFilter/include/ADM_videoFilterCache.h \ 
-../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilterInternal.h \ 
-../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilterFunc.h \ 
-../../../avidemux_core/ADM_coreVideoFilter/include/ADM_filterCategory.h \ 
-../../../avidemux_core/ADM_coreVideoFilter/include/ADM_videoFilterBridge.h \ 
-../../../avidemux_core/ADM_coreSqlLight3/include/Query.h \ 
-../../../avidemux_core/ADM_coreSqlLight3/include/libsqlitewrapped.h \ 
-../../../avidemux_core/ADM_coreSqlLight3/include/StderrLog.h \ 
-../../../avidemux_core/ADM_coreSqlLight3/include/IError.h \ 
-../../../avidemux_core/ADM_coreSqlLight3/include/SysLog2.h \ 
-../../../avidemux_core/ADM_coreSqlLight3/include/ADM_coreSqlLight3_export.h \ 
-../../../avidemux_core/ADM_coreSqlLight3/include/Database.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpauInternal.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpau.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/include/fglrxinfo.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/include/ADM_coreXvbaInternal.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/include/ADM_coreXvba.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA_internal.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codecEmpty.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codecNull.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_rgb16.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_coreVideoDecoderInternal.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_coreVideoCodec6_export.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_uyvy.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codec.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_hwAccel.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codecFFsimple.h \ 
-../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_rgb.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_colorspace.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_pp.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_interlaced.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_vidFieldUtil.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_imageFlags.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_vidField.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_coreImage6_export.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_videoFilter_internal.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_videoFilterDynamic.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_videoFilter_iface.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_imageResizer.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_image.h \ 
-../../../avidemux_core/ADM_coreImage/include/ADM_print_priv.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_uiTypes.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_audioTracks.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_enter.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_coreUI_internal.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_factory.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_working.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_encoding.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_coreToolkit.h \ 
-../../../avidemux_core/ADM_coreUI/include/ADM_coreUI6_export.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_factoryStubs.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_fileSel.h \ 
-../../../avidemux_core/ADM_coreUI/include/DIA_processing.h \ 
-../../../avidemux_core/ADM_coreUI/include/ADM_windowInfo.h \ 
+../../../avidemux_core/ADM_core/include/ADM_prettyPrint.h \ 
+../../../avidemux_core/ADM_core/include/ADM_ptrQueue.h \ 
+../../../avidemux_core/ADM_core/include/ADM_queue.h \ 
+../../../avidemux_core/ADM_core/include/ADM_threads.h \ 
+../../../avidemux_core/ADM_core/include/ADM_vidMisc.h \ 
+../../../avidemux_core/ADM_core/include/ADM_win32.h \ 
+../../../avidemux_core/ADM_core/include/BVector.h \ 
+../../../avidemux_core/ADM_core/src/ADM_nvwa/debug_new.h \ 
+../../../avidemux_core/ADM_core/src/ADM_nvwa/fast_mutex.h \ 
+../../../avidemux_core/ADM_core/src/ADM_nvwa/static_assert.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioAccessFile.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioAccessFileAACADTS.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioClock.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioCodecEnum.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audiodef.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioIdentify.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioStream.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamAC3.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamBuffered.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamConstantChunk.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamDCA.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamEac3.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamMP3.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamPCM.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioWrite.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioWriteAAC.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioWriteWav.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_audioXiphUtils.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_baseAudioStream.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_coreAudio.h \ 
+../../../avidemux_core/ADM_coreAudio/include/ADM_coreAudio6_export.h \ 
+../../../avidemux_core/ADM_coreAudioCodec/include/ADM_ad_plugin.h \ 
+../../../avidemux_core/ADM_coreAudioCodec/include/ADM_audiocodec.h \ 
+../../../avidemux_core/ADM_coreAudioCodec/include/ADM_audiocodeclist.h \ 
+../../../avidemux_core/ADM_coreAudioCodec/include/adm_ogg.h \ 
+../../../avidemux_core/ADM_coreAudioDevice/include/ADM_audiodevice.h \ 
+../../../avidemux_core/ADM_coreAudioDevice/include/ADM_audioDeviceInternal.h \ 
+../../../avidemux_core/ADM_coreAudioDevice/include/ADM_coreAudioDevice6_export.h \ 
+../../../avidemux_core/ADM_coreAudioDevice/include/audio_out.h \ 
 ../../../avidemux_core/ADM_coreAudioEncoder/include/ADM_coreAudioEncoder6_export.h \ 
 ../../../avidemux_core/ADM_coreAudioEncoder/include/audioencoder.h \ 
 ../../../avidemux_core/ADM_coreAudioEncoder/include/audioencoderInternal.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/ADM_audioFilter.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/ADM_audioResample.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/ADM_coreAudioFilterAPI6_export.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audio_encoderPlugin.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audioEncoderApi.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_bridge.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_conf.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_dolby.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_film2pal.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_internal.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_limiter.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_limiter_param.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_mixer.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_normalize.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_normalize_param.h \ 
+../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_SRC.h \ 
+../../../avidemux_core/ADM_coreAudioParser/include/ADM_a52info.h \ 
+../../../avidemux_core/ADM_coreAudioParser/include/ADM_aacadts.h \ 
+../../../avidemux_core/ADM_coreAudioParser/include/ADM_aacinfo.h \ 
 ../../../avidemux_core/ADM_coreAudioParser/include/ADM_aacLatm.h \ 
-../../../avidemux_core/ADM_coreAudioParser/include/ADM_mp3info.h \ 
 ../../../avidemux_core/ADM_coreAudioParser/include/ADM_audioParser6_export.h \ 
-../../../avidemux_core/ADM_coreAudioParser/include/ADM_aacinfo.h \ 
-../../../avidemux_core/ADM_coreAudioParser/include/ADM_a52info.h \ 
 ../../../avidemux_core/ADM_coreAudioParser/include/ADM_dcainfo.h \ 
-../../../avidemux_core/ADM_coreAudioParser/include/ADM_aacadts.h \ 
 ../../../avidemux_core/ADM_coreAudioParser/include/ADM_eac3info.h \ 
+../../../avidemux_core/ADM_coreAudioParser/include/ADM_mp3info.h \ 
+../../../avidemux_core/ADM_coreDemuxer/include/ADM_bitmap.h \ 
+../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxer.h \ 
+../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxer6_export.h \ 
+../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxerMpeg.h \ 
+../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxerMpegTemplate.cpp.h \ 
+../../../avidemux_core/ADM_coreDemuxer/include/ADM_demuxerInternal.h \ 
+../../../avidemux_core/ADM_coreDemuxer/include/ADM_Video.h \ 
+../../../avidemux_core/ADM_coreDemuxer/include/avifmt2.h \ 
+../../../avidemux_core/ADM_coreDemuxer/include/unix/avifmt.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/ADM_coreDemuxerMpeg6_export.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/ADM_indexFile.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxer.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerEs.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerMSDVR.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerPS.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerTS.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_identify.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_indexer.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_io.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_mpegstartcode.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmxPacket.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmxPSPacket.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_colorspace.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_coreImage6_export.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_image.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_imageFlags.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_imageResizer.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_interlaced.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_pp.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_print_priv.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_rgb.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_videoFilter_iface.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_videoFilter_internal.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_videoFilterDynamic.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_vidField.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_vidFieldUtil.h \ 
+../../../avidemux_core/ADM_coreImageLoader/include/ADM_coreImageLoader6_export.h \ 
+../../../avidemux_core/ADM_coreImageLoader/include/ADM_imageLoader.h \ 
+../../../avidemux_core/ADM_coreJobs/include/ADM_coreJobs.h \ 
+../../../avidemux_core/ADM_coreJobs/include/ADM_coreJobs_export.h \ 
+../../../avidemux_core/ADM_coreJobs/include/sqlJobs.h \ 
+../../../avidemux_core/ADM_coreMuxer/include/.ADM_muxer.h.swp \ 
+../../../avidemux_core/ADM_coreMuxer/include/ADM_coreMuxer6_export.h \ 
+../../../avidemux_core/ADM_coreMuxer/include/ADM_coreMuxerFfmpeg.h \ 
+../../../avidemux_core/ADM_coreMuxer/include/ADM_muxer.h \ 
+../../../avidemux_core/ADM_coreMuxer/include/ADM_muxerInternal.h \ 
+../../../avidemux_core/ADM_coreMuxer/include/ADM_muxerProto.h \ 
+../../../avidemux_core/ADM_coreMuxer/include/ADM_muxerUtils.h \ 
+../../../avidemux_core/ADM_coreScript/include/ADM_coreScript_export.h \ 
 ../../../avidemux_core/ADM_coreScript/include/ADM_scriptDF.h \ 
-../../../avidemux_core/ADM_coreScript/include/ADM_scriptDFTimeStamp.h \ 
 ../../../avidemux_core/ADM_coreScript/include/ADM_scriptDFInteger.h \ 
-../../../avidemux_core/ADM_coreScript/include/IScriptWriter.h \ 
-../../../avidemux_core/ADM_coreScript/include/ADM_ScriptEngineLoader.h \ 
 ../../../avidemux_core/ADM_coreScript/include/ADM_scriptDFMenu.h \ 
+../../../avidemux_core/ADM_coreScript/include/ADM_scriptDFTimeStamp.h \ 
 ../../../avidemux_core/ADM_coreScript/include/ADM_scriptDFToggle.h \ 
 ../../../avidemux_core/ADM_coreScript/include/ADM_scriptDialogFactory.h \ 
-../../../avidemux_core/ADM_coreScript/include/ScriptShell.h \ 
+../../../avidemux_core/ADM_coreScript/include/ADM_ScriptEngineLoader.h \ 
 ../../../avidemux_core/ADM_coreScript/include/IScriptEngine.h \ 
-../../../avidemux_core/ADM_coreScript/include/ADM_coreScript_export.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioWriteWav.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamConstantChunk.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioIdentify.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamMP3.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioAccessFile.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioStream.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioClock.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioWrite.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioAccessFileAACADTS.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioXiphUtils.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamBuffered.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audiodef.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioWriteAAC.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamAC3.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_baseAudioStream.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_coreAudio.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioCodecEnum.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamDCA.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_coreAudio6_export.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamPCM.h \ 
-../../../avidemux_core/ADM_coreAudio/include/ADM_audioStreamEac3.h \ 
-../../../avidemux_core/ADM_coreAudioDevice/include/ADM_audioDeviceInternal.h \ 
-../../../avidemux_core/ADM_coreAudioDevice/include/ADM_audiodevice.h \ 
-../../../avidemux_core/ADM_coreAudioDevice/include/audio_out.h \ 
-../../../avidemux_core/ADM_coreAudioDevice/include/ADM_coreAudioDevice6_export.h \ 
-../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxerMpeg.h \ 
-../../../avidemux_core/ADM_coreDemuxer/include/avifmt2.h \ 
-../../../avidemux_core/ADM_coreDemuxer/include/unix/avifmt.h \ 
-../../../avidemux_core/ADM_coreDemuxer/include/ADM_Video.h \ 
-../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxer6_export.h \ 
-../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxer.h \ 
-../../../avidemux_core/ADM_coreDemuxer/include/ADM_demuxerInternal.h \ 
-../../../avidemux_core/ADM_coreDemuxer/include/ADM_bitmap.h \ 
-../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxerMpegTemplate.cpp.h \ 
-../../../avidemux_core/ADM_coreUtils/src/prefs2_pref.h \ 
-../../../avidemux_core/ADM_coreUtils/src/prefs2.h \ 
-../../../avidemux_core/ADM_coreUtils/src/libjson.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONStats.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONMemoryPool.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/NumberToString.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONSharedString.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONNode.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONAllocator.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONStream.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONMemory.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONPreparse.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSON_Base64.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/internalJSONNode.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONWorker.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONSingleton.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONValidator.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONChildren.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONDebug.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/Strings_Defs.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/GNU_C.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/Unknown_C.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/Visual_C.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONGlobals.h \ 
-../../../avidemux_core/ADM_coreUtils/src/JSONOptions.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_threadQueue.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_string.h \ 
-../../../avidemux_core/ADM_coreUtils/include/prefs2_list.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_coreUtils6_export.h \ 
-../../../avidemux_core/ADM_coreUtils/include/fourcc.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_memio.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_quota.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_last.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_coreJson.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_h265_tag.h \ 
+../../../avidemux_core/ADM_coreScript/include/IScriptWriter.h \ 
+../../../avidemux_core/ADM_coreScript/include/ScriptShell.h \ 
+../../../avidemux_core/ADM_coreSocket/include/ADM_coreAvsProtocol.h \ 
+../../../avidemux_core/ADM_coreSocket/include/ADM_coreCommandSocket.h \ 
+../../../avidemux_core/ADM_coreSocket/include/ADM_coreSocket.h \ 
+../../../avidemux_core/ADM_coreSocket/include/ADM_coreSocket6_export.h \ 
+../../../avidemux_core/ADM_coreSqlLight3/include/ADM_coreSqlLight3_export.h \ 
+../../../avidemux_core/ADM_coreSqlLight3/include/Database.h \ 
+../../../avidemux_core/ADM_coreSqlLight3/include/IError.h \ 
+../../../avidemux_core/ADM_coreSqlLight3/include/libsqlitewrapped.h \ 
+../../../avidemux_core/ADM_coreSqlLight3/include/Query.h \ 
+../../../avidemux_core/ADM_coreSqlLight3/include/StderrLog.h \ 
+../../../avidemux_core/ADM_coreSqlLight3/include/SysLog2.h \ 
+../../../avidemux_core/ADM_coreSubtitles/include/ADM_coreSubtitles.h \ 
+../../../avidemux_core/ADM_coreUI/include/ADM_coreUI6_export.h \ 
+../../../avidemux_core/ADM_coreUI/include/ADM_windowInfo.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_audioTracks.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_coreToolkit.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_coreUI_internal.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_encoding.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_enter.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_factory.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_factoryStubs.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_fileSel.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_processing.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_uiTypes.h \ 
+../../../avidemux_core/ADM_coreUI/include/DIA_working.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/ADM_bitstream.h \ 
-../../../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/FFcodecContext_param.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_compressedImage.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/ADM_confCouple.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_paramList.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_h264_tag.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_coreCodecMapping.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_coreJson.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/ADM_coreUtils.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_coreUtils6_export.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/ADM_fileio.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/ADM_frameType.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_iso639.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_compressedImage.h \ 
-../../../avidemux_core/ADM_coreUtils/include/ADM_writeRiff.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/ADM_getbits.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_h264_tag.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_h265_tag.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_iso639.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_last.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_memio.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_paramList.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_quota.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_string.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_threadQueue.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/ADM_videoInfoExtractor.h \ 
-../../../avidemux_core/ADM_coreImageLoader/include/ADM_imageLoader.h \ 
-../../../avidemux_core/ADM_coreImageLoader/include/ADM_coreImageLoader6_export.h \ 
-../../../avidemux_core/ADM_coreSubtitles/include/ADM_coreSubtitles.h \ 
-../../../avidemux_core/ADM_coreSocket/include/ADM_coreCommandSocket.h \ 
-../../../avidemux_core/ADM_coreSocket/include/ADM_coreAvsProtocol.h \ 
-../../../avidemux_core/ADM_coreSocket/include/ADM_coreSocket6_export.h \ 
-../../../avidemux_core/ADM_coreSocket/include/ADM_coreSocket.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_bridge.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/ADM_audioResample.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_dolby.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_film2pal.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_limiter.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_SRC.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/ADM_coreAudioFilterAPI6_export.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_normalize.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_conf.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_mixer.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/ADM_audioFilter.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_normalize_param.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_limiter_param.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter_internal.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audio_encoderPlugin.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter.h \ 
-../../../avidemux_core/ADM_coreAudioFilter/include/audioEncoderApi.h \ 
+../../../avidemux_core/ADM_coreUtils/include/ADM_writeRiff.h \ 
+../../../avidemux_core/ADM_coreUtils/include/FFcodecContext_param.h \ 
+../../../avidemux_core/ADM_coreUtils/include/fourcc.h \ 
+../../../avidemux_core/ADM_coreUtils/include/prefs.h \ 
+../../../avidemux_core/ADM_coreUtils/include/prefs2_list.h \ 
+../../../avidemux_core/ADM_coreUtils/src/JSONOptions.h \ 
+../../../avidemux_core/ADM_coreUtils/src/libjson.h \ 
+../../../avidemux_core/ADM_coreUtils/src/prefs2.h \ 
+../../../avidemux_core/ADM_coreUtils/src/prefs2_pref.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/internalJSONNode.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSON_Base64.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONAllocator.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONChildren.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONDebug.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/GNU_C.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/Strings_Defs.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/Unknown_C.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/Visual_C.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONGlobals.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONMemory.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONMemoryPool.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONNode.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONPreparse.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONSharedString.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONSingleton.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONStats.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONStream.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONValidator.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONWorker.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/NumberToString.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA_internal.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpau.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpauInternal.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/include/ADM_coreXvba.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/include/ADM_coreXvbaInternal.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/include/fglrxinfo.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codec.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codecEmpty.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codecFFsimple.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codecFFVP9.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_codecNull.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_coreVideoCodec6_export.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_coreVideoDecoderInternal.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_hwAccel.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_rgb16.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/include/ADM_uyvy.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoder.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoder6_export.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderFFmpeg.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderFFmpeg_param.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderInternal.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/ADM_encoderConf.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecContext.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecSettings.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecSettings_desc.cpp.h \ 
+../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter.h \ 
+../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter6_export.h \ 
+../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilterFunc.h \ 
+../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilterInternal.h \ 
+../../../avidemux_core/ADM_coreVideoFilter/include/ADM_filterCategory.h \ 
+../../../avidemux_core/ADM_coreVideoFilter/include/ADM_videoFilterBridge.h \ 
+../../../avidemux_core/ADM_coreVideoFilter/include/ADM_videoFilterCache.h \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_avcodec.h.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_ff_spsinfo.h.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_golomb.h.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_vdpau.h.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavutil_avutil.h.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavutil_lfg.h.patch \ 
+../../../avidemux/qt4/ADM_jobs/include/T_jobs.h \ 
+../../../avidemux/qt4/ADM_jobs/include/T_progress.h \ 
 ../../../avidemux/qt4/ADM_openGL/include/ADM_openGl.h \ 
 ../../../avidemux/qt4/ADM_openGL/include/ADM_openGL_export.h \ 
-../../../avidemux/qt4/ADM_update/private_inc/ADM_updateImpl.h \ 
+../../../avidemux/qt4/ADM_UIs/include/ADM_dialogFactoryQt4.h \ 
+../../../avidemux/qt4/ADM_UIs/include/ADM_toolkitQt.h \ 
+../../../avidemux/qt4/ADM_UIs/include/ADM_UIQT46_export.h \ 
+../../../avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h \ 
+../../../avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4_template.h \ 
+../../../avidemux/qt4/ADM_UIs/include/T_openGLFilter.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_bitrate.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_button.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_dialogFactory.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_filesel.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_menu.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_notch.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_slider.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_threadCount.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_toggle.h \ 
 ../../../avidemux/qt4/ADM_update/include/ADM_update.h \ 
-../../../avidemux/qt4/ADM_jobs/include/T_progress.h \ 
-../../../avidemux/qt4/ADM_jobs/include/T_jobs.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTracks.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_processing.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_vobsub.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_jobs.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_license.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTrackClass.h \ 
+../../../avidemux/qt4/ADM_update/private_inc/ADM_updateImpl.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/DIA_flyPreview.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_about.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTrackClass.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTracks.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_calculator.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_jobs.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_license.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_processing.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_vobsub.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/T_index_pg.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_mwNavSlider.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_qtray.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/translation_table.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_systemTrayProgress.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/FileAction.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_dummyWidget.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/T_thumbSlider.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_qslider.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_systemTrayProgress.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/T_thumbSlider.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/T_vumeter.h \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_shell/Q_shell.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/translation_table.h \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_ocr/Q_ocr.h \ 
-../../../avidemux/qt4/ADM_UIs/src/T_filesel.h \ 
-../../../avidemux/qt4/ADM_UIs/src/T_slider.h \ 
-../../../avidemux/qt4/ADM_UIs/src/T_menu.h \ 
-../../../avidemux/qt4/ADM_UIs/src/T_threadCount.h \ 
-../../../avidemux/qt4/ADM_UIs/src/T_notch.h \ 
-../../../avidemux/qt4/ADM_UIs/src/T_toggle.h \ 
-../../../avidemux/qt4/ADM_UIs/src/T_button.h \ 
-../../../avidemux/qt4/ADM_UIs/src/T_bitrate.h \ 
-../../../avidemux/qt4/ADM_UIs/src/T_dialogFactory.h \ 
-../../../avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4_template.h \ 
-../../../avidemux/qt4/ADM_UIs/include/ADM_UIQT46_export.h \ 
-../../../avidemux/qt4/ADM_UIs/include/ADM_toolkitQt.h \ 
-../../../avidemux/qt4/ADM_UIs/include/ADM_dialogFactoryQt4.h \ 
-../../../avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h \ 
-../../../avidemux/qt4/ADM_UIs/include/T_openGLFilter.h \ 
-../../../avidemux/common/ADM_toolkit/ADM_packetQueue.h \ 
-../../../avidemux/common/ADM_toolkit/ADM_audioQueue.h \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_shell/Q_shell.h \ 
 ../../../avidemux/common/A_functions.h \ 
-../../../avidemux/common/ADM_videoEncoder/include/ADM_videoEncoderApi.h \ 
-../../../avidemux/common/gui_action.hxx \ 
-../../../avidemux/common/prototype.h \ 
-../../../avidemux/common/ADM_render/GUI_xvRender.h \ 
-../../../avidemux/common/ADM_render/GUI_simpleRender.h \ 
-../../../avidemux/common/ADM_render/ADM_render6_export.h \ 
-../../../avidemux/common/ADM_render/GUI_nullRender.h \ 
-../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreD3DApi.h \ 
-../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreDxva2.h \ 
-../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreDxva2_export.h \ 
-../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreD3D.h \ 
-../../../avidemux/common/ADM_render/GUI_libvaRender.h \ 
-../../../avidemux/common/ADM_render/GUI_render.h \ 
-../../../avidemux/common/ADM_render/GUI_sdlRender.h \ 
-../../../avidemux/common/ADM_render/GUI_renderInternal.h \ 
-../../../avidemux/common/ADM_render/GUI_qtGlRender.h \ 
-../../../avidemux/common/ADM_render/GUI_accelRender.h \ 
-../../../avidemux/common/ADM_render/GUI_vdpauRender.h \ 
-../../../avidemux/common/ADM_script2/include/ADM_script.h \ 
+../../../avidemux/common/ADM_audioFilter/include/ADM_audioFilterInterface.h \ 
+../../../avidemux/common/ADM_audioFilter/include/audiofilter_access.h \ 
+../../../avidemux/common/ADM_audioFilter/include/audiofilter_thread.h \ 
 ../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/common.h \ 
-../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/samplerate.h \ 
-../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/mid_qual_coeffs.h \ 
-../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/float_cast.h \ 
 ../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/fastest_coeffs.h \ 
+../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/float_cast.h \ 
 ../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/high_qual_coeffs.h \ 
+../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/mid_qual_coeffs.h \ 
+../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/samplerate.h \ 
 ../../../avidemux/common/ADM_audioFilter/src/audiofilter_dolby_table.h \ 
-../../../avidemux/common/ADM_audioFilter/include/audiofilter_access.h \ 
-../../../avidemux/common/ADM_audioFilter/include/ADM_audioFilterInterface.h \ 
-../../../avidemux/common/ADM_audioFilter/include/audiofilter_thread.h \ 
-../../../avidemux/common/ADM_videoCodec/private_inc/ADM_ffmpeg_vdpau_internal.h \ 
-../../../avidemux/common/ADM_videoCodec/private_inc/ADM_codecLibVA.h \ 
-../../../avidemux/common/ADM_videoCodec/private_inc/ADM_codecDxva2.h \ 
-../../../avidemux/common/ADM_videoCodec/include/ADM_codecXvba.h \ 
-../../../avidemux/common/ADM_videoCodec/include/ADM_ffmpeg_xvba_internal.h \ 
-../../../avidemux/common/ADM_muxerGate/include/ADM_videoCopy.h \ 
-../../../avidemux/common/ADM_muxerGate/include/ADM_videoProcess.h \ 
+../../../avidemux/common/ADM_commonUI/ADM_tray.h \ 
+../../../avidemux/common/ADM_commonUI/DIA_busy.h \ 
+../../../avidemux/common/ADM_commonUI/DIA_defaultAskAvisynthPort.hxx \ 
+../../../avidemux/common/ADM_commonUI/DIA_idx_pg.h \ 
+../../../avidemux/common/ADM_commonUI/GUI_ui.h \ 
+../../../avidemux/common/ADM_commonUI/myOwnMenu.h \ 
+../../../avidemux/common/ADM_commonUI/systray.h \ 
+../../../avidemux/common/ADM_editor/include/ADM_edActiveAudioTracks.h \ 
+../../../avidemux/common/ADM_editor/include/ADM_edAudioTrack.h \ 
+../../../avidemux/common/ADM_editor/include/ADM_edAudioTrackExternal.h \ 
+../../../avidemux/common/ADM_editor/include/ADM_edAudioTrackFromVideo.h \ 
+../../../avidemux/common/ADM_editor/include/ADM_edCache.h \ 
 ../../../avidemux/common/ADM_editor/include/ADM_edEditableAudioTrack.h \ 
 ../../../avidemux/common/ADM_editor/include/ADM_edit.hxx \ 
-../../../avidemux/common/ADM_editor/include/IEditor.h \ 
 ../../../avidemux/common/ADM_editor/include/ADM_editInternal.h \ 
-../../../avidemux/common/ADM_editor/include/ADM_edAudioTrack.h \ 
-../../../avidemux/common/ADM_editor/include/ADM_edScriptGenerator.h \ 
-../../../avidemux/common/ADM_editor/include/ADM_segment.h \ 
-../../../avidemux/common/ADM_editor/include/ADM_edCache.h \ 
-../../../avidemux/common/ADM_editor/include/ADM_edActiveAudioTracks.h \ 
-../../../avidemux/common/ADM_editor/include/ADM_edAudioTrackFromVideo.h \ 
-../../../avidemux/common/ADM_editor/include/ADM_edAudioTrackExternal.h \ 
 ../../../avidemux/common/ADM_editor/include/ADM_edPoolOfAudioTracks.h \ 
 ../../../avidemux/common/ADM_editor/include/ADM_edPtsDts.h \ 
+../../../avidemux/common/ADM_editor/include/ADM_edScriptGenerator.h \ 
+../../../avidemux/common/ADM_editor/include/ADM_segment.h \ 
+../../../avidemux/common/ADM_editor/include/IEditor.h \ 
 ../../../avidemux/common/ADM_libraries/ADM_libsdl/SDLMain.h \ 
-../../../avidemux/common/ADM_commonUI/myOwnMenu.h \ 
-../../../avidemux/common/ADM_commonUI/DIA_busy.h \ 
-../../../avidemux/common/ADM_commonUI/DIA_defaultAskAvisynthPort.hxx \ 
-../../../avidemux/common/ADM_commonUI/GUI_ui.h \ 
-../../../avidemux/common/ADM_commonUI/DIA_idx_pg.h \ 
-../../../avidemux/common/ADM_commonUI/systray.h \ 
-../../../avidemux/common/ADM_commonUI/ADM_tray.h \ 
+../../../avidemux/common/adm_main.h \ 
+../../../avidemux/common/ADM_muxerGate/include/ADM_videoCopy.h \ 
+../../../avidemux/common/ADM_muxerGate/include/ADM_videoProcess.h \ 
 ../../../avidemux/common/ADM_plugin/ADM_vidEnc_plugin.h \ 
+../../../avidemux/common/ADM_preview.h \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreD3D.h \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreD3DApi.h \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreDxva2.h \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/include/ADM_coreDxva2_export.h \ 
+../../../avidemux/common/ADM_render/ADM_render6_export.h \ 
+../../../avidemux/common/ADM_render/GUI_accelRender.h \ 
+../../../avidemux/common/ADM_render/GUI_libvaRender.h \ 
+../../../avidemux/common/ADM_render/GUI_nullRender.h \ 
+../../../avidemux/common/ADM_render/GUI_qtGlRender.h \ 
+../../../avidemux/common/ADM_render/GUI_render.h \ 
+../../../avidemux/common/ADM_render/GUI_renderInternal.h \ 
+../../../avidemux/common/ADM_render/GUI_sdlRender.h \ 
+../../../avidemux/common/ADM_render/GUI_simpleRender.h \ 
+../../../avidemux/common/ADM_render/GUI_vdpauRender.h \ 
+../../../avidemux/common/ADM_render/GUI_xvRender.h \ 
+../../../avidemux/common/ADM_script2/include/ADM_script.h \ 
 ../../../avidemux/common/ADM_slave.h \ 
-../../../avidemux/common/ADM_videoFilter2/src/partial.h \ 
+../../../avidemux/common/ADM_toolkit/ADM_audioQueue.h \ 
+../../../avidemux/common/ADM_toolkit/ADM_packetQueue.h \ 
+../../../avidemux/common/ADM_videoCodec/include/ADM_codecXvba.h \ 
+../../../avidemux/common/ADM_videoCodec/include/ADM_ffmpeg_xvba_internal.h \ 
+../../../avidemux/common/ADM_videoCodec/private_inc/ADM_codecDxva2.h \ 
+../../../avidemux/common/ADM_videoCodec/private_inc/ADM_codecLibVA.h \ 
+../../../avidemux/common/ADM_videoCodec/private_inc/ADM_ffmpeg_vdpau_internal.h \ 
+../../../avidemux/common/ADM_videoEncoder/include/ADM_videoEncoderApi.h \ 
 ../../../avidemux/common/ADM_videoFilter2/include/ADM_filterChain.h \ 
 ../../../avidemux/common/ADM_videoFilter2/include/ADM_filterThread.h \ 
-../../../avidemux/common/ADM_videoFilter2/include/ADM_videoFilters.h \ 
 ../../../avidemux/common/ADM_videoFilter2/include/ADM_videoFilterApi.h \ 
+../../../avidemux/common/ADM_videoFilter2/include/ADM_videoFilters.h \ 
+../../../avidemux/common/ADM_videoFilter2/src/partial.h \ 
 ../../../avidemux/common/avi_vars.h \ 
-../../../avidemux/common/ADM_preview.h \ 
-../../../avidemux/common/adm_main.h \ 
+../../../avidemux/common/gui_action.hxx \ 
+../../../avidemux/common/prototype.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/a52.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/a52_internal.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/attributes.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/bitstream.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/mm_accel.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/tables.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/bit.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/config.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/decoder.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/fixed.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/frame.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/global.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/huffman.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/layer12.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/layer3.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/mad.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/madmem.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/stream.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/synth.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/timer.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/version.h \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_vorbis/ADM_ad_vorbis.h \ 
+../../../avidemux_plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.h \ 
+../../../avidemux_plugins/ADM_audioDevices/Arts/ADM_deviceArts.h \ 
+../../../avidemux_plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.h \ 
+../../../avidemux_plugins/ADM_audioDevices/Esd/ADM_deviceEsd.h \ 
+../../../avidemux_plugins/ADM_audioDevices/Jack/ADM_deviceJack.h \ 
+../../../avidemux_plugins/ADM_audioDevices/Oss/ADM_deviceoss.h \ 
+../../../avidemux_plugins/ADM_audioDevices/PulseAudioSimple/ADM_devicePulseSimple.h \ 
+../../../avidemux_plugins/ADM_audioDevices/Sdl/ADM_deviceSDL.h \ 
+../../../avidemux_plugins/ADM_audioDevices/Win32/ADM_deviceWin32.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/aften/aften_encoder.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/dcaenc/dcaencoder.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/faac/faac_encoder.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/fdk_encoder.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame_param.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/lame/lame_encoder.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/lavcodec_encoder.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/pcm/audioencoder_pcm.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/twolame/twolame_encoder.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.h \ 
+../../../avidemux_plugins/ADM_audioEncoders/vorbis/vorbis_encoder.h \ 
+../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.h \ 
+../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfIo.h \ 
+../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfPacket.h \ 
+../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy.h \ 
+../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy_internal.h \ 
+../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy_net.h \ 
+../../../avidemux_plugins/ADM_demuxers/AvsProxy/avsHeader.h \ 
+../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.h \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_ebml.h \ 
 ../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.h \ 
-../../../avidemux_plugins/ADM_demuxers/Matroska/mkv_tags.h \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvDeviation.h \ 
 ../../../avidemux_plugins/ADM_demuxers/Matroska/mkv_tagenum.h \ 
-../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_ebml.h \ 
-../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.h \ 
-../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudioProbe.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 \ 
-../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.h \ 
-../../../avidemux_plugins/ADM_demuxers/Pictures/ADM_pics.h \ 
-../../../avidemux_plugins/ADM_demuxers/Mxf/ADM_mxf.h \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/mkv_tags.h \ 
+../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_atom.h \ 
 ../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.h \ 
 ../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Leaf.h \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_atom.h \ 
 ../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Tree.h \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.h \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_riff.h \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_audio.h \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.h \ 
+../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.h \ 
+../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudioProbe.h \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.h \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudioProbe.h \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsGetBits.h \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.h \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.h \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.h \ 
-../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.h \ 
-../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfPacket.h \ 
-../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfIo.h \ 
-../../../avidemux_plugins/ADM_demuxers/AvsProxy/avsHeader.h \ 
-../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy_net.h \ 
-../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy_internal.h \ 
-../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/logo/logo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/DIA_flyLogo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/crop.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/DIA_flyCrop.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3d.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3dHQ.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/DIA_flyBlackenBorders.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/asciiView/ascii_font.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/rotate/rte.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/black/black.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/colorYUV/colorYuv.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv_param.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/largeMedian/convolution.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/eq2.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/decimate/dec.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lav.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_debug.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/telecide/telec.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilter.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/Q_mpdelogo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/DIA_flyMpDelogo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/resize/swresize.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mcDeint/mcdeint.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/fluxsmooth.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avspipecomm.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/strnew.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/cdebug.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/convolution.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidConvolution.hxx \ 
-../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/kdeint.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/DIA_flyAsharp.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/asharp.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/hue.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/DIA_flyChromaShift.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift_param.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/chromashift.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/msharpen.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/addBorder/addBorder.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ass_ssa.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_bitmap.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_font.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_utils.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_render.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_shaper.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_func_template.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_parse.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_library.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/config.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_cache.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_fontconfig.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_cache_template.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/x86/cpuid.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_drawing.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_rasterizer.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_types.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/changeFps/confChangeFps.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/DIA_flyContrast.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.h \ 
-../../../avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/png/ADM_pngEncoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/x264_encoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/null/nullEncoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/yv12/ADM_yv12Encoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/nvEnc/ADM_nvEnc.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc_utils.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvenc.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/huff/huff_encoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/x265_settings.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpegMatrix.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpeg2_encoder.h \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qosqualifiers.h \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.h \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.h \ 
+../../../avidemux_plugins/ADM_demuxers/Mxf/ADM_mxf.h \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_audio.h \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.h \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_riff.h \ 
+../../../avidemux_plugins/ADM_demuxers/Pictures/ADM_pics.h \ 
+../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vs.h \ 
+../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsProxy.h \ 
+../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_muxer.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_utils.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndex.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndexAvi.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndexOdml.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/avilist.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/avilist_avi.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/GUI_mux.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/op_aviwrite.hxx \ 
+../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerffPS/ps_muxer.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerffTS/ts_muxer.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlv.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMkv/mkv_muxer.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/chapter.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/file.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/file_prop.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/general.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/isma.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/itmf_generic.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/itmf_tags.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/mp4v2.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/platform.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/project.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/project.h.in \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/sample.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/streaming.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/track.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/track_prop.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/config.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/config.h.in \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/endian.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/impl.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/File.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/FileSystem.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/number/random.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_base.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_posix.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_win32.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_win32_impl.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/process/process.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/prog/option.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/sys/error.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/time/time.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/warning.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atoms.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/src.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4descriptor.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/odcommands.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/type.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/itmf.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/bmff/bmff.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/bmff/impl.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/bmff/typebmff.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/descriptors.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/enum.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/exception.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/impl.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/CoverArtBox.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/generic.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/impl.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/itmf.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/Tags.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/CoverArtBox.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/ocidescriptors.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/enum.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/type.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/log.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4util.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4array.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/util.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/exception.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/qtff.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/coding.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/PictureAspectRatioBox.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/ColorParameterBox.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/impl.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4atom.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4container.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/bmff/typebmff.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/bmff/bmff.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/bmff/impl.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/impl.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/text.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4track.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4descriptor.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4file.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4property.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/descriptors.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4track.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4util.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/ocidescriptors.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/odcommands.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qosqualifiers.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/coding.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/ColorParameterBox.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/impl.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/PictureAspectRatioBox.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/qtff.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/rtphint.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4atom.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/File.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/FileSystem.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/sys/error.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/warning.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/endian.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/config.h.in \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/process/process.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/time/time.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_base.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/config.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_posix.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_win32_impl.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/impl.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/number/random.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/prog/option.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_win32.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/file_prop.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/general.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/isma.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/mp4v2.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/project.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/sample.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/track.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/itmf_generic.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/project.h.in \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/itmf_tags.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/chapter.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/track_prop.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/streaming.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/platform.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/include/mp4v2/file.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/src.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/text.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/util.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4v2/mp4v2_muxer.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerffPS/ps_muxer.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerffTS/ts_muxer.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlv.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMkv/mkv_muxer.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/GUI_mux.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndexOdml.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndex.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/avilist_avi.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/avilist.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndexAvi.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_utils.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_muxer.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/op_aviwrite.hxx \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_inout.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_mthread.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/stream_params.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/yuv4mpeg_intern.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/systems.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/streamType.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_transfert.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/audiostrm.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/aunit.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/aunitbuffer.hpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/bits.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/mplexconsts.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/mpegconsts.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/cpu_accel.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/decodebufmodel.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/format_codes.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/inputstrm.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/aunitbuffer.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/yuv4mpeg.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/mjpeg_types.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/interact.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/videostrm.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/cpu_accel.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/aunit.hpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/mjpeg_logging.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/format_codes.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/mjpeg_types.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/mpegconsts.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/mplexconsts.hpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/multiplexor.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_transfert.h \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/decodebufmodel.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/stillsstream.hpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/outputstrm.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/audiostrm.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_inout.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/padstrm.hpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerWebm/webm_muxer.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/stillsstream.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/stream_params.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/streamType.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/systems.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/videostrm.hpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/yuv4mpeg.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/yuv4mpeg_intern.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.h \ 
 ../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.h \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/TinyParams.h \ 
+../../../avidemux_plugins/ADM_muxers/muxerWebm/webm_muxer.h \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/include/pyClassDescriptor.h \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/include/pyFunc.h \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/include/PythonEngine.h \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/include/tinypy.h \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.h \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/modules/re/regexpr.h \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonScriptWriter.h \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.h \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/include/tinypy.h \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/include/PythonEngine.h \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/include/pyFunc.h \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/include/pyClassDescriptor.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGlvertex.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/resize.h \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/TinyParams.h \ 
+../../../avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpeg2_encoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpegMatrix.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/huff/huff_encoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/null/nullEncoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/nvEnc/ADM_nvEnc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvenc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc_utils.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/png/ADM_pngEncoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/x264_encoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/x265_settings.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/yv12/ADM_yv12Encoder.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/addBorder/addBorder.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/asciiView/ascii_font.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/asharp.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/DIA_flyAsharp.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_bitmap.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_cache.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_cache_template.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_drawing.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_font.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_fontconfig.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_func_template.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_library.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_parse.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_rasterizer.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_render.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_shaper.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_types.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_utils.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/config.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/x86/cpuid.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ass_ssa.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avspipecomm.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/cdebug.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/strnew.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/black/black.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/DIA_flyBlackenBorders.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/changeFps/confChangeFps.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift_param.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/chromashift.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/DIA_flyChromaShift.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv_param.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorYUV/colorYuv.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/DIA_flyContrast.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/crop.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/DIA_flyCrop.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/Q_crop.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/decimate/dec.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/eq2.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidConvolution.hxx \ 
+../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/convolution.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/fluxsmooth.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/hue.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/kdeint.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/largeMedian/convolution.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lav.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/logo/logo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/DIA_flyLogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mcDeint/mcdeint.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/DIA_flyMpDelogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/Q_mpdelogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3d.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3dHQ.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/msharpen.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/resize/swresize.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/rotate/rte.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/telecide/telec.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_debug.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilter.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glBenchmark/benchGl.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-geometry.hh \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-arc-bezier.hh \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-common.hh \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-sdf-glsl.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-arcs-bezier.hh \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-common-glsl.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-common.hh \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-freetype.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-arcs-bezier.hh \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGlDistort.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/yadif.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-geometry.hh \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-sdf-glsl.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/resize.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotate.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaderLoader.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/vdpauFilterDeint.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/smooth.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/smooth.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.h \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotate.h \ 
-../../../avidemux_plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.h \ 
-../../../avidemux_plugins/ADM_audioDevices/Sdl/ADM_deviceSDL.h \ 
-../../../avidemux_plugins/ADM_audioDevices/Oss/ADM_deviceoss.h \ 
-../../../avidemux_plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.h \ 
-../../../avidemux_plugins/ADM_audioDevices/Win32/ADM_deviceWin32.h \ 
-../../../avidemux_plugins/ADM_audioDevices/Arts/ADM_deviceArts.h \ 
-../../../avidemux_plugins/ADM_audioDevices/PulseAudioSimple/ADM_devicePulseSimple.h \ 
-../../../avidemux_plugins/ADM_audioDevices/Esd/ADM_deviceEsd.h \ 
-../../../avidemux_plugins/ADM_audioDevices/Jack/ADM_deviceJack.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/huffman.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/frame.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/version.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/timer.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/decoder.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/config.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/mad.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/bit.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/layer12.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/fixed.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/layer3.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/global.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/madmem.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/stream.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/synth.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/attributes.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/a52_internal.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/a52.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/tables.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/mm_accel.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/bitstream.h \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_vorbis/ADM_ad_vorbis.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/twolame/twolame_encoder.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/faac/faac_encoder.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/aften/aften_encoder.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/fdk_encoder.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame_param.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/lame/lame_encoder.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/vorbis/vorbis_encoder.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/lavcodec_encoder.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/pcm/audioencoder_pcm.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/dcaenc/dcaencoder.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/vdpauFilterDeint.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/yadif.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGlDistort.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.h \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGlvertex.h \ 
 
 
 SOURCES = \
-../../../avidemux_core/ADM_coreMuxer/src/ADM_dynaMuxer.cpp \ 
-../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp \ 
-../../../avidemux_core/ADM_coreMuxer/src/ADM_muxerUtils.cpp \ 
-../../../avidemux_core/ADM_coreJobs/src/sqlJobs.cpp \ 
-../../../avidemux_core/ADM_coreJobs/src/ADM_coreJobs.cpp \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/src/dmxPSPacket.cpp \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/src/dmx_io.cpp \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/src/ADM_indexFile.cpp \ 
-../../../avidemux_core/ADM_coreDemuxerMpeg/src/dmxPacket.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_nvwa/debug_new.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_nvwa/addr2line.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_benchmark.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_coreTranslator.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_cpuCap.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_crashdump_apple.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_crashdump_mingw.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_crashdump_other.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_crashdump_vs.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_threads.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_debug.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_dynamicLoading.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_fileio.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_folder_linux.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_folder_mac.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_win32_mingw.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_folder_mingw.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_folder_unix.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_folder_vs.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_folder_win32.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_memcpy.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_dynamicLoading.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_memsupport.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_win32.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_folder_unix.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_folder_mingw.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_folder_vs.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_misc.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_debug.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_coreTranslator.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_crashdump_other.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_nvwa/addr2line.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_nvwa/debug_new.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_prettyPrint.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_benchmark.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_queue.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_threads.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_win32.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_win32_mingw.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_win32_vs.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_folder_linux.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_crashdump_mingw.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_crashdump_apple.cpp \ 
 ../../../avidemux_core/ADM_core/src/TLK_clock.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_cpuCap.cpp \ 
-../../../avidemux_core/ADM_core/src/ADM_queue.cpp \ 
-../../../avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp \ 
-../../../avidemux_core/ADM_coreVideoEncoder/src/FFcodecSettings.conf \ 
-../../../avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoder.cpp \ 
-../../../avidemux_core/ADM_coreVideoEncoder/src/FFcodecContext.conf \ 
-../../../avidemux_core/ADM_coreVideoEncoder/src/FFcodecContext_desc.cpp \ 
-../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecSettings_desc.cpp.h \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_h263dec.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_hevc_parser.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 \ 
-../../../avidemux_core/ffmpeg_package/patches/libavformat_movenc.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavutil_lfg.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavcodec_h264_parser.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavformat_mpegtsenc.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc.c.patch \ 
-../../../avidemux_core/ffmpeg_package/patches/libavformat_isom.c.patch \ 
-../../../avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterCache.cpp \ 
-../../../avidemux_core/ADM_coreVideoFilter/src/ADM_coreVideoFilter.cpp \ 
-../../../avidemux_core/ADM_coreVideoFilter/src/ADM_coreVideoFilterFunc.cpp \ 
-../../../avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterBridge.cpp \ 
-../../../avidemux_core/ADM_coreSqlLight3/src/SysLog.cpp \ 
-../../../avidemux_core/ADM_coreSqlLight3/src/Database.cpp \ 
-../../../avidemux_core/ADM_coreSqlLight3/src/StderrLog.cpp \ 
-../../../avidemux_core/ADM_coreSqlLight3/src/Query.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpauMixer.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpau.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/src/fglrx.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/src/ADM_coreXvba.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA_encoder.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA_test.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/src/DIA_lavDecoder.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecSearch.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecs.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/src/ADM_uyvy.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/src/ADM_rgb16.cpp \ 
-../../../avidemux_core/ADM_coreVideoCodec/src/ADM_ffHwAccel.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_print.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_imageResizer.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_vidFieldUtil.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_image.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_vidFields.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_pp.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_videoFilter.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_vidFieldASM.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_imageOperation.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_vidFieldBlend.cpp \ 
-../../../avidemux_core/ADM_coreImage/src/ADM_interlaceUtil.cpp \ 
-../../../avidemux_core/ADM_coreUI/src/DIA_factory.cpp \ 
-../../../avidemux_core/ADM_coreUI/src/DIA_working.cpp \ 
-../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp \ 
-../../../avidemux_core/ADM_coreUI/src/DIA_coreToolkit.cpp \ 
-../../../avidemux_core/ADM_coreUI/src/DIA_encoding.cpp \ 
-../../../avidemux_core/ADM_coreAudioEncoder/src/audioencoder.cpp \ 
-../../../avidemux_core/ADM_coreAudioParser/src/ADM_dcainfo.cpp \ 
-../../../avidemux_core/ADM_coreAudioParser/src/ADM_a52info.cpp \ 
-../../../avidemux_core/ADM_coreAudioParser/src/ADM_aacadts.cpp \ 
-../../../avidemux_core/ADM_coreAudioParser/src/ADM_aacLatm.cpp \ 
-../../../avidemux_core/ADM_coreAudioParser/src/ADM_aacinfo.cpp \ 
-../../../avidemux_core/ADM_coreAudioParser/src/ADM_eac3info.cpp \ 
-../../../avidemux_core/ADM_coreAudioParser/src/ADM_mp3info.cpp \ 
-../../../avidemux_core/ADM_coreScript/src/ADM_scriptDFTimeStamp.cpp \ 
-../../../avidemux_core/ADM_coreScript/src/ADM_scriptDialogFactory.cpp \ 
-../../../avidemux_core/ADM_coreScript/src/ADM_ScriptEngineLoader.cpp \ 
-../../../avidemux_core/ADM_coreScript/src/ADM_scriptDFMenu.cpp \ 
-../../../avidemux_core/ADM_coreScript/src/ADM_scriptDFInteger.cpp \ 
-../../../avidemux_core/ADM_coreScript/src/ADM_scriptDFToggle.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioWriteWav.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioClock.cpp \ 
 ../../../avidemux_core/ADM_coreAudio/src/ADM_audioAccessFile.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamEac3.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS_indexer.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioXiphUtils.cpp \ 
 ../../../avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamConstantChunk.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioWriteAAC.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamDCA.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioUtils.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS_indexer.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioClock.cpp \ 
 ../../../avidemux_core/ADM_coreAudio/src/ADM_audioIdentify.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioWrite.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamAC3.cpp \ 
 ../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamConstantChunk.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamDCA.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamEac3.cpp \ 
 ../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp \ 
 ../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamPCM.cpp \ 
-../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamAC3.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioUtils.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioWrite.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioWriteAAC.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioWriteWav.cpp \ 
+../../../avidemux_core/ADM_coreAudio/src/ADM_audioXiphUtils.cpp \ 
 ../../../avidemux_core/ADM_coreAudioDevice/src/ADM_audiodevice.cpp \ 
 ../../../avidemux_core/ADM_coreAudioDevice/src/ADM_audioDeviceThreaded.cpp \ 
-../../../avidemux_core/ADM_coreDemuxer/src/ADM_dynaDemuxer.cpp \ 
-../../../avidemux_core/ADM_coreDemuxer/src/ADM_demuxer.cpp \ 
+../../../avidemux_core/ADM_coreAudioEncoder/src/audioencoder.cpp \ 
+../../../avidemux_core/ADM_coreAudioFilter/src/audiofilterAPI.cpp \ 
+../../../avidemux_core/ADM_coreAudioParser/src/ADM_a52info.cpp \ 
+../../../avidemux_core/ADM_coreAudioParser/src/ADM_aacadts.cpp \ 
+../../../avidemux_core/ADM_coreAudioParser/src/ADM_aacinfo.cpp \ 
+../../../avidemux_core/ADM_coreAudioParser/src/ADM_aacLatm.cpp \ 
+../../../avidemux_core/ADM_coreAudioParser/src/ADM_dcainfo.cpp \ 
+../../../avidemux_core/ADM_coreAudioParser/src/ADM_eac3info.cpp \ 
+../../../avidemux_core/ADM_coreAudioParser/src/ADM_mp3info.cpp \ 
 ../../../avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxerMpegTemplate.cpp.h \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_writeRiff.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_threadQueue.cpp \ 
+../../../avidemux_core/ADM_coreDemuxer/src/ADM_demuxer.cpp \ 
+../../../avidemux_core/ADM_coreDemuxer/src/ADM_dynaDemuxer.cpp \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/src/ADM_indexFile.cpp \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/src/dmx_io.cpp \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/src/dmxPacket.cpp \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/src/dmxPSPacket.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/ADM_image.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/ADM_imageOperation.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/ADM_imageResizer.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/ADM_pp.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/ADM_print.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/attic/ADM_interlaceUtil.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/attic/ADM_videoFilter.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/attic/ADM_vidFieldASM.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/attic/ADM_vidFieldBlend.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/attic/ADM_vidFields.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/attic/ADM_vidFieldUtil.cpp \ 
+../../../avidemux_core/ADM_coreImageLoader/src/ADM_imageLoader.cpp \ 
+../../../avidemux_core/ADM_coreJobs/src/ADM_coreJobs.cpp \ 
+../../../avidemux_core/ADM_coreJobs/src/sqlJobs.cpp \ 
+../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp \ 
+../../../avidemux_core/ADM_coreMuxer/src/ADM_dynaMuxer.cpp \ 
+../../../avidemux_core/ADM_coreMuxer/src/ADM_muxerUtils.cpp \ 
+../../../avidemux_core/ADM_coreScript/src/ADM_scriptDFInteger.cpp \ 
+../../../avidemux_core/ADM_coreScript/src/ADM_scriptDFMenu.cpp \ 
+../../../avidemux_core/ADM_coreScript/src/ADM_scriptDFTimeStamp.cpp \ 
+../../../avidemux_core/ADM_coreScript/src/ADM_scriptDFToggle.cpp \ 
+../../../avidemux_core/ADM_coreScript/src/ADM_scriptDialogFactory.cpp \ 
+../../../avidemux_core/ADM_coreScript/src/ADM_ScriptEngineLoader.cpp \ 
+../../../avidemux_core/ADM_coreSocket/src/ADM_avsProtocol.cpp \ 
+../../../avidemux_core/ADM_coreSocket/src/ADM_coreCommandSocket.cpp \ 
+../../../avidemux_core/ADM_coreSocket/src/ADM_coreSocket.cpp \ 
+../../../avidemux_core/ADM_coreSqlLight3/src/Database.cpp \ 
+../../../avidemux_core/ADM_coreSqlLight3/src/Query.cpp \ 
+../../../avidemux_core/ADM_coreSqlLight3/src/StderrLog.cpp \ 
+../../../avidemux_core/ADM_coreSqlLight3/src/SysLog.cpp \ 
+../../../avidemux_core/ADM_coreSubtitles/src/ADM_coreSubtitles.cpp \ 
+../../../avidemux_core/ADM_coreSubtitles/src/ADM_subConvert.cpp \ 
+../../../avidemux_core/ADM_coreSubtitles/src/ADM_subLoader.cpp \ 
+../../../avidemux_core/ADM_coreUI/src/DIA_coreToolkit.cpp \ 
+../../../avidemux_core/ADM_coreUI/src/DIA_encoding.cpp \ 
+../../../avidemux_core/ADM_coreUI/src/DIA_factory.cpp \ 
+../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp \ 
+../../../avidemux_core/ADM_coreUI/src/DIA_working.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_bitstream.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_codecType.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_confCouple.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_coreCodecMapping.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/ADM_file.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_frameType.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_getbits.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_infoExtractor.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH264.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH265.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/fourcc.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_memio.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_coreCodecMapping.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_infoExtractorVC1.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/ADM_json.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/ADM_last.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_confCouple.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_frameType.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/prefs2_json.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/prefs.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_memio.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/ADM_paramList.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_bitstream.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/ADM_string.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_getbits.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_threadQueue.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/ADM_writeRiff.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/fourcc.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/prefs.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/prefs2.conf \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_codecType.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_infoExtractorVC1.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/prefs2_desc.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/prefs2_json.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/internalJSONNode.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONAllocator.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONChildren.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONDebug.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONIterators.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONMemory.cpp \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONNode.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONNode_Mutex.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONPreparse.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/internalJSONNode.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONMemory.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONStream.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONValidator.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONWorker.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONWriter.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONDebug.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONIterators.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONChildren.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONNode.cpp \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/libjson.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_infoExtractor.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp \ 
-../../../avidemux_core/ADM_coreUtils/src/prefs2_desc.cpp \ 
-../../../avidemux_core/ADM_coreImageLoader/src/ADM_imageLoader.cpp \ 
-../../../avidemux_core/ADM_coreSubtitles/src/ADM_subConvert.cpp \ 
-../../../avidemux_core/ADM_coreSubtitles/src/ADM_subLoader.cpp \ 
-../../../avidemux_core/ADM_coreSubtitles/src/ADM_coreSubtitles.cpp \ 
-../../../avidemux_core/ADM_coreSocket/src/ADM_coreSocket.cpp \ 
-../../../avidemux_core/ADM_coreSocket/src/ADM_avsProtocol.cpp \ 
-../../../avidemux_core/ADM_coreSocket/src/ADM_coreCommandSocket.cpp \ 
-../../../avidemux_core/ADM_coreAudioFilter/src/audiofilterAPI.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA_encoder.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA_test.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpau.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpauMixer.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/src/ADM_coreXvba.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/src/fglrx.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecs.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecSearch.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/src/ADM_ffHwAccel.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/src/ADM_ffVp9.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/src/ADM_rgb16.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/src/ADM_uyvy.cpp \ 
+../../../avidemux_core/ADM_coreVideoCodec/src/DIA_lavDecoder.cpp \ 
+../../../avidemux_core/ADM_coreVideoEncoder/include/FFcodecSettings_desc.cpp.h \ 
+../../../avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoder.cpp \ 
+../../../avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp \ 
+../../../avidemux_core/ADM_coreVideoEncoder/src/FFcodecContext.conf \ 
+../../../avidemux_core/ADM_coreVideoEncoder/src/FFcodecContext_desc.cpp \ 
+../../../avidemux_core/ADM_coreVideoEncoder/src/FFcodecSettings.conf \ 
+../../../avidemux_core/ADM_coreVideoFilter/src/ADM_coreVideoFilter.cpp \ 
+../../../avidemux_core/ADM_coreVideoFilter/src/ADM_coreVideoFilterFunc.cpp \ 
+../../../avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterBridge.cpp \ 
+../../../avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterCache.cpp \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_h263dec.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_h264_parser.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_hevc_parser.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_mpeg12enc.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_mpegvideo_enc.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavcodec_nvenc.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavformat_isom.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc_vp9.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavformat_movenc.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavformat_mpegtsenc.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavutil_lfg.c.patch \ 
+../../../avidemux_core/ffmpeg_package/patches/libavutil_lfg2.c.patch \ 
+../../../avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp \ 
+../../../avidemux/qt4/ADM_jobs/src/ADM_jobProgress.cpp \ 
+../../../avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp \ 
+../../../avidemux/qt4/ADM_jobs/src/ADM_runOneJob.cpp \ 
 ../../../avidemux/qt4/ADM_openGL/src/ADM_openGl.cpp \ 
 ../../../avidemux/qt4/ADM_openGL/src/ADM_openGlDownloadTexture.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/DIA_none.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_aspectRatio.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_bar.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_float.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_frame.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_hex.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_integer.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_matrix.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_notch.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_readOnlyText.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/FAC_timeStamp.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_bitrate.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_button.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_dialogFactory.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_filesel.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_menu.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_notch.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_openGL.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_QCanvas.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_QSlider.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_qtFactory.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_slider.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_threadCount.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_toggle.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/toolkit.cpp \ 
 ../../../avidemux/qt4/ADM_update/src/ADM_update.cpp \ 
-../../../avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp \ 
-../../../avidemux/qt4/ADM_jobs/src/ADM_runOneJob.cpp \ 
-../../../avidemux/qt4/ADM_jobs/src/ADM_jobProgress.cpp \ 
-../../../avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/filter_none.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_license.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_processing.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_about.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/alert_qt4.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/DIA_busy.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/DIA_none.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/OCR_none.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/DIA_none.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_jobs.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_about.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_calculator.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/DIA_busy.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/alert_qt4.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_jobs.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_license.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_processing.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/T_index_pg.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/T_thumbSlider.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_qslider.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_systemTrayProgress_win32.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/filter_none.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_mwNavSlider.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_qtray.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_dummyWidget.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_systemTrayProgress_default.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_systemTrayProgress_win32.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2GL.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/gui_none.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/FileAction.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_systemTrayProgress_default.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/gui_none.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_dummyWidget.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2GL.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/T_thumbSlider.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/T_vumeter.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ui_support.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_ocr/Q_ocr.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_shell/Q_shell.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_shell/qt4Shell.cpp \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_ocr/Q_ocr.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_dialogFactory.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_integer.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_menu.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_aspectRatio.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_slider.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_threadCount.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_QCanvas.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_qtFactory.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_float.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_notch.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_readOnlyText.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_hex.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/DIA_none.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_openGL.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_notch.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_button.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/toolkit.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_bitrate.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_bar.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_frame.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_toggle.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/T_filesel.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_timeStamp.cpp \ 
-../../../avidemux/qt4/ADM_UIs/src/FAC_matrix.cpp \ 
-../../../avidemux/common/ADM_toolkit/automation.cpp \ 
-../../../avidemux/common/ADM_toolkit/filesel.cpp \ 
-../../../avidemux/common/ADM_toolkit/ADM_audioQueue.cpp \ 
-../../../avidemux/common/ADM_toolkit/ADM_packetQueue.cpp \ 
-../../../avidemux/common/gui_savenew.cpp \ 
-../../../avidemux/common/gui_play.cpp \ 
+../../../avidemux/qt4/ADM_userInterfaces/ui_support.cpp \ 
 ../../../avidemux/common/ADM_audioCodec/src/ADM_8bits.cpp \ 
 ../../../avidemux/common/ADM_audioCodec/src/ADM_audiocodec.cpp \ 
 ../../../avidemux/common/ADM_audioCodec/src/ADM_codecwav.cpp \ 
-../../../avidemux/common/ADM_audioCodec/src/ADM_pluginLoad.cpp \ 
 ../../../avidemux/common/ADM_audioCodec/src/ADM_lpcm.cpp \ 
-../../../avidemux/common/ADM_videoEncoder/src/ADM_VideoEncoders.cpp \ 
-../../../avidemux/common/ADM_videoEncoder/src/ADM_dynVideoEncoder.cpp \ 
-../../../avidemux/common/gui_main.cpp \ 
-../../../avidemux/common/gui_action.cpp \ 
-../../../avidemux/common/ADM_render/GUI_simpleRenderStub.cpp \ 
-../../../avidemux/common/ADM_render/GUI_simpleRender.cpp \ 
-../../../avidemux/common/ADM_render/GUI_qtGlRender.cpp \ 
-../../../avidemux/common/ADM_render/ADM_coreDxva2/src/vlc_dxva.c \ 
-../../../avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreD3D.cpp \ 
-../../../avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2.cpp \ 
-../../../avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2_ff.c \ 
-../../../avidemux/common/ADM_render/GUI_vdpauRender.cpp \ 
-../../../avidemux/common/ADM_render/GUI_sdlRender.cpp \ 
-../../../avidemux/common/ADM_render/GUI_render.cpp \ 
-../../../avidemux/common/ADM_render/GUI_libvaRender.cpp \ 
-../../../avidemux/common/ADM_render/GUI_dxva2Render.cpp \ 
-../../../avidemux/common/ADM_render/GUI_xvRender.cpp \ 
-../../../avidemux/common/gui_navigate.cpp \ 
-../../../avidemux/common/ADM_gettext.cpp \ 
-../../../avidemux/common/ADM_preview.cpp \ 
-../../../avidemux/common/ADM_script2/src/ADM_script.cpp \ 
-../../../avidemux/common/ADM_osSupport/ADM_misc.cpp \ 
-../../../avidemux/common/ADM_osSupport/ADM_crashHook.cpp \ 
-../../../avidemux/common/main.cpp \ 
-../../../avidemux/common/gui_blackframes.cpp \ 
-../../../avidemux/common/gui_save.cpp \ 
+../../../avidemux/common/ADM_audioCodec/src/ADM_pluginLoad.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/ADM_audioResample.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/samplerate.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/src_linear.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/src_sinc.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/src_zoh.cpp \ 
 ../../../avidemux/common/ADM_audioFilter/src/audio_encoderPlugin.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/audiofilter_SRC.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/audiocopy.cpp \ 
 ../../../avidemux/common/ADM_audioFilter/src/audiofilter.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/audiofilter_interface.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/audiofilter_mixer.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/audiofilter_limiter.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/audiofilter_encoder.cpp \ 
 ../../../avidemux/common/ADM_audioFilter/src/audiofilter_access.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/src_zoh.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/src_linear.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/src_sinc.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/ADM_libsamplerate/samplerate.cpp \ 
 ../../../avidemux/common/ADM_audioFilter/src/audiofilter_bridge.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/audiocopy.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/audiofilter_dolby.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/audiofilter_encoder.cpp \ 
 ../../../avidemux/common/ADM_audioFilter/src/audiofilter_film2pal.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/audiofilter_thread.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/ADM_audioResample.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/audiofilter_interface.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/audiofilter_limiter.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/audiofilter_mixer.cpp \ 
 ../../../avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp \ 
-../../../avidemux/common/ADM_audioFilter/src/audiofilter_dolby.cpp \ 
-../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp \ 
-../../../avidemux/common/ADM_videoCodec/src/ADM_dynVideoDecoder.cpp \ 
-../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp \ 
-../../../avidemux/common/ADM_videoCodec/src/ADM_videoCodec.cpp \ 
-../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp \ 
-../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp \ 
-../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp \ 
-../../../avidemux/common/ADM_muxerGate/src/ADM_videoProcess.cpp \ 
-../../../avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp \ 
-../../../avidemux/common/ADM_muxerGate/src/ADM_videoCopyFromAnnexB.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/audiofilter_SRC.cpp \ 
+../../../avidemux/common/ADM_audioFilter/src/audiofilter_thread.cpp \ 
+../../../avidemux/common/ADM_commonUI/DIA_audioFilter.cpp \ 
+../../../avidemux/common/ADM_commonUI/DIA_bitrateHisto.cpp \ 
+../../../avidemux/common/ADM_commonUI/DIA_builtin.cpp \ 
+../../../avidemux/common/ADM_commonUI/DIA_gototime.cpp \ 
+../../../avidemux/common/ADM_commonUI/DIA_jobs_save.cpp \ 
+../../../avidemux/common/ADM_commonUI/DIA_plugins.cpp \ 
+../../../avidemux/common/ADM_commonUI/DIA_postproc.cpp \ 
+../../../avidemux/common/ADM_commonUI/DIA_prefs.cpp \ 
+../../../avidemux/common/ADM_editor/src/ADM_edit.cpp \ 
+../../../avidemux/common/ADM_editor/src/ADM_edRender.cpp \ 
+../../../avidemux/common/ADM_editor/src/ADM_edRenderInternal.cpp \ 
 ../../../avidemux/common/ADM_editor/src/ADM_edSearch.cpp \ 
-../../../avidemux/common/ADM_editor/src/audio/ADM_edPoolOfAudioTracks.cpp \ 
-../../../avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackExternal.cpp \ 
-../../../avidemux/common/ADM_editor/src/audio/ADM_edAudioTrack.cpp \ 
+../../../avidemux/common/ADM_editor/src/ADM_edStub.cpp \ 
+../../../avidemux/common/ADM_editor/src/ADM_edVideoCopy.cpp \ 
+../../../avidemux/common/ADM_editor/src/ADM_segment.cpp \ 
+../../../avidemux/common/ADM_editor/src/audio/ADM_edActiveAudioTracks.cpp \ 
 ../../../avidemux/common/ADM_editor/src/audio/ADM_edAudioPacket.cpp \ 
 ../../../avidemux/common/ADM_editor/src/audio/ADM_edAudioPcm.cpp \ 
+../../../avidemux/common/ADM_editor/src/audio/ADM_edAudioTrack.cpp \ 
+../../../avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackExternal.cpp \ 
 ../../../avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackFromVideo.cpp \ 
 ../../../avidemux/common/ADM_editor/src/audio/ADM_edEditableAudioTrack.cpp \ 
-../../../avidemux/common/ADM_editor/src/audio/ADM_edActiveAudioTracks.cpp \ 
-../../../avidemux/common/ADM_editor/src/ADM_edRenderInternal.cpp \ 
-../../../avidemux/common/ADM_editor/src/ADM_edStub.cpp \ 
-../../../avidemux/common/ADM_editor/src/ADM_edRender.cpp \ 
-../../../avidemux/common/ADM_editor/src/ADM_segment.cpp \ 
-../../../avidemux/common/ADM_editor/src/utils/ADM_edIdentify.cpp \ 
-../../../avidemux/common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp \ 
-../../../avidemux/common/ADM_editor/src/utils/ADM_edScriptGenerator.cpp \ 
+../../../avidemux/common/ADM_editor/src/audio/ADM_edPoolOfAudioTracks.cpp \ 
 ../../../avidemux/common/ADM_editor/src/utils/ADM_edCache.cpp \ 
-../../../avidemux/common/ADM_editor/src/utils/ADM_edUndoQueue.cpp \ 
+../../../avidemux/common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp \ 
+../../../avidemux/common/ADM_editor/src/utils/ADM_edFrameType.cpp \ 
+../../../avidemux/common/ADM_editor/src/utils/ADM_edIdentify.cpp \ 
 ../../../avidemux/common/ADM_editor/src/utils/ADM_editIface.cpp \ 
 ../../../avidemux/common/ADM_editor/src/utils/ADM_edMarker.cpp \ 
 ../../../avidemux/common/ADM_editor/src/utils/ADM_edPtsDts.cpp \ 
-../../../avidemux/common/ADM_editor/src/utils/ADM_edFrameType.cpp \ 
-../../../avidemux/common/ADM_editor/src/ADM_edit.cpp \ 
-../../../avidemux/common/ADM_editor/src/ADM_edVideoCopy.cpp \ 
-../../../avidemux/common/ADM_commonUI/DIA_builtin.cpp \ 
-../../../avidemux/common/ADM_commonUI/DIA_audioFilter.cpp \ 
-../../../avidemux/common/ADM_commonUI/DIA_jobs_save.cpp \ 
-../../../avidemux/common/ADM_commonUI/DIA_gototime.cpp \ 
-../../../avidemux/common/ADM_commonUI/DIA_prefs.cpp \ 
-../../../avidemux/common/ADM_commonUI/DIA_plugins.cpp \ 
-../../../avidemux/common/ADM_commonUI/DIA_bitrateHisto.cpp \ 
-../../../avidemux/common/ADM_commonUI/DIA_postproc.cpp \ 
+../../../avidemux/common/ADM_editor/src/utils/ADM_edScriptGenerator.cpp \ 
+../../../avidemux/common/ADM_editor/src/utils/ADM_edUndoQueue.cpp \ 
+../../../avidemux/common/ADM_gettext.cpp \ 
+../../../avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp \ 
+../../../avidemux/common/ADM_muxerGate/src/ADM_videoCopyFromAnnexB.cpp \ 
+../../../avidemux/common/ADM_muxerGate/src/ADM_videoProcess.cpp \ 
+../../../avidemux/common/ADM_osSupport/ADM_crashHook.cpp \ 
+../../../avidemux/common/ADM_osSupport/ADM_misc.cpp \ 
+../../../avidemux/common/ADM_preview.cpp \ 
+../../../avidemux/common/ADM_previewNavigate.cpp \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreD3D.cpp \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2.cpp \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2_ff.c \ 
+../../../avidemux/common/ADM_render/ADM_coreDxva2/src/vlc_dxva.c \ 
+../../../avidemux/common/ADM_render/GUI_dxva2Render.cpp \ 
+../../../avidemux/common/ADM_render/GUI_libvaRender.cpp \ 
+../../../avidemux/common/ADM_render/GUI_qtGlRender.cpp \ 
+../../../avidemux/common/ADM_render/GUI_render.cpp \ 
+../../../avidemux/common/ADM_render/GUI_sdlRender.cpp \ 
+../../../avidemux/common/ADM_render/GUI_simpleRender.cpp \ 
+../../../avidemux/common/ADM_render/GUI_simpleRenderStub.cpp \ 
+../../../avidemux/common/ADM_render/GUI_vdpauRender.cpp \ 
+../../../avidemux/common/ADM_render/GUI_xvRender.cpp \ 
+../../../avidemux/common/ADM_script2/src/ADM_script.cpp \ 
+../../../avidemux/common/ADM_slave.cpp \ 
+../../../avidemux/common/ADM_toolkit/ADM_audioQueue.cpp \ 
+../../../avidemux/common/ADM_toolkit/ADM_packetQueue.cpp \ 
+../../../avidemux/common/ADM_toolkit/automation.cpp \ 
+../../../avidemux/common/ADM_toolkit/filesel.cpp \ 
+../../../avidemux/common/ADM_videoCodec/src/ADM_dynVideoDecoder.cpp \ 
+../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp \ 
+../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp \ 
+../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp \ 
+../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp \ 
+../../../avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp \ 
+../../../avidemux/common/ADM_videoCodec/src/ADM_videoCodec.cpp \ 
+../../../avidemux/common/ADM_videoEncoder/src/ADM_dynVideoEncoder.cpp \ 
+../../../avidemux/common/ADM_videoEncoder/src/ADM_VideoEncoders.cpp \ 
+../../../avidemux/common/ADM_videoFilter2/src/ADM_filterThread.cpp \ 
+../../../avidemux/common/ADM_videoFilter2/src/ADM_pluginLoad.cpp \ 
 ../../../avidemux/common/ADM_videoFilter2/src/ADM_videoFilters.cpp \ 
+../../../avidemux/common/ADM_videoFilter2/src/ADM_vidPartial.cpp \ 
 ../../../avidemux/common/ADM_videoFilter2/src/partial.conf \ 
 ../../../avidemux/common/ADM_videoFilter2/src/partial_desc.cpp \ 
 ../../../avidemux/common/ADM_videoFilter2/src/partial_json.cpp \ 
-../../../avidemux/common/ADM_videoFilter2/src/ADM_pluginLoad.cpp \ 
-../../../avidemux/common/ADM_videoFilter2/src/ADM_filterThread.cpp \ 
-../../../avidemux/common/ADM_videoFilter2/src/ADM_vidPartial.cpp \ 
+../../../avidemux/common/gui_action.cpp \ 
 ../../../avidemux/common/gui_autodrive.cpp \ 
+../../../avidemux/common/gui_blackframes.cpp \ 
 ../../../avidemux/common/GUI_jobs.cpp \ 
-../../../avidemux/common/ADM_slave.cpp \ 
-../../../avidemux/common/ADM_previewNavigate.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Matroska/mkv_tags.cpp \ 
+../../../avidemux/common/gui_main.cpp \ 
+../../../avidemux/common/gui_navigate.cpp \ 
+../../../avidemux/common/gui_play.cpp \ 
+../../../avidemux/common/gui_save.cpp \ 
+../../../avidemux/common/gui_savenew.cpp \ 
+../../../avidemux/common/main.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/bit_allocate.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/bitstream.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/downmix.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/imdct.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/parse.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_amrnb/ADM_ad_amrnb.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_dca/ADM_dca.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_faad/ADM_ad_faad.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ima_adpcm/ADM_ad_ima_adpcm.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/bit.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/decoder.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/fixed.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/frame.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/huffman.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/layer12.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/layer3.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/minimad.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/stream.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/synth.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/timer.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/version.c \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ms_adpcm/ADM_ad_ms_adpcm.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_opencore_amrnb/ADM_ad_opencore_amrnb.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_opencore_amrwb/ADM_ad_opencore_amrwb.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_opus/ADM_opus.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ulaw/ADM_ad_ulaw.cpp \ 
+../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_vorbis/ADM_ad_vorbis.cpp \ 
+../../../avidemux_plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.cpp \ 
+../../../avidemux_plugins/ADM_audioDevices/Arts/ADM_deviceArts.cpp \ 
+../../../avidemux_plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.cpp \ 
+../../../avidemux_plugins/ADM_audioDevices/Esd/ADM_deviceEsd.cpp \ 
+../../../avidemux_plugins/ADM_audioDevices/Jack/ADM_deviceJack.cpp \ 
+../../../avidemux_plugins/ADM_audioDevices/Oss/ADM_deviceoss.cpp \ 
+../../../avidemux_plugins/ADM_audioDevices/PulseAudioSimple/ADM_devicePulseSimple.cpp \ 
+../../../avidemux_plugins/ADM_audioDevices/Sdl/ADM_deviceSDL.cpp \ 
+../../../avidemux_plugins/ADM_audioDevices/Win32/ADM_deviceWin32.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/aften/aften_check.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/aften/aften_encoder.conf \ 
+../../../avidemux_plugins/ADM_audioEncoders/aften/aften_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/aften/aften_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/dcaenc/dcaencoder.conf \ 
+../../../avidemux_plugins/ADM_audioEncoders/dcaenc/dcaencoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/dcaenc/dcaencoder_json.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/faac/faac_encoder.conf \ 
+../../../avidemux_plugins/ADM_audioEncoders/faac/faac_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/faac/faac_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/fdk_encoder.conf \ 
+../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/fdk_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/fdk_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lame/lame_encoder.conf \ 
+../../../avidemux_plugins/ADM_audioEncoders/lame/lame_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lame/lame_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_aac.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_ac3.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_dts.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_mp2.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/lavcodec_encoder.conf \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/lavcodec_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/lavcodec/lavcodec_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/pcm/audioencoder_pcm.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/twolame/twolame_encoder.conf \ 
+../../../avidemux_plugins/ADM_audioEncoders/twolame/twolame_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/twolame/twolame_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/vorbis/vorbis_encoder.conf \ 
+../../../avidemux_plugins/ADM_audioEncoders/vorbis/vorbis_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_audioEncoders/vorbis/vorbis_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfAudio.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfChunk.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfPacket.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfPlugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsPlugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy_net.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxyAudio.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flvAudio.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flvIndex.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flvPlugin.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvTrackType.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Matroska/ebml.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv_audio.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvDeviation.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvPlugin.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv_audio.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvTrackType.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/ebml.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Matroska/mkv_tags.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_atom.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4audio.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Fragments.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Leaf.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Plugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudio.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudioProbe.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psReadIndex.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psComputeTimeStamp.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psPlugin.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsPlugin.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsProxy_cli.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsProxy.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vs.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flvPlugin.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flvAudio.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flvIndex.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Pictures/ADM_pics.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Pictures/ADM_picPlugin.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mxf/ADM_mxf.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mxf/ADM_mxfPlugin.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Plugin.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4audio.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_atom.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Fragments.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4audio.cpp.orig \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_atom.cpp.orig \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp.orig \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Leaf.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_riff.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLPlugin.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_regular.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_odml.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_audio.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psPlugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psReadIndex.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudio.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudioProbe.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsBruteForce.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsComputeTimeStamp.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsCrc.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsGetBits.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsReadIndex.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPlugin.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsBruteForce.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudioProbe.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsReadIndex.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsGetBits.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsCrc.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfPlugin.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfPacket.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfChunk.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfAudio.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy_net.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxyAudio.cpp \ 
-../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/logo/logo_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/logo/logo.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/crop_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/DIA_flyCrop.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/crop.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3dHQ_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3dHQ_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3d_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3d.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3dHQ.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/DIA_flyBlackenBorders.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/asciiView/vf_matrix.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/rotate/rte_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/rotate/rte.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/black/black_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/black/black.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/black/black_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/colorYUV/avsColor.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/colorYUV/colorYuv.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/colorYUV/colorYuv_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/testHeader.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidMergeField.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidSeparateField.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/largeMedian/convolution_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/largeMedian/convolution.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/eq2.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/eq2_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/eq2_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/decimate/dec.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate_sse.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/decimate/dec_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate_util.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lav.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lav_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/telecide/telec.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/telecide/telec_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilter_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilter.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/Q_mpdelogo.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/DIA_flyMpDelogo.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/resize/swresize_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/resize/swresize.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/printInfo/printInfo.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mcDeint/mcdeint.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/mcDeint/mcdeint_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mcDeint/mcdeint_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/fluxsmooth_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFluxAsm.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/fluxsmooth.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/fluxsmooth_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/horizontalFlip/horizontalFlip.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/verticalFlip/verticalFlip.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/cdebug.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/strnew.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avspipecomm.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam.conf \ 
-../../../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/ADM_vidYadif.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Gauss.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Sharpen.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/convolution_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Median.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Mean.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/convolution.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/kdeint_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/kdeint.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/asharp_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/asharp_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/asharp.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/DIA_flyAsharp.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/hue.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/hue_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/hue_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/chromashift_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/DIA_flyChromaShift.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/chromashift.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/chromashift_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/msharpen.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/msharpen_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/msharpen_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/addBorder/addBorder.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/addBorder/addBorder_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/stackField/stackField.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/stackField/unstackField.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/stackField/hzStackField.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/dummy/dummyVideoFilter.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_shaper.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_bitmap.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_library.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_render.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_drawing.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_rasterizer.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_fontconfig.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_render_api.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_cache.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_strtod.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_parse.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_blur.c \ 
-../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_rasterizer_c.c \ 
-../../../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.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/changeFps/confChangeFps_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/changeFps/confChangeFps.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/DIA_flyContrast.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoDecoder/vpx/vpxPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffDv/ffDvPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264_json.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEncH264_plugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpegPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/png/ADM_pngEncoder.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/png/pngPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/x264_encoder_json.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Plugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/x264_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264_noui.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/x264_encoder.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/null/nullPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/null/nullEncoder.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/yv12/ADM_yv12Encoder.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/yv12/yv12Plugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/nvEnc/ADM_nvEnc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvenc_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvenc_json.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvenc.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc_utils.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEncPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/huff/huff_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/huff/huffPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/huff/huff_encoder.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Plugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder_json.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ffMsMp4Plugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc_json.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEncPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_json.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ffFlv1Plugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Plugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265_noui.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/x265_settings.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/x265_settings_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/x265_settings_json.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffNvEncPlugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc_json.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ffMpeg2Plugin.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpeg2_encoder.conf \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpeg2_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp \ 
-../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ffMpeg4Plugin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Video.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/mp4v2_muxer_desc.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_ftyp.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_ohdr.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4atom.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_vmhd.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_gmin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_s263.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qosqualifiers.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mdat.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_treftype.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_tfhd.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_ftab.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_sdp.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_hdlr.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/odcommands.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/CoverArtBox.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/Tags.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/generic.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/type.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4descriptor.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_url.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/log.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_urn.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stdp.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4container.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4file_io.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_d263.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4file.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_rtp.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_hinf.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_uuid.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_root.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_enca.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_standard.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mdhd.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mp4v.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_chpl.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_avc1.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4property.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_tx3g.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_colr.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/text.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/rtphint.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4track.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_smi.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stsc.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_damr.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_trun.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/descriptors.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/coding.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/PictureAspectRatioBox.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/ColorParameterBox.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_meta.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4info.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mp4s.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_amr.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_video.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_href.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_elst.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mvhd.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/cmeta.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stsz.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_sound.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/bmff/typebmff.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_dac3.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_avcC.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4util.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_sdtp.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stsd.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/ocidescriptors.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_udta.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_tkhd.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_encv.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_nmhd.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stz2.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_ac3.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/3gp.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stbl.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_hnti.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_dref.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_text.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/isma.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/exception.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_pasp.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_free.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/File_win32.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/File.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/FileSystem_win32.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/FileSystem_posix.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/FileSystem.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/File_posix.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/sys/error.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/process/process_posix.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/process/process_win32.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/time/time_win32.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/time/time_posix.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/time/time.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_win32.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/number/random_posix.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/number/random_win32.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/prog/option.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Plugin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Config.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4v2/mp4v2_muxer.conf \ 
-../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSPlugin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mxf/ADM_mxf.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Mxf/ADM_mxfPlugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_audio.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_odml.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_regular.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLPlugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_riff.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Pictures/ADM_picPlugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/Pictures/ADM_pics.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vs.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsPlugin.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsProxy.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsProxy_cli.cpp \ 
+../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_muxer.conf \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_muxer_desc.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_utils.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndexAvi.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndexOdml.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/avilist.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/avilist_avi.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviPlugin.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerAvi/op_aviwrite.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummyPlugin.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSPlugin.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerffPS/ps_muxer.conf \ 
 ../../../avidemux_plugins/ADM_muxers/muxerffPS/ps_muxer_desc.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerffTS/ts_muxer_desc.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTSPlugin.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTSConfig.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTSPlugin.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerffTS/ts_muxer.conf \ 
-../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummyPlugin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRawPlugin.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerffTS/ts_muxer_desc.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlv.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlvPlugin.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlvConfig.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlvPlugin.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMkv/mkv_muxer.conf \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMkv/mkv_muxer_desc.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMkv/mkv_muxer.conf \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvPlugin.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.conf \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer_desc.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMp4/mp4_muxer.conf \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Plugin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/op_aviwrite.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndexAvi.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviPlugin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/aviIndexOdml.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/avilist.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_muxer.conf \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_muxer_desc.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/avilist_avi.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerAvi/avi_utils.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/stillsstream.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/stream_params.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/videostrm_out.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/lpcmstrm_in.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/File.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/File_posix.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/File_win32.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/FileSystem.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/FileSystem_posix.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/io/FileSystem_win32.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/number/random_posix.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/number/random_win32.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/platform_win32.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/process/process_posix.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/process/process_win32.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/prog/option.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/sys/error.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/time/time.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/time/time_posix.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/libplatform/time/time_win32.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/3gp.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_ac3.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_amr.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_avc1.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_avcC.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_chpl.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_colr.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_d263.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_dac3.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_damr.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_dref.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_elst.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_enca.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_encv.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_free.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_ftab.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_ftyp.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_gmin.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_hdlr.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_hinf.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_hnti.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_href.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mdat.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mdhd.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_meta.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mp4s.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mp4v.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_mvhd.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_nmhd.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_ohdr.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_pasp.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_root.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_rtp.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_s263.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_sdp.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_sdtp.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_smi.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_sound.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_standard.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stbl.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stdp.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stsc.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stsd.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stsz.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_stz2.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_text.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_tfhd.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_tkhd.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_treftype.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_trun.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_tx3g.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_udta.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_url.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_urn.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_uuid.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_video.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/atom_vmhd.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/bmff/typebmff.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/cmeta.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/descriptors.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/exception.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/isma.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/CoverArtBox.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/generic.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/Tags.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/itmf/type.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/log.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4atom.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4container.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4descriptor.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4file.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4file_io.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4info.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4property.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4track.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4util.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/ocidescriptors.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/odcommands.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qosqualifiers.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/coding.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/ColorParameterBox.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/qtff/PictureAspectRatioBox.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/rtphint.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/text.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/mp4v2_muxer.conf \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/mp4v2_muxer_desc.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Config.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Plugin.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Video.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/ac3strm_in.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_mplexInput.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/dtsstrm_in.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/cpu_accel.c \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/mjpeg_logging.c \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/padstrm.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_mplexMuxer.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_mplexOutput.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_mthread.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/systems.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_transfert.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_mplexOutput.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/ADM_mplexMuxer.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/audiostrm_out.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/inputstrm.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/mpegconsts.c \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/bits.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/cpu_accel.c \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/decodebufmodel.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/dtsstrm_in.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/inputstrm.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/interact.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/lpcmstrm_in.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/mjpeg_logging.c \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/mpastrm_in.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/mpegconsts.c \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/multiplexor.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/yuv4mpeg.c \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/padstrm.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/stillsstream.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/stream_params.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/systems.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerMplex/videostrm_in.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/ac3strm_in.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerMplex/mpastrm_in.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebmConfig.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/videostrm_out.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerMplex/yuv4mpeg.c \ 
+../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRawPlugin.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebmConfig.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebmPlugin.cpp \ 
-../../../avidemux_plugins/ADM_muxers/muxerWebm/webm_muxer_desc.cpp \ 
 ../../../avidemux_plugins/ADM_muxers/muxerWebm/webm_muxer.conf \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/TinyParams.cpp \ 
+../../../avidemux_plugins/ADM_muxers/muxerWebm/webm_muxer_desc.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/adm_gen.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemuxAudio.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyTests.cpp \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/editor_gen.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonScriptWriter.cpp \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/GUI_gen.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyHelpers_gen.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyDialogFactory_gen.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyDFToggle_gen.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyDFMenu_gen.cpp \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/modules/re/init.cpp \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/modules/re/regexpr.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/adm_gen.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyDFInteger_gen.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyDFMenu_gen.cpp \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyDFTimeStamp_gen.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/math.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tst/hello.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyDFToggle_gen.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyDialogFactory_gen.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/pyHelpers_gen.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonScriptWriter.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/TinyParams.cpp \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/init_math.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tinypy.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/math.cpp \ 
 ../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tinypy.c.org \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyTests.cpp \ 
-../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/resize_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/resize_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/resize.conf \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tinypy.cpp \ 
+../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tst/hello.cpp \ 
+../../../avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp \ 
+../../../avidemux_plugins/ADM_videoDecoder/vpx/vpxPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffDv/ffDvPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ffFlv1Plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ffMpeg2Plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpeg2_encoder.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpeg2_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ffMpeg4Plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ffMsMp4Plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffNvEncPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEncH264_plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/huff/huff_encoder.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/huff/huff_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/huff/huffPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpegPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/null/nullEncoder.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/null/nullPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/nvEnc/ADM_nvEnc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvenc.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvenc_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvenc_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc_utils.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEncPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/png/ADM_pngEncoder.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/png/pngPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEncPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264_noui.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/x264_encoder.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/x264_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/x264_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265_noui.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/x265_settings.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/x265_settings_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/x265_settings_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder.conf \ 
+../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/yv12/ADM_yv12Encoder.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/yv12/yv12Plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/addBorder/addBorder.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/addBorder/addBorder_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc_main.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc_util.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/asciiView/vf_matrix.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/asharp.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/asharp_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/asharp_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/DIA_flyAsharp.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_bitmap.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_blur.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_cache.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_drawing.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_font.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_fontconfig.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_library.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_parse.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_rasterizer.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_rasterizer_c.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_render.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_render_api.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_shaper.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_strtod.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_utils.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ass_ssa.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/ass/ass_ssa_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avspipecomm.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/cdebug.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/avsfilter/strnew.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/black/black.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/black/black_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/black/black_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/DIA_flyBlackenBorders.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/changeFps/confChangeFps.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/changeFps/confChangeFps_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/chromashift.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/chromashift_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/chromashift_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/DIA_flyChromaShift.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorYUV/avsColor.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorYUV/colorYuv.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorYUV/colorYuv_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/DIA_flyContrast.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/crop.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/crop_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/DIA_flyCrop.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/Q_crop.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/decimate/dec.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/decimate/dec_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate_sse.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate_util.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/dummy/dummyVideoFilter.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/eq2.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/eq2_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/eq2_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/convolution.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/convolution_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Gauss.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Mean.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Median.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Sharpen.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidMergeField.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidSeparateField.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFluxAsm.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/fluxsmooth.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/fluxsmooth_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/fluxsmooth_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/horizontalFlip/horizontalFlip.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/hue.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/hue_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/hue_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/kdeint.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/kdeint_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/largeMedian/convolution.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/largeMedian/convolution_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lav.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lav_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/logo/logo.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/logo/logo_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mcDeint/mcdeint.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/mcDeint/mcdeint_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mcDeint/mcdeint_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/DIA_flyMpDelogo.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/Q_mpdelogo.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3d.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3d_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3dHQ.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3dHQ_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3dHQ_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/msharpen.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/msharpen_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/msharpen_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/printInfo/printInfo.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/resize/swresize.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/resize/swresize_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/rotate/rte.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/rotate/rte_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/stackField/hzStackField.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/stackField/stackField.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/stackField/unstackField.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/telecide/telec.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/telecide/telec_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/testHeader.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilter.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilter_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/verticalFlip/verticalFlip.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif_asm.c \ 
+../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6/yadif/yadif_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glBenchmark/benchGl.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-sdf.cc \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-shaders.cc \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-arc.cc \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-extents.cc \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-arcs.cc \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-blob.cc \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-extents.cc \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-outline.cc \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-arcs.cc \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/yadif_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/yadif.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaderLoader_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-sdf.cc \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glyphy/glyphy-shaders.cc \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/resize.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/resize_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/resize_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotate.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotate_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotate_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaderLoader.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaderLoader_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaderLoader_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/vdpauFilterDeint.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/vdpauFilterDeint_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/vdpauFilterDeint_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeintGl.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/smooth.conf \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/smooth_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/smooth_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotate_desc.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotate_json.cpp \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotate.conf \ 
-../../../avidemux_plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.cpp \ 
-../../../avidemux_plugins/ADM_audioDevices/Sdl/ADM_deviceSDL.cpp \ 
-../../../avidemux_plugins/ADM_audioDevices/Oss/ADM_deviceoss.cpp \ 
-../../../avidemux_plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.cpp \ 
-../../../avidemux_plugins/ADM_audioDevices/Win32/ADM_deviceWin32.cpp \ 
-../../../avidemux_plugins/ADM_audioDevices/Arts/ADM_deviceArts.cpp \ 
-../../../avidemux_plugins/ADM_audioDevices/PulseAudioSimple/ADM_devicePulseSimple.cpp \ 
-../../../avidemux_plugins/ADM_audioDevices/Esd/ADM_deviceEsd.cpp \ 
-../../../avidemux_plugins/ADM_audioDevices/Jack/ADM_deviceJack.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ms_adpcm/ADM_ad_ms_adpcm.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ulaw/ADM_ad_ulaw.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_faad/ADM_ad_faad.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_opencore_amrnb/ADM_ad_opencore_amrnb.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/bit.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/layer12.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/version.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/synth.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/layer3.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/minimad.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/frame.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/timer.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/huffman.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/fixed.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/stream.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad/decoder.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_amrnb/ADM_ad_amrnb.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_opus/ADM_opus.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_dca/ADM_dca.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ima_adpcm/ADM_ad_ima_adpcm.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_opencore_amrwb/ADM_ad_opencore_amrwb.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/parse.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/bit_allocate.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/bitstream.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/imdct.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/downmix.c \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp \ 
-../../../avidemux_plugins/ADM_audioDecoders/ADM_ad_vorbis/ADM_ad_vorbis.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/twolame/twolame_encoder.conf \ 
-../../../avidemux_plugins/ADM_audioEncoders/twolame/twolame_encoder_json.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/twolame/twolame_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/faac/faac_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/faac/faac_encoder_json.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/faac/faac_encoder.conf \ 
-../../../avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/aften/aften_encoder_json.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/aften/aften_check.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/aften/aften_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/aften/aften_encoder.conf \ 
-../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/fdk_encoder_json.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/fdk_encoder.conf \ 
-../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/fdk_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lame/lame_encoder.conf \ 
-../../../avidemux_plugins/ADM_audioEncoders/lame/lame_encoder_json.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lame/lame_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/vorbis/vorbis_encoder.conf \ 
-../../../avidemux_plugins/ADM_audioEncoders/vorbis/vorbis_encoder_json.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/vorbis/vorbis_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_mp2.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/lavcodec_encoder.conf \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_ac3.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/lavcodec_encoder_json.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_aac.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/lavcodec_encoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_dts.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/pcm/audioencoder_pcm.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/dcaenc/dcaencoder_desc.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/dcaenc/dcaencoder_json.cpp \ 
-../../../avidemux_plugins/ADM_audioEncoders/dcaenc/dcaencoder.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/smooth_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeintGl.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/vdpauFilterDeint.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/vdpauFilterDeint_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/vdpauFilterDeint_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/yadif.conf \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/yadif_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.cpp \ 
 
 
 FORMS = \
 ../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vs.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui \ 
+../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264CustomMatrixDialog.ui \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui \ 
+../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265CustomMatrixDialog.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/asharp.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/blackenBorders.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/chromashift.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/contrast.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/mpdelogo.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/asharp.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/chromashift.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/mpdelogo.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/contrast.ui \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui \ 
-../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264CustomMatrixDialog.ui \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265CustomMatrixDialog.ui \ 
-../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui \ 
-../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui \ 
-../../../avidemux/qt4/ADM_jobs/src/uiProgress.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui \ 
 ../../../avidemux/qt4/ADM_jobs/src/uiJobs.ui \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/mainfilter.ui \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/seekablePreview.ui \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/processing.ui \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/license.ui \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/vobsub.ui \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/audioTracks.ui \ 
+../../../avidemux/qt4/ADM_jobs/src/uiProgress.ui \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/about.ui \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/audioTracks.ui \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/calculator.ui \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/encoding.ui \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/working.ui \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/jobs.ui \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/license.ui \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/processing.ui \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/props.ui \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/vobsub.ui \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_dialog/working.ui \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/mainfilter.ui \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_filters/seekablePreview.ui \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_gui/gui2.ui \ 
-../../../avidemux/qt4/ADM_userInterfaces/ADM_shell/shell.ui \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_ocr/ocr.ui \ 
+../../../avidemux/qt4/ADM_userInterfaces/ADM_shell/shell.ui \ 
 
 
 TRANSLATIONS = \
 ./avidemux_ca.ts \ 
-./avidemux_fr.ts \ 
+./avidemux_cs.ts \ 
+./avidemux_da.ts \ 
+./avidemux_de.ts \ 
+./avidemux_el.ts \ 
+./avidemux_en.ts \ 
 ./avidemux_es.ts \ 
+./avidemux_eu.ts \ 
+./avidemux_fr.ts \ 
 ./avidemux_hu.ts \ 
-./avidemux_da.ts \ 
-./avidemux_zh_TW.ts \ 
-./avidemux_sr.ts \ 
+./avidemux_it.ts \ 
+./avidemux_ja.ts \ 
+./avidemux_ko.ts \ 
+./avidemux_pl.ts \ 
 ./avidemux_pt_BR.ts \ 
 ./avidemux_ru.ts \ 
-./avidemux_eu.ts \ 
-./avidemux_el.ts \ 
+./avidemux_sr.ts \ 
 ./avidemux_sr@latin.ts \ 
-./avidemux_pl.ts \ 
-./avidemux_it.ts \ 
-./avidemux_en.ts \ 
-./avidemux_cs.ts \ 
-./avidemux_ja.ts \ 
-./avidemux_de.ts \ 
 ./avidemux_tr.ts \ 
+./avidemux_zh_TW.ts \

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

@@ -5463,7 +5463,7 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation type="unfinished">...</translation>
     </message>
@@ -5480,7 +5480,7 @@
         <translation type="obsolete">/ 0</translation>
     </message>
     <message>
-        <location line="-290"/>
+        <location line="-289"/>
         <source>Time:</source>
         <translation type="unfinished">Temps:</translation>
     </message>
@@ -5575,7 +5575,7 @@
         <translation type="obsolete">Au&amp;to</translation>
     </message>
     <message>
-        <location line="+1540"/>
+        <location line="+1545"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Obre</translation>
     </message>
@@ -6091,7 +6091,7 @@
         <translation type="obsolete">Ctrl+W</translation>
     </message>
     <message>
-        <location line="-1138"/>
+        <location line="-1143"/>
         <source>ms</source>
         <translation type="unfinished">ms</translation>
     </message>
@@ -6226,12 +6226,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+932"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-857"/>
+        <location line="-862"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6336,7 +6336,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7471,12 +7471,12 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+16"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+14"/>
         <source>About Avidemux</source>
         <translation type="unfinished">Pel que fa a l&apos;Avidemux</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+93"/>
         <source>Avidemux </source>
         <translation type="unfinished">Avidemux </translation>
     </message>
@@ -7486,12 +7486,17 @@
         <translation type="unfinished">Editor de vídeo multiplataforma</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+10"/>
+        <source>© 2001 - 2017  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>http://www.avidemux.org</source>
         <translation type="unfinished">http://www.avidemux.org</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+45"/>
         <source>&amp;License</source>
         <translation type="unfinished">&amp;Llicència</translation>
     </message>
@@ -7509,9 +7514,8 @@
         <translation type="unfinished">Accepta</translation>
     </message>
     <message>
-        <location line="-75"/>
         <source>© 2001 - 2016  Mean</source>
-        <translation type="unfinished">© 2001 - 2010  Mean {2001 ?} {2012 ?} {2001 ?} {2016 ?}</translation>
+        <translation type="obsolete">© 2001 - 2010  Mean {2001 ?} {2012 ?} {2001 ?} {2016 ?}</translation>
     </message>
 </context>
 <context>
@@ -7867,7 +7871,7 @@
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="+281"/>
+        <location filename="../../common/gui_save.cpp" line="+282"/>
         <location line="+21"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+403"/>
@@ -7916,17 +7920,18 @@
         <translation type="unfinished">Connecta a l&apos;avsproxy</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+23"/>
         <source>Copy</source>
         <translation type="unfinished">Copiat</translation>
     </message>
     <message>
+        <location line="+3"/>
         <location line="+2"/>
         <source>Delete</source>
         <translation type="unfinished">Esborra</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Set Marker A</source>
         <translation type="unfinished">Posa el marcador A</translation>
     </message>
@@ -8185,7 +8190,7 @@
         <translation type="unfinished">S&apos;ha produït un error de còdec</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+337"/>
+        <location filename="../../common/gui_main.cpp" line="+352"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">No s&apos;ha codificat en aquesta versió</translation>
     </message>
@@ -8198,7 +8203,7 @@
         <translation type="obsolete">Seleccioneu un fitxer d&apos;AVI per afegir</translation>
     </message>
     <message>
-        <location line="+238"/>
+        <location line="+241"/>
         <source>Are you sure?</source>
         <translation type="unfinished">N&apos;esteu segur?</translation>
     </message>
@@ -8256,7 +8261,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Alguna cosa ha falalt (II).</translation>
     </message>
@@ -8366,7 +8371,7 @@
         <translation type="unfinished">Elimina l&apos;efecte &quot;_ringing&quot;</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-221"/>
+        <location filename="../../common/gui_save.cpp" line="-222"/>
         <source>Select Workbench to Save</source>
         <translation type="unfinished">Seleccioneu una tasca per desar.</translation>
     </message>
@@ -8391,7 +8396,7 @@
         <translation type="unfinished">Seleccioneu un fitxer de JPEG per desar.</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation type="unfinished">Seleccioneu un fitxer per desar.</translation>
     </message>
@@ -8892,7 +8897,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-78"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-93"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8939,7 +8944,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8964,7 +8975,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Reset Markers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9167,12 +9178,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1217"/>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9187,13 +9198,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
-        <location line="+65"/>
+        <location line="+67"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-43"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9203,7 +9219,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9218,7 +9234,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+660"/>
+        <location line="+663"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -9259,12 +9275,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">S&apos;ha produït un problema en inicialitzar el dispositiu d&apos;àudio</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-390"/>
+        <location filename="../../common/gui_save.cpp" line="-391"/>
         <source>No</source>
         <translation type="unfinished">No</translation>
     </message>
@@ -9299,7 +9315,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+209"/>
         <source>Function not implemented
 </source>
         <translation type="unfinished"></translation>
@@ -9727,7 +9743,7 @@
         <translation type="unfinished">S&apos;ha produït un error de memòria</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+142"/>
         <source>Too short</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9859,6 +9875,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
@@ -10620,13 +10649,13 @@
     <message>
         <location line="-1"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation type="unfinished">Contrast</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10718,7 +10747,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation type="unfinished">Carrega&apos;l</translation>
     </message>
@@ -10766,36 +10795,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
         <source>Crop</source>
         <translation type="unfinished">Crop</translation>
     </message>
     <message>
         <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
         <source>Right:</source>
         <translation type="unfinished">Dreta:</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation type="unfinished">Amunt:</translation>
     </message>
     <message>
         <location line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
         <source>Reset</source>
         <translation type="unfinished">Reinicialitza</translation>
     </message>
     <message>
         <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
         <source>Bottom:</source>
         <translation type="unfinished">Avall:</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation type="unfinished">Esquerra:</translation>
     </message>
     <message>
         <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
         <source>Auto Crop</source>
         <translation type="unfinished">Tall automàtic</translation>
     </message>
@@ -11303,7 +11339,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
         <source>MPlayer eq2</source>
         <translation type="unfinished">MPlayer eq2</translation>
     </message>
@@ -11312,6 +11348,11 @@
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation type="unfinished">Ajusta el contrast, la lluminositat, la saturació i la gamma.</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -12830,7 +12871,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+58"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+61"/>
         <source>Adjust hue and saturation.</source>
         <translation type="unfinished">Ajusta el matís i la saturació.</translation>
     </message>
@@ -12916,7 +12957,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12926,37 +12967,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation type="unfinished">_Soroll:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation type="unfinished">Full</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation type="unfinished">Ràpid</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">_Canvi veloc. d&apos;imatge: </translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13532,7 +13585,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13908,7 +13961,7 @@
 <context>
     <name>mp3d</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+235"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+234"/>
         <source>_Spatial luma strength:</source>
         <translation type="unfinished">Intensitat _luminància espacial:</translation>
     </message>
@@ -13918,24 +13971,32 @@
         <translation type="unfinished">Intensitat _crominància espacial:</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>MPlayer denoise3d</source>
-        <translation type="unfinished">MPlayer denoise3d</translation>
+        <location line="+1"/>
+        <source>_Temporal luma strength:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
-        <source>Mplayer Denoise 3D HQ</source>
+        <location line="+1"/>
+        <source>T_emporal chroma strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D HQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MPlayer denoise3d</source>
+        <translation type="obsolete">MPlayer denoise3d</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <source>Mplayer Denoise 3D HQ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
         <location line="+1"/>
-        <source>Luma _Temporal strength:</source>
+        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -13963,8 +14024,12 @@
     </message>
     <message>
         <location line="+4"/>
+        <source>MPlayer Denoise 3D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>MPlayer denoise3d</source>
-        <translation type="unfinished">MPlayer denoise3d</translation>
+        <translation type="obsolete">MPlayer denoise3d</translation>
     </message>
     <message>
         <location line="-39"/>
@@ -13976,14 +14041,12 @@
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Hi ha hagut un problema en la lectura d&apos;encapçalaments d&apos;SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
-        <translation type="unfinished">No hi ha taula stts</translation>
+        <translation type="obsolete">No hi ha taula stts</translation>
     </message>
 </context>
 <context>
@@ -14156,7 +14219,7 @@
 <context>
     <name>msharpen</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+49"/>
         <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
         <translation type="unfinished">Aguditza els contorns sense amplificar el soroll. Per Donald Graft.</translation>
     </message>
@@ -14228,7 +14291,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation type="unfinished">Error</translation>
     </message>
@@ -14338,7 +14401,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14677,19 +14740,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation type="unfinished"></translation>
     </message>
@@ -14697,12 +14760,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+223"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14712,7 +14775,7 @@
         <translation type="unfinished">Projectes recents</translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14777,7 +14840,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+491"/>
+        <location line="+605"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
@@ -14788,7 +14851,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+315"/>
         <source> (%d track(s))</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14936,7 +14999,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation type="unfinished">Partial</translation>
     </message>
@@ -14946,22 +15009,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation type="unfinished">Afegeix</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation type="unfinished">Suprimeix</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation type="unfinished">Configura</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14971,12 +15034,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15790,12 +15853,11 @@
         <translation type="unfinished">Vista prèvia</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>00:00:00.000</source>
-        <translation type="unfinished">00:00:00.000</translation>
+        <translation type="obsolete">00:00:00.000</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15829,11 +15891,6 @@
         <source>Forward one minute</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>A&amp;utoZoom</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>separateFields</name>
@@ -16135,7 +16192,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16582,7 +16639,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16593,7 +16650,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18125,7 +18182,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18136,7 +18193,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19590,7 +19647,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation type="unfinished"></translation>
     </message>

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

@@ -10128,7 +10128,7 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation type="unfinished">...</translation>
     </message>
@@ -10145,7 +10145,7 @@
         <translation type="obsolete">/ 0</translation>
     </message>
     <message>
-        <location line="-290"/>
+        <location line="-289"/>
         <source>Time:</source>
         <translation type="unfinished">Čas:</translation>
     </message>
@@ -10240,7 +10240,7 @@
         <translation type="obsolete">Au&amp;to</translation>
     </message>
     <message>
-        <location line="+1540"/>
+        <location line="+1545"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Otevřít...</translation>
     </message>
@@ -10660,7 +10660,7 @@
         <translation type="unfinished">&amp;Na sebe</translation>
     </message>
     <message>
-        <location line="-1636"/>
+        <location line="-1641"/>
         <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10670,12 +10670,12 @@
         <translation type="unfinished">Typ snímku:</translation>
     </message>
     <message>
-        <location line="+499"/>
+        <location line="+504"/>
         <source>&amp;Separate</source>
         <translation type="unfinished">S&amp;amostatně</translation>
     </message>
     <message>
-        <location line="-1138"/>
+        <location line="-1143"/>
         <source>ms</source>
         <translation type="unfinished">ms</translation>
     </message>
@@ -10805,12 +10805,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+932"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-857"/>
+        <location line="-862"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10915,7 +10915,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12095,12 +12095,12 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+16"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+14"/>
         <source>About Avidemux</source>
         <translation type="unfinished">O Avidemuxu</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+93"/>
         <source>Avidemux </source>
         <translation type="unfinished">Avidemux </translation>
     </message>
@@ -12110,11 +12110,16 @@
         <translation type="unfinished">Multiplatformní video editor</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <source>© 2001 - 2017  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>© 2001 - 2012  Mean</source>
         <translation type="obsolete">© 2001 - 2010  Mean {2001 ?} {2012 ?}</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
@@ -12123,19 +12128,18 @@
         <translation type="obsolete">© 2001 - 2010  Mean</translation>
     </message>
     <message>
-        <location line="-56"/>
+        <location line="-65"/>
         <source>http://www.avidemux.org</source>
         <translation type="unfinished">http://www.avidemux.org</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+45"/>
         <source>&amp;License</source>
         <translation type="unfinished">&amp;Licence</translation>
     </message>
     <message>
-        <location line="-55"/>
         <source>© 2001 - 2016  Mean</source>
-        <translation type="unfinished">© 2001 - 2010  Mean {2001 ?} {2016 ?}</translation>
+        <translation type="obsolete">© 2001 - 2010  Mean {2001 ?} {2016 ?}</translation>
     </message>
 </context>
 <context>
@@ -12478,7 +12482,7 @@
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="+281"/>
+        <location filename="../../common/gui_save.cpp" line="+282"/>
         <location line="+21"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+403"/>
@@ -12532,12 +12536,12 @@
         <translation type="unfinished">Připojit se k avsproxy</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+23"/>
         <source>Copy</source>
         <translation type="unfinished">Kopie</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+8"/>
         <source>Set Marker A</source>
         <translation type="unfinished">Nastavit značku A</translation>
     </message>
@@ -12832,7 +12836,7 @@
 To je potřeba k vytvoření PSP kompatibilního videa.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+337"/>
+        <location filename="../../common/gui_main.cpp" line="+352"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">Nepodporováno v této verzi</translation>
     </message>
@@ -12845,7 +12849,7 @@
         <translation type="obsolete">Vyberte AVI soubor k připojení...</translation>
     </message>
     <message>
-        <location line="+238"/>
+        <location line="+241"/>
         <source>Are you sure?</source>
         <translation type="unfinished">Určitě?</translation>
     </message>
@@ -12888,7 +12892,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Přihodilo se něco zlého (II)</translation>
     </message>
@@ -12998,7 +13002,7 @@
         <translation type="unfinished">_Deringing</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-221"/>
+        <location filename="../../common/gui_save.cpp" line="-222"/>
         <source>Select Workbench to Save</source>
         <translation type="unfinished">Zvolte projekt k uložení</translation>
     </message>
@@ -13023,7 +13027,7 @@
         <translation type="unfinished">Vyberte JPEG soubor k uložení</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation type="unfinished">Zvolte soubor k uložení</translation>
     </message>
@@ -13789,7 +13793,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-78"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-93"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13831,7 +13835,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13856,12 +13866,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Reset Markers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14032,12 +14043,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1217"/>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14052,13 +14063,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
-        <location line="+65"/>
+        <location line="+67"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-43"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14068,7 +14084,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14098,7 +14114,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+534"/>
+        <location line="+537"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -14139,12 +14155,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">Chyba inicializace zvukového zařízení</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-390"/>
+        <location filename="../../common/gui_save.cpp" line="-391"/>
         <source>No</source>
         <translation type="unfinished">Ne</translation>
     </message>
@@ -14179,7 +14195,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+209"/>
         <source>Function not implemented
 </source>
         <translation type="unfinished"></translation>
@@ -14437,7 +14453,7 @@
         <translation type="unfinished">Chyba paměti</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+142"/>
         <source>Too short</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14569,6 +14585,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
@@ -15330,13 +15359,13 @@
     <message>
         <location line="-1"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15428,7 +15457,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation type="unfinished">Načíst</translation>
     </message>
@@ -15474,36 +15503,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
         <source>Crop</source>
         <translation type="unfinished">Crop</translation>
     </message>
     <message>
         <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
         <source>Right:</source>
         <translation type="unfinished">Vpravo:</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation type="unfinished">Nahoře:</translation>
     </message>
     <message>
         <location line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
         <source>Reset</source>
         <translation type="unfinished">Vrátit</translation>
     </message>
     <message>
         <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
         <source>Bottom:</source>
         <translation type="unfinished">Dole:</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation type="unfinished">Vlevo:</translation>
     </message>
     <message>
         <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
         <source>Auto Crop</source>
         <translation type="unfinished">Automatický ořez</translation>
     </message>
@@ -16011,7 +16047,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
         <source>MPlayer eq2</source>
         <translation type="unfinished">MPlayer eq2</translation>
     </message>
@@ -16020,6 +16056,11 @@
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation type="unfinished">Úprava kontrastu, jasu, sytosti a gama.</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -17538,7 +17579,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+58"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+61"/>
         <source>Adjust hue and saturation.</source>
         <translation type="unfinished">Úprava odstínu a sytosti.</translation>
     </message>
@@ -17624,7 +17665,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17634,37 +17675,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation type="unfinished">Š_um:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation type="unfinished">Plná</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation type="unfinished">Rychlé</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">Změna _snímkové frekvence:</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18244,7 +18297,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18620,7 +18673,7 @@
 <context>
     <name>mp3d</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+235"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+234"/>
         <source>_Spatial luma strength:</source>
         <translation type="unfinished">_Prostorový práh luminance:</translation>
     </message>
@@ -18630,24 +18683,32 @@
         <translation type="unfinished">P_rostorový práh chrominance:</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>MPlayer denoise3d</source>
-        <translation type="unfinished">MPlayer denoise3d</translation>
+        <location line="+1"/>
+        <source>_Temporal luma strength:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
-        <source>Mplayer Denoise 3D HQ</source>
+        <location line="+1"/>
+        <source>T_emporal chroma strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D HQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MPlayer denoise3d</source>
+        <translation type="obsolete">MPlayer denoise3d</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <source>Mplayer Denoise 3D HQ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
         <location line="+1"/>
-        <source>Luma _Temporal strength:</source>
+        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -18675,8 +18736,12 @@
     </message>
     <message>
         <location line="+4"/>
+        <source>MPlayer Denoise 3D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>MPlayer denoise3d</source>
-        <translation type="unfinished">MPlayer denoise3d</translation>
+        <translation type="obsolete">MPlayer denoise3d</translation>
     </message>
     <message>
         <location line="-39"/>
@@ -18688,14 +18753,12 @@
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Chyba čtení hlavičky SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
-        <translation type="unfinished">Není stts tabulka</translation>
+        <translation type="obsolete">Není stts tabulka</translation>
     </message>
 </context>
 <context>
@@ -18868,7 +18931,7 @@
 <context>
     <name>msharpen</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+49"/>
         <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
         <translation type="unfinished">Zaostří obrysy, aniž by zvětšil šum. Od Donalda Grafta.</translation>
     </message>
@@ -18944,7 +19007,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation type="unfinished">Chyba</translation>
     </message>
@@ -19065,7 +19128,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19463,19 +19526,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation type="unfinished"></translation>
     </message>
@@ -19483,12 +19546,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+223"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19498,7 +19561,7 @@
         <translation type="unfinished">Nedávné projekty</translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19563,7 +19626,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+491"/>
+        <location line="+605"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
@@ -19574,7 +19637,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+315"/>
         <source> (%d track(s))</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19722,7 +19785,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation type="unfinished">Částečný</translation>
     </message>
@@ -19732,22 +19795,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation type="unfinished">Přidat</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation type="unfinished">Odstranit</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation type="unfinished">Nastavit</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19757,12 +19820,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20572,12 +20635,11 @@
         <translation type="unfinished">Náhled</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>00:00:00.000</source>
-        <translation type="unfinished">00:00:00.000</translation>
+        <translation type="obsolete">00:00:00.000</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20611,11 +20673,6 @@
         <source>Forward one minute</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>A&amp;utoZoom</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>separateFields</name>
@@ -20917,7 +20974,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation type="unfinished">X11</translation>
     </message>
@@ -21357,7 +21414,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21368,7 +21425,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22908,7 +22965,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22919,7 +22976,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24369,7 +24426,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation type="unfinished"></translation>
     </message>

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

@@ -578,12 +578,12 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location line="-290"/>
+        <location line="-289"/>
         <source>Time:</source>
         <translation>Tid:</translation>
     </message>
@@ -624,7 +624,7 @@
         <translation>000000</translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+172"/>
         <source>&amp;Open...</source>
         <translation>&amp;Åbn...</translation>
     </message>
@@ -702,18 +702,18 @@
         <translation>Ctrl+Alt+C</translation>
     </message>
     <message>
-        <location line="-921"/>
-        <location line="+932"/>
+        <location line="-926"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigation</translation>
     </message>
     <message>
-        <location line="-1567"/>
+        <location line="-1572"/>
         <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1570"/>
+        <location line="+1575"/>
         <source>Ctrl+Alt+N</source>
         <translation>Ctrl+Alt+N</translation>
     </message>
@@ -763,7 +763,7 @@
         <translation>Si&amp;de</translation>
     </message>
     <message>
-        <location line="-1681"/>
+        <location line="-1686"/>
         <source>Codec O&amp;ptions</source>
         <translation>Codec-&amp;valgmuligheder</translation>
     </message>
@@ -873,7 +873,7 @@
         <translation>&amp;Lydstyrke</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation>Lyd&amp;metre</translation>
     </message>
@@ -932,12 +932,12 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+16"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+14"/>
         <source>About Avidemux</source>
         <translation>Om Avidemux</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+93"/>
         <source>Avidemux </source>
         <translation>Avidemux </translation>
     </message>
@@ -947,12 +947,17 @@
         <translation>Multi-platform videoredigering</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+10"/>
+        <source>© 2001 - 2017  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>http://www.avidemux.org</source>
         <translation>http://www.avidemux.org</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+45"/>
         <source>&amp;License</source>
         <translation>&amp;Licens</translation>
     </message>
@@ -962,9 +967,8 @@
         <translation>OK</translation>
     </message>
     <message>
-        <location line="-75"/>
         <source>© 2001 - 2016  Mean</source>
-        <translation>© 2001 - 2016  Mean</translation>
+        <translation type="vanished">© 2001 - 2016  Mean</translation>
     </message>
 </context>
 <context>
@@ -1030,7 +1034,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/gui_save.cpp" line="+434"/>
+        <location filename="../../common/gui_save.cpp" line="+435"/>
         <location line="+10"/>
         <source>Queue</source>
         <translation>Sæt i kø</translation>
@@ -1078,7 +1082,13 @@
         <translation>Afslut</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation>Slet seneste filer og projekter</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Undo</source>
         <translation>Fortryd</translation>
     </message>
@@ -1103,12 +1113,13 @@
         <translation>Indsæt</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Set Marker A</source>
         <translation>Sæt markør A</translation>
     </message>
@@ -1895,17 +1906,22 @@
 Det er nødvendigt for at kunne oprette PSP-kompatibel video.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+186"/>
+        <location filename="../../common/gui_main.cpp" line="+188"/>
         <source>Select script to save</source>
         <translation>Vælg script som skal gemmes</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+67"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <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="+97"/>
         <source>Not coded in this version</source>
         <translation>Ikke kodet i denne version</translation>
     </message>
     <message>
-        <location line="+238"/>
+        <location line="+241"/>
         <source>Are you sure?</source>
         <translation>Er du sikker?</translation>
     </message>
@@ -1963,7 +1979,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation>Noget gik galt (II)</translation>
     </message>
@@ -2071,7 +2087,7 @@
         <translation>_Deringing</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-240"/>
+        <location filename="../../common/gui_save.cpp" line="-241"/>
         <source>Output file</source>
         <translation>Output-fil</translation>
     </message>
@@ -2111,7 +2127,7 @@
         <translation>Vælg den JPEG som skal gemmes</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation>Vælg den fil som skal gemmes</translation>
     </message>
@@ -2545,12 +2561,12 @@
         <translation>Standardport som skal bruges</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-74"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-78"/>
         <source>Redo</source>
         <translation>Omgør</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+13"/>
         <source>Reset Markers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2616,12 +2632,12 @@
         <translation>Kan ikke vælge MPEG-4 SP-codec.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1217"/>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
         <source>Select script/project to run</source>
         <translation>Vælg script/projekt som skal køre</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation>Vælg script som skal køre</translation>
     </message>
@@ -2631,13 +2647,13 @@
         <translation>Vælg script som skal fejlfindes</translation>
     </message>
     <message>
-        <location line="+166"/>
-        <location line="+65"/>
+        <location line="+179"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation>Vælg videofil...</translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-43"/>
         <source>No engine</source>
         <translation>Ingen motor</translation>
     </message>
@@ -2647,7 +2663,7 @@
         <translation>tinyPy-script er ikke aktiveret i denne byg</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Select Video File to Append...</source>
         <translation>Vælg videofil som skal føjes til slutning...</translation>
     </message>
@@ -2662,7 +2678,7 @@
         <translation>Fejl under udklipning.</translation>
     </message>
     <message>
-        <location line="+396"/>
+        <location line="+399"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -2711,12 +2727,12 @@
         <translation>Denne funktion er deaktiveret eller er ikke længere gyldig</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation>Problem ved initialisering af lydenhed</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-366"/>
+        <location filename="../../common/gui_save.cpp" line="-367"/>
         <source>No</source>
         <translation>Nej</translation>
     </message>
@@ -2736,7 +2752,7 @@
         <translation>Kan ikke kontakte database. Har du Job-kontrol kørende?</translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+219"/>
         <source>Function not implemented
 </source>
         <translation>Funktion ikke implementeret
@@ -2968,7 +2984,7 @@
         <translation>Gemmer</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+142"/>
         <source>Too short</source>
         <translation>For kort</translation>
     </message>
@@ -3100,6 +3116,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
@@ -3782,13 +3811,13 @@
     <message>
         <location line="-1"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation>Kontrast</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation>Lysstyrke</translation>
     </message>
@@ -3868,7 +3897,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation>Indlæs den</translation>
     </message>
@@ -3918,36 +3947,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
         <source>Crop</source>
         <translation>Beskær</translation>
     </message>
     <message>
         <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
         <source>Right:</source>
         <translation>Højre:</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation>Øverst:</translation>
     </message>
     <message>
         <location line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
         <source>Reset</source>
         <translation>Nulstil</translation>
     </message>
     <message>
         <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
         <source>Bottom:</source>
         <translation>Nederst:</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation>Venstre:</translation>
     </message>
     <message>
         <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
         <source>Auto Crop</source>
         <translation>Automatisk beskæring</translation>
     </message>
@@ -4379,7 +4415,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
         <source>MPlayer eq2</source>
         <translation>MPlayer eq2</translation>
     </message>
@@ -4388,6 +4424,11 @@
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation>Justér kontrast, lysstyrke, mætning og gamma.</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -5815,7 +5856,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+57"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+60"/>
         <source>Mplayer Hue</source>
         <translation>MPlayer farvetone</translation>
     </message>
@@ -5901,7 +5942,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation>Fjern IVTC-duplet.</translation>
     </message>
@@ -5911,37 +5952,49 @@
         <translation>Fjern de duplikerede billeder som er tilstede efter ivtc.</translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation>_Støj:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation>_Vis:</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation>Fuld</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation>Hurtig</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation>Meget hurtig</translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation>Ændring af _billedhastighed:</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation>DupletFjerner</translation>
     </message>
@@ -6314,7 +6367,7 @@
         <translation>Tilføj logo</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation>Vælg logobillede</translation>
     </message>
@@ -6585,7 +6638,7 @@
         <translation>Reducér støj, blødgør billede, øg komprimeringshed. HQ version.</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+32"/>
         <source>_Spatial luma strength:</source>
         <translation>_Spatial luma styrke:</translation>
     </message>
@@ -6596,14 +6649,26 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>_Temporal luma strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>Luma _Temporal strength:</source>
-        <translation>Luma _temporal styrke:</translation>
+        <source>T_emporal chroma strength:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>MPlayer Denoise 3D HQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Luma _Temporal strength:</source>
+        <translation type="vanished">Luma _temporal styrke:</translation>
+    </message>
+    <message>
         <source>MPlayer denoise3d</source>
-        <translation>MPlayer støjfjerner 3D</translation>
+        <translation type="vanished">MPlayer støjfjerner 3D</translation>
     </message>
 </context>
 <context>
@@ -6635,22 +6700,24 @@
     </message>
     <message>
         <location line="+4"/>
+        <source>MPlayer Denoise 3D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>MPlayer denoise3d</source>
-        <translation>MPlayer støjfjerner 3D</translation>
+        <translation type="vanished">MPlayer støjfjerner 3D</translation>
     </message>
 </context>
 <context>
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>Problem ved læsning af SVQ3-hoveder</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
-        <translation>Ingen STTS-tabel</translation>
+        <translation type="vanished">Ingen STTS-tabel</translation>
     </message>
 </context>
 <context>
@@ -6824,7 +6891,7 @@
 <context>
     <name>msharpen</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+49"/>
         <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
         <translation>Skarpe kanter uden at forstærke støj. Af Donald Graft.</translation>
     </message>
@@ -6880,7 +6947,7 @@
         <translation>Søg</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
@@ -6956,7 +7023,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation>Starttid (ms):</translation>
     </message>
@@ -7214,19 +7281,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation>Alle filer (*.*)</translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation> filer (*.</translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation>Overskriv filen </translation>
     </message>
@@ -7234,12 +7301,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+223"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Ny version tilgængelig&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Udgivet den %2.&lt;br&gt;Du kan downloade den her&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Du kan deaktivere automatisk opdatering i præferencer.&lt;/small&gt;</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>Recent Files</source>
         <translation>Seneste filer</translation>
     </message>
@@ -7249,7 +7316,7 @@
         <translation>Seneste projekter</translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation>Afspil/stop</translation>
     </message>
@@ -7314,7 +7381,7 @@
         <translation>Fremad ét minut</translation>
     </message>
     <message>
-        <location line="+491"/>
+        <location line="+605"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>Programmet er stødt på et fatalt problem
@@ -7326,7 +7393,7 @@
         <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+315"/>
         <source> (%d track(s))</source>
         <translation> (%d spor)</translation>
     </message>
@@ -7474,7 +7541,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation>Delvist</translation>
     </message>
@@ -7484,22 +7551,22 @@
         <translation>Dette filter kan ikke gøre delvist</translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation>Tilføj</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation>Konfigurér</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation>Flyt op</translation>
     </message>
@@ -7509,12 +7576,12 @@
         <translation>Flyt ned</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation>Gør delvist</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation>Indlæs videofiltre..</translation>
     </message>
@@ -8266,12 +8333,11 @@
         <translation>Forhåndsvis</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>00:00:00.000</source>
-        <translation>00:00:00,000</translation>
+        <translation type="vanished">00:00:00,000</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished">Baglæns ét minut</translation>
     </message>
@@ -8305,11 +8371,6 @@
         <source>Forward one minute</source>
         <translation>Fremad ét minut</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>A&amp;utoZoom</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>separateFields</name>
@@ -8570,7 +8631,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation>X11</translation>
     </message>
@@ -8910,7 +8971,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation>Ikke kodet</translation>
     </message>
@@ -8922,7 +8983,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
         <translation>intet</translation>
     </message>
@@ -10254,7 +10315,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation>Ikke kodet</translation>
     </message>
@@ -10266,7 +10327,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
         <translation>ingen</translation>
     </message>
@@ -11674,7 +11735,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation></translation>
     </message>

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

@@ -3443,7 +3443,7 @@
     <message>
         <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
         <source>Attempt to open %s failed!</source>
-        <translation type="unfinished">Versuch %s zu öffnen ist misslungen!</translation>
+        <translation>Der Versuch, %s zu öffnen, ist fehlgeschlagen!</translation>
     </message>
     <message>
         <source>Build Time Map</source>
@@ -5140,7 +5140,7 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation type="unfinished">...</translation>
     </message>
@@ -5157,7 +5157,7 @@
         <translation type="obsolete">/ 0</translation>
     </message>
     <message>
-        <location line="-290"/>
+        <location line="-289"/>
         <source>Time:</source>
         <translation type="unfinished">Zeit:</translation>
     </message>
@@ -5236,7 +5236,7 @@
         <translation type="obsolete">V&amp;orlagen</translation>
     </message>
     <message>
-        <location line="+1540"/>
+        <location line="+1545"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Öffnen...</translation>
     </message>
@@ -5534,7 +5534,7 @@
         <translation type="obsolete">ein Bild zu&amp;rück</translation>
     </message>
     <message>
-        <location line="-1029"/>
+        <location line="-1034"/>
         <source>ms</source>
         <translation type="unfinished">ms</translation>
     </message>
@@ -5753,7 +5753,7 @@
         <translation type="obsolete">Schriftzeichen bearbeiten</translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+279"/>
         <source>&amp;Input</source>
         <translation type="unfinished">&amp;Original</translation>
     </message>
@@ -5773,12 +5773,12 @@
         <translation type="unfinished">&amp;übereinander</translation>
     </message>
     <message>
-        <location line="-511"/>
+        <location line="-516"/>
         <source>Frame type:</source>
         <translation>Frame-Typ:</translation>
     </message>
     <message>
-        <location line="+499"/>
+        <location line="+504"/>
         <source>&amp;Separate</source>
         <translation type="unfinished">&amp;eigenständig</translation>
     </message>
@@ -5803,7 +5803,7 @@
         <translation type="obsolete">Video CD</translation>
     </message>
     <message>
-        <location line="-1743"/>
+        <location line="-1748"/>
         <source>&amp;Toolbars</source>
         <translation type="unfinished">&amp;Werkzeugleisten</translation>
     </message>
@@ -5850,7 +5850,7 @@
         <translation type="obsolete">Pegelanzeige</translation>
     </message>
     <message>
-        <location line="+1032"/>
+        <location line="+1037"/>
         <source>&amp;Codec Options</source>
         <translation type="unfinished">&amp;Codec-Einstellungen</translation>
     </message>
@@ -5874,17 +5874,17 @@
         <translation type="obsolete">Filter bei Wiedergabe anwenden</translation>
     </message>
     <message>
-        <location line="-316"/>
+        <location line="-321"/>
         <source>Play filtered</source>
         <translation type="unfinished">Filter anwenden</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+158"/>
         <source>Open Video</source>
         <translation type="unfinished">Videodatei öffnen</translation>
     </message>
     <message>
-        <location line="-736"/>
+        <location line="-741"/>
         <source>Play [SPACE]</source>
         <translation>Wiedergabe/Stopp [Leertaste]</translation>
     </message>
@@ -5981,12 +5981,12 @@
     </message>
     <message>
         <location line="+553"/>
-        <location line="+932"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-854"/>
+        <location line="-859"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6022,7 +6022,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7140,40 +7140,40 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+16"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+14"/>
         <source>About Avidemux</source>
         <translation type="unfinished">Über Avidemux</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+112"/>
         <source>Multi-platform Video Editor</source>
         <translation type="unfinished">Eine plattformunabhängige Videoschnittsoftware</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+10"/>
+        <source>© 2001 - 2017  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+84"/>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
-        <location line="-56"/>
+        <location line="-65"/>
         <source>http://www.avidemux.org</source>
         <translation type="unfinished">http://www.avidemux.org</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+45"/>
         <source>&amp;License</source>
         <translation type="unfinished">&amp;Lizenz</translation>
     </message>
     <message>
-        <location line="-84"/>
+        <location line="-93"/>
         <source>Avidemux </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+29"/>
-        <source>© 2001 - 2016  Mean</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>addBorder</name>
@@ -7488,7 +7488,7 @@
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="+281"/>
+        <location filename="../../common/gui_save.cpp" line="+282"/>
         <location line="+21"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+403"/>
@@ -7525,7 +7525,7 @@
         <translation>Standardport</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+65"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+80"/>
         <source>Pr&amp;eferences</source>
         <translation>&amp;Einstellungen</translation>
     </message>
@@ -7535,7 +7535,7 @@
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-31"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-46"/>
         <source>Open</source>
         <translation>Ö&amp;ffnen...</translation>
     </message>
@@ -7592,7 +7592,13 @@
         <translation>&amp;Beenden</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation>Verlauf leeren</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Undo</source>
         <translation>&amp;Rückgängig</translation>
     </message>
@@ -7622,12 +7628,13 @@
         <translation>Ei&amp;nfügen</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
         <source>Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Set Marker A</source>
         <translation>Setze Markierung &amp;A</translation>
     </message>
@@ -7795,27 +7802,27 @@
     <message>
         <location line="+2"/>
         <source>Stereo+surround</source>
-        <translation type="unfinished">Stereo+Surround</translation>
+        <translation>Stereo + Surround</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Stereo+center</source>
-        <translation type="unfinished">Stereo+Center</translation>
+        <translation>Stereo + Center</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Stereo+center+surround</source>
-        <translation type="unfinished">Stereo+Center+Surround</translation>
+        <translation>Stereo + Center + Surround</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Stereo front+stereo rear</source>
-        <translation type="unfinished">Stereo vorn+Stero hinten</translation>
+        <translation>Stereo vorn + Stereo hinten</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>5 channels</source>
-        <translation type="unfinished">5 Kanäle</translation>
+        <translation>5 Kanäle</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7835,7 +7842,7 @@
     <message>
         <location line="+7"/>
         <source>Automatic (max -3 dB)</source>
-        <translation type="unfinished">Automatik (max -3dB)</translation>
+        <translation>Automatisch (max -3 dB)</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7988,7 +7995,7 @@
         <translation>Codec-Fehler</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+337"/>
+        <location filename="../../common/gui_main.cpp" line="+352"/>
         <source>Not coded in this version</source>
         <translation>Nicht implementiert in dieser Version</translation>
     </message>
@@ -8001,7 +8008,7 @@
         <translation type="obsolete">AVI-Datei auswählen zum Anhängen...</translation>
     </message>
     <message>
-        <location line="+238"/>
+        <location line="+241"/>
         <source>Are you sure?</source>
         <translation type="unfinished">Sind Sie sicher?</translation>
     </message>
@@ -8059,7 +8066,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Irgendetwas Schlimmes ist passiert (II)</translation>
     </message>
@@ -8153,7 +8160,7 @@
         <translation type="unfinished">_U mit V tauschen (YUV-Farbmodell)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-356"/>
+        <location filename="../../common/gui_save.cpp" line="-357"/>
         <source>Select Workbench to Save</source>
         <translation type="unfinished">Arbeitsbereich als Projekt speichern</translation>
     </message>
@@ -8178,7 +8185,7 @@
         <translation>JPEG-Datei zum Speichern wählen</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation>Datei zum Speichern wählen</translation>
     </message>
@@ -8243,7 +8250,7 @@
     <message>
         <location line="+0"/>
         <source>Saving %s as a BMP file failed.</source>
-        <translation type="unfinished">Das Speichern von %s als BMP-Datei ist misslungen.</translation>
+        <translation>Das Speichern von %s als BMP-Datei ist fehlgeschlagen.</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -8530,8 +8537,8 @@
 </translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1024"/>
-        <location line="+65"/>
+        <location filename="../../common/gui_main.cpp" line="-1030"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation>Videodatei wählen...</translation>
     </message>
@@ -8541,7 +8548,7 @@
         <translation>Videodatei zum Anfügen wählen...</translation>
     </message>
     <message>
-        <location line="+866"/>
+        <location line="+869"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished">Ungültige Liste der Tonspuren</translation>
@@ -8552,12 +8559,12 @@
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1134"/>
+        <location filename="../../common/gui_main.cpp" line="-1154"/>
         <source>Select script/project to run</source>
         <translation>Skript/Projekt zum Ausführen wählen</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation>Skript zum Ausführen wählen</translation>
     </message>
@@ -8567,7 +8574,12 @@
         <translation>Skript zum Debuggen wählen</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+71"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation>Sie sind dabei, die Liste der zuletzt geladenen Videos und Projekte zu leeren. Dies kann nicht rückgängig gemacht werden. Fortfahren?</translation>
+    </message>
+    <message>
+        <location line="+133"/>
         <source>No engine</source>
         <translation>Keine Skript-Engine</translation>
     </message>
@@ -8577,7 +8589,7 @@
         <translation>tinyPy wurde beim Kompilieren nicht aktiviert</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Cutting</source>
         <translation>Schneiden</translation>
     </message>
@@ -8587,7 +8599,7 @@
         <translation>Fehler beim Ausschneiden.</translation>
     </message>
     <message>
-        <location line="+687"/>
+        <location line="+690"/>
         <source>Cannot use that file as audio track</source>
         <translation>Kann diese Datei nicht als Tonspur verwenden</translation>
     </message>
@@ -8626,7 +8638,7 @@
         <location line="+25"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-78"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Änderung</translation>
     </message>
     <message>
         <location line="-3"/>
@@ -8636,7 +8648,7 @@
     <message>
         <location line="+5"/>
         <source>Manual (dB)</source>
-        <translation type="unfinished"></translation>
+        <translation>Manuell (dB)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -8656,7 +8668,7 @@
     <message>
         <location line="+5"/>
         <source>Shift audio:</source>
-        <translation type="unfinished"></translation>
+        <translation>Tonversatz:</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -8776,14 +8788,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-86"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-101"/>
         <location line="+2"/>
         <location line="+2"/>
         <source>-</source>
         <translation type="unfinished">-</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+59"/>
         <source>Build Option</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8886,12 +8898,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1187"/>
+        <location filename="../../common/gui_main.cpp" line="-1206"/>
         <source>Select script to save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+976"/>
+        <location line="+995"/>
         <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
         <source>Something bad happened</source>
         <translation type="unfinished"></translation>
@@ -8907,12 +8919,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">Probleme beim Initialisieren des Audio-Gerätes</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-366"/>
+        <location filename="../../common/gui_save.cpp" line="-367"/>
         <source>No</source>
         <translation type="unfinished">Nein</translation>
     </message>
@@ -8947,7 +8959,7 @@
         <translation type="unfinished">Job zur Warteschlange hinzufügen</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+209"/>
         <source>Function not implemented
 </source>
         <translation type="unfinished"></translation>
@@ -9378,7 +9390,7 @@
         <translation type="unfinished">Speicherfehler</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+142"/>
         <source>Too short</source>
         <translation>Video zu kurz</translation>
     </message>
@@ -9517,6 +9529,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
@@ -10240,13 +10265,13 @@
     <message>
         <location line="-1"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation>Kontrast</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation>Helligkeit</translation>
     </message>
@@ -10326,7 +10351,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation type="unfinished">Lade es</translation>
     </message>
@@ -10376,36 +10401,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
         <source>Crop</source>
         <translation type="unfinished">Zuschneiden</translation>
     </message>
     <message>
         <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
         <source>Right:</source>
         <translation type="unfinished">Rechts:</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation type="unfinished">Oben:</translation>
     </message>
     <message>
         <location line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
         <source>Reset</source>
         <translation type="unfinished">Originalzustand</translation>
     </message>
     <message>
         <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
         <source>Bottom:</source>
         <translation type="unfinished">Unten:</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation type="unfinished">Links:</translation>
     </message>
     <message>
         <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
         <source>Auto Crop</source>
         <translation type="unfinished">Zuschneideautomatik</translation>
     </message>
@@ -10933,7 +10965,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+60"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+65"/>
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation type="unfinished">Kontrast, Helligkeit, Sättigung und Gamma einstellen.</translation>
     </message>
@@ -10942,6 +10974,11 @@
         <source>MPlayer eq2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -12460,7 +12497,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+58"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+61"/>
         <source>Adjust hue and saturation.</source>
         <translation type="unfinished">Farbton und Sättigung einstellen (MPlayer hue Version).</translation>
     </message>
@@ -12550,7 +12587,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation type="unfinished">IVTC-duplizierte Bilder entfernen</translation>
     </message>
@@ -12560,37 +12597,49 @@
         <translation type="unfinished">Nach Inverse Telecine duplizierte Bilder entfernen.</translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation type="unfinished">_Rauschschwelle:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation type="unfinished">_Details ins Video einschließen</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation type="unfinished">Umfassend</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation type="unfinished">Schnell</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation type="unfinished">Sehr schnell</translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">_Suchmethode:</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation type="unfinished">Duplizierte Bilder entfernen</translation>
     </message>
@@ -13143,7 +13192,7 @@
         <translation type="unfinished">Video mit einem halbtransparenten Logo überlagern.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation type="unfinished">Bild als Logo auswählen</translation>
     </message>
@@ -13511,7 +13560,7 @@
 <context>
     <name>mp3d</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+235"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+234"/>
         <source>_Spatial luma strength:</source>
         <translation type="unfinished">Stärke der räumlichen _Luminanz-Filterung:</translation>
     </message>
@@ -13521,12 +13570,26 @@
         <translation type="unfinished">Stärke der räumlichen _Chrominanz-Filterung:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+1"/>
+        <source>_Temporal luma strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>T_emporal chroma strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D HQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>MPlayer denoise3d</source>
-        <translation type="unfinished">MPlayer Deinoise 3D HQ</translation>
+        <translation type="obsolete">MPlayer Deinoise 3D HQ</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-40"/>
         <source>Mplayer Denoise 3D HQ</source>
         <translation type="unfinished">MPlayer Denoise 3D HQ</translation>
     </message>
@@ -13536,10 +13599,8 @@
         <translation type="unfinished">Weichzeichnung und Rauschunterdrückung mit räumlicher und zeitlicher Filterung, HQ-Version. © Daniel Moreno und Baptiste Coudurier.</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location line="+1"/>
         <source>Luma _Temporal strength:</source>
-        <translation type="unfinished">Stärke der _zeitlichen Luminanz-Filterung:</translation>
+        <translation type="obsolete">Stärke der _zeitlichen Luminanz-Filterung:</translation>
     </message>
 </context>
 <context>
@@ -13566,8 +13627,12 @@
     </message>
     <message>
         <location line="+4"/>
+        <source>MPlayer Denoise 3D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>MPlayer denoise3d</source>
-        <translation type="unfinished">MPlayer Denoise 3D</translation>
+        <translation type="obsolete">MPlayer Denoise 3D</translation>
     </message>
     <message>
         <location line="-39"/>
@@ -13579,14 +13644,12 @@
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Problem beim Lesen der SVQ3 Kopfzeilen</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
-        <translation type="unfinished">Keine stts Tabelle</translation>
+        <translation type="obsolete">Keine stts Tabelle</translation>
     </message>
 </context>
 <context>
@@ -13763,7 +13826,7 @@
 <context>
     <name>msharpen</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+49"/>
         <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
         <translation type="unfinished">Kanten betonen ohne Rauschen zu verstärken. © Donald Graft. </translation>
     </message>
@@ -13839,7 +13902,7 @@
         <translation type="unfinished">Navigation</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
@@ -13949,7 +14012,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation type="unfinished">Anfangszeit:</translation>
     </message>
@@ -14311,19 +14374,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation>Alle Dateien (*.*)</translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation>-Dateien (*.</translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation type="unfinished">Überschreiben </translation>
     </message>
@@ -14331,7 +14394,7 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+445"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+441"/>
         <source>Recent Files</source>
         <translation>Zuletzt verwendete &amp;Dateien</translation>
     </message>
@@ -14341,7 +14404,7 @@
         <translation>Zuletzt verwendete &amp;Projekte</translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14406,17 +14469,17 @@
         <translation>Eine Minute vor</translation>
     </message>
     <message>
-        <location line="+1058"/>
+        <location line="+1182"/>
         <source> (%d track(s))</source>
         <translation> (%d Tonspur(en))</translation>
     </message>
     <message>
-        <location line="-1848"/>
+        <location line="-2091"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Neue Version verfügbar&lt;/b&gt;&lt;br&gt;Version %1&lt;br&gt;Freigegeben am %2.&lt;br&gt;Das Update kann hier heruntergeladen werden:&lt;br&gt;&lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt;Sie können automatische Überprüfung auf Updates in Einstellungen deaktivieren.&lt;/small&gt;</translation>
     </message>
     <message>
-        <location line="+1281"/>
+        <location line="+1514"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>Die Anwendung hat ein schwerwiegendes Problem festgestellt.
@@ -14571,7 +14634,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation type="unfinished">Abschnittsweise Anwendung</translation>
     </message>
@@ -14581,22 +14644,22 @@
         <translation>Dieser Filter kann nicht abschnittsweise angewendet werden</translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation>Konfigurieren</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation>Nach oben verschieben</translation>
     </message>
@@ -14606,12 +14669,12 @@
         <translation>Nach unten verschieben</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation>Abschnittsweise anwenden</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15425,12 +15488,7 @@
         <translation type="vanished">Nächstes Bild</translation>
     </message>
     <message>
-        <location line="+48"/>
-        <source>00:00:00.000</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15464,11 +15522,6 @@
         <source>Forward one minute</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>A&amp;utoZoom</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>separateFields</name>
@@ -15771,7 +15824,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16213,7 +16266,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation type="unfinished">Nicht verfügbar</translation>
     </message>
@@ -16224,9 +16277,9 @@
         <translation type="unfinished">Dieser Modus ist nicht implementiert</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Tuning</translation>
     </message>
     <message>
         <location line="+33"/>
@@ -17753,7 +17806,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation type="unfinished">Nicht verfügbar</translation>
     </message>
@@ -17764,14 +17817,14 @@
         <translation type="unfinished">Dieser Modus ist nicht implementiert</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Tuning</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Custom</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzerdefiniert</translation>
     </message>
     <message>
         <location line="+357"/>
@@ -19219,7 +19272,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation type="unfinished"></translation>
     </message>

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

@@ -3916,7 +3916,7 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -3933,7 +3933,7 @@
         <translation type="obsolete">/ 0</translation>
     </message>
     <message>
-        <location line="-290"/>
+        <location line="-289"/>
         <source>Time:</source>
         <translation>Χρόνος:</translation>
     </message>
@@ -4028,7 +4028,7 @@
         <translation type="obsolete">Αυ&amp;τόματο</translation>
     </message>
     <message>
-        <location line="+1540"/>
+        <location line="+1545"/>
         <source>&amp;Open...</source>
         <translation>Άν&amp;οιγμα...</translation>
     </message>
@@ -4315,7 +4315,7 @@
         <translation type="obsolete">Προη&amp;γούμενο Καρέ</translation>
     </message>
     <message>
-        <location line="-1029"/>
+        <location line="-1034"/>
         <source>ms</source>
         <translation>χιλ.τουδευτ.</translation>
     </message>
@@ -4572,7 +4572,7 @@
         <translation type="obsolete">Επεξεργασία των Ανάγλυφων</translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+279"/>
         <source>&amp;Input</source>
         <translation>Δεδομένα Ε&amp;ισόδου</translation>
     </message>
@@ -4592,7 +4592,7 @@
         <translation>&amp;Κορυφή</translation>
     </message>
     <message>
-        <location line="-1636"/>
+        <location line="-1641"/>
         <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4602,7 +4602,7 @@
         <translation>Τύπος στιγμιότυπου:</translation>
     </message>
     <message>
-        <location line="+499"/>
+        <location line="+504"/>
         <source>&amp;Separate</source>
         <translation>Δια&amp;χωρισμός</translation>
     </message>
@@ -4627,7 +4627,7 @@
         <translation type="obsolete">Video CD</translation>
     </message>
     <message>
-        <location line="-1743"/>
+        <location line="-1748"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Γραμμές εργαλείων</translation>
     </message>
@@ -4678,12 +4678,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+932"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Πλοήγηση</translation>
     </message>
     <message>
-        <location line="-857"/>
+        <location line="-862"/>
         <source>Play [SPACE]</source>
         <translation>Αναπαραγωγή [ΔΙΑΣΤΗΜΑ]</translation>
     </message>
@@ -4792,7 +4792,7 @@
         <translation>Έντασ&amp;η</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation>Ήχος και &amp;Μετρητής</translation>
     </message>
@@ -5313,12 +5313,17 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+16"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+14"/>
         <source>About Avidemux</source>
         <translation>Σχετικά με το Avidemux</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="+122"/>
+        <source>© 2001 - 2017  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>http://www.avidemux.org</source>
         <translation>http://www.avidemux.org</translation>
     </message>
@@ -5333,12 +5338,11 @@
         <translation>Πολλαπλών Πλατφορμών Επεξεργαστής Βίντεων</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>© 2001 - 2016  Mean</source>
-        <translation>© 2001 - 2016  Μυιν (Mean)</translation>
+        <translation type="vanished">© 2001 - 2016  Μυιν (Mean)</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+74"/>
         <source>&amp;License</source>
         <translation>&amp;Άδεια</translation>
     </message>
@@ -5670,7 +5674,7 @@
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="+281"/>
+        <location filename="../../common/gui_save.cpp" line="+282"/>
         <location line="+21"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+403"/>
@@ -5709,12 +5713,12 @@
         <translation>Σύνδεση στο avsproxy</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+23"/>
         <source>Copy</source>
         <translation>Αντιγραφή</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+8"/>
         <source>Set Marker A</source>
         <translation>Όρισε το Δείκτη Α΄</translation>
     </message>
@@ -5913,7 +5917,7 @@
         <translation>Σφάλμα Κώδικα</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+337"/>
+        <location filename="../../common/gui_main.cpp" line="+352"/>
         <source>Not coded in this version</source>
         <translation>Δεν κωδικοποιήθηκε σε αυτή την έκδοση</translation>
     </message>
@@ -5926,7 +5930,7 @@
         <translation type="obsolete">Επιλέξτε ένα αρχείο AVI για προσκόλληση...</translation>
     </message>
     <message>
-        <location line="+238"/>
+        <location line="+241"/>
         <source>Are you sure?</source>
         <translation>Στα σίγουρα;</translation>
     </message>
@@ -5985,7 +5989,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation>Κάτι στραβό συνέβη (II)</translation>
     </message>
@@ -6086,7 +6090,7 @@
         <translation>_Εναλλαγή U και V</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-221"/>
+        <location filename="../../common/gui_save.cpp" line="-222"/>
         <source>Select Workbench to Save</source>
         <translation>Επέλεξε Workbench για Αποθήκευση</translation>
     </message>
@@ -6111,7 +6115,7 @@
         <translation>Επέλεξε JPEG για Αποθήκευση</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation>Επέλεξε Αρχείο για να Φορτωθεί</translation>
     </message>
@@ -6613,7 +6617,7 @@
         <translation>Προεπιλεγμένη θύρα για χρήση</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-78"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-93"/>
         <source>Open</source>
         <translation>Άνοιγμα</translation>
     </message>
@@ -6665,7 +6669,13 @@
         <translation>Τερματισμός</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Undo</source>
         <translation>Αναίρεση</translation>
     </message>
@@ -6690,12 +6700,13 @@
         <translation>Επικόλληση</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
         <source>Delete</source>
         <translation>Διαγραφή</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Reset Markers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6914,12 +6925,12 @@
 Είναι απαραίτητο για τη δημιουργία βίντεου συμβατό με PSP.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1217"/>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
         <source>Select script/project to run</source>
         <translation>Επέλεξε σενάριο ή εργασία για τρέξιμο</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation>Επέλεξε σενάριο για τρέξιμο</translation>
     </message>
@@ -6934,13 +6945,18 @@
         <translation>Επέλεξε σενάριο για αποθήκευση</translation>
     </message>
     <message>
-        <location line="+162"/>
-        <location line="+65"/>
+        <location line="+67"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation>Επιλέξτε Αρχείο Βίντεου...</translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-43"/>
         <source>No engine</source>
         <translation>Καμία μηχανή</translation>
     </message>
@@ -6950,7 +6966,7 @@
         <translation>το σενάριο tinyPy δεν είναι ενεργό σε αυτή τη σύνθεση</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Select Video File to Append...</source>
         <translation>Επιλέξτε Αρχείο Βίντεου για Προσκόλληση...</translation>
     </message>
@@ -6965,7 +6981,7 @@
         <translation>Σφάλμα κατά την αποκοπή.</translation>
     </message>
     <message>
-        <location line="+660"/>
+        <location line="+663"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation>Δόθηκε μη έγκυρο ευρετήριο ήχου</translation>
@@ -7011,12 +7027,12 @@
         <translation>Αυτή η λειτουργία είναι απενεργοποιημένη και δεν ισχύει πια</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation>Πρόβλημα στην αρχικοποίηση της συσκευής ήχου</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-390"/>
+        <location filename="../../common/gui_save.cpp" line="-391"/>
         <source>No</source>
         <translation>Όχι</translation>
     </message>
@@ -7051,7 +7067,7 @@
         <translation>Προσθήκη της διαδικασίας στη σειρά του ΚατάστιχουΔιαδικασιών</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+209"/>
         <source>Function not implemented
 </source>
         <translation>Η λειτουργία δεν έχει υλοποιηθεί</translation>
@@ -7517,7 +7533,7 @@
         <translation>Σφάλμα μνήμης</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+142"/>
         <source>Too short</source>
         <translation>Πολύ σύντομο</translation>
     </message>
@@ -7655,6 +7671,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
@@ -8407,7 +8436,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+34"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation>Αντίθεση</translation>
     </message>
@@ -8417,8 +8446,8 @@
         <translation>Προσαρμογή της αντίθεσης, της φωτεινότητας και των χρωμάτων.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8506,7 +8535,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation>Να γίνει φόρτωση</translation>
     </message>
@@ -8562,36 +8591,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
         <source>Crop</source>
         <translation>Περιτομή</translation>
     </message>
     <message>
         <location line="+88"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+88"/>
         <source>Reset</source>
         <translation>Επαναφορά</translation>
     </message>
     <message>
         <location line="-50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-50"/>
         <source>Right:</source>
         <translation>Δεξιά:</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation>Κορυφή:</translation>
     </message>
     <message>
         <location line="+64"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+64"/>
         <source>Bottom:</source>
         <translation>Κάτω:</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation>Αριστερά:</translation>
     </message>
     <message>
         <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
         <source>Auto Crop</source>
         <translation>Αυτόματη Περιτομή</translation>
     </message>
@@ -9072,7 +9108,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
         <source>MPlayer eq2</source>
         <translation>MPlayer ισοσταθμιστής2</translation>
     </message>
@@ -9081,6 +9117,11 @@
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation>Προσαρμογή της αντίθεσης, της φωτεινότητας, της πληρότητας και του γάμμα.</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -10574,7 +10615,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+58"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+61"/>
         <source>Adjust hue and saturation.</source>
         <translation>Προσαρμογή της απόχρωσης και της πληρότητας.</translation>
     </message>
@@ -10668,7 +10709,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation>Απομάκρυνση του διπλότυπου IVTC.</translation>
     </message>
@@ -10678,37 +10719,49 @@
         <translation>Απομάκρυνση των διπλότυπων στιγμιότυπων που υπάρχουν μετά το ivtc.</translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation>_Θόρυβος:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation>_Προβολή:</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation>Πλήρες</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation>Γρήγορο</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation>ΠολύΓρήγορη</translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation>Αλλαγή _ταχύτητας στιγμιότυπων:</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation>ΑπομάκρυνσηΔιπλότυπου</translation>
     </message>
@@ -11232,7 +11285,7 @@
         <translation>Τοποθέτηση ενός λογότυπου πάνω από το βίντεο, με ομαλή μείξη διαφάνειας.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation>Επιλογή Εικόνας Λογότυπου</translation>
     </message>
@@ -11548,12 +11601,11 @@
 <context>
     <name>mp3d</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+242"/>
         <source>MPlayer denoise3d</source>
-        <translation>Αποθορυβοτής3Δ MPlayer</translation>
+        <translation type="vanished">Αποθορυβοτής3Δ MPlayer</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+201"/>
         <source>Mplayer Denoise 3D HQ</source>
         <translation>Αποθορυβοτής MPlayer 3Δ Υψ.Ποι.</translation>
     </message>
@@ -11563,7 +11615,7 @@
         <translation>Μείωση του θορύβου, ομαλοποίηση της εικόνας, αύξηση της συμπιεστικότητας· Υψηλής Ποιότητας Έκδοση.</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+32"/>
         <source>_Spatial luma strength:</source>
         <translation>Έντα_ση χωρικής φωτεινότητας:</translation>
     </message>
@@ -11574,9 +11626,22 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>_Temporal luma strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>T_emporal chroma strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D HQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Luma _Temporal strength:</source>
-        <translation>Χωρική δύναμη Φω_τεινότητας:</translation>
+        <translation type="vanished">Χωρική δύναμη Φω_τεινότητας:</translation>
     </message>
 </context>
 <context>
@@ -11587,12 +11652,11 @@
         <translation>_Χρονική ένταση:</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>MPlayer denoise3d</source>
-        <translation>Αποθορυβοτής3Δ MPlayer</translation>
+        <translation type="vanished">Αποθορυβοτής3Δ MPlayer</translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-35"/>
         <source>Mplayer Denoise 3D</source>
         <translation>Αποθορυβοτής 3Δ MPlayer </translation>
     </message>
@@ -11611,19 +11675,22 @@
         <source>S_patial chroma strength:</source>
         <translation>_Χωρική ένταση χρωματισμού:</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>MPlayer Denoise 3D</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>Πρόβλημα στην ανάγνωση των κεφαλίδων SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
-        <translation>Κανένας πίνακας stts</translation>
+        <translation type="vanished">Κανένας πίνακας stts</translation>
     </message>
 </context>
 <context>
@@ -11821,7 +11888,7 @@
         <translation type="vanished">MSharpen (οξύτητα)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+48"/>
         <source>Msharpen</source>
         <translation>M-οξύτητα</translation>
     </message>
@@ -11877,7 +11944,7 @@
         <translation>Αναζήτηση</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
@@ -11987,7 +12054,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation>Χρόνος έναρξης (χιλ.τουδευτ..):</translation>
     </message>
@@ -12283,19 +12350,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation>Όλα τα αρχεία (*.*)</translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation> αρχεία (*.</translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation>Επανογραφή αρχείου </translation>
     </message>
@@ -12303,12 +12370,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+223"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Διαθέσιμη νέα έκδοση&lt;/b&gt;&lt;br&gt; Έκδοση %1&lt;br&gt;Εκδόθηκε στις %2.&lt;br&gt;Μπορείς να το κατεβάσεις από εδώ&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Μπορείς να απενεργοποιήσεις την αυτόματη ενημέρωση στις προτιμήσεις.&lt;/small&gt;</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>Recent Files</source>
         <translation>Πρόσφατα Αρχεία</translation>
     </message>
@@ -12318,7 +12385,7 @@
         <translation>Πρόσφατες Εργασίες</translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12383,7 +12450,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+491"/>
+        <location line="+605"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>Η εφαρμογή αντιμετώπισε ένα μοιραίο πρόβλημα
@@ -12395,7 +12462,7 @@
         <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+315"/>
         <source> (%d track(s))</source>
         <translation> (%d κανάλι(-α))</translation>
     </message>
@@ -12543,7 +12610,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation>Μερικό</translation>
     </message>
@@ -12553,22 +12620,22 @@
         <translation>Αυτός ε μεταμορφωτής δεν μπορεί να γίνει μερικός</translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation>Προσθήκη</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation>Απομάκρυνση</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation>Ρύθμιση</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation>Μετακίνηση πάνω</translation>
     </message>
@@ -12578,12 +12645,12 @@
         <translation>Μετακίνηση κάτω</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation>Να γίνει μερικό</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation>Φόρτωση μεταμορφωτών βίντεου...</translation>
     </message>
@@ -13367,16 +13434,15 @@
         <translation>Προεπισκόπηση</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>00:00:00.000</source>
-        <translation>00:00:00.000</translation>
+        <translation type="vanished">00:00:00.000</translation>
     </message>
     <message>
         <source>next</source>
         <translation type="vanished">επόμενο</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13410,11 +13476,6 @@
         <source>Forward one minute</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>A&amp;utoZoom</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>separateFields</name>
@@ -13702,7 +13763,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation>X11</translation>
     </message>
@@ -14103,7 +14164,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation>Δεν κωδικοποιήθηκε</translation>
     </message>
@@ -14114,7 +14175,7 @@
         <translation>αυτή η κατάσταση λειτουργίας δεν έχει υλοποιηθεί</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
         <translation>κανένα</translation>
     </message>
@@ -15452,7 +15513,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation>Δεν κωδικοποιήθηκε</translation>
     </message>
@@ -15463,7 +15524,7 @@
         <translation>αυτή η κατάσταση λειτουργίας δεν έχει υλοποιηθεί</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
         <translation>κανένα</translation>
     </message>
@@ -16889,7 +16950,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation>Yadif</translation>
     </message>

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

@@ -564,12 +564,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+932"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-857"/>
+        <location line="-862"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -592,12 +592,12 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-607"/>
+        <location line="-606"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -733,7 +733,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -920,12 +920,12 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+16"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+14"/>
         <source>About Avidemux</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+93"/>
         <source>Avidemux </source>
         <translation type="unfinished"></translation>
     </message>
@@ -936,7 +936,7 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2016  Mean</source>
+        <source>© 2001 - 2017  Mean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -945,7 +945,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+45"/>
         <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1018,7 +1018,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/gui_save.cpp" line="+434"/>
+        <location filename="../../common/gui_save.cpp" line="+435"/>
         <location line="+10"/>
         <source>Queue</source>
         <translation>Qu&amp;eue</translation>
@@ -1044,7 +1044,13 @@
         <translation>&amp;Quit</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Redo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1069,12 +1075,13 @@
         <translation>&amp;Paste</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
         <source>Delete</source>
         <translation type="unfinished">&amp;Delete</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Set Marker A</source>
         <translation>Set Marker &amp;A</translation>
     </message>
@@ -1892,7 +1899,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-89"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-104"/>
         <source>Save as BMP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1914,12 +1921,12 @@
         <translation type="unfinished">Connect &amp;to avsproxy</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+19"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+16"/>
         <source>Pr&amp;eferences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1980,7 +1987,7 @@
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="+1309"/>
+        <location filename="../../common/gui_main.cpp" line="+1330"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
@@ -2080,12 +2087,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1217"/>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2100,18 +2107,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+67"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
         <source>Not coded in this version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
-        <location line="+65"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-43"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2121,7 +2133,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2193,7 +2205,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2323,12 +2335,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-326"/>
+        <location filename="../../common/gui_save.cpp" line="-327"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2388,7 +2400,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2935,7 +2947,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+142"/>
         <source>Too short</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3067,6 +3079,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
@@ -3733,7 +3758,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+34"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3743,8 +3768,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3824,7 +3849,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3870,36 +3895,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4298,7 +4330,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
         <source>MPlayer eq2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4307,6 +4339,11 @@
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -5723,7 +5760,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+57"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+60"/>
         <source>Mplayer Hue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5809,7 +5846,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5819,37 +5856,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6222,7 +6271,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6493,7 +6542,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+32"/>
         <source>_Spatial luma strength:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6504,13 +6553,17 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>_Temporal luma strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>Luma _Temporal strength:</source>
+        <source>T_emporal chroma strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <source>MPlayer denoise3d</source>
+        <source>MPlayer Denoise 3D HQ</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -6543,7 +6596,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <source>MPlayer denoise3d</source>
+        <source>MPlayer Denoise 3D</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -6551,15 +6604,9 @@
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
-        <source>No stts table</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>mp4muxer</name>
@@ -6731,7 +6778,7 @@
 <context>
     <name>msharpen</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+48"/>
         <source>Msharpen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6787,7 +6834,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6863,7 +6910,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7120,19 +7167,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation type="unfinished"></translation>
     </message>
@@ -7140,12 +7187,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+223"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7155,7 +7202,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7220,7 +7267,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+491"/>
+        <location line="+605"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
@@ -7231,7 +7278,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+315"/>
         <source> (%d track(s))</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7379,7 +7426,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7389,22 +7436,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7414,12 +7461,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8168,12 +8215,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
-        <source>00:00:00.000</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8207,11 +8249,6 @@
         <source>Forward one minute</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>A&amp;utoZoom</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>separateFields</name>
@@ -8471,7 +8508,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8809,7 +8846,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8820,7 +8857,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10147,7 +10184,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10158,7 +10195,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11561,7 +11598,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation type="unfinished"></translation>
     </message>

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

@@ -4868,12 +4868,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+932"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-857"/>
+        <location line="-862"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4896,12 +4896,12 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-607"/>
+        <location line="-606"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5006,7 +5006,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5639,17 +5639,17 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+139"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+155"/>
         <source>http://www.avidemux.org</source>
         <translation type="unfinished">http://www.avidemux.org</translation>
     </message>
     <message>
-        <location line="-123"/>
+        <location line="-141"/>
         <source>About Avidemux</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+93"/>
         <source>Avidemux </source>
         <translation type="unfinished"></translation>
     </message>
@@ -5660,11 +5660,11 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2016  Mean</source>
+        <source>© 2001 - 2017  Mean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+64"/>
         <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6024,7 +6024,7 @@
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="+281"/>
+        <location filename="../../common/gui_save.cpp" line="+282"/>
         <location line="+21"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+403"/>
@@ -6051,7 +6051,7 @@
         <translation type="unfinished">Hilos</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+65"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+80"/>
         <source>Pr&amp;eferences</source>
         <translation type="unfinished">Preferencias</translation>
     </message>
@@ -6061,7 +6061,7 @@
         <translation type="unfinished">Preferencias</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-31"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-46"/>
         <source>Open</source>
         <translation type="unfinished">Abrir</translation>
     </message>
@@ -6125,7 +6125,13 @@
         <translation type="unfinished">Salir</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Undo</source>
         <translation type="unfinished">Deshacer</translation>
     </message>
@@ -6155,12 +6161,13 @@
         <translation type="unfinished">Pegar</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
         <source>Delete</source>
         <translation type="unfinished">Borrar</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Set Marker A</source>
         <translation type="unfinished">Establecer Marcador A</translation>
     </message>
@@ -6569,12 +6576,12 @@
 Se necesita para crear video compatible PSP</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+186"/>
+        <location filename="../../common/gui_main.cpp" line="+188"/>
         <source>Select script to save</source>
         <translation type="unfinished">Seleccione script para guardar</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+164"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">Sin codificar en esta versión</translation>
     </message>
@@ -6587,7 +6594,7 @@
         <translation type="obsolete">Seleccionar archivo AVI para anexar...</translation>
     </message>
     <message>
-        <location line="+238"/>
+        <location line="+241"/>
         <source>Are you sure?</source>
         <translation type="unfinished">¿Está seguro?</translation>
     </message>
@@ -6645,7 +6652,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Algo imprevisto pasó (II)</translation>
     </message>
@@ -6761,7 +6768,7 @@
             </translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-375"/>
+        <location filename="../../common/gui_save.cpp" line="-376"/>
         <source>Output file</source>
         <translation type="unfinished">Archivo de Salida</translation>
     </message>
@@ -6801,7 +6808,7 @@
         <translation type="unfinished">Seleccionar JPEG a guardar</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation type="unfinished">Seleccionar archivo a guardar</translation>
     </message>
@@ -7459,12 +7466,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1217"/>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7474,13 +7481,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
-        <location line="+65"/>
+        <location line="+71"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-43"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7490,7 +7502,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7505,7 +7517,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+660"/>
+        <location line="+663"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -7546,12 +7558,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">Problema al inicializar el dispositivo de sonido</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-366"/>
+        <location filename="../../common/gui_save.cpp" line="-367"/>
         <source>No</source>
         <translation type="unfinished">No</translation>
     </message>
@@ -7571,7 +7583,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+219"/>
         <source>Function not implemented
 </source>
         <translation type="unfinished"></translation>
@@ -7876,7 +7888,7 @@
         <translation type="unfinished">Error de memoria</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+142"/>
         <source>Too short</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8008,6 +8020,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
@@ -8761,13 +8786,13 @@
     <message>
         <location line="-1"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation type="unfinished">Contraste</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8847,7 +8872,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation type="unfinished">Cargarlo</translation>
     </message>
@@ -8903,36 +8928,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
         <source>Crop</source>
         <translation type="unfinished">Cortar</translation>
     </message>
     <message>
         <location line="+88"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+88"/>
         <source>Reset</source>
         <translation type="unfinished">Restablecer</translation>
     </message>
     <message>
         <location line="-50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-50"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+64"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+64"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9390,7 +9422,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
         <source>MPlayer eq2</source>
         <translation type="unfinished">MPlayer eq2</translation>
     </message>
@@ -9399,6 +9431,11 @@
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation type="unfinished">Ajustar contraste, brillo, saturación y gamma.</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -10902,7 +10939,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+57"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+60"/>
         <source>Mplayer Hue</source>
         <translation type="unfinished">Mplayer matizado</translation>
     </message>
@@ -10988,7 +11025,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10998,37 +11035,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation type="unfinished">Completo</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation type="unfinished">Rápido</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11575,7 +11624,7 @@
         <translation type="unfinished">Poner un logo sobre el video, con mezclado alfa.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11895,7 +11944,7 @@
         <translation type="unfinished">Reducir ruído, suavizar imagen, aumentar compresibilidad. Versión Alta Calidad.</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+32"/>
         <source>_Spatial luma strength:</source>
         <translation type="unfinished">Intensidad filtrado e_spacial luma:</translation>
     </message>
@@ -11906,17 +11955,29 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>_Temporal luma strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>Luma _Temporal strength:</source>
-        <translation type="unfinished">Intensidad filtrado _temporal luma:</translation>
+        <source>T_emporal chroma strength:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>MPlayer Denoise 3D HQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Luma _Temporal strength:</source>
+        <translation type="obsolete">Intensidad filtrado _temporal luma:</translation>
+    </message>
+    <message>
         <source>MPlayer denoise3d</source>
-        <translation type="unfinished">MPlayer Denoise3D</translation>
+        <translation type="obsolete">MPlayer Denoise3D</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-40"/>
         <source>Mplayer Denoise 3D HQ</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11944,13 +12005,13 @@
         <translation type="unfinished">Intensidad filtrado _temporal:</translation>
     </message>
     <message>
-        <location line="-35"/>
-        <source>Mplayer Denoise 3D</source>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <source>MPlayer denoise3d</source>
+        <location line="-39"/>
+        <source>Mplayer Denoise 3D</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -11958,14 +12019,12 @@
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Hubo un problema leyendo cabeceras SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
-        <translation type="unfinished">Sin tabla stts</translation>
+        <translation type="obsolete">Sin tabla stts</translation>
     </message>
 </context>
 <context>
@@ -12138,7 +12197,7 @@
 <context>
     <name>msharpen</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+49"/>
         <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
         <translation type="unfinished">Aclarar bordes sin amplificar ruído. Por Donald Graft.</translation>
     </message>
@@ -12239,7 +12298,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation type="unfinished">Error</translation>
     </message>
@@ -12364,7 +12423,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12663,19 +12722,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12683,12 +12742,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+223"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>Recent Files</source>
         <translation type="unfinished">Archivos Recientes</translation>
     </message>
@@ -12698,7 +12757,7 @@
         <translation type="unfinished">Proyectos Recientes</translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12763,7 +12822,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+491"/>
+        <location line="+605"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
@@ -12774,7 +12833,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+315"/>
         <source> (%d track(s))</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12922,7 +12981,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation type="unfinished">Parcial</translation>
     </message>
@@ -12932,22 +12991,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation type="unfinished">Añadir</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation type="unfinished">Eliminar</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation type="unfinished">Configurar</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12957,12 +13016,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13775,16 +13834,15 @@
         <translation type="unfinished">Previsualizar</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>00:00:00.000</source>
-        <translation type="unfinished">00:00:00,000</translation>
+        <translation type="obsolete">00:00:00,000</translation>
     </message>
     <message>
         <source>next</source>
         <translation type="obsolete">Siguiente</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13818,11 +13876,6 @@
         <source>Forward one minute</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>A&amp;utoZoom</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>separateFields</name>
@@ -14122,7 +14175,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation type="unfinished">X11</translation>
     </message>
@@ -14642,7 +14695,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14653,7 +14706,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16007,7 +16060,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16018,7 +16071,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17444,7 +17497,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation type="unfinished"></translation>
     </message>

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

@@ -2792,7 +2792,7 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -2809,7 +2809,7 @@
         <translation type="obsolete">/ 0</translation>
     </message>
     <message>
-        <location line="-290"/>
+        <location line="-289"/>
         <source>Time:</source>
         <translation>Denbora:</translation>
     </message>
@@ -2964,7 +2964,7 @@
         <translation type="vanished">Audio Neurgailua</translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+323"/>
         <source>&amp;Open...</source>
         <translation>&amp;Ireki...</translation>
     </message>
@@ -3471,8 +3471,8 @@
         <translation>Ctrl+Alt+C</translation>
     </message>
     <message>
-        <location line="-921"/>
-        <location line="+932"/>
+        <location line="-926"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Nabigazioa</translation>
     </message>
@@ -3598,7 +3598,7 @@
         <translation type="obsolete">Bideo CD-a</translation>
     </message>
     <message>
-        <location line="-1657"/>
+        <location line="-1662"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3713,7 +3713,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4827,12 +4827,12 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+16"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+14"/>
         <source>About Avidemux</source>
         <translation>Avidemux buruz</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+93"/>
         <source>Avidemux </source>
         <translation>Avidemux </translation>
     </message>
@@ -4843,15 +4843,19 @@
     </message>
     <message>
         <location line="+10"/>
+        <source>© 2001 - 2017  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>© 2001 - 2016  Mean</source>
-        <translation type="unfinished">© 2001 - 2010  Mean {2001 ?} {2016 ?}</translation>
+        <translation type="obsolete">© 2001 - 2010  Mean {2001 ?} {2016 ?}</translation>
     </message>
     <message>
         <source>© 2001 - 2012  Mean</source>
         <translation type="vanished">© 2001 - 2012  Mean</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+84"/>
         <source>OK</source>
         <translation>Ongi</translation>
     </message>
@@ -4860,12 +4864,12 @@
         <translation type="obsolete">© 2001 - 2010  Mean</translation>
     </message>
     <message>
-        <location line="-56"/>
+        <location line="-65"/>
         <source>http://www.avidemux.org</source>
         <translation>http://www.avidemux.org</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+45"/>
         <source>&amp;License</source>
         <translation>&amp;Baimena</translation>
     </message>
@@ -5155,7 +5159,7 @@
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-38"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="+281"/>
+        <location filename="../../common/gui_save.cpp" line="+282"/>
         <location line="+21"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+403"/>
@@ -5626,7 +5630,13 @@
         <translation>Utzi</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Undo</source>
         <translation>Desegin</translation>
     </message>
@@ -5656,12 +5666,13 @@
         <translation>Itsatsi</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
         <source>Delete</source>
         <translation>Ezabatu</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Set Marker A</source>
         <translation>Ezarri A Markatzailea</translation>
     </message>
@@ -5878,12 +5889,12 @@
 Hau beharrezkoa da PSP bateragarri bideoa sortzeko.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+186"/>
+        <location filename="../../common/gui_main.cpp" line="+188"/>
         <source>Select script to save</source>
         <translation>Hautatu gordetzeko eskripta</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+164"/>
         <source>Not coded in this version</source>
         <translation>Kodeatu gabe bertsio honetan</translation>
     </message>
@@ -5896,7 +5907,7 @@
         <translation type="vanished">Hautatu Eransteko AVI Agiria...</translation>
     </message>
     <message>
-        <location line="+238"/>
+        <location line="+241"/>
         <source>Are you sure?</source>
         <translation>Zihur zaude?</translation>
     </message>
@@ -5954,7 +5965,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation>Zerbait gaitza gertatu da (II)</translation>
     </message>
@@ -6044,7 +6055,7 @@
         <translation>Frame Hex Iraulketa</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-375"/>
+        <location filename="../../common/gui_save.cpp" line="-376"/>
         <source>Output file</source>
         <translation>Irteera agiria</translation>
     </message>
@@ -6084,7 +6095,7 @@
         <translation>Hautatu Gordetzeko JPEG-a</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation>Hautatu Gordetzeko Agiria</translation>
     </message>
@@ -6636,12 +6647,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1217"/>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6651,13 +6662,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
-        <location line="+65"/>
+        <location line="+71"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-43"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6667,7 +6683,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6682,7 +6698,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+660"/>
+        <location line="+663"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -6723,12 +6739,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">Arazoak audio gailua abiarazterakoan</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-366"/>
+        <location filename="../../common/gui_save.cpp" line="-367"/>
         <source>No</source>
         <translation type="unfinished">Ez</translation>
     </message>
@@ -6748,7 +6764,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+219"/>
         <source>Function not implemented
 </source>
         <translation type="unfinished"></translation>
@@ -6971,7 +6987,7 @@
         <translation type="unfinished">Oroimen akatsa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+142"/>
         <source>Too short</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7103,6 +7119,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
@@ -7867,7 +7896,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+34"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation type="unfinished">Zuribeltztasuna</translation>
     </message>
@@ -7877,8 +7906,8 @@
         <translation>Zehaztu zuribeltztasuna, dizdira eta margoak.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7970,7 +7999,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation>Gertatu hura</translation>
     </message>
@@ -8026,36 +8055,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
         <source>Crop</source>
         <translation type="unfinished">Moztu</translation>
     </message>
     <message>
         <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
         <source>Right:</source>
         <translation type="unfinished">Eskuin:</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation type="unfinished">Goi:</translation>
     </message>
     <message>
         <location line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
         <source>Reset</source>
         <translation type="unfinished">Birrezarri</translation>
     </message>
     <message>
         <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
         <source>Bottom:</source>
         <translation type="unfinished">Behe:</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation type="unfinished">Ezker:</translation>
     </message>
     <message>
         <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
         <source>Auto Crop</source>
         <translation type="unfinished">Berez Moztu</translation>
     </message>
@@ -8581,7 +8617,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
         <source>MPlayer eq2</source>
         <translation>MPlayer eq2</translation>
     </message>
@@ -8590,6 +8626,11 @@
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation>Zehaztu zuribeltztasuna, dizdira, margoasetasuna eta gamma.</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -10111,7 +10152,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+57"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+60"/>
         <source>Mplayer Hue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10197,7 +10238,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10207,37 +10248,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation type="unfinished">_Zarata:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation type="unfinished">Osoa</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">_Frame neurri aldaketa:</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10825,7 +10878,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11153,7 +11206,7 @@
 <context>
     <name>mp3d</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+235"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+234"/>
         <source>_Spatial luma strength:</source>
         <translation type="unfinished">Argitasun _espazial indarra:</translation>
     </message>
@@ -11164,17 +11217,29 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>_Temporal luma strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>Luma _Temporal strength:</source>
-        <translation type="unfinished">Margotasun _Tenporal indarra:</translation>
+        <source>T_emporal chroma strength:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>MPlayer Denoise 3D HQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Luma _Temporal strength:</source>
+        <translation type="obsolete">Margotasun _Tenporal indarra:</translation>
+    </message>
+    <message>
         <source>MPlayer denoise3d</source>
-        <translation type="unfinished">MPlayer zaratakentze 3d</translation>
+        <translation type="obsolete">MPlayer zaratakentze 3d</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-40"/>
         <source>Mplayer Denoise 3D HQ</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11197,12 +11262,11 @@
         <translation type="unfinished">Margotasun es_pazial indarra:</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>MPlayer denoise3d</source>
-        <translation type="unfinished">MPlayer zaratakentze 3d</translation>
+        <translation type="obsolete">MPlayer zaratakentze 3d</translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-34"/>
         <source>Mplayer Denoise 3D</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11216,19 +11280,22 @@
         <source>_Temporal strength:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Arazoak SVQ3 idazburuak irakurtzean</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
-        <translation type="unfinished">Ez dago stts taularik</translation>
+        <translation type="obsolete">Ez dago stts taularik</translation>
     </message>
 </context>
 <context>
@@ -11401,7 +11468,7 @@
 <context>
     <name>msharpen</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+49"/>
         <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
         <translation>Zorroztu hertzak zarata handitu gabe. Donald Graft-ek egina.</translation>
     </message>
@@ -11502,7 +11569,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation type="unfinished">Akatsa</translation>
     </message>
@@ -11627,7 +11694,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11993,19 +12060,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12013,12 +12080,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+223"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>Recent Files</source>
         <translation type="unfinished">Azken Agiriak</translation>
     </message>
@@ -12028,7 +12095,7 @@
         <translation type="unfinished">Azken Egitasmoak</translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12093,7 +12160,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+491"/>
+        <location line="+605"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
@@ -12104,7 +12171,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+315"/>
         <source> (%d track(s))</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12252,7 +12319,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12262,22 +12329,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation type="unfinished">Gehitu</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation type="unfinished">Kendu</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation type="unfinished">Itxuratu</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12287,12 +12354,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13133,12 +13200,11 @@
         <translation type="vanished">hurrengoa</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>00:00:00.000</source>
-        <translation>00:00:00.000</translation>
+        <translation type="vanished">00:00:00.000</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13172,11 +13238,6 @@
         <source>Forward one minute</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>A&amp;utoZoom</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>separateFields</name>
@@ -13478,7 +13539,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation>X11</translation>
     </message>
@@ -14094,7 +14155,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14105,7 +14166,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15597,7 +15658,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15608,7 +15669,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17062,7 +17123,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation type="unfinished"></translation>
     </message>

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

@@ -894,7 +894,7 @@
         <translation>&lt;b&gt;Format de sortie&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+922"/>
+        <location line="+927"/>
         <source>&amp;Open...</source>
         <translation>&amp;Ouvrir...</translation>
     </message>
@@ -967,7 +967,7 @@
         <translation>Cot&amp;e à cote</translation>
     </message>
     <message>
-        <location line="-1781"/>
+        <location line="-1786"/>
         <source>Vi&amp;deo</source>
         <translation></translation>
     </message>
@@ -1024,12 +1024,12 @@
     </message>
     <message>
         <location line="+149"/>
-        <location line="+932"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-857"/>
+        <location line="-862"/>
         <source>Play [SPACE]</source>
         <translation>Lire [SPACE]</translation>
     </message>
@@ -1052,12 +1052,12 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation></translation>
     </message>
     <message>
-        <location line="-607"/>
+        <location line="-606"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished">Image précédente [GAUCHE]</translation>
     </message>
@@ -1193,7 +1193,7 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation></translation>
     </message>
@@ -1339,12 +1339,12 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+16"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+14"/>
         <source>About Avidemux</source>
         <translation>A propos d&apos;Avidemux</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+112"/>
         <source>Multi-platform Video Editor</source>
         <translation>Editeur vidéo multiplateformes</translation>
     </message>
@@ -1355,8 +1355,8 @@
     </message>
     <message>
         <location line="+29"/>
-        <source>© 2001 - 2016  Mean</source>
-        <translation></translation>
+        <source>© 2001 - 2017  Mean</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
@@ -1364,7 +1364,7 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+45"/>
         <source>&amp;License</source>
         <translation></translation>
     </message>
@@ -1733,7 +1733,13 @@
         <translation>Quitter</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Undo</source>
         <translation>Défaire</translation>
     </message>
@@ -1763,12 +1769,13 @@
         <translation>Coller</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Set Marker A</source>
         <translation>Mettre le marqueur A</translation>
     </message>
@@ -2074,12 +2081,12 @@
         <translation type="vanished">Impossible de choisir le codec mpeg4sp.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+186"/>
+        <location filename="../../common/gui_main.cpp" line="+188"/>
         <source>Select script to save</source>
         <translation>Choisir le script à sauvegarder</translation>
     </message>
     <message>
-        <location line="+389"/>
+        <location line="+405"/>
         <source>Are you sure?</source>
         <translation>Etes vous sur ?</translation>
     </message>
@@ -2104,7 +2111,7 @@
         <translation>Plusieurs pistes audio</translation>
     </message>
     <message>
-        <location line="+368"/>
+        <location line="+371"/>
         <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
         <source>Something bad happened</source>
         <translation>Quelque chose d&apos;anormal c&apos;est produit</translation>
@@ -2305,7 +2312,7 @@
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-38"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="+281"/>
+        <location filename="../../common/gui_save.cpp" line="+282"/>
         <location line="+21"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+403"/>
@@ -2510,7 +2517,7 @@
         <translation>Préférences</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-91"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-106"/>
         <location filename="../../common/gui_save.cpp" line="+125"/>
         <location line="+10"/>
         <source>Queue</source>
@@ -2529,7 +2536,7 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+37"/>
         <source>Pr&amp;eferences</source>
         <translation>Préférences</translation>
     </message>
@@ -2613,12 +2620,12 @@
 Il est nécessaire pour créer un fichier compatible PSP</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1217"/>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
         <source>Select script/project to run</source>
         <translation>Choisir un script/projet à lancer</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation>Choisir un script à lancer</translation>
     </message>
@@ -2628,18 +2635,23 @@
         <translation>Choisir un script à débugger</translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+71"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
         <source>Not coded in this version</source>
         <translation>Pas disponible dans cette version</translation>
     </message>
     <message>
         <location line="+11"/>
-        <location line="+65"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation>Choisir un fichier vidéo</translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-43"/>
         <source>No engine</source>
         <translation>Pas de moteur de script</translation>
     </message>
@@ -2649,7 +2661,7 @@
         <translation>tinypy n&apos;est pas disponible. C&apos;est anormal.</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Select Video File to Append...</source>
         <translation>Choisir le fichier à concatener</translation>
     </message>
@@ -2696,7 +2708,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation>Quelque chose d&apos;horrible est arrivé (II)</translation>
     </message>
@@ -2820,12 +2832,12 @@
         <translation>Cette fonction est désactivée ou plus disponible.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation>Le device audio ne peut pas être initialisé</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-326"/>
+        <location filename="../../common/gui_save.cpp" line="-327"/>
         <source>No</source>
         <translation>Non</translation>
     </message>
@@ -2885,7 +2897,7 @@
         <translation>Choisir l&apos;image Jpeg à sauver</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation>Choisir le fichier à écrire</translation>
     </message>
@@ -3430,7 +3442,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+142"/>
         <source>Too short</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3566,6 +3578,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+246"/>
@@ -4265,7 +4290,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+34"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4275,8 +4300,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4356,7 +4381,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4402,36 +4427,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4834,7 +4866,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
         <source>MPlayer eq2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4843,6 +4875,11 @@
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -6281,7 +6318,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+57"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+60"/>
         <source>Mplayer Hue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6367,7 +6404,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6377,37 +6414,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation type="unfinished">Complète</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">Changement i/s</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6862,7 +6911,7 @@
         <translation type="unfinished">Ajouter un logo sur la vidéo, avec transparence</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation type="unfinished">Choisir l&apos;image</translation>
     </message>
@@ -7294,18 +7343,16 @@
 <context>
     <name>mp3d</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+235"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+234"/>
         <source>_Spatial luma strength:</source>
         <translation type="unfinished">Luma, intensité spatiale:</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+1"/>
         <source>Luma _Temporal strength:</source>
-        <translation type="unfinished">Luma, intensité temporelle:</translation>
+        <translation type="obsolete">Luma, intensité temporelle:</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-33"/>
         <source>Mplayer Denoise 3D HQ</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7315,13 +7362,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>S_patial chroma strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>MPlayer denoise3d</source>
+        <location line="+1"/>
+        <source>_Temporal luma strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>T_emporal chroma strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D HQ</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -7354,7 +7411,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>MPlayer denoise3d</source>
+        <source>MPlayer Denoise 3D</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -7362,14 +7419,12 @@
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Impossible de lire l&apos;entete SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
-        <translation type="unfinished">Pas d&apos;element STTS</translation>
+        <translation type="obsolete">Pas d&apos;element STTS</translation>
     </message>
 </context>
 <context>
@@ -7550,7 +7605,7 @@
         <translation type="obsolete">Force:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+48"/>
         <source>Msharpen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7638,7 +7693,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation type="unfinished">Erreur</translation>
     </message>
@@ -7725,7 +7780,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7983,19 +8038,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation>Tous les fichiers (*.*)</translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation> fichiers (*.</translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation>Écraser le fichier </translation>
     </message>
@@ -8003,12 +8058,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+223"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Nouvelle version disponible&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Publié le %2.&lt;br&gt;Vous pouvez la télécharger ici&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Vous pouvez désactiver autoupdate dans les préférences.&lt;/small&gt;</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>Recent Files</source>
         <translation>Fichiers Récents</translation>
     </message>
@@ -8018,7 +8073,7 @@
         <translation>Projets Récents</translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8083,7 +8138,7 @@
         <translation>Avancer d&apos;une minute</translation>
     </message>
     <message>
-        <location line="+491"/>
+        <location line="+605"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>L&apos;application a rencontré un problème fatal
@@ -8095,7 +8150,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+315"/>
         <source> (%d track(s))</source>
         <translation> (%d piste(s))</translation>
     </message>
@@ -8243,7 +8298,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation>Partiel</translation>
     </message>
@@ -8253,22 +8308,22 @@
         <translation>Ce filtre ne peut pas être partiel</translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation>Enlever</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation>Configurer</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation>Déplacer vers le haut</translation>
     </message>
@@ -8278,12 +8333,12 @@
         <translation>Déplacer vers le bas</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation>Faire partiel</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation>Charger les filtres vidéo..</translation>
     </message>
@@ -9051,12 +9106,7 @@
         <translation type="vanished">Suivant</translation>
     </message>
     <message>
-        <location line="+48"/>
-        <source>00:00:00.000</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9090,11 +9140,6 @@
         <source>Forward one minute</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>A&amp;utoZoom</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>separateFields</name>
@@ -9382,7 +9427,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9827,7 +9872,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9838,7 +9883,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11213,7 +11258,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11225,7 +11270,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12672,7 +12717,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation type="unfinished"></translation>
     </message>

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

@@ -645,12 +645,12 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation>…</translation>
     </message>
     <message>
-        <location line="-290"/>
+        <location line="-289"/>
         <source>Time:</source>
         <translation>Idő:</translation>
     </message>
@@ -725,7 +725,7 @@
         <translation>U&amp;grás</translation>
     </message>
     <message>
-        <location line="+1540"/>
+        <location line="+1545"/>
         <source>&amp;Open...</source>
         <translation>M&amp;egnyitás…</translation>
     </message>
@@ -788,7 +788,7 @@
         <translation>F7</translation>
     </message>
     <message>
-        <location line="-1029"/>
+        <location line="-1034"/>
         <source>ms</source>
         <translation>ms</translation>
     </message>
@@ -803,7 +803,7 @@
         <translation>B:</translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+279"/>
         <source>&amp;Input</source>
         <translation>&amp;Bemenet</translation>
     </message>
@@ -823,17 +823,17 @@
         <translation>Fen&amp;t</translation>
     </message>
     <message>
-        <location line="-511"/>
+        <location line="-516"/>
         <source>Frame type:</source>
         <translation>Képkocka típus:</translation>
     </message>
     <message>
-        <location line="+499"/>
+        <location line="+504"/>
         <source>&amp;Separate</source>
         <translation>&amp;Szeparált</translation>
     </message>
     <message>
-        <location line="-1743"/>
+        <location line="-1748"/>
         <source>&amp;Toolbars</source>
         <translation>Eszköz&amp;tárak</translation>
     </message>
@@ -898,7 +898,7 @@
         <translation type="vanished">Hang méter</translation>
     </message>
     <message>
-        <location line="+1032"/>
+        <location line="+1037"/>
         <source>&amp;Codec Options</source>
         <translation>&amp;Kódek beállítás</translation>
     </message>
@@ -908,8 +908,8 @@
         <translation>Alt+Ctrl+C</translation>
     </message>
     <message>
-        <location line="-921"/>
-        <location line="+932"/>
+        <location line="-926"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigálás</translation>
     </message>
@@ -944,7 +944,7 @@
         <translation>Ctrl+Alt+M</translation>
     </message>
     <message>
-        <location line="-1645"/>
+        <location line="-1650"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1059,7 +1059,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1258,32 +1258,37 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+16"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+14"/>
         <source>About Avidemux</source>
         <translation>Avidemux névjegye</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+112"/>
         <source>Multi-platform Video Editor</source>
         <translation>Videószerkesztő több rendszerhez</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+10"/>
+        <source>© 2001 - 2017  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+84"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location line="-56"/>
+        <location line="-65"/>
         <source>http://www.avidemux.org</source>
         <translation>http://www.avidemux.org</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+45"/>
         <source>&amp;License</source>
         <translation>&amp;Licensz</translation>
     </message>
     <message>
-        <location line="-84"/>
+        <location line="-93"/>
         <source>Avidemux </source>
         <translation>Avidemux</translation>
     </message>
@@ -1292,9 +1297,8 @@
         <translation type="vanished">© 2001-2012  Mean</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>© 2001 - 2016  Mean</source>
-        <translation type="unfinished">© 2001-2012  Mean {2001 ?} {2016 ?}</translation>
+        <translation type="obsolete">© 2001-2012  Mean {2001 ?} {2016 ?}</translation>
     </message>
 </context>
 <context>
@@ -1588,7 +1592,7 @@
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="+281"/>
+        <location filename="../../common/gui_save.cpp" line="+282"/>
         <location line="+21"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+403"/>
@@ -1615,7 +1619,7 @@
         <translation>Szálak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+65"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+80"/>
         <source>Pr&amp;eferences</source>
         <translation>Beállítások</translation>
     </message>
@@ -1625,7 +1629,7 @@
         <translation>Beállítások</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-31"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-46"/>
         <source>Open</source>
         <translation>Megnyitás</translation>
     </message>
@@ -1689,7 +1693,13 @@
         <translation>Kilépés</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Undo</source>
         <translation>Visszavonás</translation>
     </message>
@@ -1719,12 +1729,13 @@
         <translation>Beillesztés</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
         <source>Delete</source>
         <translation>Törlés</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Set Marker A</source>
         <translation>»A« jelző beállítása</translation>
     </message>
@@ -2282,12 +2293,12 @@
 A PSP kompatibilis videóhoz szükséges.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+186"/>
+        <location filename="../../common/gui_main.cpp" line="+188"/>
         <source>Select script to save</source>
         <translation>Mentendő szkript választás</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+164"/>
         <source>Not coded in this version</source>
         <translation>Nem kódolt ebben a verzióban</translation>
     </message>
@@ -2300,7 +2311,7 @@
         <translation type="vanished">AVI fájl kiválasztása hozzáfűzésre...</translation>
     </message>
     <message>
-        <location line="+238"/>
+        <location line="+241"/>
         <source>Are you sure?</source>
         <translation>Biztos benne?</translation>
     </message>
@@ -2358,7 +2369,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation>Valami rossz történt (II)</translation>
     </message>
@@ -2473,7 +2484,7 @@
         <translation>Deringing</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-375"/>
+        <location filename="../../common/gui_save.cpp" line="-376"/>
         <source>Output file</source>
         <translation>Kimeneti fájl</translation>
     </message>
@@ -2513,7 +2524,7 @@
         <translation>JPEG kiválasztása mentésre</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation>Fájl kiválasztása mentésre</translation>
     </message>
@@ -3060,12 +3071,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1217"/>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3075,13 +3086,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
-        <location line="+65"/>
+        <location line="+71"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-43"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3091,7 +3107,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3106,7 +3122,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+660"/>
+        <location line="+663"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -3147,12 +3163,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">Probléma a hangeszköz inicializálásánál</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-366"/>
+        <location filename="../../common/gui_save.cpp" line="-367"/>
         <source>No</source>
         <translation type="unfinished">Nem</translation>
     </message>
@@ -3172,7 +3188,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+219"/>
         <source>Function not implemented
 </source>
         <translation type="unfinished"></translation>
@@ -3400,7 +3416,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+142"/>
         <source>Too short</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3532,6 +3548,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
@@ -4262,13 +4291,13 @@
     <message>
         <location line="-1"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation>kontraszt</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4348,7 +4377,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation>Beolvasás</translation>
     </message>
@@ -4404,36 +4433,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4847,7 +4883,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
         <source>MPlayer eq2</source>
         <translation>MPlayer eq2</translation>
     </message>
@@ -4856,6 +4892,11 @@
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation>Kontraszt, fenyero, telitettseg es gamma beallitasa.</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -6315,7 +6356,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+57"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+60"/>
         <source>Mplayer Hue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6401,7 +6442,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6411,37 +6452,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation type="unfinished">Teljes</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation type="unfinished">Gyors</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">Képkockasebesség váltás:</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6838,7 +6891,7 @@
         <translation>A filmen fenn logo lesz alfa keverten.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7135,7 +7188,7 @@
         <translation>Mplayer Denoise 3D HQ</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>_Spatial luma strength:</source>
         <translation>Térbeli fényesség erőssége:</translation>
     </message>
@@ -7146,17 +7199,29 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>_Temporal luma strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>Luma _Temporal strength:</source>
-        <translation>Ideiglenes fényesség erőssége:</translation>
+        <source>T_emporal chroma strength:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>MPlayer Denoise 3D HQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Luma _Temporal strength:</source>
+        <translation type="vanished">Ideiglenes fényesség erőssége:</translation>
+    </message>
+    <message>
         <source>MPlayer denoise3d</source>
-        <translation>MPlayer denoise3d</translation>
+        <translation type="vanished">MPlayer denoise3d</translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-39"/>
         <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7185,8 +7250,12 @@
     </message>
     <message>
         <location line="+4"/>
+        <source>MPlayer Denoise 3D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>MPlayer denoise3d</source>
-        <translation>MPlayer denoise3d</translation>
+        <translation type="vanished">MPlayer denoise3d</translation>
     </message>
     <message>
         <location line="-38"/>
@@ -7198,14 +7267,12 @@
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Probléma a SVQ3 fejek olvasásánál</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
-        <translation type="unfinished">Nincs STTS tábla</translation>
+        <translation type="obsolete">Nincs STTS tábla</translation>
     </message>
 </context>
 <context>
@@ -7398,7 +7465,7 @@
         <translation type="vanished">MSharpen</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+48"/>
         <source>Msharpen</source>
         <translation>MSharpen</translation>
     </message>
@@ -7479,7 +7546,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation type="unfinished">Hiba</translation>
     </message>
@@ -7570,7 +7637,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7827,19 +7894,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation type="unfinished"></translation>
     </message>
@@ -7847,12 +7914,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+223"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>Recent Files</source>
         <translation type="unfinished">Legutóbbi fájlok</translation>
     </message>
@@ -7862,7 +7929,7 @@
         <translation type="unfinished">Legutóbbi projektek</translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7927,7 +7994,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+491"/>
+        <location line="+605"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
@@ -7938,7 +8005,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+315"/>
         <source> (%d track(s))</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8086,7 +8153,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8096,22 +8163,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation type="unfinished">Hozzáadás</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation type="unfinished">Eltávolítás</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation type="unfinished">Beállítás</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8121,12 +8188,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8905,16 +8972,15 @@
         <translation>Előnézet</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>00:00:00.000</source>
-        <translation>00:00:00.000</translation>
+        <translation type="vanished">00:00:00.000</translation>
     </message>
     <message>
         <source>next</source>
         <translation type="vanished">következő</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8948,11 +9014,6 @@
         <source>Forward one minute</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>A&amp;utoZoom</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>separateFields</name>
@@ -9212,7 +9273,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation>X11</translation>
     </message>
@@ -9631,7 +9692,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9642,7 +9703,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11020,7 +11081,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11031,7 +11092,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12438,7 +12499,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation type="unfinished"></translation>
     </message>

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

@@ -5598,7 +5598,7 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -5615,7 +5615,7 @@
         <translation type="obsolete">/ 0</translation>
     </message>
     <message>
-        <location line="-290"/>
+        <location line="-289"/>
         <source>Time:</source>
         <translation>Tempo:</translation>
     </message>
@@ -5710,7 +5710,7 @@
         <translation type="obsolete">A&amp;uto</translation>
     </message>
     <message>
-        <location line="+1540"/>
+        <location line="+1545"/>
         <source>&amp;Open...</source>
         <translation>&amp;Apri...</translation>
     </message>
@@ -6237,12 +6237,12 @@
         <translation>Affiancati ver&amp;ticalmente</translation>
     </message>
     <message>
-        <location line="-511"/>
+        <location line="-516"/>
         <source>Frame type:</source>
         <translation>Tipo di fotogramma:</translation>
     </message>
     <message>
-        <location line="+499"/>
+        <location line="+504"/>
         <source>&amp;Separate</source>
         <translation>&amp;Separati</translation>
     </message>
@@ -6255,7 +6255,7 @@
         <translation type="obsolete">Ctrl+W</translation>
     </message>
     <message>
-        <location line="-1138"/>
+        <location line="-1143"/>
         <source>ms</source>
         <translation>ms</translation>
     </message>
@@ -6367,7 +6367,7 @@
         <translation type="vanished">Audiometro</translation>
     </message>
     <message>
-        <location line="+1032"/>
+        <location line="+1037"/>
         <source>&amp;Codec Options</source>
         <translation>Opzioni &amp;codec</translation>
     </message>
@@ -6377,8 +6377,8 @@
         <translation>Ctrl+Alt+C</translation>
     </message>
     <message>
-        <location line="-921"/>
-        <location line="+932"/>
+        <location line="-926"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigazione</translation>
     </message>
@@ -6413,7 +6413,7 @@
         <translation>Ctrl+Alt+M</translation>
     </message>
     <message>
-        <location line="-1645"/>
+        <location line="-1650"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6528,7 +6528,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8119,12 +8119,12 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+16"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+14"/>
         <source>About Avidemux</source>
         <translation>Informazioni su Avidemux</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+93"/>
         <source>Avidemux </source>
         <translation>Avidemux </translation>
     </message>
@@ -8134,11 +8134,16 @@
         <translation>Video editor multi-piattaforma</translation>
     </message>
     <message>
+        <location line="+10"/>
+        <source>© 2001 - 2017  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>© 2001 - 2012  Mean</source>
         <translation type="vanished">© 2001 - 2012  Mean</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -8147,19 +8152,18 @@
         <translation type="obsolete">© 2001 - 2010  Mean</translation>
     </message>
     <message>
-        <location line="-56"/>
+        <location line="-65"/>
         <source>http://www.avidemux.org</source>
         <translation>http://www.avidemux.org</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+45"/>
         <source>&amp;License</source>
         <translation>&amp;Licenza</translation>
     </message>
     <message>
-        <location line="-55"/>
         <source>© 2001 - 2016  Mean</source>
-        <translation type="unfinished">© 2001 - 2010  Mean {2001 ?} {2016 ?}</translation>
+        <translation type="obsolete">© 2001 - 2010  Mean {2001 ?} {2016 ?}</translation>
     </message>
 </context>
 <context>
@@ -8515,7 +8519,7 @@
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="+281"/>
+        <location filename="../../common/gui_save.cpp" line="+282"/>
         <location line="+21"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+403"/>
@@ -8542,7 +8546,7 @@
         <translation>Threading</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+65"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+80"/>
         <source>Pr&amp;eferences</source>
         <translation>Preferenze</translation>
     </message>
@@ -8552,7 +8556,7 @@
         <translation>Preferenze</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-31"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-46"/>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
@@ -8616,7 +8620,13 @@
         <translation>Esci</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Undo</source>
         <translation>Annulla</translation>
     </message>
@@ -8646,12 +8656,13 @@
         <translation>Incolla</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Set Marker A</source>
         <translation>Imposta segnalibro A</translation>
     </message>
@@ -9172,12 +9183,12 @@
 È necessario per creare un video compatibile con PSP.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+186"/>
+        <location filename="../../common/gui_main.cpp" line="+188"/>
         <source>Select script to save</source>
         <translation>Seleziona lo script da salvare</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+164"/>
         <source>Not coded in this version</source>
         <translation>Non incluso in questa versione</translation>
     </message>
@@ -9190,7 +9201,7 @@
         <translation type="vanished">Seleziona il file video da aggiungere...</translation>
     </message>
     <message>
-        <location line="+238"/>
+        <location line="+241"/>
         <source>Are you sure?</source>
         <translation>Sei sicuro?</translation>
     </message>
@@ -9248,7 +9259,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation>C&apos;è stato qualche errore (II)</translation>
     </message>
@@ -9363,7 +9374,7 @@
         <translation>_Deringing</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-375"/>
+        <location filename="../../common/gui_save.cpp" line="-376"/>
         <source>Output file</source>
         <translation>File in uscita</translation>
     </message>
@@ -9403,7 +9414,7 @@
         <translation>Seleziona il file JPEG da salvare</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation>Seleziona il file da salvare</translation>
     </message>
@@ -9735,12 +9746,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1217"/>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9750,13 +9761,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
-        <location line="+65"/>
+        <location line="+71"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-43"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9766,7 +9782,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9781,7 +9797,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+660"/>
+        <location line="+663"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -9822,12 +9838,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-366"/>
+        <location filename="../../common/gui_save.cpp" line="-367"/>
         <source>No</source>
         <translation type="unfinished">No</translation>
     </message>
@@ -9847,7 +9863,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+219"/>
         <source>Function not implemented
 </source>
         <translation type="unfinished"></translation>
@@ -10270,7 +10286,7 @@
         <translation type="unfinished">Errore di memoria</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+142"/>
         <source>Too short</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10402,6 +10418,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
@@ -11142,7 +11171,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+34"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation type="unfinished">Contrasto</translation>
     </message>
@@ -11152,8 +11181,8 @@
         <translation type="unfinished">Regola contrasto, luminosità e colori.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11245,7 +11274,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation type="unfinished">Carica</translation>
     </message>
@@ -11293,36 +11322,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
         <source>Crop</source>
         <translation type="unfinished">Crop</translation>
     </message>
     <message>
         <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
         <source>Right:</source>
         <translation type="unfinished">Destra:</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation type="unfinished">Alto:</translation>
     </message>
     <message>
         <location line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
         <source>Reset</source>
         <translation type="unfinished">Azzera</translation>
     </message>
     <message>
         <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
         <source>Bottom:</source>
         <translation type="unfinished">Basso:</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation type="unfinished">Sinistra:</translation>
     </message>
     <message>
         <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
         <source>Auto Crop</source>
         <translation type="unfinished">Crop automatico</translation>
     </message>
@@ -11848,7 +11884,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
         <source>MPlayer eq2</source>
         <translation type="unfinished">MPlayer eq2</translation>
     </message>
@@ -11857,6 +11893,11 @@
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation type="unfinished">Regola contrasto, luminosità, saturazione e gamma.</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -13383,7 +13424,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+58"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+61"/>
         <source>Adjust hue and saturation.</source>
         <translation type="unfinished">Regola tonalità e saturazione.</translation>
     </message>
@@ -13469,7 +13510,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13479,37 +13520,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation type="unfinished">_Rumore:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation type="unfinished">Completo</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation type="unfinished">Veloce</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14097,7 +14150,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14473,7 +14526,7 @@
 <context>
     <name>mp3d</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+235"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+234"/>
         <source>_Spatial luma strength:</source>
         <translation type="unfinished">Intensità luma _spaziale:</translation>
     </message>
@@ -14484,17 +14537,29 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>_Temporal luma strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>Luma _Temporal strength:</source>
-        <translation type="unfinished">Intensità luma _temporale:</translation>
+        <source>T_emporal chroma strength:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
+        <source>MPlayer Denoise 3D HQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Luma _Temporal strength:</source>
+        <translation type="obsolete">Intensità luma _temporale:</translation>
+    </message>
+    <message>
         <source>MPlayer denoise3d</source>
-        <translation type="unfinished">MPlayer denoise3d</translation>
+        <translation type="obsolete">MPlayer denoise3d</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-40"/>
         <source>Mplayer Denoise 3D HQ</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14528,8 +14593,12 @@
     </message>
     <message>
         <location line="+4"/>
+        <source>MPlayer Denoise 3D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>MPlayer denoise3d</source>
-        <translation type="unfinished">MPlayer denoise3d</translation>
+        <translation type="obsolete">MPlayer denoise3d</translation>
     </message>
     <message>
         <location line="-39"/>
@@ -14541,14 +14610,12 @@
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Problema di lettura delle intestazioni SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
-        <translation type="unfinished">Nessuna tabbela stts</translation>
+        <translation type="obsolete">Nessuna tabbela stts</translation>
     </message>
 </context>
 <context>
@@ -14721,7 +14788,7 @@
 <context>
     <name>msharpen</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+49"/>
         <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
         <translation type="unfinished">Rende nitidi i margini senza amplificare il rumore. Di Donald Graft.</translation>
     </message>
@@ -14829,7 +14896,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation type="unfinished">Errore</translation>
     </message>
@@ -14954,7 +15021,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15336,19 +15403,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation type="unfinished"></translation>
     </message>
@@ -15356,12 +15423,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+223"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>Recent Files</source>
         <translation type="unfinished">File recenti</translation>
     </message>
@@ -15371,7 +15438,7 @@
         <translation type="unfinished">Progetti recenti</translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15436,7 +15503,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+491"/>
+        <location line="+605"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
@@ -15447,7 +15514,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+315"/>
         <source> (%d track(s))</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16050,7 +16117,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation type="unfinished">Parziale</translation>
     </message>
@@ -16060,22 +16127,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation type="unfinished">Aggiungi</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation type="unfinished">Rimuovi</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation type="unfinished">Configura</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16085,12 +16152,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16927,16 +16994,15 @@
         <translation>Anteprima</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>00:00:00.000</source>
-        <translation>00:00:00.000</translation>
+        <translation type="vanished">00:00:00.000</translation>
     </message>
     <message>
         <source>next</source>
         <translation type="vanished">Avanti</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16970,11 +17036,6 @@
         <source>Forward one minute</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>A&amp;utoZoom</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>separateFields</name>
@@ -17276,7 +17337,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17907,7 +17968,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17918,7 +17979,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19450,7 +19511,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19461,7 +19522,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20895,7 +20956,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation type="unfinished"></translation>
     </message>

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

@@ -3614,12 +3614,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+932"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-857"/>
+        <location line="-862"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3642,12 +3642,12 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-607"/>
+        <location line="-606"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3752,7 +3752,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4341,17 +4341,17 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+139"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+155"/>
         <source>http://www.avidemux.org</source>
         <translation type="unfinished">http://www.avidemux.org</translation>
     </message>
     <message>
-        <location line="-123"/>
+        <location line="-141"/>
         <source>About Avidemux</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+93"/>
         <source>Avidemux </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4362,11 +4362,11 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2016  Mean</source>
+        <source>© 2001 - 2017  Mean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+64"/>
         <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4737,7 +4737,7 @@
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="+281"/>
+        <location filename="../../common/gui_save.cpp" line="+282"/>
         <location line="+21"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+403"/>
@@ -4777,12 +4777,12 @@
         <translation type="unfinished">-</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+22"/>
         <source>Copy</source>
         <translation type="unfinished">コピー</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <location line="+8"/>
         <source>Filters</source>
         <translation type="unfinished">フィルタ</translation>
@@ -4951,7 +4951,7 @@
         <translation type="unfinished">コーデックエラー</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+337"/>
+        <location filename="../../common/gui_main.cpp" line="+352"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">このバージョンではコード化されていません</translation>
     </message>
@@ -4964,7 +4964,7 @@
         <translation type="obsolete">追加するAVIファイルの選択...</translation>
     </message>
     <message>
-        <location line="+238"/>
+        <location line="+241"/>
         <source>Are you sure?</source>
         <translation type="unfinished">本当ですか ?</translation>
     </message>
@@ -5022,7 +5022,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">何か悪いことが起きました (II)</translation>
     </message>
@@ -5127,7 +5127,7 @@
         <translation type="unfinished">デリング(_D)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-221"/>
+        <location filename="../../common/gui_save.cpp" line="-222"/>
         <source>Select Workbench to Save</source>
         <translation type="unfinished">保存するプロジェクトの選択</translation>
     </message>
@@ -5152,7 +5152,7 @@
         <translation type="unfinished">保存するJPEGの選択</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation type="unfinished">保存するファイルの選択</translation>
     </message>
@@ -5610,7 +5610,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-50"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-65"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5667,7 +5667,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5692,12 +5698,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Set Marker A</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5935,12 +5942,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1217"/>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5955,13 +5962,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
-        <location line="+65"/>
+        <location line="+67"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-43"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5971,7 +5983,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5986,7 +5998,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+660"/>
+        <location line="+663"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -6027,12 +6039,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">音声デバイス初期化トラブル</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-390"/>
+        <location filename="../../common/gui_save.cpp" line="-391"/>
         <source>No</source>
         <translation type="unfinished">いいえ</translation>
     </message>
@@ -6067,7 +6079,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+209"/>
         <source>Function not implemented
 </source>
         <translation type="unfinished"></translation>
@@ -6531,7 +6543,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+142"/>
         <source>Too short</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6663,6 +6675,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
@@ -7346,7 +7371,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+34"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation type="unfinished">コントラスト</translation>
     </message>
@@ -7356,8 +7381,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7437,7 +7462,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation type="unfinished">それを読込む</translation>
     </message>
@@ -7485,36 +7510,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+102"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+102"/>
         <source>Reset</source>
         <translation type="unfinished">リセット</translation>
     </message>
     <message>
         <location line="-88"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-88"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+64"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+64"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7955,7 +7987,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
         <source>MPlayer eq2</source>
         <translation type="unfinished">
             </translation>
@@ -7965,6 +7997,11 @@
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -9447,7 +9484,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+57"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+60"/>
         <source>Mplayer Hue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9533,7 +9570,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9543,38 +9580,50 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation type="unfinished">ノイズ(_N):</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation type="unfinished">
             </translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation type="unfinished">高速</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">フレームレート変換(_F):</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10088,7 +10137,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10372,7 +10421,7 @@
 <context>
     <name>mp3d</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+235"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+234"/>
         <source>_Spatial luma strength:</source>
         <translation type="unfinished">空間的輝度の強さ(_S):</translation>
     </message>
@@ -10382,24 +10431,28 @@
         <translation type="unfinished">空間的彩度の強さ(_P):</translation>
     </message>
     <message>
-        <location line="-35"/>
-        <source>Mplayer Denoise 3D HQ</source>
+        <location line="+1"/>
+        <source>_Temporal luma strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
+        <source>T_emporal chroma strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location line="+1"/>
-        <source>Luma _Temporal strength:</source>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D HQ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>MPlayer denoise3d</source>
+        <location line="-40"/>
+        <source>Mplayer Denoise 3D HQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10421,18 +10474,18 @@
         <translation type="unfinished">時間的強さ(_T):</translation>
     </message>
     <message>
-        <location line="-35"/>
-        <source>Mplayer Denoise 3D</source>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Reduce noise, smooth image, increase compressibility.</source>
+        <location line="-39"/>
+        <source>Mplayer Denoise 3D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>MPlayer denoise3d</source>
+        <location line="+1"/>
+        <source>Reduce noise, smooth image, increase compressibility.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10440,14 +10493,12 @@
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">SVQ3ヘッダ読取に問題</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
-        <translation type="unfinished">stts テーブルがない</translation>
+        <translation type="obsolete">stts テーブルがない</translation>
     </message>
 </context>
 <context>
@@ -10636,7 +10687,7 @@
         <translation type="obsolete">強さ(_S):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+48"/>
         <source>Msharpen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10692,7 +10743,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation type="unfinished">エラー</translation>
     </message>
@@ -10802,7 +10853,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11101,19 +11152,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11121,12 +11172,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+223"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11136,7 +11187,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11201,7 +11252,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+491"/>
+        <location line="+605"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
@@ -11212,7 +11263,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+315"/>
         <source> (%d track(s))</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11361,7 +11412,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation type="unfinished">部分適用</translation>
     </message>
@@ -11371,22 +11422,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation type="unfinished">構成</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11396,12 +11447,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12186,12 +12237,11 @@
         <translation type="unfinished">プレビュー</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>00:00:00.000</source>
-        <translation type="unfinished">00:00:00.000</translation>
+        <translation type="obsolete">00:00:00.000</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12225,11 +12275,6 @@
         <source>Forward one minute</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>A&amp;utoZoom</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>separateFields</name>
@@ -12512,7 +12557,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12939,7 +12984,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12950,7 +12995,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14283,7 +14328,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14294,7 +14339,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15701,7 +15746,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation type="unfinished"></translation>
     </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/avidemux_ko.ts Added

@@ -0,0 +1,11750 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="ko_KR">
+<context>
+    <name>ADM_Composer</name>
+    <message>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+193"/>
+        <source>Cannot find a demuxer for %s</source>
+        <translation>%s용 디먹서를 찾을 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Attempt to open %s failed!</source>
+        <translation>%s 열기 실패!</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
+1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
+2.) concatenate them together</source>
+        <translation>아직 다른 비디오 해상도를 믹싱할 수 없습니다. 나중에 부분적인 비디오 필터를 사용해도 이 문제를 해결할 수 없습니다. 다른 해결책은:
+1) 각 스트림을 같은 해상도로 &quot;크기조절&quot; / &quot;경계 추가&quot; / &quot;잘라내기&quot;를 한 후
+2) 작업한 것들을 함께 연결시키면 됩니다 </translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+51"/>
+        <source>Checking if timestamps are valid..</source>
+        <translation>타임스탬프가 유효한지 검사 중..</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Some timing information are incorrect.
+It happens with some capture software.
+If you re encode video we should drop these informations,
+ else it will cause dropped frame/jerky video.
+If you just copy the video without reencoding,
+ you should keep them.
+Drop timing informations ?</source>
+        <translation>몇몇 타이밍 정보가 부정확합니다.
+이것은 일부 캡처 소프트웨어에서 발생합니다.
+비디오를 재인코딩시 이 정보를 빼야 합니다.
+ 아니면 비디오가 절룩거리거나 프레임 드랍이 발생할 것입니다.
+비디오를 재인코딩 없이 복사만 하는 경우,
+ 그 정보는 유지해야 합니다.
+타이밍 정보를 뺄까요? </translation>
+    </message>
+</context>
+<context>
+    <name>CalculatorDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="+16"/>
+        <source>Calculator</source>
+        <translation>계산기</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Target</source>
+        <translation>대상</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>00:00:00</source>
+        <translation>00:00:00</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>AVI</source>
+        <translation>AVI</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>OGM</source>
+        <translation>OGM</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MPEG</source>
+        <translation>MPEG</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Medium:</source>
+        <translation>매체:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Format:</source>
+        <translation>형식:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration:</source>
+        <translation>시간:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>1 x 80 minute CD</source>
+        <translation>1 x 80 분 CD</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2 x 80 minute CD</source>
+        <translation>2 x 80 분 CD</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1 x 74 minute CD</source>
+        <translation>1 x 74 분 CD</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2 x 74 minute CD</source>
+        <translation>2 x 74 분 CD</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>DVD-5</source>
+        <translation>DVD-5</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Custom</source>
+        <translation>사용자 정의</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Custom Size:</source>
+        <translation>사용자 크기:</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <location line="+198"/>
+        <location line="+27"/>
+        <location line="+34"/>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <location line="-217"/>
+        <source>Audio Bitrate</source>
+        <translation>오디오 비트레이트</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Track 1:</source>
+        <translation>트랙 1:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location line="+37"/>
+        <location line="+232"/>
+        <source>kbps</source>
+        <translation>kbps</translation>
+    </message>
+    <message>
+        <location line="-246"/>
+        <source>Track 2:</source>
+        <translation>트랙 2:</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Result</source>
+        <translation>결과</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Audio Size:</source>
+        <translation>오디오 크기:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Video Size:</source>
+        <translation>비디오 크기:</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+27"/>
+        <location line="+34"/>
+        <location line="+68"/>
+        <location line="+18"/>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <location line="-101"/>
+        <source>Total Size:</source>
+        <translation>전체 크기:</translation>
+    </message>
+    <message>
+        <location line="+120"/>
+        <source>Bits Per Pixel:</source>
+        <translation>픽셀당 비트:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Video Bitrate:</source>
+        <translation>비디오 비트레이트:</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <source>OK</source>
+        <translation>확인</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation>취소</translation>
+    </message>
+</context>
+<context>
+    <name>Dialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+64"/>
+        <source>Indexing</source>
+        <translation>인덱싱</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Time Left : Infinity</source>
+        <translation>남은 시간 : 무한</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source># Images :</source>
+        <translation># 이미지 :</translation>
+    </message>
+</context>
+<context>
+    <name>DialogAudioTracks</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="+14"/>
+        <source>Audio Tracks Configuration</source>
+        <translation>오디오 트랙 설정</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Track 1</source>
+        <translation>트랙 1</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+41"/>
+        <location line="+41"/>
+        <location line="+41"/>
+        <source>Enabled</source>
+        <translation>활성화됨</translation>
+    </message>
+    <message>
+        <location line="-107"/>
+        <location line="+41"/>
+        <location line="+41"/>
+        <location line="+41"/>
+        <source>Configure</source>
+        <translation>설정</translation>
+    </message>
+    <message>
+        <location line="-116"/>
+        <location line="+41"/>
+        <location line="+41"/>
+        <location line="+41"/>
+        <source>Filters</source>
+        <translation>필터&amp;Filters</translation>
+    </message>
+    <message>
+        <location line="-112"/>
+        <source>Track 2</source>
+        <translation>트랙 2</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Track 3</source>
+        <translation>트랙 3</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Track 4</source>
+        <translation>트랙 4</translation>
+    </message>
+</context>
+<context>
+    <name>DialogOcr</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="+13"/>
+        <source>Dialog</source>
+        <translation>대화</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Calibrate</source>
+        <translation>캘리브레이트</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Skip All</source>
+        <translation>모두 건너뛰기</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Skip Glyph</source>
+        <translation>글리프 건너뛰기</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Ignore</source>
+        <translation>무시</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Ok</source>
+        <translation>확인</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Close</source>
+        <translation>닫기</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>00:00:00/000</source>
+        <translation>00:00:00/000</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Timecode:</source>
+        <translation>타임코드:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>0/0</source>
+        <translation>0/0</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Nb Lines :</source>
+        <translation>Nb 라인 :</translation>
+    </message>
+</context>
+<context>
+    <name>DialogProcessing</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+14"/>
+        <source>Dialog</source>
+        <translation>대화</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Cancel</source>
+        <translation>취소</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TimeLeft</source>
+        <translation>남은시간</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>00:00:00</source>
+        <translation>00:00:00</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>ProcessImages</source>
+        <translation>이미지처리</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Speed</source>
+        <translation>속도</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>0 fps</source>
+        <translation>0 fps</translation>
+    </message>
+</context>
+<context>
+    <name>DialogProgress</name>
+    <message>
+        <location filename="../ADM_jobs/src/uiProgress.ui" line="+17"/>
+        <source>Progress</source>
+        <translation>진행</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Current job</source>
+        <translation>현재 작업</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>1/1</source>
+        <translation>1/1</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>File being written </source>
+        <translation>파일 쓰는 중</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>FDK-AAC</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp" line="+433"/>
+        <source>_Profile::</source>
+        <translation>_프로파일::</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>_Bitrate:</source>
+        <translation>_비트레이트:</translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <source>SBR enabled</source>
+        <translation>SBR 활성화됨</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+7"/>
+        <source>After burner</source>
+        <translation>애프터 버너</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <location line="+5"/>
+        <source>FDK-AAC Configuration</source>
+        <translation>FDK-AAC 설정</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+151"/>
+        <source>&amp;Auto</source>
+        <translation>자동(&amp;U)</translation>
+    </message>
+    <message>
+        <location line="-136"/>
+        <source>Avidemux</source>
+        <translation>Avidemux</translation>
+    </message>
+    <message>
+        <location line="+105"/>
+        <source>&amp;Help</source>
+        <translation>도움말(&amp;H)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vi&amp;deo</source>
+        <translation>비디오(&amp;D)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Edit</source>
+        <translation>편집(&amp;E)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;View</source>
+        <translation>보기(&amp;V)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Toolbars</source>
+        <translation>도구바(&amp;T)</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>&amp;Custom</source>
+        <translation>사용자(&amp;C)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Go</source>
+        <translation>이동(&amp;G)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Tools</source>
+        <translation>도구(&amp;T)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Audio</source>
+        <translation>오디오(&amp;A)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;File</source>
+        <translation>파일(&amp;F)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Recent</source>
+        <translation>최근(&amp;R)</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Codec O&amp;ptions</source>
+        <translation>코덱 옵션(&amp;P)</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
+        <translation>&lt;b&gt;비디오 디코더&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+75"/>
+        <location line="+7"/>
+        <source>XXXX</source>
+        <translation>XXXX</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+142"/>
+        <location line="+169"/>
+        <location line="+181"/>
+        <source>Configure</source>
+        <translation>설정</translation>
+    </message>
+    <message>
+        <location line="-453"/>
+        <source>&lt;b&gt;Video Output&lt;/b&gt;</source>
+        <translation>&lt;b&gt;비디오 출력&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <location line="+169"/>
+        <source>Copy</source>
+        <translation>복사</translation>
+    </message>
+    <message>
+        <location line="-136"/>
+        <location line="+169"/>
+        <source>Filters</source>
+        <translation>필터</translation>
+    </message>
+    <message>
+        <location line="-112"/>
+        <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
+        <translation>&lt;b&gt;오디오 출력&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>   (0 track(s))</source>
+        <translation>   (0 트랙)</translation>
+    </message>
+    <message>
+        <location line="+129"/>
+        <source>&amp;Shift:</source>
+        <translation>이동(&amp;S):</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>ms</source>
+        <translation>ms</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
+        <translation>&lt;b&gt;출력 형식&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+114"/>
+        <location line="+937"/>
+        <source>&amp;Navigation</source>
+        <translation>탐색(&amp;N)</translation>
+    </message>
+    <message>
+        <location line="-862"/>
+        <source>Play [SPACE]</source>
+        <translation>재생 [SPACE]</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Play</source>
+        <translation>재생</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+26"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+23"/>
+        <location line="+26"/>
+        <location line="+344"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location line="-606"/>
+        <source>Go to previous frame [LEFT]</source>
+        <translation>이전 프레임으로 가기 [LEFT]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next frame [RIGHT]</source>
+        <translation>다음 프레임으로 가기 [RIGHT]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to previous keyframe [DOWN]</source>
+        <translation>이전 키프레임으로 가기 [DOWN]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next keyframe [UP]</source>
+        <translation>다음 키프레임으로 가기 [UP]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Set start marker [CTRL+PAGEUP]</source>
+        <translation>시작 표시 설정 [CTRL+PAGEUP]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Set end marker [CTRL+PAGEDOWN]</source>
+        <translation>끝 표시 설정 [CTRL+PAGEDOWN]</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Search previous black frame</source>
+        <translation>이전 검정 프레임 찾기</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Search next black frame</source>
+        <translation>다음 검정 프레임 찾기</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to first frame [HOME]</source>
+        <translation>첫 번째 프레임으로 가기 [HOME]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to last frame [END]</source>
+        <translation>마지막 프레임으로 가기 [END]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Backward one minute [CTRL+DOWN]</source>
+        <translation>1분 뒤로 [CTRL+DOWN]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Forward one minute [CTRL+UP]</source>
+        <translation>1분 앞으로 [CTRL+UP]</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Forward one minute</source>
+        <translation>1분 앞으로</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Time:</source>
+        <translation>시간:</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>00:00:00.000</source>
+        <translation>00:00:00.000</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>/ 00:00:00.000</source>
+        <translation>/ 00:00:00.000</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Frame type:</source>
+        <translation>프레임 형식:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>?</source>
+        <translation>?</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Se&amp;lection</source>
+        <translation>선택(&amp;L)</translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>A:</source>
+        <translation>A:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>B:</source>
+        <translation>B:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Go to marker A [PAGE UP]</source>
+        <translation>표시 A로 가기 [PAGE UP]</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+10"/>
+        <source>000000</source>
+        <translation>000000</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Go to Marker B [PAGE DOWN]</source>
+        <translation>표시 B로 가기 [PAGE DOWN]</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Display output video on playback</source>
+        <translation>재생시 출력 비디오 표시하기</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Play filtered</source>
+        <translation>처리 후 재생</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Vol&amp;ume</source>
+        <translation>볼륨(&amp;M)</translation>
+    </message>
+    <message>
+        <location line="+89"/>
+        <source>Audio &amp;Metre</source>
+        <translation>오디오 미터(&amp;M)</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>&amp;Open...</source>
+        <translation>열기(&amp;O)...</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Open Video</source>
+        <translation>비디오 열기</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;Information...</source>
+        <translation>정보(&amp;I)...</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Alt+Return</source>
+        <translation>Alt+Return</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save &amp;Video...</source>
+        <translation>비디오 저장(&amp;V)...</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+3"/>
+        <source>Save Video</source>
+        <translation>비디오 저장하기</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;Load/Run Project...</source>
+        <translation>프로젝트 불러오기/실행(&amp;L)...</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+3"/>
+        <source>Load/Run Project</source>
+        <translation>프로젝트 불러오기/실행하기</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save &amp;Project</source>
+        <translation>프로젝트 저장(&amp;P)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+3"/>
+        <source>Save Project</source>
+        <translation>프로젝트 저장하기</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;Calculator...</source>
+        <translation>계산기(&amp;C)...</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>F7</source>
+        <translation>F7</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>&amp;Input</source>
+        <translation>입력(&amp;I)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;Output</source>
+        <translation>출력(&amp;O)</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>&amp;Codec Options</source>
+        <translation>코덱 옵션(&amp;C)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+C</source>
+        <translation>Ctrl+Alt+C</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>&amp;Selection</source>
+        <translation>선택(&amp;S)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>&amp;Volume</source>
+        <translation>볼륨(&amp;V)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+V</source>
+        <translation>Ctrl+Alt+V</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>&amp;Audio Metre</source>
+        <translation>오디오 미터(&amp;A)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+M</source>
+        <translation>Ctrl+Alt+M</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;Separate</source>
+        <translation>분리(&amp;S)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;Top</source>
+        <translation>맨 위(&amp;T)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Si&amp;de</source>
+        <translation>옆(&amp;D)</translation>
+    </message>
+</context>
+<context>
+    <name>SpiderMonkeyShell</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="+17"/>
+        <source>Shell</source>
+        <translation>쉘</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Clear</source>
+        <translation>지우기</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>Evaluate</source>
+        <translation>평가</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Return</source>
+        <translation>Ctrl+Return</translation>
+    </message>
+</context>
+<context>
+    <name>VapourSynthProxy</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vs.ui" line="+14"/>
+        <source>VapourSynth Proxy</source>
+        <translation>VapourSynth 프락시</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Select VS file</source>
+        <translation>VS 파일 선택</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Run!</source>
+        <translation>실행!</translation>
+    </message>
+</context>
+<context>
+    <name>aboutDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+14"/>
+        <source>About Avidemux</source>
+        <translation>Avidemux 정보</translation>
+    </message>
+    <message>
+        <location line="+93"/>
+        <source>Avidemux </source>
+        <translation>Avidemux </translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Multi-platform Video Editor</source>
+        <translation>다중 플랫폼 비디오 편집기</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>© 2001 - 2017  Mean</source>
+        <translation>© 2001 - 2017  Mean</translation>
+    </message>
+    <message>
+        <source>© 2001 - 2016  Mean</source>
+        <translation>© 2001 - 2016  Mean</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>http://www.avidemux.org</source>
+        <translation>http://www.avidemux.org</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>&amp;License</source>
+        <translation>라이선스(&amp;L)</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>OK</source>
+        <translation>확인</translation>
+    </message>
+</context>
+<context>
+    <name>addBorder</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
+        <source>_Left border:</source>
+        <translation>왼쪽 경계선: </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Right border:</source>
+        <translation>오른쪽 경계선:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Top border:</source>
+        <translation>위쪽 경계선:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Bottom border:</source>
+        <translation>아래쪽 경계선:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h" line="+42"/>
+        <source>Add Borders</source>
+        <translation>경계선 추가</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Incorrect parameters</source>
+        <translation>틀린 매개변수</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All parameters must be even and within range.</source>
+        <translation>모든 매개변수는 범위 내의 짝수여야 합니다.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h" line="+1"/>
+        <source>Add black borders around the image.</source>
+        <translation>이미지 둘레에 검정색 경계선을 추가합니다.</translation>
+    </message>
+</context>
+<context>
+    <name>adm</name>
+    <message>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+34"/>
+        <source>Open</source>
+        <translation>열기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Append</source>
+        <translation>덧붙이기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save</source>
+        <translation>저장</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/gui_save.cpp" line="+435"/>
+        <location line="+10"/>
+        <source>Queue</source>
+        <translation>대기열</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save as Image</source>
+        <translation>이미지로 저장</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Close</source>
+        <translation>닫기</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Information</source>
+        <translation>정보</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Quit</source>
+        <translation>끝내기</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation>최근 항목 지우기</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Redo</source>
+        <translation>재실행</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Edit</source>
+        <translation>편집 초기화</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cut</source>
+        <translation>잘라내기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy</source>
+        <translation>복사</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Paste</source>
+        <translation>붙여넣기</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source>Delete</source>
+        <translation>삭제</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set Marker A</source>
+        <translation>표시 A 설정</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set Marker B</source>
+        <translation>표시 B 설정</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Markers</source>
+        <translation>표시 초기화</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Save current settings as default</source>
+        <translation>현재 설정을 기본값으로 저장</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Load saved settings</source>
+        <translation>저장된 설정 불러오기</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Decoder Option</source>
+        <translation>디코더 옵션</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>PostProcessing</source>
+        <translation>후처리</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+8"/>
+        <source>Filters</source>
+        <translation>필터</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <source>Select Track</source>
+        <translation>트랙 선택</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save audio</source>
+        <translation>오디오 저장</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Build Option</source>
+        <translation>빌드 옵션</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Plugins</source>
+        <translation>플러그인</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>About</source>
+        <translation>정보</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>First Frame</source>
+        <translation>첫 프레임</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Last Frame</source>
+        <translation>끝 프레임</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Go To Marker A</source>
+        <translation>표시 A로 가기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Go To Marker B</source>
+        <translation>표시 B로 가기</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Go To Time</source>
+        <translation>시간으로 이동</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Zoom 1:4</source>
+        <translation>줌 1:4</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Zoom 1:2</source>
+        <translation>줌 1:2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Zoom 1:1</source>
+        <translation>줌 1:1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Zoom 2:1</source>
+        <translation>줌 2:1</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+33"/>
+        <source>R_esampling (Hz):</source>
+        <translation>리샘플링 (Hz):</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Resampling frequency (Hz)</source>
+        <translation>리샘플링 주파수 (Hz)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+25"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+43"/>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>Film to PAL</source>
+        <translation>Film -&gt; PAL</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>PAL to Film</source>
+        <translation>PAL -&gt; Film</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Frame rate change:</source>
+        <translation>프레임 속도 변경:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>No change</source>
+        <translation>변경 없음</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mono</source>
+        <translation>모노</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+366"/>
+        <source>Stereo</source>
+        <translation>스테레오</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Stereo+surround</source>
+        <translation>스테레오+서라운드</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Stereo+center</source>
+        <translation>스테레오+센터</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Stereo+center+surround</source>
+        <translation>스테레오+센터+서라운드</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Stereo front+stereo rear</source>
+        <translation>전면 스테레오+후면 스테레오</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>5 channels</source>
+        <translation>5 채널</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>5.1</source>
+        <translation>5.1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Dolby Pro Logic</source>
+        <translation>돌비 프로 로직</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Dolby Pro Logic II</source>
+        <translation>돌비 프로 로직 II</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DRC</source>
+        <translation>DRC</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Automatic (max -3 dB)</source>
+        <translation>자동 (최대 -3 dB)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Manual (dB)</source>
+        <translation>수동 (dB)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Gain</source>
+        <translation>게인</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Gain mode:</source>
+        <translation>게인 모드:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>G_ain value:</source>
+        <translation>게인 값:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>_Mixer:</source>
+        <translation>믹서:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Remix:</source>
+        <translation>리믹스:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Mixer</source>
+        <translation>믹서</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Shift audio:</source>
+        <translation>오디오 이동:</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Shift Value (ms):</source>
+        <translation>이동 값 (ms):</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Audio Filters</source>
+        <translation>오디오 필터</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+81"/>
+        <source>Fontconfig</source>
+        <translation>Fontconfig</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>FreeType 2</source>
+        <translation>FreeType 2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Gettext</source>
+        <translation>Gettext</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>SDL</source>
+        <translation>SDL</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>XVideo</source>
+        <translation>XVideo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>VDPAU</source>
+        <translation>VDPAU</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>x86</source>
+        <translation>x86</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>x86-64</source>
+        <translation>x86-64</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Libraries</source>
+        <translation>라이브러리</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+121"/>
+        <source>CPU</source>
+        <translation>CPU</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Built-in Support</source>
+        <translation>내장 지원</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+31"/>
+        <source>TimeStamp:</source>
+        <translation>타임스탬프:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to Time</source>
+        <translation>시간으로 이동</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="+8"/>
+        <source>_Job name:</source>
+        <translation>작업 이름:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Output _File:</source>
+        <translation>출력 파일:</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Select Video To Write</source>
+        <translation>쓸 비디오 선택</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Save Job</source>
+        <translation>작업 저장</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+57"/>
+        <source>Audio Plugins</source>
+        <translation>오디오 플러그인</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-38"/>
+        <location line="+3"/>
+        <location line="+5"/>
+        <location filename="../../common/gui_save.cpp" line="-163"/>
+        <location line="+21"/>
+        <location line="+7"/>
+        <location filename="../../common/gui_savenew.cpp" line="+403"/>
+        <source>Audio</source>
+        <translation>오디오</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Video Encoder Plugins</source>
+        <translation>비디오 인코더 플러그인</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Video Encoder</source>
+        <translation>비디오 인코더</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Video Decoder Plugins</source>
+        <translation>비디오 디코더 플러그인</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Video Decoder</source>
+        <translation>비디오 디코더</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Audio Device Plugins</source>
+        <translation>오디오 장치 플러그인</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Audio Device</source>
+        <translation>오디오 장치</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Audio Encoder Plugins</source>
+        <translation>오디오 인코더 플러그인</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Audio Encoders</source>
+        <translation>오디오 인코더</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Demuxer Plugins</source>
+        <translation>디먹서 플러그인</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Demuxers</source>
+        <translation>디먹서</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Muxer Plugins</source>
+        <translation>먹서 플러그인</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Muxers</source>
+        <translation>먹서</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Plugins Info</source>
+        <translation>플러그인 정보</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+27"/>
+        <source>_Filter strength:</source>
+        <translation>필터 강도:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Swap U and V</source>
+        <translation>U와 V 교체</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-70"/>
+        <source>_Horizontal deblocking</source>
+        <translation>수평 깍두기 제거 (deblocking)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>_Vertical deblocking</source>
+        <translation>수직 깍두기 제거 (deblocking)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Deringing</source>
+        <translation>물결 현상 제거 (deringing)</translation>
+    </message>
+    <message>
+        <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"/>
+        <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>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation>LIBVA로 비디오 디코드 (인텔)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable openGl support</source>
+        <translation>OpenGL 지원 활성화하기</translation>
+    </message>
+    <message>
+        <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"/>
+        <source>_Accept non-standard audio frequency for DVD</source>
+        <translation>DVD에 대해 비표준 오디오 주파수 받아들이기 </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Create _OpenDML files</source>
+        <translation>OpenDML 파일 만들기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Revert to saved default output settings on video load</source>
+        <translation>비디오 불러올 때 저장된 기본 출력 설정으로 복귀하기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Enable alternative keyboard shortcuts</source>
+        <translation>대체 키보드 단축기 활성화하기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Re_verse UP and DOWN arrow keys for navigation</source>
+        <translation>탐색용 위/아래 화살표 키 뒤바꾸기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Check for new release</source>
+        <translation>새 버전 검사하기</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>SIMD</source>
+        <translation>SIMD</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Enable all SIMD</source>
+        <translation>전체 SIMD 활성화</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable MMX</source>
+        <translation>MMX 활성화</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable MMXEXT</source>
+        <translation>MMXEXT 활성화</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable 3DNOW</source>
+        <translation>3DNOW 활성화</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable 3DNOWEXT</source>
+        <translation>3DNOWEXT 활성화</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE</source>
+        <translation>SSE 활성화</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE2</source>
+        <translation>SSE2 활성화</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE3</source>
+        <translation>SSE3 활성화</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSSE3</source>
+        <translation>SSSE3 활성화</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>_lavc threads:</source>
+        <translation>lavc 쓰레드:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Multi-threading</source>
+        <translation>멀티 쓰레딩</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+4"/>
+        <source>High</source>
+        <translation>높음</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Above normal</source>
+        <translation>보통 이상</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Normal</source>
+        <translation>보통</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Below normal</source>
+        <translation>보통 이하</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-2"/>
+        <source>Low</source>
+        <translation>낮음</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Encoding priority:</source>
+        <translation>인코딩 우선권:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Indexing/unpacking priority:</source>
+        <translation>인덱싱/압축해제 우선권:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Playback priority:</source>
+        <translation>재생 우선권:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Prioritisation</source>
+        <translation>우선 순위</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Split MPEG files every (MB):</source>
+        <translation>MPEG 파일 용량 자르기 (MB):</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Use alternative tag for MP3 in .mp4</source>
+        <translation>.mp4에서 MP3용 대체 태그 사용하기</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Default to the directory of the last read file for saving</source>
+        <translation>최근 읽은 파일의 폴더를 저장용 폴더로 사용하기</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>XVideo (best)</source>
+        <translation>XVideo (최상)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>VDPAU (best)</source>
+        <translation>VDPAU (최상)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DXVA2 (best)</source>
+        <translation>DXVA2 (최상)</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>OpenGL (best)</source>
+        <translation>OpenGL (최상)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>LIBVA (best)</source>
+        <translation>LIBVA (최상)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>SDL (good)</source>
+        <translation>SDL (좋음)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Video _display:</source>
+        <translation>비디오 디스플레이:</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location line="+3"/>
+        <source>Sdl driver</source>
+        <translation>Sdl 드라이버</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>No alerts</source>
+        <translation>경고 없음</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display only error alerts</source>
+        <translation>오류 경고만 표시</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display all alerts</source>
+        <translation>모든 경고 표시</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Message level:</source>
+        <translation>메시지 단계:</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+216"/>
+        <source>PCM</source>
+        <translation>PCM</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Master</source>
+        <translation>마스터</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Volume control:</source>
+        <translation>볼륨 제어:</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>No downmixing</source>
+        <translation>다운믹싱 없음</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Pro Logic</source>
+        <translation>프로 로직</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Pro Logic II</source>
+        <translation>프로 로직 II</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Local playback downmixing:</source>
+        <translation>로컬 재생 다운믹싱:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>_AudioDevice</source>
+        <translation>오디오 장치</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>De_ringing</source>
+        <translation>물결현상 제거 (Deringing)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Strength:</source>
+        <translation>강도:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default Postprocessing</source>
+        <translation>기본 후처리</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>System language</source>
+        <translation>시스템 언어</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>_Language</source>
+        <translation>언어</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>User Interface</source>
+        <translation>사용자 인터페이스</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Output</source>
+        <translation>출력</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>_Limit Refresh Rate</source>
+        <translation>갱신 속도 제한</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Refresh Rate Cap (ms)</source>
+        <translation>갱신 속도 한도 (ms)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>GUI Rendering Options</source>
+        <translation>GUI 렌더링 옵션</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Display</source>
+        <translation>디스플레이</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>HW Accel</source>
+        <translation>HW 가속</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Threading</source>
+        <translation>쓰레딩</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Always ask which port to use</source>
+        <translation>사용할 포트 항상 묻기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Default port to use</source>
+        <translation>기본 사용 포트</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Preferences</source>
+        <translation>환경 설정</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-104"/>
+        <source>Save as BMP</source>
+        <translation>BMP로 저장</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save as JPEG</source>
+        <translation>JPEG로 저장</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>Connect to avsproxy</source>
+        <translation>avsproxy에 연결</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Undo</source>
+        <translation>실행 취소</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Pr&amp;eferences</source>
+        <translation>환경 설정(&amp;E)</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>&amp;Advanced</source>
+        <translation>고급(&amp;A)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open Application &amp;Log</source>
+        <translation>프로그램 로그 열기(&amp;L)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open Application Data &amp;Folder</source>
+        <translation>프로그램 데이터 폴더 열기(&amp;F)</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Play/Stop</source>
+        <translation>재생/정지</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Previous Frame</source>
+        <translation>이전 프레임</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Frame</source>
+        <translation>다음 프레임</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Previous Intra Frame</source>
+        <translation>이전 인트라 프레임</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Intra Frame</source>
+        <translation>다음 인트라 프레임</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Previous Black Frame</source>
+        <translation>이전 검정 프레임</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Black Frame</source>
+        <translation>다음 검정 프레임</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+614"/>
+        <location line="+42"/>
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+81"/>
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
+        <location filename="../../common/gui_main.cpp" line="+1330"/>
+        <location line="+27"/>
+        <location line="+24"/>
+        <location line="+8"/>
+        <location line="+4"/>
+        <location filename="../../common/gui_save.cpp" line="+71"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
+        <source>Error</source>
+        <translation>오류</translation>
+    </message>
+    <message>
+        <location line="-42"/>
+        <location line="+42"/>
+        <source>You cannot remove *all* the video
+</source>
+        <translation>*모든* 비디오를 삭제할 수는 없습니다</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edFrameType.cpp" line="+72"/>
+        <source>Updating frametype</source>
+        <translation>프레임형식 업데이트 중</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+0"/>
+        <source>Core has been compiled without LIBVA support, but the application has been compiled with it.
+Installation mismatch</source>
+        <translation>LIBVA 지원 없이 코어를 컴파일했지만 프로그램은 LIBVA를 포함해 컴파일했습니다.
+설치가 일치하지 않습니다</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+0"/>
+        <source>Core has been compiled without VDPAU support, but the application has been compiled with it.
+Installation mismatch</source>
+        <translation>VDPAU 지원 없이 코어를 컴파일했지만 프로그램은 VDPAU를 포함해 컴파일했습니다.
+설치가 일치하지 않습니다</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+0"/>
+        <source>Core has been compiled without XVBA support, but the application has been compiled with it.
+Installation mismatch</source>
+        <translation>XVBA 지원 없이 코어를 컴파일했지만 프로그램은 XVBA를 포함해 컴파일했습니다.
+설치가 일치하지 않습니다</translation>
+    </message>
+    <message>
+        <location filename="../../common/gui_autodrive.cpp" line="+48"/>
+        <source>No audio track</source>
+        <translation>오디오 트랙 없음</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An audio track is necessary to create such file</source>
+        <translation>그런 파일을 만드려면 오디오 트랙이 필요합니다</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+6"/>
+        <location line="+15"/>
+        <location line="+27"/>
+        <location line="+35"/>
+        <source>Codec Error</source>
+        <translation>코덱 오류</translation>
+    </message>
+    <message>
+        <location line="-128"/>
+        <source>Cannot select the MPEG-4 SP codec.</source>
+        <translation>MPEG-4 SP 코덱을 선택할 수 없습니다.</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>No AAC audio encoder plugin found.</source>
+        <translation>AAC 오디오 인코더 플러그인을 찾지 못했습니다.</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>The MP3 codec does not allow disabling reservoir.
+Install lame plugin</source>
+        <translation>MP3 코덱이 저장소를 비활성화지 못하게 합니다. lame 플러그인을 설치하세요</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>You don&apos;t have LAME!.
+It is needed to create FLV  video.</source>
+        <translation>LAME 코덱이 없습니다! FLV 비디오를 만들 때 필요합니다.</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Cannot select FLV1  codec.</source>
+        <translation>FLV1 코덱을 선택할 수 없습니다.</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Cannot select MPEG-4 SP codec.</source>
+        <translation>MPEG-4 SP 코덱을 선택할 수 없습니다.</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>You don&apos;t have FAAC!.
+It is needed to create PSP compatible video.</source>
+        <translation>FAAC 코덱이 없습니다! PSP 호환 비디오를 만들 때 필요합니다.</translation>
+    </message>
+    <message>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
+        <source>Select script/project to run</source>
+        <translation>실행할 스크립트/프로젝트 선택</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Select script to run</source>
+        <translation>실행할 스크립트 선택</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select script to debug</source>
+        <translation>디버그할 스크립트 선택</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Select script to save</source>
+        <translation>저장할 스크립트 선택</translation>
+    </message>
+    <message>
+        <location line="+67"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation>최근 파일과 프로젝트의 목록을 지우려고 합니다. 이 작업은 복구할 수 없습니다. 진행할까요?</translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Not coded in this version</source>
+        <translation>이 버전에 코딩되어 있지 않습니다</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+68"/>
+        <source>Select Video File...</source>
+        <translation>비디오 파일 선택...</translation>
+    </message>
+    <message>
+        <location line="-43"/>
+        <source>No engine</source>
+        <translation>엔진 없음</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>tinyPy script is not enabled in this build</source>
+        <translation>이 빌드에서 TinyPy 스크립트는 사용할 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Select Video File to Append...</source>
+        <translation>덧붙일 비디오 파일 선택...</translation>
+    </message>
+    <message>
+        <location line="+159"/>
+        <source>Are you sure?</source>
+        <translation>확실한가요?</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Cutting</source>
+        <translation>잘라내느 중</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while cutting out.</source>
+        <translation>잘라내는 중 오류 발생.</translation>
+    </message>
+    <message>
+        <location line="+72"/>
+        <source>Permission error</source>
+        <translation>권한 오류</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cannot open &quot;%s&quot;.</source>
+        <translation>&quot;%s&quot;를 열 수 없습니다.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>File error</source>
+        <translation>파일 오류</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>&quot;%s&quot; does not exist.</source>
+        <translation>&quot;%s&quot;이 존재하지 않습니다.</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Cannot open project using the video loader.</source>
+        <translation>비디오 로더를 이용해 프로젝트를 열 수 없습니다.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Try &apos;File&apos; -&gt; &apos;Load/Run Project...&apos;</source>
+        <translation>&apos;파일&apos; -&gt; &apos;프로젝트 불러오기/실행...&apos;으로 해보세요</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Could not open the file</source>
+        <translation>파일을 열 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Multiple Audio Tracks</source>
+        <translation>다중 오디오 트랙</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>The file you just loaded contains several audio tracks.
+Go to Audio-&gt;MainTrack to select the active one.</source>
+        <translation>방금 불러온 파일에 몇몇 오디오 트랙이 있습니다.
+오디오 -&gt; 메인트랙에서 사용할 것을 선택하세요.</translation>
+    </message>
+    <message>
+        <location line="+105"/>
+        <source>Something failed when appending</source>
+        <translation>덧붙이는 중 뭔가 잘못됐습니다</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+268"/>
+        <source>Something bad happened (II)</source>
+        <translation>잘못된 일이 발생했습니다 (II)</translation>
+    </message>
+    <message>
+        <location line="-151"/>
+        <location line="+43"/>
+        <source>The tinypy plugin is missing.
+Expect problems.</source>
+        <translation>TinyPY 플러그인이 없습니다. 문제가 생길 수 있습니다.</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>Checking video</source>
+        <translation>비디오 검사 중</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>No error found</source>
+        <translation>오류 없음</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Errors found in %u frames</source>
+        <translation>%u 프레임에서 오류 발견</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Marker A &gt; B</source>
+        <translation>표시 A &gt; B</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cannot delete the selection.</source>
+        <translation>선택을 삭제할 수 없습니다.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>You can&apos;t remove all frames</source>
+        <translation>모든 프레임을 제거할 수는 없습니다</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
+        <source>Something bad happened</source>
+        <translation>잘못된 일이 발생했습니다</translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <source>_Track from video:</source>
+        <translation>비디오의 트랙:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Main Audio Track</source>
+        <translation>메인 오디오 트랙</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <location line="+7"/>
+        <source>Invalid audio index given</source>
+        <translation>무효한 오디오 인덱스값</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Cannot use that file as audio track</source>
+        <translation>그 파일을 오디오 트랙으로 사용할 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Audio file not found in list, even though it should be there. Create a bug report!</source>
+        <translation>목록에서 있어야 하는 오디오 파일을 찾지 못했습니다. 버그 리포트를 작성해 주세요!</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Unable to set the audio language: No video loaded yet!</source>
+        <translation>오디오 언어를 설정할 수 없스ㅂ니다: 아직 불러온 비디오가 없습니다!</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Setting the language for the given track index is not possible: Video has no audio file!</source>
+        <translation>주어진 트랙 인덱스의 언어를 설정할 수 없습니다: 비디오에 오디오 파일이 없습니다!</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Setting the language for the given track index is not possible: Invalid track index!</source>
+        <translation>주어진 트릭 인덱스의 언어를 설정할 수 없습니다: 무효한 트랙 인덱스!</translation>
+    </message>
+    <message>
+        <location line="+138"/>
+        <source>AvsProxy</source>
+        <translation>AvsProxy</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Failed to connect to avsproxy.
+Is it running ?</source>
+        <translation>avsproxy에 연결하지 못했습니다. 실행 중인지 확인하세요.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>avsproxy</source>
+        <translation>avsproxy</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Frame type:</source>
+        <translation>프레임 형식:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Frame size:</source>
+        <translation>프레임 크기:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Frame Hex Dump</source>
+        <translation>프레임 헥스 덤프</translation>
+    </message>
+    <message>
+        <location line="+110"/>
+        <source>Oops</source>
+        <translation>웁스</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>This function is disabled or no longer valid</source>
+        <translation>이 기능이 비활성화되었거나 더 이상 유효하지 않습니다</translation>
+    </message>
+    <message>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
+        <source>Trouble initializing audio device</source>
+        <translation>오디오 장치 초기화 중 문제 발생</translation>
+    </message>
+    <message>
+        <location filename="../../common/gui_save.cpp" line="-327"/>
+        <source>No</source>
+        <translation>아니오</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>No file loaded</source>
+        <translation>불러온 파일이 없습니다</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Job</source>
+        <translation>작업</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cannot reach database. Do you have Job control running ?</source>
+        <translation>데이터베이스에 접근할 수 없습니다. 실행 중인 작업이 있는지 확인하세요.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Output file</source>
+        <translation>출력 파일</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Job name</source>
+        <translation>작업 이름</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Queue job to jobList</source>
+        <translation>작업목록 대기열에 작업 넣기</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Select Workbench to Save</source>
+        <translation>저장할 작업벤치 선택</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Select File to Save Audio</source>
+        <translation>오디오를 저장할 파일 선택</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select JPEG Sequence to Save</source>
+        <translation>저장할 JPEG 시퀀스 선택</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Select BMP to Save</source>
+        <translation>저장할 BMP 선택</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Select JPEG to Save</source>
+        <translation>저장할 JPEG 선택</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Select File to Save</source>
+        <translation>저장할 파일 선택</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Saving audio</source>
+        <translation>오디오 저장 중</translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <source>Function not implemented
+</source>
+        <translation>기능이 구현되지 않았습니다</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Cannot create stream</source>
+        <translation>스트림을 만들 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Saving failed</source>
+        <translation>저장 실패</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Jpeg</source>
+        <translation>Jpeg</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fail to save as jpeg</source>
+        <translation>JPEG로 저장 실패</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>Saving as set of jpegs</source>
+        <translation>JPEG 세트로 저장 중</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cannot decode frame</source>
+        <translation>프레임을 디코드할 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Aborting.</source>
+        <translation>취소 중.</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+38"/>
+        <source>Done</source>
+        <translation>완료</translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <source>Saved %d images.</source>
+        <translation>%d개의 이미지를 저장했습니다.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Could not save all images.</source>
+        <translation>전체 이미지를 저장할 수 없습니다.</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BMP op failed</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Saving %s as a BMP file failed.</source>
+        <translation>%s를 BMP 파일로 저장에 실패했습니다.</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>File %s has been successfully saved.</source>
+        <translation>%s 파일을 성공적으로 저장했습니다.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Failed</source>
+        <translation>실패</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>File %s was NOT saved correctly.</source>
+        <translation>%s 파일을 제대로 저장하지 못했습니다.</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Cannot get tinyPÿ script engine</source>
+        <translation>TinyPÿ 스크립트 엔진을 가져올 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cannot add job %s</source>
+        <translation>%s 작업을 추가할 수 없습니다</translation>
+    </message>
+    <message>
+        <location filename="../../common/gui_savenew.cpp" line="-233"/>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation>이전의 첫 패스 데이터를 재사용할까요? 경고, 설정을 닫어야 합니다.</translation>
+    </message>
+    <message>
+        <location line="+160"/>
+        <location line="+12"/>
+        <location line="+16"/>
+        <location line="+8"/>
+        <source>Video</source>
+        <translation>비디오</translation>
+    </message>
+    <message>
+        <location line="-36"/>
+        <source>Cannot instantiate video chain</source>
+        <translation>비디오 체인을 인스턴스화할수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location line="+24"/>
+        <source>Cannot create encoder</source>
+        <translation>인코더를 만들 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <source>Cannot setup codec. Bitrate too low?</source>
+        <translation>코덱을 설정할 수 없습니다. 비트레이트가 너무 낮은지 확인하세요.</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
+        <translation>오디오 인코더를 설정할 수 없습니다, 스트림이 오디오 인코더와 호환되는지 확인하세요 (채널수, 비트레이트, 형식)</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>The video is in copy mode but the cut points are not on keyframes.
+The video will be saved but there will be corruption at cut point(s).
+Do you want to continue anyway ?</source>
+        <translation>비디오가 복사 모드이지만 잘라내기 지점이 키프레임상에 있지 않습니다.
+비디오는 저장될 것이나 잘라낸 지점의 화면은 깨질 것입니다.
+어쨌든 계속할까요?</translation>
+    </message>
+    <message>
+        <location line="-244"/>
+        <location line="+255"/>
+        <location line="+26"/>
+        <source>Muxer</source>
+        <translation>먹서</translation>
+    </message>
+    <message>
+        <location line="-281"/>
+        <location line="+255"/>
+        <source>Cannot instantiate muxer</source>
+        <translation>먹서를 인스턴스화할 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Cannot open </source>
+        <translation>열 수 없습니다</translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+45"/>
+        <source>Disabled</source>
+        <translation>비활성화</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto-detect</source>
+        <translation>자동 감지</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Custom</source>
+        <translation>사용자 정의</translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-11"/>
+        <source>_Interlaced</source>
+        <translation>인터레이스</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ca_rtoon mode</source>
+        <translation>카툰 모드</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Greyscale</source>
+        <translation>그레이스케일</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Turbo mode</source>
+        <translation>터보 모드</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>C_hroma optimizer</source>
+        <translation>크로마 옵티마이저</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Main</source>
+        <translation>메인</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Very Low</source>
+        <translation>매우 낮음</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Medium</source>
+        <translation>중간</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Very High</source>
+        <translation>매우 높음</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ultra High</source>
+        <translation>최고로 높음</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion Search Precision</source>
+        <translation>모션 검색 정밀도</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Off</source>
+        <translation>끄기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mode Decision</source>
+        <translation>모드 결정</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Limited Search</source>
+        <translation>제한 검색</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Medium Search</source>
+        <translation>중간 검색</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Wide Search</source>
+        <translation>광역 검색</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>VHQ Mode</source>
+        <translation>VHQ 모드</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Max B Frames</source>
+        <translation>최대 B 프레임</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quarter Pixel</source>
+        <translation>쿼터 픽셀</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>GMC</source>
+        <translation>GMC</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>BVHQ</source>
+        <translation>BVHQ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Advanced Simple Profile</source>
+        <translation>고급 간편 프로파일</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>4MV</source>
+        <translation>4MV</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Chroma ME</source>
+        <translation>크로마 ME</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>HQ AC</source>
+        <translation>HQ AC</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>More Search</source>
+        <translation>추가 검색</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Min Gop Size</source>
+        <translation>최소 GOP 크기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max Gop Size</source>
+        <translation>최대 GOP 크기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>GOP Size</source>
+        <translation>GOP 크기</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Motion</source>
+        <translation>모션</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>H263</source>
+        <translation>H263</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mpeg</source>
+        <translation>Mpeg</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantization Matrix</source>
+        <translation>양자화 매트릭스</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Trellis Quantization</source>
+        <translation>트렐리스 양자화</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Quantization</source>
+        <translation>양자화</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Two Pass Tuning</source>
+        <translation>투 패스 튜닝</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Key Frame Boost(%)</source>
+        <translation>키프레임 부스트(%)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>I-frames closer than...</source>
+        <translation>더 가까운 I 프레임...</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>.. are reduced by(%)</source>
+        <translation>.. 줄였습니다: (%)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max Overflow Improvement(%)</source>
+        <translation>최대 오버플로우 향상(%)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max Overglow Degradation(%)</source>
+        <translation>최대 오버글로우 저화(%) </translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Curve Compression</source>
+        <translation>곡선 압축</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>High Bitrate Scenes (%)</source>
+        <translation>높은 비트레이트 장면 (%)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Low Bitrate Scenes (%)</source>
+        <translation>낮은 비트레이트 장면 (%)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Overflow Control Strength</source>
+        <translation>오버플로우 제어 강도</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Two Pass</source>
+        <translation>투 패스</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Xvid4 Configuration</source>
+        <translation>Xvid4 설정</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_core/src/ADM_prettyPrint.cpp" line="+23"/>
+        <source>%d minute(s)</source>
+        <translation>%d 분</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>%d hour(s)</source>
+        <translation>%d 시간</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Less than a minute</source>
+        <translation>1분 이내</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>A few seconds</source>
+        <translation>수 초</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-1"/>
+        <source>DTS</source>
+        <translation>DTS</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>MP2</source>
+        <translation>MP2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MP3</source>
+        <translation>MP3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>WMAPRO</source>
+        <translation>WMAPRO</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>WMA</source>
+        <translation>WMA</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>LPCM</source>
+        <translation>LPCM</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AC3</source>
+        <translation>AC3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OPUS</source>
+        <translation>OPUS</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>FLAC</source>
+        <translation>FLAC</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>E-AC3</source>
+        <translation>E-AC3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ogg Vorbis</source>
+        <translation>Ogg Vorbis</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MP4</source>
+        <translation>MP4</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AAC</source>
+        <translation>AAC</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>QDM2</source>
+        <translation>QDM2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AMR-NB</source>
+        <translation>AMR-NB</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MSADPCM</source>
+        <translation>MSADPCM</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>ULAW</source>
+        <translation>ULAW</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>IMA ADPCM</source>
+        <translation>IMA ADPCM</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>8-bit PCM</source>
+        <translation>8-bit PCM</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Unknown codec</source>
+        <translation>알 수 없는 코덱</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+176"/>
+        <source>Building time map</source>
+        <translation>시간 맵 빌드 중</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="-26"/>
+        <source>Memory error</source>
+        <translation>메모리 오류</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+452"/>
+        <source>Saving</source>
+        <translation>저장 중</translation>
+    </message>
+    <message>
+        <location line="+142"/>
+        <source>Too short</source>
+        <translation>너무 짧음</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>The video has been saved but seems to be incomplete.</source>
+        <translation>비디오를 저장했으나 미완성인 듯 싶습니다. </translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+385"/>
+        <source>Unknown</source>
+        <translation>알 수 없음</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-4"/>
+        <source>can&apos;t open &quot;%s&quot;: %s
+%s
+</source>
+        <translation>&quot;%s&quot;을 열수 없음: %s %s</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+85"/>
+        <source>filesystem full</source>
+        <translation>파일시스템 꽉 참</translation>
+    </message>
+    <message>
+        <location line="-85"/>
+        <location line="+85"/>
+        <source>quota exceeded</source>
+        <translation>한도 초과</translation>
+    </message>
+    <message>
+        <location line="-84"/>
+        <location line="+85"/>
+        <source>Please free up some space and press RETRY to try again.</source>
+        <translation>여유 공간을 만들고 다시 시도해 보세요.</translation>
+    </message>
+    <message>
+        <location line="-78"/>
+        <source>can&apos;t open &quot;%s&quot;: %u (%s)
+</source>
+        <translation>&quot;%s&quot;을 열수 없음: %u (%s)</translation>
+    </message>
+    <message>
+        <location line="+75"/>
+        <source>can&apos;t write to file &quot;%s&quot;: %s
+%s
+</source>
+        <translation>&quot;%s&quot; 파일에 쓸 수 없음: %s %s</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+11"/>
+        <source>__unknown__</source>
+        <translation>__알 수 없음__</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <source>Ignore</source>
+        <translation>무시</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Retry</source>
+        <translation>재시도</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>can&apos;t write to file &quot;%s&quot;: %u (%s)
+</source>
+        <translation>&quot;%s&quot; 파일에 쓸 수 없음: %u (%s)</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="-7"/>
+        <source>NTSC 4:3</source>
+        <translation>NTSC 4:3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>NTSC 16:9</source>
+        <translation>NTSC 16:9</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>PAL 4:3</source>
+        <translation>PAL 4:3</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>PAL 16:9</source>
+        <translation>PAL 16:9</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>1:1</source>
+        <translation>1:1</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+        <location line="+32"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+34"/>
+        <location line="+35"/>
+        <source>Codec</source>
+        <translation>코덱</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-35"/>
+        <source>Internal error finding codec 0x%x</source>
+        <translation>코덱 0x%x 찾는 중 내부 오류 발생</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Internal error opening 0x%x</source>
+        <translation>0x%x를 여는 중 내부 오류 발생</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+0"/>
+        <source>Core has been compiled without DXVA2 support, but the application has been compiled with it.
+Installation mismatch</source>
+        <translation>DXVA2 지원 없이 코어를 컴파일했지만 프로그램은 DXVA2를 포함해서 컴파일되었습니다.
+설치가 일치하지 않습니다</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="+246"/>
+        <source>Cannot compile shader</source>
+        <translation>쉐이더를 컴파일할 수 없습니다</translation>
+    </message>
+</context>
+<context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation>ADM ivtc.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation>일체형 ivtc.</translation>
+    </message>
+</context>
+<context>
+    <name>aften</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
+        <source>_Bitrate:</source>
+        <translation>비트레이트:</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Aften Configuration</source>
+        <translation>Aften 설정</translation>
+    </message>
+</context>
+<context>
+    <name>asciiView</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+59"/>
+        <source>Ascii View</source>
+        <translation>아스키 보기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ascii view</source>
+        <translation>아스키 보기</translation>
+    </message>
+</context>
+<context>
+    <name>asfdemuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp" line="+158"/>
+        <source>File Error.</source>
+        <translation>파일오류.</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cannot open file
+</source>
+        <translation>파일을 열 수 없습니다</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp" line="+471"/>
+        <source>Indexing</source>
+        <translation>인덱싱</translation>
+    </message>
+</context>
+<context>
+    <name>asharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp" line="+65"/>
+        <source>Asharp</source>
+        <translation>ASharp</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptative sharpener by MarcFD.</source>
+        <translation>MarcFD가 만든 적응형 샤픈 필터입니다. </translation>
+    </message>
+</context>
+<context>
+    <name>asharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/asharp.ui" line="+14"/>
+        <source>ASharp</source>
+        <translation>ASharp</translation>
+    </message>
+    <message>
+        <location line="+123"/>
+        <source>Strength</source>
+        <translation>강도</translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Threshold</source>
+        <translation>임계값</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>Block Adaptative</source>
+        <translation>블럭 적응형</translation>
+    </message>
+    <message>
+        <location line="-27"/>
+        <source>Unknown flag</source>
+        <translation>알 수 없는 플래그</translation>
+    </message>
+</context>
+<context>
+    <name>ass</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="+67"/>
+        <source>SSA/ASS/SRT</source>
+        <translation>SSA/ASS/SRT</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+        <translation>ASS/SSA/SRT 자막을 libass로 하드코딩합니다.</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Format ?</source>
+        <translation>형식?</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Are you sure this is an ass file ?</source>
+        <translation>ASS 파일이 확실한가요?</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>_Subtitle file (ASS/SSA):</source>
+        <translation>자막 파일 (ASS/SSA):</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Select Subtitle file</source>
+        <translation>자막 파일 선택</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Line spacing:</source>
+        <translation>줄 간격:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Font scale:</source>
+        <translation>글꼴 크기:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Top margin:</source>
+        <translation>상단 여백:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Botto_m margin</source>
+        <translation>하단 여백</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>ASS</source>
+        <translation>ASS</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>This is a srt file. Convert to SSA ?</source>
+        <translation>이것은 SRT 파일입니다. SSA로 변환할까요?</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+5"/>
+        <location line="+8"/>
+        <source>Error</source>
+        <translation>오류</translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Cannot load this srt file.</source>
+        <translation>이 SRT 파일을 불러올 수 없습니다.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cannot convert to ssa.</source>
+        <translation>SSA로 변환할 수 없습니다.</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Cannot save converted file.</source>
+        <translation>변환한 파일을 저장할 수 없습니다.</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Fonts</source>
+        <translation>글꼴</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Preparing the fonts can take a few minutes the first time.
+This message will not be displayed again.</source>
+        <translation>처음으로 글꼴을 준비하는데 몇 분 정도 걸릴 수 있습니다.
+이 메시지는 다시 표시되지 않습니다.</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>SSA Error</source>
+        <translation>SSA 오류</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cannot read_file for *%s*</source>
+        <translation>*%s*용 파일을 읽을 수 없습니다</translation>
+    </message>
+</context>
+<context>
+    <name>avimuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+74"/>
+        <source>Bad Idea</source>
+        <translation>잘못된 생각</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Using H264/H265 in AVI is a bad idea, MKV is better for that.
+ Do you want to continue anyway ?</source>
+        <translation>AVI에서 H264/H265 사용은 나쁘고 MKV가 최선입니다.
+ 그래도 계속할까요?</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Error</source>
+        <translation>오류</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cannot create AVI file</source>
+        <translation>AVI 파일을 만들 수 없습니다</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>Muxing Format</source>
+        <translation>먹싱 형식</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Avi Muxer</source>
+        <translation>AVI 먹서</translation>
+    </message>
+</context>
+<context>
+    <name>avsfilter</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="+598"/>
+        <source>_wine app file:</source>
+        <translation>와인 앱 파일:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select wine filename[wine/cedega/etc.]</source>
+        <translation>와인 파일명[wine/cedega/등] 선택</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_loader file:</source>
+        <translation>로더 파일:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select loader filename[avsload.exe]</source>
+        <translation>로더 파일명[avsload.exe] 선택</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_avs file:</source>
+        <translation>AVS 파일:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select avs filename[*.avs]</source>
+        <translation>AVS 파일명[*.avs] 선택</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_pipe timeout:</source>
+        <translation>파이프 타임아웃:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>AvsFilter config</source>
+        <translation>AvsFilter 설정</translation>
+    </message>
+</context>
+<context>
+    <name>bitrate</name>
+    <message>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
+        <source>Constant Bitrate</source>
+        <translation>고정 비트레이트</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Constant Quantiser</source>
+        <translation>고정 양자화기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Same Quantiser as Input</source>
+        <translation>입력과 같은 양자화기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Constant Rate Factor</source>
+        <translation>고정 속도 인수</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Two Pass - Video Size</source>
+        <translation>투 패스 - 비디오 크기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Two Pass - Average Bitrate</source>
+        <translation>투 패스 - 평균 비트레이트</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Encoding mode</source>
+        <translation>인코딩 모드</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bitrate</source>
+        <translation>비트레이트</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Target bitrate (kb/s)</source>
+        <translation>대상 비트레이트 (kb/s)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+19"/>
+        <source>Quantizer</source>
+        <translation>양자화기</translation>
+    </message>
+    <message>
+        <location line="-14"/>
+        <source>Target video size (MB)</source>
+        <translation>대상 비디오 크기 (MB)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Average bitrate (kb/s)</source>
+        <translation>평균 비트레이트 (kb/s)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+</context>
+<context>
+    <name>black</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp" line="+48"/>
+        <source>Black</source>
+        <translation>검정색</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace a section by black.</source>
+        <translation>구역을 검정색으로 바꿉니다.</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>_Start time (ms):</source>
+        <translation>시작 시간 (ms):</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time (ms):</source>
+        <translation>끝 시간 (ms):</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Replace by Black</source>
+        <translation>검정색으로 바꾸기</translation>
+    </message>
+</context>
+<context>
+    <name>blacken</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <source>Blacken Borders</source>
+        <translation>경계선 검은색으로 만들기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove noisy edge by turning them to black.</source>
+        <translation>잡음이 있는 경계를 검정색으로 만들어 제거합니다.</translation>
+    </message>
+</context>
+<context>
+    <name>blackenDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/blackenBorders.ui" line="+14"/>
+        <source>Blacken Borders</source>
+        <translation>경계선 검은색으로 만들기</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Right:</source>
+        <translation>오른쪽:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Top:</source>
+        <translation>위쪽:</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation>초기화</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Bottom:</source>
+        <translation>아래쪽:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Left:</source>
+        <translation>왼쪽:</translation>
+    </message>
+</context>
+<context>
+    <name>blackframes</name>
+    <message>
+        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
+        <source>BlackFrame</source>
+        <translation>검정프레임</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>This function is unsupported at the moment</source>
+        <translation>이 기능은 당분간 지원되지 않습니다</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Searching black frame..</source>
+        <translation>검정 프레임 찾는 중..</translation>
+    </message>
+</context>
+<context>
+    <name>changeFps</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
+        <source>Custom</source>
+        <translation>사용자 정의</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25  (PAL)</source>
+        <translation>25  (PAL)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>23.976 (Film)</source>
+        <translation>23.976 (Film)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>29.97 (NTSC)</source>
+        <translation>29.97 (NTSC)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 (Pal)</source>
+        <translation>50 (PAL)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>59.93  (NTSC)</source>
+        <translation>59.93  (NTSC)</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>Change FPS</source>
+        <translation>FPS 변경</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
+        <translation>마치 FPS를 변경하듯이 비디오 속도를 빠르게/느리게 합니다. 이 필터는 재생시간을 변경합니다.</translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <source>Source Fps:</source>
+        <translation>원본 FPS:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Source frame rate:</source>
+        <translation>원본 프레임 속도:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Destination Fps:</source>
+        <translation>대상 FPS:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Destination frame rate:</source>
+        <translation>대상 프레임 속도:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Change fps</source>
+        <translation>FPS 변경</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error</source>
+        <translation>오류</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Invalid fps</source>
+        <translation>무효한 FPS</translation>
+    </message>
+</context>
+<context>
+    <name>chromashift</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp" line="+35"/>
+        <source>ChromaShift</source>
+        <translation>크로마 이동</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Shift chroma U/V to fix badly synced luma/chroma.</source>
+        <translation>심하게 싱크가 어긋난 루마/크로마를 고치기 위해 크로마 U/V를 이동합니다.</translation>
+    </message>
+</context>
+<context>
+    <name>chromashiftDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/chromashift.ui" line="+14"/>
+        <source>ChromaShift</source>
+        <translation>크로마이동</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>V Shift</source>
+        <translation>V 이동</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>U Shift</source>
+        <translation>U 이동</translation>
+    </message>
+</context>
+<context>
+    <name>coloryuv</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="+62"/>
+        <source>Avisynth color filter.</source>
+        <translation>Avisynth 색상 필터</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Color management filter.</source>
+        <translation>색상을 관리할 수 있는 필터입니다.</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>AutoWhite</source>
+        <translation>자동 화이트 밸런스</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AutoGain</source>
+        <translation>자동 이득</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clip to Tv Range (16-235)</source>
+        <translation>TV 범위로 자르기 (16-235)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>PC-&gt;TV</source>
+        <translation>PC-&gt;TV</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>TV-&gt;PC</source>
+        <translation>TV-&gt;PC</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Levels:</source>
+        <translation>레벨:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Y gain</source>
+        <translation>Y 이득</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Y Brightness</source>
+        <translation>Y 밝기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Y Gamma</source>
+        <translation>Y 감마</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Y Contrast</source>
+        <translation>Y 대비 </translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>U gain</source>
+        <translation>U 이득</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>U Brightness</source>
+        <translation>U 밝기</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>U Contrast</source>
+        <translation>U 대비</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>V gain</source>
+        <translation>V 이득</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>V Brightness</source>
+        <translation>V 밝기</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>V Contrast</source>
+        <translation>V 대비</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Flags</source>
+        <translation>플래그</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Y</source>
+        <translation>Y</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>U</source>
+        <translation>U</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>V</source>
+        <translation>V</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>colorYuv</source>
+        <translation>colorYuv</translation>
+    </message>
+</context>
+<context>
+    <name>contrast</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+34"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
+        <location line="+89"/>
+        <source>Contrast</source>
+        <translation>대비</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust contrast, brightness and colors.</source>
+        <translation>대비, 밝기와 색상을 조정합니다.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
+        <source>Brightness</source>
+        <translation>밝기</translation>
+    </message>
+</context>
+<context>
+    <name>contrastDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/contrast.ui" line="+14"/>
+        <location line="+19"/>
+        <source>Contrast</source>
+        <translation>대비</translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <source>Contrast  </source>
+        <translation>대비</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Brightness  </source>
+        <translation>밝기</translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <source>Luma</source>
+        <translation>루마</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Process</source>
+        <translation>처리</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>MPEG2-&gt;PC</source>
+        <translation>MPEG2-&gt;PC</translation>
+    </message>
+    <message>
+        <location line="-43"/>
+        <source>ChromaU</source>
+        <translation>크로마U</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>ChromaV</source>
+        <translation>크로마V</translation>
+    </message>
+    <message>
+        <location line="-46"/>
+        <source>Brightness</source>
+        <translation>밝기</translation>
+    </message>
+</context>
+<context>
+    <name>convolution</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="+136"/>
+        <source>_Process luma</source>
+        <translation>루마 처리</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Process luma plane</source>
+        <translation>루마 플레인 처리</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>P_rocess chroma</source>
+        <translation>크로마 처리</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fast Convolution</source>
+        <translation>빠른 컨벌루션</translation>
+    </message>
+</context>
+<context>
+    <name>crash</name>
+    <message>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
+        <source>Load it</source>
+        <translation>불러오기</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Crash file</source>
+        <translation>크래쉬 파일</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>I have detected a crash file. 
+Do you want to load it  ?
+(It will be deleted in all cases, you should save it if you want to keep it)</source>
+        <translation>충돌 파일을 감지했습니다.
+그 파일을 불러올까요?
+(어떤 경우든 삭제될 것입니다, 보존하려면 저장해야 합니다)</translation>
+    </message>
+</context>
+<context>
+    <name>crop</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <source>Crop</source>
+        <translation>잘라내기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Crop filter</source>
+        <translation>잘라내기 필터</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Warning Cropping too much width ! Width reseted !
+</source>
+        <translation>경고: 너비를 너무 많이 잘라냈습니다! 너비 초기화!</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Warning Cropping too much height ! Height reseted !
+</source>
+        <translation>경고: 높이를 너무 많이 잘라냈습니다! 높이 초기화!</translation>
+    </message>
+</context>
+<context>
+    <name>cropDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
+        <source>Crop</source>
+        <translation>잘라내기</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <source>Right:</source>
+        <translation>오른쪽:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <source>Top:</source>
+        <translation>위쪽:</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
+        <source>Reset</source>
+        <translation>초기화</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
+        <source>Bottom:</source>
+        <translation>아래쪽:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <source>Left:</source>
+        <translation>왼쪽:</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
+        <source>Auto Crop</source>
+        <translation>자동 잘라내기</translation>
+    </message>
+</context>
+<context>
+    <name>dcaenc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp" line="+272"/>
+        <source>_Bitrate:</source>
+        <translation>비트레이트:</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>DcaEnc Configuration</source>
+        <translation>DcaEnc 설정</translation>
+    </message>
+</context>
+<context>
+    <name>decimate</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+56"/>
+        <source>Decomb decimate</source>
+        <translation>Decomb 데시메이트</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Donald Graft decimate. Remove duplicate after telecide.</source>
+        <translation>도널드 그래프트의 데시메이트 필터. 텔레사이드 후의 중복 프레임을 제거합니다.</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Discard closer</source>
+        <translation>더 가까운 것 버리기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace (interpolate)</source>
+        <translation>바꾸기 (보간하기)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Discard longer dupe (animés)</source>
+        <translation>더 긴 중복 프레임 버리기 (애니메이션)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Pulldown dupe removal</source>
+        <translation>중복 프레임 제거 풀다운하기</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Fastest (no chroma, partial luma)</source>
+        <translation>가장 빠르게 (크로마 없음, 일부 루마)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Medium (full luma, no chroma)</source>
+        <translation>중간 (전체 루마, 크로마 없음)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Mode:</source>
+        <translation>모드:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Quality:</source>
+        <translation>품질:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Threshold 1:</source>
+        <translation>임계값 1:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>T_hreshold 2:</source>
+        <translation>임계값 2:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>C_ycle:</source>
+        <translation>사이클:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Sho_w</source>
+        <translation>보이기</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Decomb Decimate</source>
+        <translation>Decomb 데시메이트</translation>
+    </message>
+</context>
+<context>
+    <name>delogo2</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp" line="+41"/>
+        <source>MPlayer delogo2</source>
+        <translation>MPlayer 로고 제거 2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend a logo by interpolating its surrounding box.</source>
+        <translation>로고 주위의 네모를 채워서 로고를 혼합합니다. </translation>
+    </message>
+</context>
+<context>
+    <name>dgbob</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+56"/>
+        <source>dgbob</source>
+        <translation>DGBob</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Donald Graft Bob.</source>
+        <translation>도널드 그래프트가 만든 Bob 필터입니다.</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Top</source>
+        <translation>상단</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom</source>
+        <translation>하단</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Keep nb of frames and fps</source>
+        <translation>프레임 수와 FPS 유지</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double nb of frames and fps</source>
+        <translation>두 배의 프레임 수와 FPS</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double nb of frames (slow motion)</source>
+        <translation>두 배의 프레임 수 (슬로 모션)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Top Field First:</source>
+        <translation>상단 필드 먼저:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Mode:</source>
+        <translation>모드:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Threshold:</source>
+        <translation>임계값:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Extra</source>
+        <translation>추가</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Extra check, avoid using it</source>
+        <translation>그 사용을 회피하기 위한 추가 확인</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DGBob</source>
+        <translation>DGBob</translation>
+    </message>
+</context>
+<context>
+    <name>dummy</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dummy/dummyVideoFilter.cpp" line="+44"/>
+        <source>Dummy</source>
+        <translation>더미</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter, it does nothing at all.</source>
+        <translation>Null 필터, 아무것도 하지 않습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>dv</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
+        <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+        <translation>DV는 720*576*25fps와 720*480*29.97fps만 지원합니다</translation>
+    </message>
+</context>
+<context>
+    <name>encodingDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+26"/>
+        <source>Encoding...</source>
+        <translation>인코딩...</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Main</source>
+        <translation>메인</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+223"/>
+        <source>Unknown</source>
+        <translation>알 수 없음</translation>
+    </message>
+    <message>
+        <location line="-206"/>
+        <location line="+189"/>
+        <location line="+24"/>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <location line="-200"/>
+        <source>Phase:</source>
+        <translation>페이즈:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Time Remaining:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;남은 시간:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Shut down computer when finished</source>
+        <translation>종료시 컴퓨터 끄기</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Priority:</source>
+        <translation>우선권:</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>High</source>
+        <translation>높음</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Above Normal</source>
+        <translation>보통 이상</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Normal</source>
+        <translation>보통</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Below Normal</source>
+        <translation>보통 이하</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Low</source>
+        <translation>낮음</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Minimize to Tray</source>
+        <translation>트레이로 최소화하기</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Pause / Abort</source>
+        <translation>일시 정지 / 취소</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Advanced</source>
+        <translation>고급</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;오디오 코덱:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Container:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;컨테이너:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Video Codec:</source>
+        <translation>비디오 코덱</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Audio Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;오디오 크기:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Total Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;전체 크기:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+7"/>
+        <location line="+17"/>
+        <source>0 MB</source>
+        <translation>0 MB</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Video Size:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;비디오 크기:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Average Bitrate:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;평균 비트레이트:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+37"/>
+        <location line="+51"/>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <location line="-78"/>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Processed Frames:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;처리된 프레임:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;양자화기:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>0 kB/s</source>
+        <translation>0 kB/s</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Elapsed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;경과:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>00:00:00</source>
+        <translation>00:00:00</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Frames/sec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;프레임/초:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>eq2</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
+        <source>MPlayer eq2</source>
+        <translation>MPlayer 비디오 이퀄라이저</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust contrast, brightness, saturation and gamma.</source>
+        <translation>대비, 밝기, 채도와 감마를 조정합니다.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation>초기화</translation>
+    </message>
+</context>
+<context>
+    <name>eq2Dialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+14"/>
+        <location line="+88"/>
+        <source>Contrast</source>
+        <translation>대비</translation>
+    </message>
+    <message>
+        <location line="-51"/>
+        <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
+        <translation>&lt;b&gt;감마&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Saturation</source>
+        <translation>채도</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Brightness</source>
+        <translation>밝기</translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <source>Blue</source>
+        <translation>파란색</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Red</source>
+        <translation>빨간색</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Initial</source>
+        <translation>초기</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Weight</source>
+        <translation>가중치</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Green</source>
+        <translation>녹색</translation>
+    </message>
+</context>
+<context>
+    <name>faac</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.cpp" line="+292"/>
+        <source>_Bitrate:</source>
+        <translation>비트레이트:</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Faac Configuration</source>
+        <translation>FAAC 설정</translation>
+    </message>
+</context>
+<context>
+    <name>fadeTo</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
+        <location line="+24"/>
+        <source>Fade</source>
+        <translation>페이드</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Fade.</source>
+        <translation>점점 사라지게 합니다.</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>_Start time (ms):</source>
+        <translation>시작 시간 (ms):</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time (ms):</source>
+        <translation>끝 시간 (ms):</translation>
+    </message>
+</context>
+<context>
+    <name>fadeToBlack</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+53"/>
+        <location line="+26"/>
+        <source>Fade to black</source>
+        <translation>검정색으로 페이드</translation>
+    </message>
+    <message>
+        <location line="-25"/>
+        <source>Fade to black in/out.</source>
+        <translation>검정색으로 점점 사라지게/나타나게 합니다.</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Out</source>
+        <translation>퇴장 효과</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade out</source>
+        <translation>점점 사라짐 </translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>In</source>
+        <translation>등장 효과</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade in</source>
+        <translation>점점 나타남</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>_Fade type:</source>
+        <translation>페이드 형식:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Start time (ms):</source>
+        <translation>시작 시간 (ms):</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time (ms):</source>
+        <translation>끝 시간 (ms):</translation>
+    </message>
+</context>
+<context>
+    <name>ffmpeg2</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+217"/>
+        <source>Normal (4:3)</source>
+        <translation>보통 (4:3)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Wide (16:9)</source>
+        <translation>와이드 (16:9)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Default</source>
+        <translation>기본값</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tmpgenc</source>
+        <translation>TMPGenc</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Animes</source>
+        <translation>애니메이션</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>KVCD</source>
+        <translation>KVCD</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MB comparison</source>
+        <translation>MB 비교</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fewest bits (vhq)</source>
+        <translation>가장 적은 비트 (vhq)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Rate distortion</source>
+        <translation>비율 왜곡 Rate distortion</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>One thread</source>
+        <translation>1개 쓰레드</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Two threads)</source>
+        <translation>2개 쓰레드</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Three threads</source>
+        <translation>3개 쓰레드</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto (#cpu)</source>
+        <translation>자동 (#cpu)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Progressive</source>
+        <translation>프로그레시브</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Interlaced</source>
+        <translation>인터레이스</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Top Field First</source>
+        <translation>상단 필드 먼저</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom Field First</source>
+        <translation>하단 필드 먼저</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Threading</source>
+        <translation>쓰레딩</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mi_n. quantizer:</source>
+        <translation>최소 양자화기:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ma_x. quantizer:</source>
+        <translation>최대 양자화기:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max. quantizer _difference:</source>
+        <translation>최대 양자화기 차이:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>VBV Buffer Size:</source>
+        <translation>VBV 버퍼 크기:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max bitrate (kb/s):</source>
+        <translation>최대 비트레이트 (kb/s):</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Trellis quantization</source>
+        <translation>트렐리스 Trellis 양자화</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Number of B frames:</source>
+        <translation>B 프레임 개수:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Macroblock decision:</source>
+        <translation>매크로블럭 결정:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Aspect ratio:</source>
+        <translation>화면 비율:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Matrices:</source>
+        <translation>매트릭스:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Filesize tolerance (kb):</source>
+        <translation>파일 크기 허용 오차 (kb):</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Quantizer compression:</source>
+        <translation>양자화기 압축:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantizer _blur:</source>
+        <translation>양자화기 블러 blur:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Gop Size:</source>
+        <translation>GOP 크기:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Interlaced:</source>
+        <translation>인터레이스:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Field Order:</source>
+        <translation>필드 순서:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Basic Settings</source>
+        <translation>기본 설정</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Adv. Settings</source>
+        <translation>고급 설정</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Interlacing</source>
+        <translation>인터레이싱</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quantization</source>
+        <translation>양자화</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Rate Control</source>
+        <translation>속도 제어</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>libavcodec MPEG-2 configuration</source>
+        <translation>libavcodec MPEG-2 설정</translation>
+    </message>
+</context>
+<context>
+    <name>ffmpeg4</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Full</source>
+        <translation>전체</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Log</source>
+        <translation>로그</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Phods</source>
+        <translation>Phods</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>EPZS</source>
+        <translation>EPZS</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>X1</source>
+        <translation>X1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>H.263</source>
+        <translation>H.263</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MPEG</source>
+        <translation>MPEG</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MB comparison</source>
+        <translation>MB 비교</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fewest bits (vhq)</source>
+        <translation>가장 적은 비트 (vhq)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Rate distortion</source>
+        <translation>비율 왜곡 Rate distortion</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>One thread</source>
+        <translation>1개 쓰레드</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Two threads)</source>
+        <translation>2개 쓰레드</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Three threads</source>
+        <translation>3개 쓰레드</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto (#cpu)</source>
+        <translation>자동 (#cpu)</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Matrices</source>
+        <translation>매트릭스</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threading</source>
+        <translation>쓰레딩</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mi_n. quantizer:</source>
+        <translation>최소 양자화기:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ma_x. quantizer:</source>
+        <translation>최대 양자화기:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max. quantizer _difference:</source>
+        <translation>최대 양자화기 차이:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>4_MV</source>
+        <translation>4MV</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Trellis quantization</source>
+        <translation>트렐리스 Trellis 양자화</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Quarter pixel</source>
+        <translation>쿼터 픽셀 Q-pel</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_GMC</source>
+        <translation>GMC</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Number of B frames:</source>
+        <translation>B 프레임 개수:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Quantization type:</source>
+        <translation>양자화 형식:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Macroblock decision:</source>
+        <translation>매크로블럭 결정:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Filesize tolerance (kb):</source>
+        <translation>파일 크기 허용 오차 (kb):</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Quantizer compression:</source>
+        <translation>양자화기 압축:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantizer _blur:</source>
+        <translation>양자화기 블러 blur:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Gop Size:</source>
+        <translation>GOP 크기:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>User Interface</source>
+        <translation>사용자 인터페이스</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Advanced Simple Profile</source>
+        <translation>고급 간편 프로파일</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Motion Estimation</source>
+        <translation>모션 추정</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Quantization</source>
+        <translation>양자화</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Rate Control</source>
+        <translation>속도 제어</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation>libavcodec MPEG-4 설정</translation>
+    </message>
+</context>
+<context>
+    <name>ffmsmpeg4</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="+224"/>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Full</source>
+        <translation>전체</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Log</source>
+        <translation>로그</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Phods</source>
+        <translation>Phods</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>EPZS</source>
+        <translation>EPZS</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>X1</source>
+        <translation>X1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>H.263</source>
+        <translation>H.263</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MPEG</source>
+        <translation>MPEG</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MB comparison</source>
+        <translation>MB 비교</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fewest bits (vhq)</source>
+        <translation>가장 적은 비트 (vhq)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Rate distortion</source>
+        <translation>비율 왜곡 Rate distortion</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Mi_n. quantizer:</source>
+        <translation>최소 양자화기:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ma_x. quantizer:</source>
+        <translation>최대 양자화기:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max. quantizer _difference:</source>
+        <translation>최대 양자화기 차이:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Trellis quantization</source>
+        <translation>트렐리스 Trellis 양자화</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Filesize tolerance (kb):</source>
+        <translation>파일 크기 허용 오차 (kb):</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Quantizer compression:</source>
+        <translation>양자화기 압축:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantizer _blur:</source>
+        <translation>양자화기 블러 blur:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Gop Size:</source>
+        <translation>GOP 크기:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>User Interface</source>
+        <translation>사용자 인터페이스</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quantization</source>
+        <translation>양자화</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Rate Control</source>
+        <translation>속도 제어</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation>libavcodec MPEG-4 설정</translation>
+    </message>
+</context>
+<context>
+    <name>ffnvenc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+219"/>
+        <source>Low Quality</source>
+        <translation>낮은 품질</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
+        <source>High Quality</source>
+        <translation>높은 품질</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
+        <source>BluRay</source>
+        <translation>블루레이</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
+        <source>Low Latency</source>
+        <translation>낮은 레이턴시</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
+        <source>Low Latency (LQ)</source>
+        <translation>낮은 레이턴시 (LQ)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
+        <source>Low Latency (HQ)</source>
+        <translation>낮은 레이턴시 (HQ)</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+7"/>
+        <source>Preset:</source>
+        <translation>프리셋:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation>비트레이트 (kbps):</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+1"/>
+        <source>Max Bitrate (kbps):</source>
+        <translation>최대 비트레이트 (kbps):</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>NVENC H.264 configuration</source>
+        <translation>NVENC H.264 설정</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+4"/>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation>libavcodec MPEG-4 설정</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp" line="+4"/>
+        <source>nvEnc HEVC  configuration</source>
+        <translation>NVENC HEVC 설정</translation>
+    </message>
+</context>
+<context>
+    <name>ffpsmuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+64"/>
+        <source>[Mismatch]</source>
+        <translation>[불일치]</translation>
+    </message>
+    <message>
+        <location line="+78"/>
+        <source>Saving mpeg PS (ff)</source>
+        <translation>Mpeg PS 저장 중 (ff)</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source> video not compatible
+</source>
+        <translation>비디오가 호환되지 않습니다</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source> Bad width/height for VCD
+</source>
+        <translation>VCD용으로는 잘못된 너비/높이</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source> Bad width/height for SVCD
+</source>
+        <translation>SVCD용으로는 잘못된 너비/높이</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source> Bad width/height for DVD
+</source>
+        <translation>DVD용으로는 잘못된 너비/높이</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source> VCD : only MP2 audio accepted
+</source>
+        <translation>VCD: MP2 오디오만 사용 가능합니다</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source> VCD : only 44.1 khz audio accepted
+</source>
+        <translation>VCD: 44.1 khz 오디오만 사용 가능합니다</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source> DVD : only 48 khz audio accepted
+</source>
+        <translation>DVD: 48 khz 오디오만 사용 가능합니다</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>[ffPS] DVD : only MP2/AC3/DTS audio accepted
+</source>
+        <translation>[ffPS] DVD: MP2/AC3/DTS만 사용 가능합니다</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <source>Free</source>
+        <translation>자유</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Muxing Format</source>
+        <translation>먹싱 형식</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Allow non compliant stream</source>
+        <translation>비호환 스트림 허용</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Total Muxrate (kbits)</source>
+        <translation>전체 먹스 속도 (kbits)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video Muxrate (kbits)</source>
+        <translation>비디오 먹스 속도 (kbits)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>VBV size (kBytes)</source>
+        <translation>VBV 크기 (kBytes)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Advanced</source>
+        <translation>고급</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Mpeg PS Muxer</source>
+        <translation>Mpeg PS 먹서</translation>
+    </message>
+</context>
+<context>
+    <name>fftsmuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+143"/>
+        <source>Saving mpeg TS (ff)</source>
+        <translation>Mpeg TS 저장 중 (ff)</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTSConfig.cpp" line="+28"/>
+        <source>VBR muxing</source>
+        <translation>VBR 먹싱</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mux rate (MBits/s)</source>
+        <translation>먹스 속도 (Mbits/s)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>TS Muxer</source>
+        <translation>TS 먹서</translation>
+    </message>
+</context>
+<context>
+    <name>filesel</name>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
+        <source>File error</source>
+        <translation>파일 오류</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cannot open &quot;%s&quot;.</source>
+        <translation>&quot;%s&quot;을 열 수 없습니다.</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>%s already exists.
+
+Do you want to replace it?</source>
+        <translation>%s가 이미 있습니다.
+
+그것을 바꿀까요?</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location line="+14"/>
+        <source>It is possible that you are trying to overwrite an input file!</source>
+        <translation>입력 파일을 덮어 쓰려고 합니다. 주의하세요!</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Cannot write the file</source>
+        <translation>파일을 쓸 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>No write access to &quot;%s&quot;.</source>
+        <translation>&quot;%s&quot;에 쓰기 권한이 없습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>flux</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+37"/>
+        <location line="+56"/>
+        <source>FluxSmooth</source>
+        <translation>FluxSmooth</translation>
+    </message>
+    <message>
+        <location line="-55"/>
+        <source>Spatio-temporal cleaner by Ross Thomas.</source>
+        <translation>공간과 시간상의 잡음을 제거합니다, 로스 토마스 제작.</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>_Temporal threshold:</source>
+        <translation>시간 임계값:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Spatial threshold:</source>
+        <translation>공간 임계값:</translation>
+    </message>
+</context>
+<context>
+    <name>flv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="+162"/>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Full</source>
+        <translation>전체</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Log</source>
+        <translation>로그</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Phods</source>
+        <translation>Phods</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>EPZS</source>
+        <translation>EPZS</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>X1</source>
+        <translation>X1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>H.263</source>
+        <translation>H.263</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MPEG</source>
+        <translation>MPEG</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MB comparison</source>
+        <translation>MB 비교</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fewest bits (vhq)</source>
+        <translation>가장 적은 비트 (vhq)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Rate distortion</source>
+        <translation>비율 왜곡 Rate distortion</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Mi_n. quantizer:</source>
+        <translation>최소 양자화기:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ma_x. quantizer:</source>
+        <translation>최대 양자화기:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max. quantizer _difference:</source>
+        <translation>최대 양자화기 차이:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Trellis quantization</source>
+        <translation>트렐리스 Trellis 양자화</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Filesize tolerance (kb):</source>
+        <translation>파일 크기 허용 오차 (kb):</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Quantizer compression:</source>
+        <translation>양자화기 압축:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quantizer _blur:</source>
+        <translation>양자화기 블러 blur:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Gop Size:</source>
+        <translation>GOP 크기:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>User Interface</source>
+        <translation>사용자 인터페이스</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quantization</source>
+        <translation>양자화</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Rate Control</source>
+        <translation>속도 제어</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>libavcodec FLV1 configuration</source>
+        <translation>libavcodec FLV1 설정</translation>
+    </message>
+</context>
+<context>
+    <name>flvdemuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+406"/>
+        <source>Warning</source>
+        <translation>경고</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>This FLV file says it has no video.
+I will assume it has and try to continue</source>
+        <translation>이 FLV 파일은 비디오가 없다고 하는데
+있다고 가정하고 계속해 보겠습니다</translation>
+    </message>
+</context>
+<context>
+    <name>flvmuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerFlv/muxerFlv.cpp" line="+68"/>
+        <location line="+10"/>
+        <location line="+6"/>
+        <source>Unsupported</source>
+        <translation>미지원</translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <source>Only FLV1 &amp; VP6 supported for video</source>
+        <translation>비디오용으로 FLV와 VP6만 지원합니다</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Only AAC &amp; mpegaudio supported for audio</source>
+        <translation>오디오용으로 AAC와 MPEG 오디오만 지원합니다</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Only 44.1, 22.050 and 11.025 kHz supported</source>
+        <translation>44.1, 22.050k/f 11.025 kHz만 지원합니다</translation>
+    </message>
+</context>
+<context>
+    <name>gaussian</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Gauss.cpp" line="+26"/>
+        <source>Gaussian convolution.</source>
+        <translation>가우시안 컨벌루션</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>3x3 convolution filter :gaussian.</source>
+        <translation>3x3 컨벌루션 필터인 가우시안 필터입니다.</translation>
+    </message>
+</context>
+<context>
+    <name>glBenchmark</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glBenchmark/benchGl.cpp" line="+61"/>
+        <source>OpenGl ReadBack benchmark</source>
+        <translation>OpenGL ReadBack 벤치마크</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Check how fast readback is.</source>
+        <translation>ReadBack이 얼마나 빠른지 검사합니다.</translation>
+    </message>
+</context>
+<context>
+    <name>glFragment</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.cpp" line="+68"/>
+        <source>OpenGl Fragment Shader Sample</source>
+        <translation>OpenGL 프래그먼트 쉐이더 샘플 </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Run a fragment shader.</source>
+        <translation>프래그먼트 쉐이더를 실행합니다.</translation>
+    </message>
+</context>
+<context>
+    <name>glFragment2</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.cpp" line="+66"/>
+        <source>OpenGl Fragment Shader Sample2</source>
+        <translation>OpenGL 프래그먼트 쉐이더 샘플2 </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Run a fragment shader.</source>
+        <translation>프래그먼트 쉐이더를 실행합니다.</translation>
+    </message>
+</context>
+<context>
+    <name>glResize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="+66"/>
+        <source>OpenGl Resize</source>
+        <translation>OpenGL 크기조절</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize using openGl.</source>
+        <translation>OpenGL을 이용해 크기를 조절합니다.</translation>
+    </message>
+    <message>
+        <location line="+146"/>
+        <source>Width :</source>
+        <translation>너비:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height :</source>
+        <translation>높이:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>glResize</source>
+        <translation>glResize</translation>
+    </message>
+</context>
+<context>
+    <name>glRotate</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp" line="+57"/>
+        <source>OpenGl Rotate</source>
+        <translation>OpenGL 회전</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Rotate image by a small amount.</source>
+        <translation>작은 양만큼 이미지를 회전합니다.</translation>
+    </message>
+    <message>
+        <location line="+118"/>
+        <source>Angle (°):</source>
+        <translation>각도 (°):</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>glRotate</source>
+        <translation>glRotate</translation>
+    </message>
+</context>
+<context>
+    <name>glSample</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.cpp" line="+68"/>
+        <source>OpenGl Fragment Shader Sample</source>
+        <translation>OpenGL 프래그먼트 쉐이더 샘플</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Run a fragment shader.</source>
+        <translation>프래그먼트 쉐이더를 실행합니다.</translation>
+    </message>
+</context>
+<context>
+    <name>glShader</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="-182"/>
+        <source>Shader Loader</source>
+        <translation>쉐이더 불러오기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Run an external shader program.</source>
+        <translation>외부 쉐이더 프로그램을 실행합니다.</translation>
+    </message>
+    <message>
+        <location line="+192"/>
+        <source>ShaderFile to load</source>
+        <translation>불러올 쉐이더 파일</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>ShaderLoader</source>
+        <translation>쉐이더로더</translation>
+    </message>
+</context>
+<context>
+    <name>glSmooth</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.cpp" line="+61"/>
+        <source>OpenGl Smooth</source>
+        <translation>OpenGL 부드럽게</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Smooth image while preserving edge.</source>
+        <translation>경계를 보존하면서 이미지를 부드럽게 만듭니다.</translation>
+    </message>
+</context>
+<context>
+    <name>glVdpaufilter</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="+84"/>
+        <source>vdpauDeintGl</source>
+        <translation>vdpauDeintGl</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>VDPAU deinterlacer+resize, openGl version (faster).</source>
+        <translation>VDPAU 디인터레이서+크기조절, OpenGL 버전 (더 빠름).</translation>
+    </message>
+    <message>
+        <location line="+178"/>
+        <source>Keep Top Field</source>
+        <translation>상단 필드 유지</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Keep Bottom Field</source>
+        <translation>하단 필드 유지</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double framerate</source>
+        <translation>더블 프레임레이트</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Resize:</source>
+        <translation>크기조절:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Deint Mode:</source>
+        <translation>Deint 모드:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width :</source>
+        <translation>너비:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height :</source>
+        <translation>높이:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>vdpau</source>
+        <translation>vdpau</translation>
+    </message>
+</context>
+<context>
+    <name>glVertex</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.cpp" line="+59"/>
+        <source>OpenGl Vertex Shader</source>
+        <translation>OpenGL 버텍스 쉐이더</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Run a simple vertex shader.</source>
+        <translation>간단한 버텍스 쉐이더를 실행합니다.</translation>
+    </message>
+</context>
+<context>
+    <name>glWave</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.cpp" line="+59"/>
+        <source>OpenGl wave </source>
+        <translation>OpenGL 웨이브</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Simple wave filter.</source>
+        <translation>간단한 웨이브 필터입니다.</translation>
+    </message>
+</context>
+<context>
+    <name>glYadif</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.cpp" line="+77"/>
+        <source>Yadif (openGl)</source>
+        <translation>Yadif (OpenGL)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Yet another deinterlacer, using shaders.</source>
+        <translation>쉐이더를 이용한 다른 디인터레이싱 필터입니다.</translation>
+    </message>
+    <message>
+        <location line="+182"/>
+        <source>Temporal &amp; spatial check</source>
+        <translation>시간 &amp; 공간 검사</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bob, temporal &amp; spatial check</source>
+        <translation>Bob, 시간 &amp; 공간 검사</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Skip spatial temporal check</source>
+        <translation>시간 공간 검사 건너뛰기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bob, skip spatial temporal check</source>
+        <translation>Bob, 시간 공간 검사 건너뛰기</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Bottom field first</source>
+        <translation>하단 필드 먼저</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Top field first</source>
+        <translation>상단 필드 먼저</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation>모드:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Order:</source>
+        <translation>순서:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>yadif</source>
+        <translation>yadif</translation>
+    </message>
+</context>
+<context>
+    <name>hflip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/horizontalFlip/horizontalFlip.cpp" line="+44"/>
+        <source>Horizontal Flip</source>
+        <translation>수평 뒤집기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Horizontally flip the image.</source>
+        <translation>수평으로 이미지를 뒤집습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>histogram</name>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_bitrateHisto.cpp" line="+56"/>
+        <location line="+75"/>
+        <source>No data</source>
+        <translation>데이터 없음</translation>
+    </message>
+    <message>
+        <location line="+71"/>
+        <source>Max. bitrate:</source>
+        <translation>최대 비트레이트:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Average bitrate:</source>
+        <translation>평균 비트레이트:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Number of I frames:</source>
+        <translation>I 프레임 개수:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Number of P frames:</source>
+        <translation>P 프레임 개수:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Number of B frames:</source>
+        <translation>B 프레임 개수:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max. B frames:</source>
+        <translation>최대 B 프레임:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Bitrate Histogram</source>
+        <translation>비트레이트 히스토그램</translation>
+    </message>
+</context>
+<context>
+    <name>hue</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+60"/>
+        <source>Mplayer Hue</source>
+        <translation>MPlayer 색상</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust hue and saturation.</source>
+        <translation>색상(Hue)과 채도를 조정합니다.</translation>
+    </message>
+</context>
+<context>
+    <name>hueDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui" line="+14"/>
+        <location line="+45"/>
+        <source>Hue</source>
+        <translation>색상 (Hue)</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Saturation</source>
+        <translation>채도 (Saturation)</translation>
+    </message>
+</context>
+<context>
+    <name>huff</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <source>HUFFYUV</source>
+        <translation>HUFFYUV</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>FF HUFFYUV</source>
+        <translation>FF HUFFYUV</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Type:</source>
+        <translation>형식:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>HuffYUV Configuration</source>
+        <translation>HuffYUV 설정</translation>
+    </message>
+</context>
+<context>
+    <name>hzstackfield</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/hzStackField.cpp" line="+52"/>
+        <source>Horizontal Stack Fields</source>
+        <translation>수평 필드 쌓기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Put fields side by side.</source>
+        <translation>필드를 나란히 놓습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>indexing</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
+        <source>Continue indexing</source>
+        <translation>인덱싱을 계속하기</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Abort Requested</source>
+        <translation>요청 사항 취소</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Do you want to abort indexing ?</source>
+        <translation>인덱싱을 취소할까요?</translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <source>Time Left :%02d:%02d:%02d</source>
+        <translation>남은 시간: %02d:%02d:%02d</translation>
+    </message>
+</context>
+<context>
+    <name>ivtcRemover</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
+        <source>Remove IVTC dupe.</source>
+        <translation>IVTC 중복 제거</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove the duplicate frames present after ivtc.</source>
+        <translation>IVTC 후 나오는 중복 프레임을 제거합니다.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
+        <source>_Noise:</source>
+        <translation>노이즈:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
+        <source>_Show:</source>
+        <translation>보이기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation>중복 제거:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <source>Full</source>
+        <translation>전체</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
+        <source>Fast</source>
+        <translation>빠르게</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
+        <source>VeryFast</source>
+        <translation>매우 빠르게</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <source>_Frame rate change:</source>
+        <translation>프레임 속도 변경:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
+        <source>DupeRemover</source>
+        <translation>중복 제거</translation>
+    </message>
+</context>
+<context>
+    <name>jobs</name>
+    <message>
+        <location filename="../ADM_jobs/src/uiJobs.ui" line="+17"/>
+        <source>Avidemux Jobs</source>
+        <translation>Avidemux 작업</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Run all pending jobs</source>
+        <translation>모든 대기 중인 작업 실행</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Run jobs</source>
+        <translation>작업 실행</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Delete already executed jobs</source>
+        <translation>이미 실행한 작업 삭제</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Cleanup</source>
+        <translation>청소</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>If you use VDPAU you cannot use CLI version</source>
+        <translation>VDPAU 사용시 CLI 버전을 사용할 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>use QT4 version</source>
+        <translation>QT4 버전 사용</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Quit</source>
+        <translation>끝내기</translation>
+    </message>
+    <message>
+        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
+        <source>Oops</source>
+        <translation>웁스</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Something very wrong happened when building joblist.</source>
+        <translation>작업 목록을 만드는 중 매우 잘못된 일이 발생했습니다.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>There are no jobs stored</source>
+        <translation>저장된 작업이 없습니다</translation>
+    </message>
+</context>
+<context>
+    <name>jobsDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="+13"/>
+        <source>Jobs</source>
+        <translation>작업</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Delete Sel. Job</source>
+        <translation>선택 작업 삭제</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Delete All Jobs</source>
+        <translation>모든 작업 삭제</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Run All Jobs</source>
+        <translation>모든 작업 실행</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Run Selected Job</source>
+        <translation>선택 작업 실행</translation>
+    </message>
+</context>
+<context>
+    <name>jpeg</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+83"/>
+        <source>YUV422</source>
+        <translation>YUV422</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>YUV420</source>
+        <translation>YUV420</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>_Quantizer:</source>
+        <translation>양자화기:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_ColorSpace:</source>
+        <translation>색공간:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Mjpeg Configuration</source>
+        <translation>MJPEG 설정</translation>
+    </message>
+</context>
+<context>
+    <name>kerneldeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="+50"/>
+        <source>Kernel Deint.</source>
+        <translation>커널 디인터레이서 </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Port of Donald Graft Kernel Deinterlacer.</source>
+        <translation>도널드 그래프트가 만든 커널 디인터레이서입니다.</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top</source>
+        <translation>상단</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom</source>
+        <translation>하단</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Field order:</source>
+        <translation>필드 순서:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Threshold:</source>
+        <translation>임계값:</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Smaller means more deinterlacing</source>
+        <translation>더 작으면 더 많은 디인터레이싱을 뜻합니다</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Sharp</source>
+        <translation>날카롭게</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>_Sharper engine:</source>
+        <translation>날카롭게 엔진:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>T_woway</source>
+        <translation>두방향 twoway</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Extrapolate better (better not to use it)</source>
+        <translation>더 잘 추론하기 (사용하지 않는 게 좋음)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Map</source>
+        <translation>맵 map</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Show interlaced areas (for test!)</source>
+        <translation>인터레이스 영역 보이기 (테스트용!)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>KernelDeint</source>
+        <translation>KernelDeint</translation>
+    </message>
+</context>
+<context>
+    <name>lame</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="+310"/>
+        <source>CBR</source>
+        <translation>CBR</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>ABR</source>
+        <translation>ABR</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Bit_rate mode:</source>
+        <translation>비트레이트 모드:</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>_Bitrate:</source>
+        <translation>비트레이트:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Quality:</source>
+        <translation>품질:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Disable reservoir:</source>
+        <translation>저장소 비활성화:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>LAME Configuration</source>
+        <translation>LAME 설정</translation>
+    </message>
+</context>
+<context>
+    <name>largemedian</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.cpp" line="+36"/>
+        <source>Large Median (5x5).</source>
+        <translation>대형 메디안 (5x5)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Median filter on 5x5 matrix.</source>
+        <translation>5x5 매트릭스의 큰 메디안 필터입니다.</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>_Process luma</source>
+        <translation>루마 처리</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Process luma plane</source>
+        <translation>루마 플레인 처리</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>P_rocess chroma</source>
+        <translation>크로마 처리</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fast Convolution</source>
+        <translation>빠른 컨벌루션</translation>
+    </message>
+</context>
+<context>
+    <name>lavcodec</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+518"/>
+        <source>_Bitrate:</source>
+        <translation>비트레이트:</translation>
+    </message>
+</context>
+<context>
+    <name>lavdecoder</name>
+    <message>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/DIA_lavDecoder.cpp" line="+23"/>
+        <source>_Swap U and V</source>
+        <translation>U와 V 교체하기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show motion _vectors</source>
+        <translation>모션 벡터 보여주기</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Decoder Options</source>
+        <translation>디코더 옵션</translation>
+    </message>
+</context>
+<context>
+    <name>lavdeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="+71"/>
+        <source>Libavdec Deinterlacers</source>
+        <translation>Libavdec 디인터레이서</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lavcodec deinterlacer family.</source>
+        <translation>Lavcodec의 디인터레이싱 필터들입니다.</translation>
+    </message>
+    <message>
+        <location line="+116"/>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Linear blend</source>
+        <translation>선형 혼합 Linear blend</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Linear interpolate</source>
+        <translation>선형 보간 Linear interpolate</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cubic interpolate</source>
+        <translation>큐빅 보간 Cubic interpolate</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Median interpolate</source>
+        <translation>메디안 보간 Median interpolate</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>FFmpeg deint</source>
+        <translation>FFmpeg 디인터레이서</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Deinterlacing:</source>
+        <translation>디인터레이싱:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Autolevel</source>
+        <translation>자동 레벨</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libavcodec deinterlacer</source>
+        <translation>libavcodec 디인터레이서</translation>
+    </message>
+</context>
+<context>
+    <name>licenseDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/license.ui" line="+16"/>
+        <source>License</source>
+        <translation>라이선스</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>OK</source>
+        <translation>확인</translation>
+    </message>
+</context>
+<context>
+    <name>logo</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp" line="+22"/>
+        <source>Add logo</source>
+        <translation>로고 추가</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Put a logo on top of video, with alpha blending.</source>
+        <translation>비디오 위에 로고를 알파블렌딩으로 추가합니다.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
+        <source>Select Logo Image</source>
+        <translation>로고 이미지 선택</translation>
+    </message>
+</context>
+<context>
+    <name>logoDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui" line="+14"/>
+        <source>Logo</source>
+        <translation>로고</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+7"/>
+        <source>Image</source>
+        <translation>이미ㅈ</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Select</source>
+        <translation>선택</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>X</source>
+        <translation>X</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Y</source>
+        <translation>Y</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Alpha will be ignored if the image has alpha channel (png in RGB)</source>
+        <translation>이미지에 알파 채널(RGB로 된 PNG)이 있다면 알파는 무시될 것입니다</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Alpha</source>
+        <translation>알파</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>You can click in the image to set the logo approximatively</source>
+        <translation>로고를 대략적으로 설정하기 위해 이미지에서 클릭할 수 있습니다</translation>
+    </message>
+</context>
+<context>
+    <name>lumaonly</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
+        <source>GreyScale</source>
+        <translation>그레이스케일</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove color, only key grey image.</source>
+        <translation>회색 이미지를 제외한 색상을 제거합니다.</translation>
+    </message>
+</context>
+<context>
+    <name>mainFilterDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="+20"/>
+        <source>Video Filter Manager</source>
+        <translation>비디오 필터 관리자</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
+        <translation>&lt;big&gt;&lt;b&gt;사용 중인 필터&lt;/b&gt;&lt;/big&gt;</translation>
+    </message>
+    <message>
+        <location line="+78"/>
+        <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
+        <translation>&lt;big&gt;&lt;b&gt;이용 가능한 필터&lt;/b&gt;&lt;/big&gt;</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Transform</source>
+        <translation>변환</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Interlacing</source>
+        <translation>인터레이싱</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Colors</source>
+        <translation>색상</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Noise</source>
+        <translation>노이즈</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Sharpness</source>
+        <translation>날카롭게</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Subtitles</source>
+        <translation>자막</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>OpenGl</source>
+        <translation>OpenGL</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Miscellaneous</source>
+        <translation>기타</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>&amp;Preview</source>
+        <translation>미리보기(&amp;P)</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>&amp;Close</source>
+        <translation>닫기(&amp;C)</translation>
+    </message>
+</context>
+<context>
+    <name>matroskademuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
+        <source>Matroska Images</source>
+        <translation>Matroska 이미지</translation>
+    </message>
+    <message>
+        <location line="+426"/>
+        <source>Matroska clusters</source>
+        <translation>Matroska 클러스터</translation>
+    </message>
+</context>
+<context>
+    <name>mcdeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="+81"/>
+        <source>MCDeint</source>
+        <translation>MC 디인터레이서</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation deinterlacer. Ported from MPlayer.</source>
+        <translation>MPlayer에서 가져온 모션 보상 디인터레이서입니다.</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Fast</source>
+        <translation>빠른</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Medium</source>
+        <translation>중간</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Slow iterative motion search</source>
+        <translation>느린 반복 모션 검색</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Extra slow (same as 3+multiple reference frames)</source>
+        <translation>매우 느린 (3+다중 참조 프레임과 동일)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation>모드:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom :</source>
+        <translation>하단:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Qp:</source>
+        <translation>Qp:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>mcDeinterlace</source>
+        <translation>mcDeinterlace</translation>
+    </message>
+</context>
+<context>
+    <name>mean</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Mean.cpp" line="+27"/>
+        <source>Mean convolution.</source>
+        <translation>평균 컨벌루션</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>3x3 convolution filter :mean.</source>
+        <translation>3x3 컨벌루션 필터인 평균 mean 필터입니다.</translation>
+    </message>
+</context>
+<context>
+    <name>median</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Median.cpp" line="+28"/>
+        <source>Median convolution.</source>
+        <translation>메디안 컨벌루션</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>3x3 convolution filter :median.</source>
+        <translation>3x3 컨벌루션 필터인 메디안 median 필터입니다.</translation>
+    </message>
+</context>
+<context>
+    <name>mergeFields</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidMergeField.cpp" line="+52"/>
+        <source>Merge Fields</source>
+        <translation>필드 합치기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Merge two pictures as if they were two fields.</source>
+        <translation>두 화면을 두 필드인 것처럼 합칩니다.</translation>
+    </message>
+</context>
+<context>
+    <name>mkvmuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+139"/>
+        <source>Saving Mkv</source>
+        <translation>Mkv 저장 중</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+27"/>
+        <source>Force display width</source>
+        <translation>출력 너비 강제</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display width</source>
+        <translation>출력 너비</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>MKV Muxer</source>
+        <translation>MKV 먹서</translation>
+    </message>
+</context>
+<context>
+    <name>mp3d</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+201"/>
+        <source>Mplayer Denoise 3D HQ</source>
+        <translation>Mplayer 디노이즈 3D HQ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
+        <translation>노이즈는 줄이고 이미지는 부드럽게, 압축률은 높입니다. HQ 버전.</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>_Spatial luma strength:</source>
+        <translation>공간 루마 강도:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>S_patial chroma strength:</source>
+        <translation>공간 크로마 강도:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Temporal luma strength:</source>
+        <translation>시간 루마 강도</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>T_emporal chroma strength:</source>
+        <translation>시간 크로마 강도</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D HQ</source>
+        <translation>MPlayer 디노이즈 3D HQ</translation>
+    </message>
+    <message>
+        <source>Luma _Temporal strength:</source>
+        <translation>루마 시간 강도:</translation>
+    </message>
+    <message>
+        <source>MPlayer denoise3d</source>
+        <translation>MPlayer denoise3d</translation>
+    </message>
+</context>
+<context>
+    <name>mp3dlow</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="+36"/>
+        <source>Mplayer Denoise 3D</source>
+        <translation>Mplayer 디노이즈 3D</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce noise, smooth image, increase compressibility.</source>
+        <translation>노이즈는 줄이고 이미지는 부드럽게, 압축률은 높입니다.</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>_Spatial luma strength:</source>
+        <translation>공간 루마 강도:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>S_patial chroma strength:</source>
+        <translation>공간 크로마 강도:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Temporal strength:</source>
+        <translation>시간 강도:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D</source>
+        <translation>Mplayer 디노이즈 3D</translation>
+    </message>
+    <message>
+        <source>MPlayer denoise3d</source>
+        <translation>MPlayer denoise3d</translation>
+    </message>
+</context>
+<context>
+    <name>mp4demuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
+        <source>Problem reading SVQ3 headers</source>
+        <translation>SVQ3 헤더를 읽는 중 문제 발생</translation>
+    </message>
+    <message>
+        <source>No stts table</source>
+        <translation>Stts 테이블이 없습니다</translation>
+    </message>
+</context>
+<context>
+    <name>mp4muxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+64"/>
+        <location line="+9"/>
+        <source>Unsupported</source>
+        <translation>미지원</translation>
+    </message>
+    <message>
+        <location line="-9"/>
+        <source>Only MP4Video, H264, and H265 supported for video</source>
+        <translation>비디오용으로 MP4 비디오, H264와 H265만 지원합니다</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Only AAC, AC3, E-AC3 and mpegaudio supported for audio</source>
+        <translation>오디오용으로 AAC, AC3, E-AC3와 MPEG 오디오만 지원합니다</translation>
+    </message>
+    <message>
+        <location line="+81"/>
+        <source>Saving mp4</source>
+        <translation>MP4 저장 중</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Saving PSP</source>
+        <translation>PSP 저장 중</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+27"/>
+        <source>Muxing Format</source>
+        <translation>먹싱 형식</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use alternate MP3 tag</source>
+        <translation>대체 MP3 태그 사용</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>MP4 Muxer</source>
+        <translation>MP4 먹서</translation>
+    </message>
+</context>
+<context>
+    <name>mp4v2muxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <source>Audio</source>
+        <translation>오디오</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Audio format not supported, only AAC/MP3/AC3</source>
+        <translation>AAC/MP3/AC3 오디오 형식만 지원됩니다</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Saving</source>
+        <translation>저장 중</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Video</source>
+        <translation>비디오</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Video does not have enough timing information. Are you copying from AVI?</source>
+        <translation>비디오에 충분한 타이밍 정보가 없습니다. AVI에서 복사 중인가요?</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Cannot rename file (optimize)</source>
+        <translation>파일 이름을 바꿀 수 없습니다 (최적화)</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp" line="+53"/>
+        <source>Invalid frequency for AC3. Only 32, 44.1 &amp; 48 kHz</source>
+        <translation>AC3는 32, 44.1과 48 kHz만 사용할 수 있습니다</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Invalid bitrate for AC3</source>
+        <translation>AC3 용으로는 무효한 비트레이트입니다</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Invalid number of channels for AC3</source>
+        <translation>AC3용으로는 무효한 채널 수입니다</translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>Cannot get AAC Extra data
+</source>
+        <translation>AAC 추가 데이터를 가져올 수 없습니다</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Config.cpp" line="+31"/>
+        <source>Optimize for streaming (SLOW)</source>
+        <translation>스트리밍에 최적화 (느림)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add ipod metadata</source>
+        <translation>아이팟 메타데이터 추가</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MP4V2 Settings</source>
+        <translation>MP4V2 설정</translation>
+    </message>
+</context>
+<context>
+    <name>mpdelogoDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/mpdelogo.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+14"/>
+        <source>Mplayer Delogo</source>
+        <translation>MPlayer 로고 제거</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+32"/>
+        <source>X</source>
+        <translation>X</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+37"/>
+        <source>Y</source>
+        <translation>Y</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="-17"/>
+        <source>Width</source>
+        <translation>너비</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+7"/>
+        <source>Height</source>
+        <translation>높이</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="-14"/>
+        <source>Border Width</source>
+        <translation>경계 너비</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Preview. Click in the image above to coarsly set the box coordinates</source>
+        <translation>미리보기. 네모 좌표를 대충 정하기 위해 위 이미지에서 클릭하세요 </translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+59"/>
+        <source>You can resize the red rectangle using the grips </source>
+        <translation>그립을 이용해 빨간 직사각형의 크기를 조절할 수 있습니다</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Preview</source>
+        <translation>미리보기</translation>
+    </message>
+</context>
+<context>
+    <name>msharpen</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+48"/>
+        <source>Msharpen</source>
+        <translation>MSharpen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
+        <translation>노이즈 증폭 없이 경계를 날카롭게 합니다. 도널드 그래프트 제작.</translation>
+    </message>
+</context>
+<context>
+    <name>msharpenDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui" line="+14"/>
+        <source>MSharpen</source>
+        <translation>MSharpen</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Mask</source>
+        <translation>마스크</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Strength</source>
+        <translation>강도</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Threshold</source>
+        <translation>임계값</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>HighQuality</source>
+        <translation>고품질</translation>
+    </message>
+</context>
+<context>
+    <name>navigate</name>
+    <message>
+        <location filename="../../common/gui_navigate.cpp" line="+244"/>
+        <source>Cannot go to next keyframe</source>
+        <translation>다음 키프레임으로 이동할 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Cannot go to previous keyframe</source>
+        <translation>이전 키프레임으로 이동할 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+192"/>
+        <source>Seek</source>
+        <translation>탐색</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Error</source>
+        <translation>오류</translation>
+    </message>
+</context>
+<context>
+    <name>nvenc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/ADM_nvEnc.cpp" line="+136"/>
+        <source>Low Quality</source>
+        <translation>낮은 품질</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>High Quality</source>
+        <translation>높은 품질</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>BluRay</source>
+        <translation>블루레이</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Low Latency</source>
+        <translation>낮은 레이턴시</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Low Latency (LQ)</source>
+        <translation>낮은 레이턴시 (LQ)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Low Latency (HQ)</source>
+        <translation>낮은 레이턴시 (HQ)</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Preset:</source>
+        <translation>프리셋:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation>비트레이트 (kbps):</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max Bitrate (kbps):</source>
+        <translation>최대 비트레이트 (kbps):</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation>엔비디아 H264 인코더 설정</translation>
+    </message>
+</context>
+<context>
+    <name>opendmldemuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location line="+76"/>
+        <location line="+263"/>
+        <source>Malformed header</source>
+        <translation>잘못된 형식의 헤더</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
+        <source>Unpacking bitstream</source>
+        <translation>비트스트림 압축 해제 중</translation>
+    </message>
+</context>
+<context>
+    <name>partial</name>
+    <message>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
+        <source>Start time (ms):</source>
+        <translation>시작 시간 (ms):</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>End time (ms):</source>
+        <translation>끝 시간 (ms):</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Configure filter</source>
+        <translation>필터 설정</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Partial Filter</source>
+        <translation>부분적인 필터</translation>
+    </message>
+</context>
+<context>
+    <name>printinfo</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/printInfo/printInfo.cpp" line="+44"/>
+        <source>PrintInfo</source>
+        <translation>프린트  정보</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display some informations on Screen.</source>
+        <translation>화면에 몇몇 정보를 출력합니다.</translation>
+    </message>
+</context>
+<context>
+    <name>propsDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="+14"/>
+        <source>Properties</source>
+        <translation>속성</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Video</source>
+        <translation>비디오</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation>텍스트레이블</translation>
+    </message>
+    <message>
+        <location line="-49"/>
+        <source>Frame Rate:</source>
+        <translation>프레임 속도:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location line="+135"/>
+        <source>Total Duration:</source>
+        <translation>전체 시간:</translation>
+    </message>
+    <message>
+        <location line="-121"/>
+        <source>Aspect Ratio:</source>
+        <translation>화면 비율:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Image Size:</source>
+        <translation>이미지 크기:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Codec 4CC:</source>
+        <translation>코덱 4CC:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Extra Video Properties</source>
+        <translation>추가 비디오 속성</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>ExtraDataSize:</source>
+        <translation>추가날짜크기:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Extra data :</source>
+        <translation>추가 데이터:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Audio</source>
+        <translation>오디오</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Frequency:</source>
+        <translation>주파수:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Variable Bitrate:</source>
+        <translation>가변 비트레이트:</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Bitrate:</source>
+        <translation>비트레이트:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Channels:</source>
+        <translation>채널:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Codec:</source>
+        <translation>코덱:</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Copy to Clipboard</source>
+        <translation>클립보드에 복사</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>OK</source>
+        <translation>확인</translation>
+    </message>
+</context>
+<context>
+    <name>psdemuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+61"/>
+        <source>Error</source>
+        <translation>오류</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>This file&apos;s index has been created with an older version of avidemux.
+Please delete the idx2 file and reopen.</source>
+        <translation>이 파일의 인덱스는 이전 버전의 avidemux로 만들었습니다.
+idx2 파일을 삭제하고 파일을 다시 여세요.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+159"/>
+        <source>Indexing</source>
+        <translation>인덱싱</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>There are several files with sequential file names. Should they be all loaded ?</source>
+        <translation>연속적인 파일 이름을 가진 파일이 여럿 있습니다. 전부 불러올까요?</translation>
+    </message>
+</context>
+<context>
+    <name>qaudiotracks</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
+        <source>Select audio file</source>
+        <translation>오디오 파일 선택</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location line="+140"/>
+        <source>Error</source>
+        <translation>오류</translation>
+    </message>
+    <message>
+        <location line="-140"/>
+        <source>Cannot use that file as audio track</source>
+        <translation>그 파일을 오디오 트랙으로 사용할 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+140"/>
+        <source>Some tracks are used multiple times</source>
+        <translation>몇몇 트랙이 중복 사용되었습니다</translation>
+    </message>
+    <message>
+        <location line="+126"/>
+        <source>Track </source>
+        <translation>트랙</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source> from video</source>
+        <translation>비디오에서</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>File </source>
+        <translation>파일</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>.... Add audio track</source>
+        <translation>... 오디오 트랙 추가</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>copy</source>
+        <translation>복사</translation>
+    </message>
+</context>
+<context>
+    <name>qencoding</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+65"/>
+        <location line="+20"/>
+        <source>Privileges Required</source>
+        <translation>권한이 필요합니다</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+20"/>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation>이 동작을 수행하려면 루트 권한이 필요합니다.</translation>
+    </message>
+    <message>
+        <location line="+101"/>
+        <source>First Pass</source>
+        <translation>첫 패스</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Pass 1</source>
+        <translation>패스 1</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Encoding...</source>
+        <translation>인코딩...</translation>
+    </message>
+    <message>
+        <location line="+188"/>
+        <source>The encoding is paused. Do you want to resume or abort?</source>
+        <translation>인코딩을 일시 중지했습니다. 재시작하거나 취소할까요?</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resume</source>
+        <translation>재시작</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Abort</source>
+        <translation>취소</translation>
+    </message>
+</context>
+<context>
+    <name>qfile</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
+        <source>All files (*.*)</source>
+        <translation>전체 파일 (*.*)</translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <location line="+96"/>
+        <source> files (*.</source>
+        <translation>파일 (*.</translation>
+    </message>
+    <message>
+        <location line="-68"/>
+        <source>Overwrite file </source>
+        <translation>파일 덮어쓰기</translation>
+    </message>
+</context>
+<context>
+    <name>qgui2</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
+        <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
+        <translation>&lt;b&gt;새 버전이 나왔습니다!&lt;/b&gt;&lt;br&gt; 버전 %1&lt;br&gt;%2에 배포.&lt;br&gt;여기에서 다운로드할 수 있습니다&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; 자동 업데이트는 환경 설정에서 끌 수 있습니다.&lt;/small&gt;</translation>
+    </message>
+    <message>
+        <location line="+230"/>
+        <source>Recent Files</source>
+        <translation>최근 파일</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Recent Projects</source>
+        <translation>최근 프로젝트</translation>
+    </message>
+    <message>
+        <location line="+627"/>
+        <source>Play/Stop</source>
+        <translation>재생/정지</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to previous frame</source>
+        <translation>이전 프레임으로 가기</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to next frame</source>
+        <translation>다음 프레임으로 가기</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to previous keyframe</source>
+        <translation>이전 키프레임으로 가기</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to next keyframe</source>
+        <translation>다음 키프레임으로 가기</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set start marker</source>
+        <translation>시작 표시 설정</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Set end marker</source>
+        <translation>끝 표시 설정</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Go to first frame</source>
+        <translation>첫 프레임으로 가기</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to last frame</source>
+        <translation>끝 프레임으로 가기</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to marker A</source>
+        <translation>표시 A로 가기</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Go to marker B</source>
+        <translation>표시 B로 가기</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Backward one minute</source>
+        <translation>1분 전으로</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Forward one minute</source>
+        <translation>1분 앞으로</translation>
+    </message>
+    <message>
+        <location line="+605"/>
+        <source>The application has encountered a fatal problem
+The current editing has been saved and will be reloaded at next start</source>
+        <translation>프로그램에서 치명적인 문제가 발생했습니다
+현재 편집 중인 것을 저장하고 다음 시작시에 다시 불러올 것입니다</translation>
+    </message>
+    <message>
+        <location line="+262"/>
+        <source>%c-%s (%02d)</source>
+        <translation>%c-%s (%02d)</translation>
+    </message>
+    <message>
+        <location line="+315"/>
+        <source> (%d track(s))</source>
+        <translation> (%d 트랙)</translation>
+    </message>
+</context>
+<context>
+    <name>qgui2menu</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp" line="+51"/>
+        <source>Project Script</source>
+        <translation>프로젝트 스크립트</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source> Project</source>
+        <translation>프로젝트</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&amp;Run Project...</source>
+        <translation>프로젝트 실행(&amp;R)...</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Debug Project...</source>
+        <translation>프로젝트 디버그(&amp;D)...</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save &amp;As Project...</source>
+        <translation>프로젝트로 저장(&amp;A)...</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Scripting Shell</source>
+        <translation>스크립팅 쉘</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source> Shell</source>
+        <translation>쉘</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Scripting Reference</source>
+        <translation>스크립팅 참고</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source> Reference</source>
+        <translation>참고</translation>
+    </message>
+</context>
+<context>
+    <name>qjobs</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="+13"/>
+        <source>Ready</source>
+        <translation>준비 완료</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Succeeded</source>
+        <translation>성공했습니다</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Failed</source>
+        <translation>실패했습니다</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Deleted</source>
+        <translation>삭제했습니다</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Running</source>
+        <translation>실행 중</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Job Name</source>
+        <translation>작업 이름</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Status</source>
+        <translation>상태</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Start Time</source>
+        <translation>시작 시간</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>End Time</source>
+        <translation>끝 시간</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <location line="+14"/>
+        <source>Sure!</source>
+        <translation>확인!</translation>
+    </message>
+    <message>
+        <location line="-14"/>
+        <source>Delete job</source>
+        <translation>작업 삭제</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Are you sure you want to delete %s job?</source>
+        <translation>%s 작업을 정말 삭제할까요?</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Delete *all* job</source>
+        <translation>*전체* 작업 삭제</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Are you sure you want to delete ALL jobs?</source>
+        <translation>전체 작업을 정말 삭제할까요?</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Already done</source>
+        <translation>이미 완료</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>This script has already been successfully executed.</source>
+        <translation>이 스크립트는 이미 성공적으로 실행되었습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>qlicense</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_license.cpp" line="+25"/>
+        <source>&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot;&gt;&lt;html&gt;&lt;head&gt;  &lt;title&gt;Avidemux is free software; you can redistribute it and/or  modify it under the terms of the GNU General Public License  version 2 as published by the Free Software Foundation&lt;/title&gt;&lt;style type=&quot;text/css&quot;&gt;&lt;!-- /* Style Definitions */ p.licenseStyle, li.licenseStyle, div.licenseStyle        {margin:0cm;        margin-bottom:.0001pt;        font-size:12.0pt;        font-family:&quot;Times New Roman&quot;;} /* Page Definitions */ @page Section1        {size:612.0pt 792.0pt;        margin:72.0pt 90.0pt 72.0pt 90.0pt;}div.Section1        {page:Section1;}--&gt;&lt;/style&gt;&lt;/head&gt;&lt;body lang=&quot;EN-GB&quot; style=&apos;text-justify-trim:punctuation&apos;&gt;  &lt;div class=&quot;Section1&quot;&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt;Avidemux is    free software; you can redistribute it and/or modify it under    the terms of the GNU General Public License version 2 as    published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;b&gt;&lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt;    &lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC    LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Version 2, June    1991&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Copyright (C) 1989, 1991    Free Software Foundation, Inc.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;59 Temple Place, Suite    330, Boston, MA  02111-1307  USA&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Everyone is permitted to    copy and distribute verbatim copies of this license document,    but changing it is not allowed.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Preamble&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The licenses for most    software are designed to take away your freedom to share and    change it.  By contrast, the GNU General Public License is    intended to guarantee your freedom to share and change free    software--to make sure the software is free for all its users.     This General Public License applies to most of the Free    Software Foundation&apos;s software and to any other program whose    authors commit to using it.  (Some other Free Software    Foundation software is covered by the GNU Library General    Public License instead.)  You can apply it to your programs,    too.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;When we speak of free    software, we are referring to freedom, not price.  Our General    Public Licenses are designed to make sure that you have the    freedom to distribute copies of free software (and charge for    this service if you wish), that you receive source code or can    get it if you want it, that you can change the software or use    pieces of it in new free programs; and that you know you can do    these things.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;To protect your rights, we    need to make restrictions that forbid anyone to deny you these    rights or to ask you to surrender the rights. These    restrictions translate to certain responsibilities for you if    you distribute copies of the software, or if you modify    it.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;For example, if you    distribute copies of such a program, whether gratis or for a    fee, you must give the recipients all the rights that you have.     You must make sure that they, too, receive or can get the    source code.  And you must show them these terms so they know    their rights.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;We protect your rights    with two steps: (1) copyright the software, and (2) offer you    this license which gives you legal permission to copy,    distribute and/or modify the software.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Also, for each author&apos;s    protection and ours, we want to make certain that everyone    understands that there is no warranty for this free software.     If the software is modified by someone else and passed on, we    want its recipients to know that what they have is not the    original, so that any problems introduced by others will not    reflect on the original authors&apos; reputations.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Finally, any free program    is threatened constantly by software patents.  We wish to avoid    the danger that redistributors of a free program will    individually obtain patent licenses, in effect making the    program proprietary.  To prevent this, we have made it clear    that any patent must be licensed for everyone&apos;s free use or not    licensed at all.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The precise terms and    conditions for copying, distribution and modification    follow.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC    LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;TERMS AND CONDITIONS FOR    COPYING, DISTRIBUTION AND MODIFICATION&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;0. This License applies to    any program or other work which contains a notice placed by the    copyright holder saying it may be distributed under the terms    of this General Public License.  The &quot;Program&quot;, below, refers    to any such program or work, and a &quot;work based on the Program&quot;    means either the Program or any derivative work under copyright    law: that is to say, a work containing the Program or a portion    of it, either verbatim or with modifications and/or translated    into another language.  (Hereinafter, translation is included    without limitation in the term &quot;modification&quot;.)  Each licensee    is addressed as &quot;you&quot;.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Activities other than    copying, distribution and modification are not covered by this    License; they are outside its scope.  The act of running the    Program is not restricted, and the output from the Program is    covered only if its contents constitute a work based on the    Program (independent of having been made by running the    Program). Whether that is true depends on what the Program    does.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;1. You may copy and    distribute verbatim copies of the Program&apos;s source code as you    receive it, in any medium, provided that you conspicuously and    appropriately publish on each copy an appropriate copyright    notice and disclaimer of warranty; keep intact all the notices    that refer to this License and to the absence of any warranty;    and give any other recipients of the Program a copy of this    License along with the Program.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;You may charge a fee for    the physical act of transferring a copy, and you may at your    option offer warranty protection in exchange for a    fee.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;2. You may modify your    copy or copies of the Program or any portion of it, thus    forming a work based on the Program, and copy and distribute    such modifications or work under the terms of Section 1 above,    provided that you also meet all of these conditions:&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) You must cause the    modified files to carry prominent notices stating that you    changed the files and the date of any change.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) You must cause any work    that you distribute or publish, that in whole or in part    contains or is derived from the Program or any part thereof, to    be licensed as a whole at no charge to all third parties under    the terms of this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) If the modified program    normally reads commands interactively when run, you must cause    it, when started running for such interactive use in the most    ordinary way, to print or display an announcement including an    appropriate copyright notice and a notice that there is no    warranty (or else, saying that you provide a warranty) and that    users may redistribute the program under these conditions, and    telling the user how to view a copy of this License.     (Exception: if the Program itself is interactive but does not    normally print such an announcement, your work based on the    Program is not required to print an announcement.)&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;These requirements apply    to the modified work as a whole.  If identifiable sections of    that work are not derived from the Program, and can be    reasonably considered independent and separate works in    themselves, then this License, and its terms, do not apply to    those sections when you distribute them as separate works.  But    when you distribute the same sections as part of a whole which    is a work based on the Program, the distribution of the whole    must be on the terms of this License, whose permissions for    other licensees extend to the entire whole, and thus to each    and every part regardless of who wrote it.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Thus, it is not the intent    of this section to claim rights or contest your rights to work    written entirely by you; rather, the intent is to exercise the    right to control the distribution of derivative or collective    works based on the Program.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;In addition, mere    aggregation of another work not based on the Program with the    Program (or with a work based on the Program) on a volume of a    storage or distribution medium does not bring the other work    under the scope of this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;3. You may copy and    distribute the Program (or a work based on it, under Section 2)    in object code or executable form under the terms of Sections 1    and 2 above provided that you also do one of the    following:&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) Accompany it with the    complete corresponding machine-readable source code, which must    be distributed under the terms of Sections 1 and 2 above on a    medium customarily used for software interchange;    or,&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) Accompany it with a    written offer, valid for at least three years, to give any    third party, for a charge no more than your cost of physically    performing source distribution, a complete machine-readable    copy of the corresponding source code, to be distributed under    the terms of Sections 1 and 2 above on a medium customarily    used for software interchange; or,&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) Accompany it with the    information you received as to the offer to distribute    corresponding source code.  (This alternative is allowed only    for noncommercial distribution and only if you received the    program in object code or executable form with such an offer,    in accord with Subsection b above.)&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The source code for a work    means the preferred form of the work for making modifications    to it.  For an executable work, complete source code means all    the source code for all modules it contains, plus any    associated interface definition files, plus the scripts used to    control compilation and installation of the executable.     However, as a special exception, the source code distributed    need not include anything that is normally distributed (in    either source or binary form) with the major components    (compiler, kernel, and so on) of the operating system on which    the executable runs, unless that component itself accompanies    the executable.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If distribution of    executable or object code is made by offering access to copy    from a designated place, then offering equivalent access to    copy the source code from the same place counts as distribution    of the source code, even though third parties are not compelled    to copy the source along with the object code.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;4. You may not copy,    modify, sublicense, or distribute the Program except as    expressly provided under this License.  Any attempt otherwise    to copy, modify, sublicense or distribute the Program is void,    and will automatically terminate your rights under this    License. However, parties who have received copies, or rights,    from you under this License will not have their licenses    terminated so long as such parties remain in full    compliance.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;5. You are not required to    accept this License, since you have not signed it.  However,    nothing else grants you permission to modify or distribute the    Program or its derivative works.  These actions are prohibited    by law if you do not accept this License.  Therefore, by    modifying or distributing the Program (or any work based on the    Program), you indicate your acceptance of this License to do    so, and all its terms and conditions for copying, distributing    or modifying the Program or works based on it.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;6. Each time you    redistribute the Program (or any work based on the Program),    the recipient automatically receives a license from the    original licensor to copy, distribute or modify the Program    subject to these terms and conditions.  You may not impose any    further restrictions on the recipients&apos; exercise of the rights    granted herein. You are not responsible for enforcing    compliance by third parties to this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;7. If, as a consequence of    a court judgment or allegation of patent infringement or for    any other reason (not limited to patent issues), conditions are    imposed on you (whether by court order, agreement or otherwise)    that contradict the conditions of this License, they do not    excuse you from the conditions of this License.  If you cannot    distribute so as to satisfy simultaneously your obligations    under this License and any other pertinent obligations, then as    a consequence you may not distribute the Program at all.  For    example, if a patent license would not permit royalty-free    redistribution of the Program by all those who receive copies    directly or indirectly through you, then the only way you could    satisfy both it and this License would be to refrain entirely    from distribution of the Program.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If any portion of this    section is held invalid or unenforceable under any particular    circumstance, the balance of the section is intended to apply    and the section as a whole is intended to apply in other    circumstances.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;It is not the purpose of    this section to induce you to infringe any patents or other    property right claims or to contest validity of any such    claims; this section has the sole purpose of protecting the    integrity of the free software distribution system, which is    implemented by public license practices.  Many people have made    generous contributions to the wide range of software    distributed through that system in reliance on consistent    application of that system; it is up to the author/donor to    decide if he or she is willing to distribute software through    any other system and a licensee cannot impose that    choice.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;This section is intended    to make thoroughly clear what is believed to be a consequence    of the rest of this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;8. If the distribution    and/or use of the Program is restricted in certain countries    either by patents or by copyrighted interfaces, the original    copyright holder who places the Program under this License may    add an explicit geographical distribution limitation excluding    those countries, so that distribution is permitted only in or    among countries not thus excluded.  In such case, this License    incorporates the limitation as if written in the body of this    License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;9. The Free Software    Foundation may publish revised and/or new versions of the    General Public License from time to time.  Such new versions    will be similar in spirit to the present version, but may    differ in detail to address new problems or    concerns.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Each version is given a    distinguishing version number.  If the Program specifies a    version number of this License which applies to it and &quot;any    later version&quot;, you have the option of following the terms and    conditions either of that version or of any later version    published by the Free Software Foundation.  If the Program does    not specify a version number of this License, you may choose    any version ever published by the Free Software    Foundation.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;10. If you wish to    incorporate parts of the Program into other free programs whose    distribution conditions are different, write to the author to    ask for permission.  For software which is copyrighted by the    Free Software Foundation, write to the Free Software    Foundation; we sometimes make exceptions for this.  Our    decision will be guided by the two goals of preserving the free    status of all derivatives of our free software and of promoting    the sharing and reuse of software generally.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;NO WARRANTY&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;11. BECAUSE THE PROGRAM IS    LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM,    TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN    OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER    PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY    KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A    PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND    PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM    PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY    SERVICING, REPAIR OR CORRECTION.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;12. IN NO EVENT UNLESS    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY    COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR    REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU    FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR    CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO    USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR    DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR    THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY    OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN    ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;END OF TERMS AND    CONDITIONS&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;  &lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot;&gt;&lt;html&gt;&lt;head&gt;  &lt;title&gt;Avidemux는 무료 소프트웨어입니다; 자유 소프웨어 재단에 의해 공개된 GNU 일반 공중 사용 허가서 버전 2의 조항 내에서 재배포하거나 변경할 수 있습니다.&lt;/title&gt;&lt;style type=&quot;text/css&quot;&gt;&lt;!-- /* Style Definitions */ p.licenseStyle, li.licenseStyle, div.licenseStyle        {margin:0cm;        margin-bottom:.0001pt;        font-size:12.0pt;        font-family:&quot;Times New Roman&quot;;} /* Page Definitions */ @page Section1        {size:612.0pt 792.0pt;        margin:72.0pt 90.0pt 72.0pt 90.0pt;}div.Section1        {page:Section1;}--&gt;&lt;/style&gt;&lt;/head&gt;&lt;body lang=&quot;EN-GB&quot; style=&apos;text-justify-trim:punctuation&apos;&gt;  &lt;div class=&quot;Section1&quot;&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt;Avidemux는 무료 소프트웨어입니다; 자유 소프웨어 재단에 의해 공개된 GNU 일반 공중 사용 허가서 버전 2의 조항 내에서 재배포하거나 변경할 수 있습니다.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;b&gt;&lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt;    &lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC    LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Version 2, June    1991&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Copyright (C) 1989, 1991    Free Software Foundation, Inc.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;59 Temple Place, Suite    330, Boston, MA  02111-1307  USA&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Everyone is permitted to    copy and distribute verbatim copies of this license document,    but changing it is not allowed.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Preamble&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The licenses for most    software are designed to take away your freedom to share and    change it.  By contrast, the GNU General Public License is    intended to guarantee your freedom to share and change free    software--to make sure the software is free for all its users.     This General Public License applies to most of the Free    Software Foundation&apos;s software and to any other program whose    authors commit to using it.  (Some other Free Software    Foundation software is covered by the GNU Library General    Public License instead.)  You can apply it to your programs,    too.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;When we speak of free    software, we are referring to freedom, not price.  Our General    Public Licenses are designed to make sure that you have the    freedom to distribute copies of free software (and charge for    this service if you wish), that you receive source code or can    get it if you want it, that you can change the software or use    pieces of it in new free programs; and that you know you can do    these things.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;To protect your rights, we    need to make restrictions that forbid anyone to deny you these    rights or to ask you to surrender the rights. These    restrictions translate to certain responsibilities for you if    you distribute copies of the software, or if you modify    it.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;For example, if you    distribute copies of such a program, whether gratis or for a    fee, you must give the recipients all the rights that you have.     You must make sure that they, too, receive or can get the    source code.  And you must show them these terms so they know    their rights.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;We protect your rights    with two steps: (1) copyright the software, and (2) offer you    this license which gives you legal permission to copy,    distribute and/or modify the software.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Also, for each author&apos;s    protection and ours, we want to make certain that everyone    understands that there is no warranty for this free software.     If the software is modified by someone else and passed on, we    want its recipients to know that what they have is not the    original, so that any problems introduced by others will not    reflect on the original authors&apos; reputations.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Finally, any free program    is threatened constantly by software patents.  We wish to avoid    the danger that redistributors of a free program will    individually obtain patent licenses, in effect making the    program proprietary.  To prevent this, we have made it clear    that any patent must be licensed for everyone&apos;s free use or not    licensed at all.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The precise terms and    conditions for copying, distribution and modification    follow.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC    LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;TERMS AND CONDITIONS FOR    COPYING, DISTRIBUTION AND MODIFICATION&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;0. This License applies to    any program or other work which contains a notice placed by the    copyright holder saying it may be distributed under the terms    of this General Public License.  The &quot;Program&quot;, below, refers    to any such program or work, and a &quot;work based on the Program&quot;    means either the Program or any derivative work under copyright    law: that is to say, a work containing the Program or a portion    of it, either verbatim or with modifications and/or translated    into another language.  (Hereinafter, translation is included    without limitation in the term &quot;modification&quot;.)  Each licensee    is addressed as &quot;you&quot;.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Activities other than    copying, distribution and modification are not covered by this    License; they are outside its scope.  The act of running the    Program is not restricted, and the output from the Program is    covered only if its contents constitute a work based on the    Program (independent of having been made by running the    Program). Whether that is true depends on what the Program    does.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;1. You may copy and    distribute verbatim copies of the Program&apos;s source code as you    receive it, in any medium, provided that you conspicuously and    appropriately publish on each copy an appropriate copyright    notice and disclaimer of warranty; keep intact all the notices    that refer to this License and to the absence of any warranty;    and give any other recipients of the Program a copy of this    License along with the Program.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;You may charge a fee for    the physical act of transferring a copy, and you may at your    option offer warranty protection in exchange for a    fee.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;2. You may modify your    copy or copies of the Program or any portion of it, thus    forming a work based on the Program, and copy and distribute    such modifications or work under the terms of Section 1 above,    provided that you also meet all of these conditions:&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) You must cause the    modified files to carry prominent notices stating that you    changed the files and the date of any change.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) You must cause any work    that you distribute or publish, that in whole or in part    contains or is derived from the Program or any part thereof, to    be licensed as a whole at no charge to all third parties under    the terms of this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) If the modified program    normally reads commands interactively when run, you must cause    it, when started running for such interactive use in the most    ordinary way, to print or display an announcement including an    appropriate copyright notice and a notice that there is no    warranty (or else, saying that you provide a warranty) and that    users may redistribute the program under these conditions, and    telling the user how to view a copy of this License.     (Exception: if the Program itself is interactive but does not    normally print such an announcement, your work based on the    Program is not required to print an announcement.)&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;These requirements apply    to the modified work as a whole.  If identifiable sections of    that work are not derived from the Program, and can be    reasonably considered independent and separate works in    themselves, then this License, and its terms, do not apply to    those sections when you distribute them as separate works.  But    when you distribute the same sections as part of a whole which    is a work based on the Program, the distribution of the whole    must be on the terms of this License, whose permissions for    other licensees extend to the entire whole, and thus to each    and every part regardless of who wrote it.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Thus, it is not the intent    of this section to claim rights or contest your rights to work    written entirely by you; rather, the intent is to exercise the    right to control the distribution of derivative or collective    works based on the Program.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;In addition, mere    aggregation of another work not based on the Program with the    Program (or with a work based on the Program) on a volume of a    storage or distribution medium does not bring the other work    under the scope of this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;3. You may copy and    distribute the Program (or a work based on it, under Section 2)    in object code or executable form under the terms of Sections 1    and 2 above provided that you also do one of the    following:&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) Accompany it with the    complete corresponding machine-readable source code, which must    be distributed under the terms of Sections 1 and 2 above on a    medium customarily used for software interchange;    or,&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) Accompany it with a    written offer, valid for at least three years, to give any    third party, for a charge no more than your cost of physically    performing source distribution, a complete machine-readable    copy of the corresponding source code, to be distributed under    the terms of Sections 1 and 2 above on a medium customarily    used for software interchange; or,&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) Accompany it with the    information you received as to the offer to distribute    corresponding source code.  (This alternative is allowed only    for noncommercial distribution and only if you received the    program in object code or executable form with such an offer,    in accord with Subsection b above.)&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The source code for a work    means the preferred form of the work for making modifications    to it.  For an executable work, complete source code means all    the source code for all modules it contains, plus any    associated interface definition files, plus the scripts used to    control compilation and installation of the executable.     However, as a special exception, the source code distributed    need not include anything that is normally distributed (in    either source or binary form) with the major components    (compiler, kernel, and so on) of the operating system on which    the executable runs, unless that component itself accompanies    the executable.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If distribution of    executable or object code is made by offering access to copy    from a designated place, then offering equivalent access to    copy the source code from the same place counts as distribution    of the source code, even though third parties are not compelled    to copy the source along with the object code.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;4. You may not copy,    modify, sublicense, or distribute the Program except as    expressly provided under this License.  Any attempt otherwise    to copy, modify, sublicense or distribute the Program is void,    and will automatically terminate your rights under this    License. However, parties who have received copies, or rights,    from you under this License will not have their licenses    terminated so long as such parties remain in full    compliance.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;5. You are not required to    accept this License, since you have not signed it.  However,    nothing else grants you permission to modify or distribute the    Program or its derivative works.  These actions are prohibited    by law if you do not accept this License.  Therefore, by    modifying or distributing the Program (or any work based on the    Program), you indicate your acceptance of this License to do    so, and all its terms and conditions for copying, distributing    or modifying the Program or works based on it.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;6. Each time you    redistribute the Program (or any work based on the Program),    the recipient automatically receives a license from the    original licensor to copy, distribute or modify the Program    subject to these terms and conditions.  You may not impose any    further restrictions on the recipients&apos; exercise of the rights    granted herein. You are not responsible for enforcing    compliance by third parties to this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;7. If, as a consequence of    a court judgment or allegation of patent infringement or for    any other reason (not limited to patent issues), conditions are    imposed on you (whether by court order, agreement or otherwise)    that contradict the conditions of this License, they do not    excuse you from the conditions of this License.  If you cannot    distribute so as to satisfy simultaneously your obligations    under this License and any other pertinent obligations, then as    a consequence you may not distribute the Program at all.  For    example, if a patent license would not permit royalty-free    redistribution of the Program by all those who receive copies    directly or indirectly through you, then the only way you could    satisfy both it and this License would be to refrain entirely    from distribution of the Program.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If any portion of this    section is held invalid or unenforceable under any particular    circumstance, the balance of the section is intended to apply    and the section as a whole is intended to apply in other    circumstances.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;It is not the purpose of    this section to induce you to infringe any patents or other    property right claims or to contest validity of any such    claims; this section has the sole purpose of protecting the    integrity of the free software distribution system, which is    implemented by public license practices.  Many people have made    generous contributions to the wide range of software    distributed through that system in reliance on consistent    application of that system; it is up to the author/donor to    decide if he or she is willing to distribute software through    any other system and a licensee cannot impose that    choice.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;This section is intended    to make thoroughly clear what is believed to be a consequence    of the rest of this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;8. If the distribution    and/or use of the Program is restricted in certain countries    either by patents or by copyrighted interfaces, the original    copyright holder who places the Program under this License may    add an explicit geographical distribution limitation excluding    those countries, so that distribution is permitted only in or    among countries not thus excluded.  In such case, this License    incorporates the limitation as if written in the body of this    License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;9. The Free Software    Foundation may publish revised and/or new versions of the    General Public License from time to time.  Such new versions    will be similar in spirit to the present version, but may    differ in detail to address new problems or    concerns.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Each version is given a    distinguishing version number.  If the Program specifies a    version number of this License which applies to it and &quot;any    later version&quot;, you have the option of following the terms and    conditions either of that version or of any later version    published by the Free Software Foundation.  If the Program does    not specify a version number of this License, you may choose    any version ever published by the Free Software    Foundation.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;10. If you wish to    incorporate parts of the Program into other free programs whose    distribution conditions are different, write to the author to    ask for permission.  For software which is copyrighted by the    Free Software Foundation, write to the Free Software    Foundation; we sometimes make exceptions for this.  Our    decision will be guided by the two goals of preserving the free    status of all derivatives of our free software and of promoting    the sharing and reuse of software generally.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;NO WARRANTY&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;11. BECAUSE THE PROGRAM IS    LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM,    TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN    OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER    PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY    KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A    PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND    PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM    PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY    SERVICING, REPAIR OR CORRECTION.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;12. IN NO EVENT UNLESS    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY    COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR    REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU    FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR    CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO    USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR    DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR    THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY    OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN    ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;END OF TERMS AND    CONDITIONS&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;  &lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>qmainfilter</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
+        <source>Partial</source>
+        <translation>일부분</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>This filter cannot be made partial</source>
+        <translation>이 필터는 부분적으로 만들 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+244"/>
+        <source>Add</source>
+        <translation>추가</translation>
+    </message>
+    <message>
+        <location line="-96"/>
+        <source>Remove</source>
+        <translation>제거</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>Configure</source>
+        <translation>설정</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <source>Move up</source>
+        <translation>위로 이동</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Move down</source>
+        <translation>아래로 이동</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make partial</source>
+        <translation>부분적으로 만들기</translation>
+    </message>
+    <message>
+        <location line="+224"/>
+        <source>Load video filters..</source>
+        <translation>비디오 필터 불러오기..</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Save video filters..</source>
+        <translation>비디오 필터 저장..</translation>
+    </message>
+</context>
+<context>
+    <name>qprocessing</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+66"/>
+        <source>Unknown</source>
+        <translation>알 수 없음</translation>
+    </message>
+    <message>
+        <location line="+94"/>
+        <source>_Resume</source>
+        <translation>다시 시작</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The processing is paused.</source>
+        <translation>처리를 일시 중지했습니다.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel it ?</source>
+        <translation>취소할까요?</translation>
+    </message>
+</context>
+<context>
+    <name>qprops</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+24"/>
+        <source>No</source>
+        <translation>아니오</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Yes</source>
+        <translation>예</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>%2.3f fps</source>
+        <translation>%2.3f fps</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+59"/>
+        <source>%02d:%02d:%02d.%03d</source>
+        <translation>%02d:%02d:%02d.%03d</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>Video</source>
+        <translation>비디오</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Codec 4CC:	</source>
+        <translation>코덱 4CC:	</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Image Size:	</source>
+        <translation>이미지 크기:	</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Aspect Ratio:	</source>
+        <translation>화면 비율:	</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Frame Rate:	</source>
+        <translation>프레임 속도:	</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+27"/>
+        <source>Total Duration:	</source>
+        <translation>전체 재생시간:	</translation>
+    </message>
+    <message>
+        <location line="-25"/>
+        <source>Extra Video Properties</source>
+        <translation>추가 비디오 속성</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>ExtraDataSize:	</source>
+        <translation>추가날짜크기:	</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Extra data:	</source>
+        <translation>추가 날짜:	</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Audio</source>
+        <translation>오디오</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Codec:		</source>
+        <translation>코덱:		</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Channels:	</source>
+        <translation>채널:	</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Bitrate:	</source>
+        <translation>비트레이트:	</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Frequency:	</source>
+        <translation>주파수:	</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>No Audio</source>
+        <translation>오디오 없음</translation>
+    </message>
+    <message>
+        <location line="-134"/>
+        <source>%s (%u:%u)</source>
+        <translation>%s (%u:%u)</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Mono</source>
+        <translation>모노</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Stereo</source>
+        <translation>Stereo</translation>
+    </message>
+</context>
+<context>
+    <name>qshell</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+43"/>
+        <source>Enter your commands then press the evaluate button or CTRL+ENTER.
+</source>
+        <translation>명령어를 입력하고 &quot;평가&quot; 버튼이나 Ctrl+Enter를 누르세요.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You can use CTRL+PageUP and CTRL+Page Down to recall previous commands
+Ready.
+</source>
+        <translation>이전 명령어를 호출하려면 Ctrl+Page Up과 Ctrl+Page Down 키를 사용할 수 있습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>qtalert</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
+        <source>Alert</source>
+        <translation>경고</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+25"/>
+        <location line="+25"/>
+        <source>Info</source>
+        <translation>정보</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <location line="+30"/>
+        <source>Confirmation</source>
+        <translation>확인</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location line="+30"/>
+        <source>Question</source>
+        <translation>질문</translation>
+    </message>
+    <message>
+        <location line="-7"/>
+        <source>Question?</source>
+        <translation>질문?</translation>
+    </message>
+</context>
+<context>
+    <name>qtray</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_gui/ADM_qtray.cpp" line="+82"/>
+        <source>Open Avidemux</source>
+        <translation>Avidemux 열기</translation>
+    </message>
+</context>
+<context>
+    <name>qvobsub</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
+        <source>Select Idx File</source>
+        <translation>Idx 파일 선택</translation>
+    </message>
+</context>
+<context>
+    <name>removeplane</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp" line="+45"/>
+        <source>Remove  Plane</source>
+        <translation>플레인 제거</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove Y,U or V plane (used mainly to debug other filters).</source>
+        <translation>Y, U나 V 플레인을 제거합니다 (다른 필터를 디버그하는 용도로 쓰임).</translation>
+    </message>
+    <message>
+        <location line="+105"/>
+        <source>Keep Y Plane</source>
+        <translation>Y 플레인 유지</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Process luma plane</source>
+        <translation>루마 플레인 처리</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Keep U Plane</source>
+        <translation>U 플레인 유지</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Process chromaU plane</source>
+        <translation>크로마U 플레인 처리</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Keep V Plane</source>
+        <translation>V 플레인 유지</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Process chromaV plane</source>
+        <translation>크로마V 플레인 처리</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Remove plane</source>
+        <translation>플레인 제거</translation>
+    </message>
+</context>
+<context>
+    <name>resampleFps</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+43"/>
+        <source>Custom</source>
+        <translation>사용자 정의</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>25  (PAL)</source>
+        <translation>25  (PAL)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>23.976 (Film)</source>
+        <translation>23.976 (Film)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>29.97 (NTSC)</source>
+        <translation>29.97 (NTSC)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>50 (Pal)</source>
+        <translation>50 (PAL)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>59.93  (NTSC)</source>
+        <translation>59.93 (NTSC)</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Resample FPS</source>
+        <translation>FPS 리샘플</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change and enforce FPS. Keep duration and sync.</source>
+        <translation>FPS를 강제로 변경합니다. 재생시간과 싱크를 유지합니다.</translation>
+    </message>
+    <message>
+        <location line="+274"/>
+        <source>_Mode:</source>
+        <translation>모드:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_New frame rate:</source>
+        <translation>새 프레임 속도:</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Resample fps</source>
+        <translation>FPS 리샘플</translation>
+    </message>
+</context>
+<context>
+    <name>resize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
+        <source>Width and height cannot be odd</source>
+        <translation>너비와 높이는 홀수가 될 수 없습니다</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+80"/>
+        <source>swsResize</source>
+        <translation>SW 스케일 크기조절</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>swScale Resizer.</source>
+        <translation>SW 방식으로 크기를 조절합니다.</translation>
+    </message>
+</context>
+<context>
+    <name>resizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+13"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+13"/>
+        <source>Resize</source>
+        <translation>크기조절</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+12"/>
+        <source>Aspect Ratio</source>
+        <translation>화면 비율</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+12"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+12"/>
+        <source>Lock Aspect Ratio</source>
+        <translation>화면 비율 잠금</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+18"/>
+        <source>Source:</source>
+        <translation>원본:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+8"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+8"/>
+        <location line="+42"/>
+        <source>1:1</source>
+        <translation>1:1</translation>
+    </message>
+    <message>
+        <location line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <source>4:3</source>
+        <translation>4:3</translation>
+    </message>
+    <message>
+        <location line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-37"/>
+        <location line="+42"/>
+        <source>16:9</source>
+        <translation>16:9</translation>
+    </message>
+    <message>
+        <location line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="-18"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="-18"/>
+        <source>Destination:</source>
+        <translation>대상:</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+44"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+44"/>
+        <source>Resize Dimensions</source>
+        <translation>해상도 크기조절</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+20"/>
+        <source>Width:</source>
+        <translation>너비:</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+36"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+36"/>
+        <source>Height:</source>
+        <translation>높이:</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+35"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation>16 배수의 근사치로 반올림</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+55"/>
+        <source>1%</source>
+        <translation>1%</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+20"/>
+        <source>Percent</source>
+        <translation>퍼센트</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+20"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+20"/>
+        <source>200%</source>
+        <translation>200%</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+50"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+50"/>
+        <source>Error X / Y:</source>
+        <translation>오류 X / Y:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+7"/>
+        <source>0.00 / 0.00</source>
+        <translation>0.00 / 0.00</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+51"/>
+        <source>Resize Method:</source>
+        <translation>크기조절 방법:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+8"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+8"/>
+        <source>Bilinear</source>
+        <translation>Bilinear</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
+        <source>Bicubic</source>
+        <translation>Bicubic</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vf_vdpauGl.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.ui" line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.ui" line="+5"/>
+        <source>Lanzcos3</source>
+        <translation>Lanzcos3</translation>
+    </message>
+</context>
+<context>
+    <name>rotate</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
+        <location line="+163"/>
+        <source>Rotate</source>
+        <translation>회전</translation>
+    </message>
+    <message>
+        <location line="-162"/>
+        <source>Rotate the image by 90/180/270 degrees.</source>
+        <translation>이미지를 90/180/270도로 회전합니다.</translation>
+    </message>
+    <message>
+        <location line="+155"/>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 degrees</source>
+        <translation>90도</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>90°</source>
+        <translation>90°</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 degrees</source>
+        <translation>180도</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>180°</source>
+        <translation>180°</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>270 degrees</source>
+        <translation>270도</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>270°</source>
+        <translation>270°</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Angle:</source>
+        <translation>각도:</translation>
+    </message>
+</context>
+<context>
+    <name>seekablePreviewDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_filters/seekablePreview.ui" line="+20"/>
+        <source>Preview</source>
+        <translation>미리보기</translation>
+    </message>
+    <message>
+        <source>00:00:00.000</source>
+        <translation>00:00:00.000</translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
+        <source>Back one minute</source>
+        <translation>1분 뒤로</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&lt;&lt;</source>
+        <translation>&lt;&lt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Play</source>
+        <translation>재생</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next image</source>
+        <translation>다음 이미지</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&gt;</source>
+        <translation>&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&gt;&gt;</source>
+        <translation>&gt;&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation>1분 앞으로</translation>
+    </message>
+    <message>
+        <source>A&amp;utoZoom</source>
+        <translation>자동 확대/축소</translation>
+    </message>
+</context>
+<context>
+    <name>separateFields</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidSeparateField.cpp" line="+53"/>
+        <source>Separate Fields</source>
+        <translation>필드 분리</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Split each image into 2 fields.</source>
+        <translation>각 이미지를 두개의 필드로 나눕니다.</translation>
+    </message>
+</context>
+<context>
+    <name>shaderLoader</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="-3"/>
+        <source>Reload shader</source>
+        <translation>쉐이더 다시 불러오기</translation>
+    </message>
+</context>
+<context>
+    <name>sharpen</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Sharpen.cpp" line="+27"/>
+        <source>Sharpen convolution.</source>
+        <translation>샤픈 컨벌루션</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>3x3 convolution filter :sharpen.</source>
+        <translation>날카롭게 효과를 주는 3x3 컨벌루션 필터입니다.</translation>
+    </message>
+</context>
+<context>
+    <name>stackfield</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/stackField.cpp" line="+47"/>
+        <source>Stack Fields</source>
+        <translation>필드 중첩</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Put even lines on top, odd lines at bottom.</source>
+        <translation>짝수 줄은 맨 위에, 홀수 줄은 맨 아래에 놓습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>swapuv</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp" line="+41"/>
+        <source>Swap UV</source>
+        <translation>UV 교체</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Swap the U and V planes.</source>
+        <translation>U와 V 플레인을 서로 바꿉니다.</translation>
+    </message>
+</context>
+<context>
+    <name>telecide</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.cpp" line="+45"/>
+        <source>Decomb telecide</source>
+        <translation>Decomb Telecide</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Donald Graft Telecide. Replace ivtc pattern by progressive frames. Video stays at 30 fps.</source>
+        <translation>도널드 그래프트의 텔레사이드 필터. IVTC 패턴을 프로그레시브 프레임으로 바꿉니다. 비디오는 30fps으로 나옵니다. </translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="+186"/>
+        <source>No strategy</source>
+        <translation>계획 없음</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>3:2 pulldown</source>
+        <translation>3:2 풀다운</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>PAL/SECAM</source>
+        <translation>PAL/SECAM</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>NTSC converted from PAL</source>
+        <translation>PAL에서 변환된 NTSC</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Top</source>
+        <translation>상단</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom</source>
+        <translation>하단</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Never</source>
+        <translation>전혀 없음</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>If still combed</source>
+        <translation>여전히 결합되어 있으면 If still combed</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Always</source>
+        <translation>항상</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None but compute</source>
+        <translation>없지만 계산하기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Postproc on best match</source>
+        <translation>최고 일치시 후처리</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Postproc and show zones (debug)</source>
+        <translation>후처리 후 구역 보이기 (디버그)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Process image (not fields)</source>
+        <translation>이미지 처리 (필드 아님)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Process image (not fields), debug</source>
+        <translation>이미지 처리 (필드 아님), 디버그</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Strategy:</source>
+        <translation>계획:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Field order:</source>
+        <translation>필드 순서:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Postprocessing:</source>
+        <translation>후처리:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Try backward:</source>
+        <translation>뒤로 시도:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Direct threshold:</source>
+        <translation>직접 임계값:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Backward threshold:</source>
+        <translation>뒤쪽 임계값</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Noise threshold:</source>
+        <translation>잡음 입계값:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Postp_rocessing threshold:</source>
+        <translation>후처리 임계값</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Use chroma to decide</source>
+        <translation>결정을 위해 크로마 사용</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Sho_w info</source>
+        <translation>정보 보이기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Debu_g</source>
+        <translation>디버그</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bl_end</source>
+        <translation>혼합하기 Blend</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Decomb Telecide</source>
+        <translation>Decomb 텔레사이드</translation>
+    </message>
+</context>
+<context>
+    <name>tsdemuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+70"/>
+        <source>Error</source>
+        <translation>오류</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>This file&apos;s index has been created with an older version of avidemux.
+Please delete the idx2 file and reopen.</source>
+        <translation>이 파일의 인덱스는 이전 버전의 avidemux로 만들었습니다.
+idx2 파일을 삭제하고 파일을 다시 여세요.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+185"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+322"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+82"/>
+        <source>There are several files with sequential file names. Should they be all loaded ?</source>
+        <translation>연속적인 파일 이름을 가진 파일이 여럿 있습니다. 전부 불러올까요?</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+9"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+66"/>
+        <source>Indexing</source>
+        <translation>인덱싱</translation>
+    </message>
+</context>
+<context>
+    <name>twolame</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.cpp" line="+205"/>
+        <source>_Bitrate:</source>
+        <translation>비트레이트:</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>TwoLame Configuration</source>
+        <translation>TwoLame 설정</translation>
+    </message>
+</context>
+<context>
+    <name>uisupport</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
+        <source>X11</source>
+        <translation>X11</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>MS Windows GDI</source>
+        <translation>MS Windows GDI</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mac OS X Quartz 2D</source>
+        <translation>Mac OS X Quartz 2D</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mac OS X QuickDraw</source>
+        <translation>Mac OS X QuickDraw</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>OpenGL</source>
+        <translation>OpenGL</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>MS Windows Direct3D</source>
+        <translation>MS Windows Direct3D</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Default Raster</source>
+        <translation>기본 래스터 </translation>
+    </message>
+</context>
+<context>
+    <name>unstackfield</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/unstackField.cpp" line="+47"/>
+        <source>Unstack Fields</source>
+        <translation>필드 중첩 해제</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Weave top and bottom halves.</source>
+        <translation>2개의 필드로 나뉘어 저장된 영상의 위쪽과 아래쪽 반을 하나로 합칩니다.  </translation>
+    </message>
+</context>
+<context>
+    <name>vaapiResize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+67"/>
+        <source>vaapi: Resize</source>
+        <translation>vaapi: 크기조절</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>vaapi: Resize image using vaapi.</source>
+        <translation>vaapi를 이용하여 이미지의 크기를 조절합니다.</translation>
+    </message>
+    <message>
+        <location line="+134"/>
+        <source>Width :</source>
+        <translation>너비:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height :</source>
+        <translation>높이:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>mpeg-&gt;PC:</source>
+        <translation>mpeg-&gt;PC:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>vaapi</source>
+        <translation>vaapi</translation>
+    </message>
+</context>
+<context>
+    <name>vaenc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp" line="+247"/>
+        <source>Bitrate (kbps):</source>
+        <translation>비트레이트 (kbps):</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max Bitrate (kbps):</source>
+        <translation>최대 비트레이트 (kbps):</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>VAAPI H264 Encoder</source>
+        <translation>vaapi H264 인코더</translation>
+    </message>
+</context>
+<context>
+    <name>vdpaudeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+131"/>
+        <source>vdpauDeint</source>
+        <translation>vdpauDeint</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>VDPAU deinterlacer (+resize).</source>
+        <translation>VDPAU 디인터레이서 (+크기조절).</translation>
+    </message>
+    <message>
+        <location line="+185"/>
+        <source>Keep Top Field</source>
+        <translation>상단 필드 유지</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Keep Bottom Field</source>
+        <translation>하단 필드 유지</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double framerate</source>
+        <translation>더블 프레임레이트</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Ivtc:</source>
+        <translation>Ivtc:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Resize:</source>
+        <translation>크기조절:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Deint Mode:</source>
+        <translation>Deint 모드:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Width :</source>
+        <translation>너비:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height :</source>
+        <translation>높이:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>vdpau</source>
+        <translation>vdpau</translation>
+    </message>
+</context>
+<context>
+    <name>vdpresize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="+69"/>
+        <source>vdpau: Resize</source>
+        <translation>vdpau: 크기조절</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>vdpau: Resize image using vdpau.</source>
+        <translation>vdpau를 이용해 이미지의 크기를 조절합니다.</translation>
+    </message>
+    <message>
+        <location line="+133"/>
+        <source>Width :</source>
+        <translation>너비:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Height :</source>
+        <translation>높이:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>vdpau</source>
+        <translation>vdpau</translation>
+    </message>
+</context>
+<context>
+    <name>vflip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/verticalFlip/verticalFlip.cpp" line="+47"/>
+        <source>Vertical Flip</source>
+        <translation>수직 뒤집기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically flip the image.</source>
+        <translation>이미지를 세로로 뒤집습니다. </translation>
+    </message>
+</context>
+<context>
+    <name>vobSubDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/vobsub.ui" line="+13"/>
+        <source>Subtitle Font Size and Position</source>
+        <translation>자막 글꼴 크기와 위치</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Delay :</source>
+        <translation>지연:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Select File</source>
+        <translation>파일 선택</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Language :</source>
+        <translation>언어:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Idx File :</source>
+        <translation>Idx 파일:</translation>
+    </message>
+</context>
+<context>
+    <name>vorbis</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp" line="+331"/>
+        <source>VBR</source>
+        <translation>VBR</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quality based</source>
+        <translation>품질 기반</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Mode:</source>
+        <translation>모드:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>_Bitrate:</source>
+        <translation>비트레이트:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Quality:</source>
+        <translation>품질:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Vorbis Configuration</source>
+        <translation>Vorbis 설정</translation>
+    </message>
+</context>
+<context>
+    <name>vsWindow</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+68"/>
+        <source>Open VapourSynth File 1</source>
+        <translation>VapourSynth 파일 열기</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>VS File Files (*.vpy)</source>
+        <translation>VS 파일 (*.vpy)</translation>
+    </message>
+</context>
+<context>
+    <name>webmmuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+66"/>
+        <source>Unsupported Video.
+Only VP8/VP9 video and Vorbis/Opus audio supported</source>
+        <translation>미지원 비디오.
+VP8/VP9 비디오와 Vorbis/Opus 오디오만 지원합니다</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Unsupported Audio.
+Only VP8/VP9 video and Vorbis/Opus audio supported</source>
+        <translation>미지원 오디오.
+VP8/VP9 비디오와 Vorbis/Opus 오디오만 지원합니다</translation>
+    </message>
+    <message>
+        <location line="+78"/>
+        <source>Saving Webm</source>
+        <translation>WebM 저장 중</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebmConfig.cpp" line="+27"/>
+        <source>Force display width</source>
+        <translation>출력 너비 강제</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Display width</source>
+        <translation>출력 너비</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Webm Muxer</source>
+        <translation>WebM 먹서</translation>
+    </message>
+</context>
+<context>
+    <name>workingDialog</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
+        <source>Processing</source>
+        <translation>처리 중</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Elapsed:</source>
+        <translation>경과:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Time Remaining:</source>
+        <translation>남은 시간:</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>00:00:00</source>
+        <translation>00:00:00</translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Cancel</source>
+        <translation>취소</translation>
+    </message>
+</context>
+<context>
+    <name>x264</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
+        <source>Not coded</source>
+        <translation>코딩되지 않았습니다</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>this mode has not been implemented
+</source>
+        <translation>이 모드는 구현되지 않았습니다</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
+        <source>none</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Custom</source>
+        <translation>사용자 정의</translation>
+    </message>
+    <message>
+        <location line="+411"/>
+        <source>Target Bitrate:</source>
+        <translation>대상 비트레이트:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+19"/>
+        <source>kbit/s</source>
+        <translation>kbit/s</translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Quantiser:</source>
+        <translation>양자화기:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Quality:</source>
+        <translation>품질:</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Target Video Size:</source>
+        <translation>대상 비디오 크기:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Average Bitrate:</source>
+        <translation>평균 비트레이트:</translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
+
+Do you wish to continue?</source>
+        <translation>매크로블럭-트리 최적화는 변동 적응형 양자화(Variance AQ)를 활성화해야 합니다. 변동 적응형 양자화는 자동으로 활성화될 것입니다.
+
+계속할까요?</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Macroblock-Tree optimisation will automatically be disabled.
+
+Do you wish to continue?</source>
+        <translation>매크로블럭-트리 최적화는 변동 적응형 양자화(Variance AQ)를 활성화해야 합니다. 매크로블럭-트리 최적화는 자동으로 비활성화될 것입니다.
+
+계속할까요?</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <location line="+69"/>
+        <location line="+14"/>
+        <source>Error</source>
+        <translation>오류</translation>
+    </message>
+    <message>
+        <location line="-83"/>
+        <source>Cannot load preset</source>
+        <translation>프리셋을 불러올 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Save Profile</source>
+        <translation>프로파일 저장</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>my profile</source>
+        <translation>내 프로파일</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Overwrite</source>
+        <translation>덮어쓰기</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Replace the following preset ?:</source>
+        <translation>다음 프리셋을 바꿀까요?</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Cannot save preset</source>
+        <translation>프리셋을 저장할 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Cannot delete custom profile</source>
+        <translation>사용자 정의 프로파일을 삭제할 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Do you really want to delete the </source>
+        <translation>정말 </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source> profile ?.
+If it is a system profile it will be recreated next time.</source>
+        <translation>프로파일을 삭제할까요?
+시스템 프로파일이면 다음번에 재생성될 것입니다.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete preset</source>
+        <translation>프리셋 삭제</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Delete</source>
+        <translation>삭제</translation>
+    </message>
+</context>
+<context>
+    <name>x264ConfigDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui" line="+15"/>
+        <source>x264 Configuraton</source>
+        <translation>x264 설정</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Configuration:</source>
+        <translation>설정:</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save As</source>
+        <translation>저장...</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+3152"/>
+        <source>Delete</source>
+        <translation>삭제</translation>
+    </message>
+    <message>
+        <location line="-3110"/>
+        <source>General</source>
+        <translation>일반</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Basic</source>
+        <translation>기본</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Use advanced configuration</source>
+        <translation>고급 설정 사용</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Profile:</source>
+        <translation>프로파일:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Preset:</source>
+        <translation>프리셋:</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>Tuning:</source>
+        <translation>튜닝:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>IDC Level:</source>
+        <translation>IDC 레벨:</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <location line="+1149"/>
+        <source>Auto</source>
+        <translation>자동</translation>
+    </message>
+    <message>
+        <location line="-1144"/>
+        <location line="+669"/>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <location line="-664"/>
+        <source>1.1</source>
+        <translation>1.1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1.2</source>
+        <translation>1.2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1.3</source>
+        <translation>1.3</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2</source>
+        <translation>2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2.1</source>
+        <translation>2.1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2.2</source>
+        <translation>2.2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+639"/>
+        <source>3</source>
+        <translation>3</translation>
+    </message>
+    <message>
+        <location line="-634"/>
+        <source>3.1</source>
+        <translation>3.1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>3.2</source>
+        <translation>3.2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4</source>
+        <translation>4</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4.1</source>
+        <translation>4.1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4.2</source>
+        <translation>4.2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>5</source>
+        <translation>5</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>5.1</source>
+        <translation>5.1</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Fast Decode</source>
+        <translation>빠른 디코더</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zero Latency</source>
+        <translation>제로 레이턴시</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Fast First Pass</source>
+        <translation>빠른 첫 패스</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Threads </source>
+        <translation>쓰레드</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Rate Control</source>
+        <translation>속도 제어</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Target Video Size:</source>
+        <translation>대상 비디오 크기:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Constant Bitrate (Single Pass)</source>
+        <translation>고정 비트레이트 (싱글 패스)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Constant Quantiser (Single Pass)</source>
+        <translation>고정 양자화기 (싱글 패스)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Constant Rate Factor (Single Pass)</source>
+        <translation>고정 속도 인수 (싱글 패스)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Video Size (Two Pass)</source>
+        <translation>비디오 크기 (투 패스)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Average Bitrate (Two Pass)</source>
+        <translation>평균 비트레이트 (투 패스)</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Encoding Mode:</source>
+        <translation>인코딩 모드:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+200"/>
+        <source>0 (High Quality)</source>
+        <translation>0 (높은 품질)</translation>
+    </message>
+    <message>
+        <location line="-177"/>
+        <location line="+200"/>
+        <location line="+1649"/>
+        <source>Quantiser</source>
+        <translation>양자화기</translation>
+    </message>
+    <message>
+        <location line="-1826"/>
+        <location line="+200"/>
+        <source>51 (Low Quality)</source>
+        <translation>51 (낮은 품질)</translation>
+    </message>
+    <message>
+        <location line="-101"/>
+        <source>Advanced RC</source>
+        <translation>고급 RC</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Advanced Rate Control</source>
+        <translation>고급 속도 제어 Rate Control</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Maximum Constant Rate Factor</source>
+        <translation>최대 고정 속도 인수</translation>
+    </message>
+    <message>
+        <location line="+158"/>
+        <source>Macroblock-tree Rate Control</source>
+        <translation>매크로블럭-트리 속도 제어</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Frametype Lookahead:</source>
+        <translation>프레임 형식 미리 보기:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location line="+2490"/>
+        <source>frames</source>
+        <translation>프레임</translation>
+    </message>
+    <message>
+        <location line="-2466"/>
+        <source>Sequence Parameter Set Identifer:</source>
+        <translation>시퀀스 매개변수 세트 식별자: </translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>7</source>
+        <translation>7</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>15</source>
+        <translation>15</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>31</source>
+        <translation>31</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Motion</source>
+        <translation>모션</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Motion Estimation</source>
+        <translation>모션 추정</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion Estimation Method:</source>
+        <translation>모션 추정 방법:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Diamond Search</source>
+        <translation>마름모꼴 Diamond 검색</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hexagonal Search</source>
+        <translation>육각형 Hexagonal 검색</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Uneven Multi-hexagonal Search</source>
+        <translation>홀수의 다중 육각형 Uneven Multi-Hexagonal 검색</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Exhaustive Search</source>
+        <translation>철처하게 Exhaustive 검색</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hadamard Exhaustive Search</source>
+        <translation>하다마르 철저하게 Hadamard Exhaustive 검색</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>1 (Fast)</source>
+        <translation>1 (빠른)</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subpixel Refinement</source>
+        <translation>하위 픽셀 개선</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>10 (Best)</source>
+        <translation>10 (최고)</translation>
+    </message>
+    <message>
+        <location line="+78"/>
+        <source>Motion Vector</source>
+        <translation>모션 벡터</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Maximum Motion Vector Length:</source>
+        <translation>최대 모션 벡터 길이:</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Minimum Buffer Between Threads:</source>
+        <translation>쓰레드 사이의 최소 버퍼:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Maximum Motion Vector Search Range:</source>
+        <translation>최대 모션 벡터 검색 범위:</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Prediction</source>
+        <translation>예측</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+450"/>
+        <location line="+36"/>
+        <source>Disabled</source>
+        <translation>비활성화</translation>
+    </message>
+    <message>
+        <location line="-481"/>
+        <source>Weighted References</source>
+        <translation>가중된 참조들</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted References + Duplicates</source>
+        <translation>가중된 참조들 + 중복들</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Direct Prediction Mode:</source>
+        <translation>직접 예측 모드:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Weighted Prediction for P-frames:</source>
+        <translation>P 프레임에 대한 가중된 예측:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location line="+2596"/>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <location line="-2591"/>
+        <source>Spatial</source>
+        <translation>공간의</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Temporal</source>
+        <translation>시간의</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Weighted Prediction for B-frames</source>
+        <translation>B 프레임에 대한 가중된 예측</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Constrained Intra Prediction</source>
+        <translation>강제적인 인트라 예측</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Partition</source>
+        <translation>파티션</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Partition Search</source>
+        <translation>파티션 검색</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>8x8 DCT Spatial Transform</source>
+        <translation>8x8 DCT 공간 트랜스폼</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>8x8, 8x16 and 16x8 P-frame Intra-predicted Blocks</source>
+        <translation>8x8, 8x16과 16x8 P-프레임 인트라-예측된 블럭</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>8x8, 8x16 and 16x8 B-frame Intra-predicted Blocks</source>
+        <translation>8x8, 8x16과 16x8 P-프레임 인트라-예측된 블럭</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>4x4, 4x8 and 8x4 P-frame Intra-predicted Blocks</source>
+        <translation>4x4, 4x8과 8x4 P-프레임 인트라-예측된 블럭</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>8x8 Intra-predicted Blocks</source>
+        <translation>8x8 인트라-예측된 블럭</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>4x4 Intra-predicted Blocks</source>
+        <translation>4x4 인트라-예측된 블럭</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Frame</source>
+        <translation>프레임</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Frame Encoding</source>
+        <translation>프레임 인코딩</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>CABAC</source>
+        <translation>CABAC</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Loop Filter:</source>
+        <translation>루프 Loop 필터:</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location line="+1328"/>
+        <source>Strength:</source>
+        <translation>강도:</translation>
+    </message>
+    <message>
+        <location line="-1289"/>
+        <source>Threshold:</source>
+        <translation>임계값:</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Open GOP:</source>
+        <translation>GOP 열기:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Normal Mode</source>
+        <translation>보통 모드</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Blu-ray Mode</source>
+        <translation>블루레이 모드</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Interlaced:</source>
+        <translation>인터레이스:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Bottom Field First</source>
+        <translation>하단 필드 먼저</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Top Field First</source>
+        <translation>상단 필드 먼저</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Maximum Reference Frames:</source>
+        <translation>최대 참조 프레임:</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>B-frames</source>
+        <translation>B 프레임</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>B-frames as References:</source>
+        <translation>B 프레임을 참조로:</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Strictly Hierarchical Pyramid</source>
+        <translation>엄격하게 계층적인 피라미드</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Non-strict (Not Blu-ray Compatible)</source>
+        <translation>엄격하지 않음 (블루레이 비호환)</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>Fast</source>
+        <translation>빠른</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Optimal</source>
+        <translation>최적</translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>B-frame Bias:</source>
+        <translation>B 프레임 편향:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Maximum Consecutive B-frames:</source>
+        <translation>최대 연속 B 프레임:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Adaptive B-frame Decision:</source>
+        <translation>적응형 B 프레임 결정:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>I-frames</source>
+        <translation>I 프레임</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>GOP Size:</source>
+        <translation>GOP 크기:</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Minimum:</source>
+        <translation>최소:</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Maximum:</source>
+        <translation>최대:</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I-frame Threshold:</source>
+        <translation>I 프레임 임계값:</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Periodic Intra Refresh</source>
+        <translation>주기적인 인트라 갱신</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <location line="+6"/>
+        <source>Analysis</source>
+        <translation>분석</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Mixed References</source>
+        <translation>뒤섞인 참조들</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Chroma Motion Estimation</source>
+        <translation>크로마 모션 예측</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Trellis Quantization:</source>
+        <translation>트렐리스 Trellis 양자화:</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Final Macroblock Only</source>
+        <translation>마지막 매크로블럭만</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Always On</source>
+        <translation>항상 켬</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Fast Skip Detection on P-frames</source>
+        <translation>P 프레임에서 빠른 건너뛰기 검출</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>DCT Decimation on P-frames</source>
+        <translation>P 프레임에서 DCT 데시메이션 Decimation</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Psychovisual Rate Distortion Optimisation:</source>
+        <translation>시각 심리 비율 왜곡 최적화:</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Psychovisual Trellis:</source>
+        <translation>시각 심리 트렐리스:</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Noise Reduction:</source>
+        <translation>노이즈 리덕션:</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Luma Quantisation Deadzone</source>
+        <translation>루마 양자화 데드존</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Intra Luma Quantisation Deadzone:</source>
+        <translation>인트라 루마 양자화 데드존:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Inter Luma Quantisation Deadzone:</source>
+        <translation>인터 루마 양자화 데드존:</translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Quantisation Matrix</source>
+        <translation>양자화 매트릭스</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Flat Matrix</source>
+        <translation>평평한 매트릭스</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>JVT Matrix</source>
+        <translation>JVT 매트릭스</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Custom Matrix</source>
+        <translation>사용자 정의 매트릭스</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+856"/>
+        <source>Edit</source>
+        <translation>편집</translation>
+    </message>
+    <message>
+        <location line="-809"/>
+        <source>Quantiser Control</source>
+        <translation>양자화기 제어</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Maximum Quantiser:</source>
+        <translation>최대 양자화기:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>I and P-frame Quantiser Ratio:</source>
+        <translation>I와 P 프레임 양자화기 비율:</translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <location line="+179"/>
+        <location line="+302"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location line="-459"/>
+        <source>Maximum Quantiser Step:</source>
+        <translation>최대 양자화기 스텝:</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>P and B-frame Quantiser Ratio:</source>
+        <translation>P와 B 프레임 양자화기 비율:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Average Bitrate Tolerance:</source>
+        <translation>평균 비트레이트 허용 오차: </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Chroma to Luma Quantiser Offset:</source>
+        <translation>크로마에서 루마까지 양자화기 오프셋:</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Minimum Quantiser:</source>
+        <translation>최소 양자화기:</translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>Quantiser Curve Compression</source>
+        <translation>양자화기 곡선 압축 Quantiser Curve Compression</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Quantiser Curve Compression:</source>
+        <translation>양자화기 곡선 압축:</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Reduce Fluctuation Before Curve Compression:</source>
+        <translation>곡선 압축 전 변동폭 줄이기:</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Reduce Fluctuation After Curve Compression:</source>
+        <translation>곡선 압축 후 변동폭 줄이기</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Adaptive Quantisation</source>
+        <translation>적응형 양자화 Adaptive Quantisation</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Variance AQ:</source>
+        <translation>변동 적응형 양자화 Variance AQ</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Normal</source>
+        <translation>보통</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance AQ</source>
+        <translation>자동 변동 적응형 양자화</translation>
+    </message>
+    <message>
+        <location line="+91"/>
+        <source>Advanced 1</source>
+        <translation>고급 1</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Video Buffer Verifier</source>
+        <translation>비디오 버퍼 검사기</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Maximum VBV Bitrate:</source>
+        <translation>최대 VBV 비트레이트:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Initial VBV Buffer Occupancy:</source>
+        <translation>초기 VBV 버퍼 점유: </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>kbit</source>
+        <translation>kbit</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>kbit/s</source>
+        <translation>kbit/s</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>VBV Buffer Size:</source>
+        <translation>VBV 버퍼 크기:</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Slicing</source>
+        <translation>슬라이싱</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Slices per Frame:</source>
+        <translation>프레임당 슬라이스:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Maximum Size per Slice:</source>
+        <translation>슬라이스당 최대 크기:</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>bytes</source>
+        <translation>바이트</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Maximum Macroblocks per Slice:</source>
+        <translation>슬라이스당 최대 매크로블럭:</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Zones</source>
+        <translation>구역</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Add</source>
+        <translation>추가</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Advanced 2</source>
+        <translation>고급 2</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Multithreading</source>
+        <translation>멀티쓰레딩</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Disable</source>
+        <translation>비활성화</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Auto-detect</source>
+        <translation>자동 감지</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Custom:</source>
+        <comment>multithreading</comment>
+        <translation>사용자 정의:</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Enforce Repeatability</source>
+        <translation>반복성 강제하기</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Slice-based Threading</source>
+        <translation>슬라이스 기반의 쓰레딩</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Custom Threaded Lookahead Buffer:</source>
+        <translation>쓰레드된 미리보기 버퍼 사용자 정의:</translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>Output 1</source>
+        <translation>출력 1</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Output</source>
+        <translation>출력</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Generate Access Unit Delimiters</source>
+        <translation>접근 단위 Access Unit 구분 문자 만들기</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>BluRay compatibility</source>
+        <translation>블루레이 호환성</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Generate fake interlaced</source>
+        <translation>가짜 인터레이스 만들기</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pixel Aspect Ratio</source>
+        <translation>픽셀 종횡비 Pixel Aspect Ratio </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Custom:</source>
+        <comment>PAR</comment>
+        <translation>사용자 정의:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>As Input</source>
+        <translation>입력 그대로</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>:</source>
+        <translation>:</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Predefined Aspect Ratio:</source>
+        <translation>가로/세로 비율 프리셋:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>16:15 (PAL 4:3)</source>
+        <translation>16:15 (PAL 4:3)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>64:45 (PAL 16:9)</source>
+        <translation>64:45 (PAL 16:9)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>8:9 (NTSC 4:3)</source>
+        <translation>8:9 (NTSC 4:3)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>32:27 (NTSC 16:9)</source>
+        <translation>32:27 (NTSC 16:9)</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Output 2</source>
+        <translation>출력 2</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Video Usability Information</source>
+        <translation>비디오 가용성 정보 </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>These settings are only suggestions for the playback equipment.  Use at your own risk.</source>
+        <translation>이 설정은 단지 재생 장치를 위한 제안입니다. 주의해서 사용하세요.</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Overscan:</source>
+        <translation>오버스캔:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+46"/>
+        <location line="+58"/>
+        <location line="+63"/>
+        <location line="+73"/>
+        <source>Undefined</source>
+        <translation>미정의</translation>
+    </message>
+    <message>
+        <location line="-235"/>
+        <source>Show</source>
+        <translation>보이기</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Crop</source>
+        <translation>잘라내기</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Video Format:</source>
+        <translation>비디오 형식:</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Component</source>
+        <translation>컴포넌트</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>PAL</source>
+        <translation>PAL</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>NTSC</source>
+        <translation>NTSC</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>SECAM</source>
+        <translation>SECAM</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MAC</source>
+        <translation>MAC</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Colour Primaries:</source>
+        <translation>컬러 프라이머리:</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+63"/>
+        <location line="+73"/>
+        <source>BT709</source>
+        <translation>BT709</translation>
+    </message>
+    <message>
+        <location line="-131"/>
+        <location line="+63"/>
+        <source>BT470M</source>
+        <translation>BT470M</translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <location line="+63"/>
+        <location line="+73"/>
+        <source>BT470BG</source>
+        <translation>BT470BG</translation>
+    </message>
+    <message>
+        <location line="-131"/>
+        <location line="+136"/>
+        <source>SMPTE170M</source>
+        <translation>SMPTE170M</translation>
+    </message>
+    <message>
+        <location line="-131"/>
+        <location line="+78"/>
+        <location line="+58"/>
+        <source>SMPTE240M</source>
+        <translation>SMPTE240M</translation>
+    </message>
+    <message>
+        <location line="-131"/>
+        <source>Film</source>
+        <translation>Film</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Transfer Characteristics:</source>
+        <translation>전송 특성:</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Linear</source>
+        <translation>선형</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>LOG100</source>
+        <translation>LOG100</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>LOG316</source>
+        <translation>LOG316</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>SMPTEL170M</source>
+        <translation>SMPTEL170M</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Colour Matrix:</source>
+        <translation>컬러 매트릭스:</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>FCC</source>
+        <translation>FCC</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>GBR</source>
+        <translation>GBR</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>YCgCo</source>
+        <translation>YCgCo</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>HRD Parameters:</source>
+        <translation>HDR 매개변수:</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>VBR</source>
+        <translation>VBR</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>CBR</source>
+        <translation>CBR</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Chroma Sample Location:</source>
+        <translation>크로마 샘플 위치:</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Full Range Samples</source>
+        <translation>전체 범위 샘플</translation>
+    </message>
+</context>
+<context>
+    <name>x264CustomMatrixDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264CustomMatrixDialog.ui" line="+16"/>
+        <source>x264 Custom Matrix</source>
+        <translation>x264 사용자 정의 매트릭스</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Intra 4x4</source>
+        <translation>인트라 4x4</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+446"/>
+        <location line="+446"/>
+        <location line="+703"/>
+        <source>Luma:</source>
+        <translation>루마:</translation>
+    </message>
+    <message>
+        <location line="-1385"/>
+        <location line="+446"/>
+        <source>Chroma U/V:</source>
+        <translation>크로마 U/V:</translation>
+    </message>
+    <message>
+        <location line="-238"/>
+        <source>Inter 4x4</source>
+        <translation>인터 4x4</translation>
+    </message>
+    <message>
+        <location line="+446"/>
+        <source>Intra 8x8</source>
+        <translation>인트라 8x8</translation>
+    </message>
+    <message>
+        <location line="+703"/>
+        <source>Inter 8x8</source>
+        <translation>인터 8x8</translation>
+    </message>
+    <message>
+        <location line="+727"/>
+        <source>Load File</source>
+        <translation>파일 불러오기</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>OK</source>
+        <translation>확인</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cancel</source>
+        <translation>취소</translation>
+    </message>
+</context>
+<context>
+    <name>x265</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
+        <source>Not coded</source>
+        <translation>코딩되지 않았습니다</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>this mode has not been implemented
+</source>
+        <translation>이 모드는 구현되지 않았습니다</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
+        <source>none</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Custom</source>
+        <translation>사용자 정의</translation>
+    </message>
+    <message>
+        <location line="+357"/>
+        <source>Target Bitrate:</source>
+        <translation>대상 비트레이트:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+20"/>
+        <source>kbit/s</source>
+        <translation>kbit/s</translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Quantiser:</source>
+        <translation>양자화기:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Quality:</source>
+        <translation>품질:</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Target Video Size:</source>
+        <translation>대상 비디오 크기:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Average Bitrate:</source>
+        <translation>평균 비트레이트:</translation>
+    </message>
+    <message>
+        <location line="+101"/>
+        <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
+
+Do you wish to continue?</source>
+        <translation>매크로블럭-트리 최적화는 변동 적응형 양자화(Variance AQ)를 활성화해야 합니다. 변동 적응형 양자화는 자동으로 활성화될 것입니다.</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Macroblock-Tree optimisation will automatically be disabled.
+
+Do you wish to continue?</source>
+        <translation>매크로블럭-트리 최적화는 변동 적응형 양자화(Variance AQ)를 활성화해야 합니다. 매크로블럭-트리 최적화는 자동으로 비활성화될 것입니다.</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <location line="+69"/>
+        <location line="+14"/>
+        <source>Error</source>
+        <translation>오류</translation>
+    </message>
+    <message>
+        <location line="-83"/>
+        <source>Cannot load preset</source>
+        <translation>프리셋을 불러올 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Save Profile</source>
+        <translation>프로파일 저장</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Overwrite</source>
+        <translation>덮어쓰기</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Replace the following preset ?:</source>
+        <translation>다음 프리셋을 바꿀까요?</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Cannot save preset</source>
+        <translation>프리셋을 저장할 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Cannot delete custom profile</source>
+        <translation>사용자 정의 프로파일을 삭제할 수 없습니다</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Do you really want to delete the </source>
+        <translation>정말 </translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source> profile ?.
+If it is a system profile it will be recreated next time.</source>
+        <translation>프로파일을 삭제할까요?
+시스템 프로파일이면 다음번에 재생성될 것입니다.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete preset</source>
+        <translation>프리셋 삭제</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Delete</source>
+        <translation>삭제</translation>
+    </message>
+</context>
+<context>
+    <name>x265ConfigDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
+        <source>x265 Configuraton</source>
+        <translation>x265 설정</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Configuration:</source>
+        <translation>설정:</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save As</source>
+        <translation>저장...</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+2731"/>
+        <source>Delete</source>
+        <translation>삭제</translation>
+    </message>
+    <message>
+        <location line="-2689"/>
+        <source>General</source>
+        <translation>일반</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Basic</source>
+        <translation>기본</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Use advanced configuration</source>
+        <translation>고급 설정 사용</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Profile:</source>
+        <translation>프로파일:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Preset:</source>
+        <translation>프리셋:</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>Tuning:</source>
+        <translation>튜닝:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>IDC Level:</source>
+        <translation>IDC 레벨:</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Auto</source>
+        <translation>자동</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+668"/>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <location line="-663"/>
+        <source>1.1</source>
+        <translation>1.1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1.2</source>
+        <translation>1.2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1.3</source>
+        <translation>1.3</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2</source>
+        <translation>2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2.1</source>
+        <translation>2.1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>2.2</source>
+        <translation>2.2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+638"/>
+        <source>3</source>
+        <translation>3</translation>
+    </message>
+    <message>
+        <location line="-633"/>
+        <source>3.1</source>
+        <translation>3.1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>3.2</source>
+        <translation>3.2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4</source>
+        <translation>4</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4.1</source>
+        <translation>4.1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4.2</source>
+        <translation>4.2</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>5</source>
+        <translation>5</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>5.1</source>
+        <translation>5.1</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Pool Threads </source>
+        <translation>풀 Pool 쓰레드 </translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Frame Threads </source>
+        <translation>프레임 쓰레드</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Rate Control</source>
+        <translation>속도 제어</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Target Video Size:</source>
+        <translation>대상 비디오 크기:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Constant Bitrate (Single Pass)</source>
+        <translation>고정 비트레이트 (싱글 패스)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Constant Quantiser (Single Pass)</source>
+        <translation>고정 양자화기 (싱글 패스)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Constant Rate Factor (Single Pass)</source>
+        <translation>고정 속도 인수 (싱글 패스)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Video Size (Two Pass)</source>
+        <translation>비디오 크기 (투 패스)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Average Bitrate (Two Pass)</source>
+        <translation>평균 비트레이트 (투 패스)</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Encoding Mode:</source>
+        <translation>인코딩 모드:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <location line="+213"/>
+        <source>0 (High Quality)</source>
+        <translation>0 (높은 품질)</translation>
+    </message>
+    <message>
+        <location line="-190"/>
+        <location line="+213"/>
+        <location line="+1267"/>
+        <source>Quantiser</source>
+        <translation>양자화기</translation>
+    </message>
+    <message>
+        <location line="-1457"/>
+        <location line="+213"/>
+        <source>51 (Low Quality)</source>
+        <translation>51 (낮은 품질)</translation>
+    </message>
+    <message>
+        <location line="-143"/>
+        <source>Use Strict Constant Bitrate Mode</source>
+        <translation>엄격한 고정 비트레이트 모드 사용</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Advanced RC</source>
+        <translation>고급 RC</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Advanced Rate Control</source>
+        <translation>고급 속도 제어 Rate Control</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Maximum Constant Rate Factor</source>
+        <translation>최대 고정 속도 인수</translation>
+    </message>
+    <message>
+        <location line="+158"/>
+        <source>Coding Unit-tree Rate Control</source>
+        <translation>코딩 트리 단위(CTU) 속도 제어</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Frametype Lookahead:</source>
+        <translation>프레임 형식 미리 보기:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location line="+2070"/>
+        <source>frames</source>
+        <translation>프레임</translation>
+    </message>
+    <message>
+        <location line="-2046"/>
+        <source>Sequence Parameter Set Identifer:</source>
+        <translation>시퀀스 매개변수 세트 식별자: </translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>7</source>
+        <translation>7</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>15</source>
+        <translation>15</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>31</source>
+        <translation>31</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Motion</source>
+        <translation>모션</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Motion Estimation</source>
+        <translation>모션 추정</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion Estimation Method:</source>
+        <translation>모션 추정 방법:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Diamond Search</source>
+        <translation>마름모꼴 Diamond 검색</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hexagonal Search</source>
+        <translation>육각형 Hexagonal 검색</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Uneven Multi-hexagonal Search</source>
+        <translation>홀수의 다중 육각형 Uneven Multi-Hexagonal 검색</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Star Search</source>
+        <translation>별 모양 Star 검색</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Exhaustive Search</source>
+        <translation>철처하게 Exhaustive 검색</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>1 (Fast)</source>
+        <translation>1 (빠른)</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subpixel Refinement</source>
+        <translation>하위 픽셀 개선</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>7 (Best)</source>
+        <translation>7 (최고)</translation>
+    </message>
+    <message>
+        <location line="+78"/>
+        <source>Motion Vector</source>
+        <translation>모션 벡터</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Maximum Motion Vector Search Range:</source>
+        <translation>최대 모션 벡터 검색 범위:</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Prediction</source>
+        <translation>예측</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Weighted Prediction for B-frames</source>
+        <translation>B 프레임에 대한 가중된 예측</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Constrained Intra Prediction</source>
+        <translation>강제적인 인트라 예측</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Weighted Prediction for P-frames:</source>
+        <translation>P 프레임에 대한 가중된 예측:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+217"/>
+        <location line="+36"/>
+        <source>Disabled</source>
+        <translation>비활성화됨</translation>
+    </message>
+    <message>
+        <location line="-248"/>
+        <source>Weighted References</source>
+        <translation>가중된 참조들</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted References + Duplicates</source>
+        <translation>가중된 참조들 + 중복들</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Frame</source>
+        <translation>프레임</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Frame Encoding</source>
+        <translation>프레임 인코딩</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Loop Filter:</source>
+        <translation>루프 Loop 필터:</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Open GOP:</source>
+        <translation>GOP 열기:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Normal Mode</source>
+        <translation>보통 모드</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Blu-ray Mode</source>
+        <translation>블루레이 모드</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Interlaced:</source>
+        <translation>인터레이스:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Top Field First</source>
+        <translation>상단 필드 먼저</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bottom Field First</source>
+        <translation>하단 필드 먼저</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Maximum Reference Frames:</source>
+        <translation>최대 참조 프레임:</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>B-frames</source>
+        <translation>B 프레임</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>B-frames as References:</source>
+        <translation>B 프레임을 참조로:</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Strictly Hierarchical Pyramid</source>
+        <translation>엄격하게 계층적인 피라미드</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Non-strict (Not Blu-ray Compatible)</source>
+        <translation>엄격하지 않음 (블루레이 비호환)</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>Fast</source>
+        <translation>빠른</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Optimal</source>
+        <translation>최적</translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>B-frame Bias:</source>
+        <translation>B 프레임 편향:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Maximum Consecutive B-frames:</source>
+        <translation>최대 연속 B 프레임:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Adaptive B-frame Decision:</source>
+        <translation>적응형 B 프레임 결정:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>I-frames</source>
+        <translation>I 프레임</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>GOP Size:</source>
+        <translation>GOP 크기:</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Minimum:</source>
+        <translation>최소:</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Maximum:</source>
+        <translation>최대:</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I-frame Threshold:</source>
+        <translation>I 프레임 임계값:</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <location line="+6"/>
+        <source>Analysis</source>
+        <translation>분석</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Trellis Quantization:</source>
+        <translation>트렐리스 Trellis 양자화:</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Final Macroblock Only</source>
+        <translation>마지막 매크로블럭만</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Always On</source>
+        <translation>항상 켬</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Fast Skip Detection on P-frames</source>
+        <translation>P 프레임에서 빠른 건너뛰기 검출</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>DCT Decimation on P-frames</source>
+        <translation>P 프레임에서 DCT 데시메이션 Decimation</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Psychovisual Rate Distortion Optimisation:</source>
+        <translation>시각 심리 비율 왜곡 최적화:</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise Reduction:</source>
+        <translation>노이즈 리덕션:</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Noise Reduction Intra:</source>
+        <translation>노이즈 리덕션 인트라:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Noise Reduction Inter:</source>
+        <translation>노이즈 리덕션 인터:</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Quantisation Matrix</source>
+        <translation>양자화 매트릭스</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Flat Matrix</source>
+        <translation>평평한 매트릭스</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>JVT Matrix</source>
+        <translation>JVT 매트릭스</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Custom Matrix</source>
+        <translation>사용자 정의 매트릭스</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+818"/>
+        <source>Edit</source>
+        <translation>편집</translation>
+    </message>
+    <message>
+        <location line="-771"/>
+        <source>Quantiser Control</source>
+        <translation>양자화기 제어</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Chroma to Luma Quantiser Offset:</source>
+        <translation>크로마에서 루마까지 양자화기 오프셋:</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>I and P-frame Quantiser Ratio:</source>
+        <translation>I와 P 프레임 양자화기 비율:</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <location line="+168"/>
+        <location line="+302"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location line="-448"/>
+        <source>Maximum Quantiser Step:</source>
+        <translation>최대 양자화기 스텝:</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Cb</source>
+        <translation>Cb</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Cr</source>
+        <translation>Cr</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>P and B-frame Quantiser Ratio:</source>
+        <translation>P와 B 프레임 양자화기 비율:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Average Bitrate Tolerance:</source>
+        <translation>평균 비트레이트 허용 오차: </translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>Quantiser Curve Compression</source>
+        <translation>양자화기 곡선 압축 Quantiser Curve Compression</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Quantiser Curve Compression:</source>
+        <translation>양자화기 곡선 압축:</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Reduce Fluctuation Before Curve Compression:</source>
+        <translation>곡선 압축 전 변동폭 줄이기:</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Reduce Fluctuation After Curve Compression:</source>
+        <translation>곡선 압축 후 변동폭 줄이기</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Adaptive Quantisation</source>
+        <translation>적응형 양자화 Adaptive Quantisation</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Variance AQ:</source>
+        <translation>변동 적응형 양자화 Variance AQ</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Normal</source>
+        <translation>보통</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Auto Variance AQ</source>
+        <translation>자동 변동 적응형 양자화</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Strength:</source>
+        <translation>강도:</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Advanced 1</source>
+        <translation>고급 1</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Video Buffer Verifier</source>
+        <translation>비디오 버퍼 검사기</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Maximum VBV Bitrate:</source>
+        <translation>최대 VBV 비트레이트:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Initial VBV Buffer Occupancy:</source>
+        <translation>초기 VBV 버퍼 점유: </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>kbit</source>
+        <translation>kbit</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>kbit/s</source>
+        <translation>kbit/s</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>VBV Buffer Size:</source>
+        <translation>VBV 버퍼 크기:</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Slicing</source>
+        <translation>슬라이싱</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Slices per Frame:</source>
+        <translation>프레임당 슬라이스:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Maximum Size per Slice:</source>
+        <translation>슬라이스당 최대 크기:</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>bytes</source>
+        <translation>바이트</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Maximum Macroblocks per Slice:</source>
+        <translation>슬라이스당 최대 매크로블럭:</translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Zones</source>
+        <translation>구역</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Add</source>
+        <translation>추가</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Advanced 2</source>
+        <translation>고급 2</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Multithreading</source>
+        <translation>멀티쓰레딩</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Disable</source>
+        <translation>비활성화</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Auto-detect</source>
+        <translation>자동 감지</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Custom:</source>
+        <comment>multithreading</comment>
+        <translation>사용자 정의:</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Enforce Repeatability</source>
+        <translation>반복성 강제하기</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Slice-based Threading</source>
+        <translation>슬라이스 기반의 쓰레딩</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Custom Threaded Lookahead Buffer:</source>
+        <translation>쓰레드된 미리보기 버퍼 사용자 정의:</translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>Output 1</source>
+        <translation>출력 1</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Output</source>
+        <translation>출력</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Generate Access Unit Delimiters</source>
+        <translation>접근 단위 Access Unit 구분 문자 만들기</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pixel Aspect Ratio</source>
+        <translation>픽셀 종횡비 Pixel Aspect Ratio </translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Custom:</source>
+        <comment>PAR</comment>
+        <translation>사용자 정의:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>As Input</source>
+        <translation>입력 그대로</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>:</source>
+        <translation>:</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Predefined Aspect Ratio:</source>
+        <translation>가로/세로 비율 프리셋:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>16:15 (PAL 4:3)</source>
+        <translation>16:15 (PAL 4:3)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>64:45 (PAL 16:9)</source>
+        <translation>64:45 (PAL 16:9)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>8:9 (NTSC 4:3)</source>
+        <translation>8:9 (NTSC 4:3)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>32:27 (NTSC 16:9)</source>
+        <translation>32:27 (NTSC 16:9)</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Output 2</source>
+        <translation>출력 2</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Video Usability Information</source>
+        <translation>비디오 가용성 정보 </translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>These settings are only suggestions for the playback equipment.  Use at your own risk.</source>
+        <translation>이 설정은 단지 재생 장치를 위한 제안입니다. 주의해서 사용하세요.</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Overscan:</source>
+        <translation>오버스캔:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+46"/>
+        <location line="+58"/>
+        <location line="+63"/>
+        <location line="+73"/>
+        <source>Undefined</source>
+        <translation>미정의</translation>
+    </message>
+    <message>
+        <location line="-235"/>
+        <source>Show</source>
+        <translation>보이기</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Crop</source>
+        <translation>잘라내기</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Video Format:</source>
+        <translation>비디오 형식:</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Component</source>
+        <translation>컴포넌트</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>PAL</source>
+        <translation>PAL</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>NTSC</source>
+        <translation>NTSC</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>SECAM</source>
+        <translation>SECAM</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MAC</source>
+        <translation>MAC</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Colour Primaries:</source>
+        <translation>컬러 프라이머리:</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <location line="+63"/>
+        <location line="+73"/>
+        <source>BT709</source>
+        <translation>BT709</translation>
+    </message>
+    <message>
+        <location line="-131"/>
+        <location line="+63"/>
+        <source>BT470M</source>
+        <translation>BT470M</translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <location line="+63"/>
+        <location line="+73"/>
+        <source>BT470BG</source>
+        <translation>BT470BG</translation>
+    </message>
+    <message>
+        <location line="-131"/>
+        <location line="+136"/>
+        <source>SMPTE170M</source>
+        <translation>SMPTE170M</translation>
+    </message>
+    <message>
+        <location line="-131"/>
+        <location line="+78"/>
+        <location line="+58"/>
+        <source>SMPTE240M</source>
+        <translation>SMPTE240M</translation>
+    </message>
+    <message>
+        <location line="-131"/>
+        <source>Film</source>
+        <translation>Film</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Transfer Characteristics:</source>
+        <translation>전송 특성:</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Linear</source>
+        <translation>선형</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>LOG100</source>
+        <translation>LOG100</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>LOG316</source>
+        <translation>LOG316</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>SMPTEL170M</source>
+        <translation>SMPTEL170M</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Colour Matrix:</source>
+        <translation>컬러 매트릭스:</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>FCC</source>
+        <translation>FCC</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>GBR</source>
+        <translation>GBR</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>YCgCo</source>
+        <translation>YCgCo</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>HRD Parameters:</source>
+        <translation>HDR 매개변수:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>VBR</source>
+        <translation>VBR</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>CBR</source>
+        <translation>CBR</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Chroma Sample Location:</source>
+        <translation>크로마 샘플 위치:</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Full Range Samples</source>
+        <translation>전체 범위 샘플</translation>
+    </message>
+</context>
+<context>
+    <name>x265CustomMatrixDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265CustomMatrixDialog.ui" line="+14"/>
+        <source>x265 Custom Matrix</source>
+        <translation>x265 사용자 정의 매트릭스</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Intra 4x4</source>
+        <translation>인트라 4x4</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <location line="+446"/>
+        <location line="+446"/>
+        <location line="+703"/>
+        <source>Luma:</source>
+        <translation>루마:</translation>
+    </message>
+    <message>
+        <location line="-1385"/>
+        <location line="+446"/>
+        <source>Chroma U/V:</source>
+        <translation>크로마 U/V:</translation>
+    </message>
+    <message>
+        <location line="-238"/>
+        <source>Inter 4x4</source>
+        <translation>인터 4x4</translation>
+    </message>
+    <message>
+        <location line="+446"/>
+        <source>Intra 8x8</source>
+        <translation>인트라 8x8</translation>
+    </message>
+    <message>
+        <location line="+703"/>
+        <source>Inter 8x8</source>
+        <translation>인터 8x8</translation>
+    </message>
+    <message>
+        <location line="+727"/>
+        <source>Load File</source>
+        <translation>파일 불러오기</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>OK</source>
+        <translation>확인</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cancel</source>
+        <translation>취소</translation>
+    </message>
+</context>
+<context>
+    <name>xvid4</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
+        <location line="+24"/>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Low</source>
+        <translation>낮음</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Medium</source>
+        <translation>중간</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Full</source>
+        <translation>전체</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>H.263</source>
+        <translation>H.263</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MPEG</source>
+        <translation>MPEG</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Custom</source>
+        <translation>사용자 정의</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>DCT</source>
+        <translation>DCT</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Qpel16</source>
+        <translation>Qpel16</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Qpel8</source>
+        <translation>Qpel8</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Square</source>
+        <translation>Square</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>One thread</source>
+        <translation>1개 쓰레드</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Two threads)</source>
+        <translation>2개 쓰레드</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Three threads</source>
+        <translation>3개 쓰레드</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto (#cpu)</source>
+        <translation>자동 (#cpu)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>1:1 (PC)</source>
+        <translation>1:1 (PC)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4:3 (PAL)</source>
+        <translation>4:3 (PAL)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4:3 (NTSC)</source>
+        <translation>4:3 (NTSC)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>16:9 (PAL)</source>
+        <translation>16:9 (PAL)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>16:9 (NTSC)</source>
+        <translation>16:9 (NTSC)</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>MotionEstimation</source>
+        <translation>모션추정</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Threading</source>
+        <translation>쓰레딩</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mi_n. quantizer:</source>
+        <translation>최소 양자화기:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ma_x. quantizer:</source>
+        <translation>최대 양자화기:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Trellis quantization</source>
+        <translation>트렐리스 양자화</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Number of B frames:</source>
+        <translation>B 프레임 개수:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Quantization type:</source>
+        <translation>양자화 형식:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Macroblock decision:</source>
+        <translation>매크로블럭 결정:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Profile:</source>
+        <translation>프로파일:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Aspect Ratio:</source>
+        <translation>화면 비율:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>_Gop Size:</source>
+        <translation>GOP 크기:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation>XVID fcc 사용 (아니면 DIVX)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Advanced Simple Profile</source>
+        <translation>고급 간편 프로파일</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Motion Estimation</source>
+        <translation>모션 추정</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Quantization</source>
+        <translation>양자화</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Threads</source>
+        <translation>쓰레드</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Aspect Ratio</source>
+        <translation>화면 비율</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Rate Control</source>
+        <translation>속도 제어</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Xvid4 MPEG-4 ASP configuration</source>
+        <translation>Xvid4 MPEG-4 ASP 설정</translation>
+    </message>
+</context>
+<context>
+    <name>yadif</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
+        <source>Yadif</source>
+        <translation>Yadif</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Yadif, port of avisynth version (c) Fizick.</source>
+        <translation>Fizick 이 만든 avisynth 버전의 Yadif를 포팅한 필터입니다.</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Temporal &amp; spatial check</source>
+        <translation>시간 &amp; 공간 검사</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bob, temporal &amp; spatial check</source>
+        <translation>Bob, 시간 &amp; 공간 검사</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Skip spatial temporal check</source>
+        <translation>시간 공간 검사 건너뛰기</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bob, skip spatial temporal check</source>
+        <translation>Bob, 시간 공간 검사 건너뛰기</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Bottom field first</source>
+        <translation>하단 필드 먼저</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Top field first</source>
+        <translation>상단 필드 먼저</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation>모드:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Order:</source>
+        <translation>순서:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>yadif</source>
+        <translation>Yadif</translation>
+    </message>
+</context>
+</TS>

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

@@ -5059,12 +5059,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+932"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-857"/>
+        <location line="-862"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5087,12 +5087,12 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-607"/>
+        <location line="-606"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5202,7 +5202,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5870,23 +5870,23 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+110"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+126"/>
         <source>Multi-platform Video Editor</source>
         <translation type="unfinished">Wieloplatformowy edytor wideo</translation>
     </message>
     <message>
-        <location line="-94"/>
+        <location line="-112"/>
         <source>About Avidemux</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+93"/>
         <source>Avidemux </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+29"/>
-        <source>© 2001 - 2016  Mean</source>
+        <source>© 2001 - 2017  Mean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5895,7 +5895,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+45"/>
         <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6258,7 +6258,7 @@
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="+281"/>
+        <location filename="../../common/gui_save.cpp" line="+282"/>
         <location line="+21"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+403"/>
@@ -6285,7 +6285,7 @@
         <translation type="unfinished">Wątkowanie</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+65"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+80"/>
         <source>Pr&amp;eferences</source>
         <translation type="unfinished">Preferencje</translation>
     </message>
@@ -6295,24 +6295,25 @@
         <translation type="unfinished">Preferencje</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-23"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-38"/>
         <location line="+2"/>
         <location line="+2"/>
         <source>-</source>
         <translation type="unfinished">-</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+22"/>
         <source>Copy</source>
         <translation type="unfinished">Kopiuj</translation>
     </message>
     <message>
+        <location line="+3"/>
         <location line="+2"/>
         <source>Delete</source>
         <translation type="unfinished">Usuń</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <location line="+8"/>
         <source>Filters</source>
         <translation type="unfinished">Filtry</translation>
@@ -6536,7 +6537,7 @@
         <translation type="unfinished">Błąd kodeka</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+337"/>
+        <location filename="../../common/gui_main.cpp" line="+352"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">Nie zaimplementowane w tej wersji</translation>
     </message>
@@ -6549,7 +6550,7 @@
         <translation type="obsolete">Wybierz plik AVI aby dołączyć...</translation>
     </message>
     <message>
-        <location line="+238"/>
+        <location line="+241"/>
         <source>Are you sure?</source>
         <translation type="unfinished">Na pewno?</translation>
     </message>
@@ -6607,7 +6608,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Stało się coś złego (II)</translation>
     </message>
@@ -6717,7 +6718,7 @@
         <translation type="unfinished">Usuwanie pie_rścienia</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-221"/>
+        <location filename="../../common/gui_save.cpp" line="-222"/>
         <source>Select Workbench to Save</source>
         <translation type="unfinished">Wybierz narzędzia do zapisania</translation>
     </message>
@@ -6742,7 +6743,7 @@
         <translation type="unfinished">Wybierz plik JPEG do zapisu</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation type="unfinished">Wybiez plik do zapisu</translation>
     </message>
@@ -7149,7 +7150,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-50"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-65"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7206,7 +7207,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7231,7 +7238,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+7"/>
         <source>Set Marker A</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7464,12 +7471,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1217"/>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7484,13 +7491,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
-        <location line="+65"/>
+        <location line="+67"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-43"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7500,7 +7512,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7515,7 +7527,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+660"/>
+        <location line="+663"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -7556,12 +7568,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">Urządzenie dźwiękowe jest nie skonfigurowane</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-390"/>
+        <location filename="../../common/gui_save.cpp" line="-391"/>
         <source>No</source>
         <translation type="unfinished">Nie</translation>
     </message>
@@ -7596,7 +7608,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+209"/>
         <source>Function not implemented
 </source>
         <translation type="unfinished"></translation>
@@ -8054,7 +8066,7 @@
         <translation type="unfinished">Błąd alokacji pamięci</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+139"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+142"/>
         <source>Too short</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8186,6 +8198,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
@@ -8931,13 +8956,13 @@
     <message>
         <location line="-1"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation type="unfinished">Kontrast</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9017,7 +9042,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation type="unfinished">Wczytaj</translation>
     </message>
@@ -9065,36 +9090,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
         <source>Crop</source>
         <translation type="unfinished">Kadrowanie</translation>
     </message>
     <message>
         <location line="+146"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+146"/>
         <source>Auto Crop</source>
         <translation type="unfinished">Automatyczne kadrowanie</translation>
     </message>
     <message>
         <location line="-108"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-108"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9554,7 +9586,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
         <source>MPlayer eq2</source>
         <translation type="unfinished">MPlayer eq2</translation>
     </message>
@@ -9563,6 +9595,11 @@
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation type="unfinished">Dostosuj kontrast, jasność, nasycenie i gammę.</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -11051,7 +11088,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+58"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+61"/>
         <source>Adjust hue and saturation.</source>
         <translation type="unfinished">Dostosuj odcień i nasycenie</translation>
     </message>
@@ -11137,7 +11174,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11147,37 +11184,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation type="unfinished">_Szum:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation type="unfinished">Pełny</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation type="unfinished">Szybki</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">Zmiana liczby _klatek na sekundę:</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11721,7 +11770,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12001,7 +12050,7 @@
 <context>
     <name>mp3d</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+235"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+234"/>
         <source>_Spatial luma strength:</source>
         <translation type="unfinished">Natężenie luminancji prze_strzennej:</translation>
     </message>
@@ -12011,24 +12060,32 @@
         <translation type="unfinished">Natężenie _przestrzenne chrominancji:</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>MPlayer denoise3d</source>
-        <translation type="unfinished">MPlayer denoise3d</translation>
+        <location line="+1"/>
+        <source>_Temporal luma strength:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
-        <source>Mplayer Denoise 3D HQ</source>
+        <location line="+1"/>
+        <source>T_emporal chroma strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D HQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MPlayer denoise3d</source>
+        <translation type="obsolete">MPlayer denoise3d</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <source>Mplayer Denoise 3D HQ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
         <location line="+1"/>
-        <source>Luma _Temporal strength:</source>
+        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -12056,8 +12113,12 @@
     </message>
     <message>
         <location line="+4"/>
+        <source>MPlayer Denoise 3D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>MPlayer denoise3d</source>
-        <translation type="unfinished">MPlayer denoise3d</translation>
+        <translation type="obsolete">MPlayer denoise3d</translation>
     </message>
     <message>
         <location line="-39"/>
@@ -12069,14 +12130,12 @@
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Wystąpił problem podczas czytania nagłówków SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
-        <translation type="unfinished">Brak tablicy statystyk</translation>
+        <translation type="obsolete">Brak tablicy statystyk</translation>
     </message>
 </context>
 <context>
@@ -12249,7 +12308,7 @@
 <context>
     <name>msharpen</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+49"/>
         <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
         <translation type="unfinished">Wyostrz krawędzie bez zwiększania szumu. Od Donalda Grafta</translation>
     </message>
@@ -12325,7 +12384,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation type="unfinished">Błąd</translation>
     </message>
@@ -12435,7 +12494,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12734,19 +12793,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12754,12 +12813,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+223"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12769,7 +12828,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12834,7 +12893,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+491"/>
+        <location line="+605"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
@@ -12845,7 +12904,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+315"/>
         <source> (%d track(s))</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12993,7 +13052,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation type="unfinished">Częściowo</translation>
     </message>
@@ -13003,22 +13062,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation type="unfinished">Konfiguruj</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13028,12 +13087,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13823,12 +13882,11 @@
         <translation type="unfinished">Podgląd</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>00:00:00.000</source>
-        <translation type="unfinished">00:00:00.000</translation>
+        <translation type="obsolete">00:00:00.000</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13862,11 +13920,6 @@
         <source>Forward one minute</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>A&amp;utoZoom</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>separateFields</name>
@@ -14157,7 +14210,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14592,7 +14645,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14603,7 +14656,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16051,7 +16104,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16062,7 +16115,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17496,7 +17549,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation type="unfinished"></translation>
     </message>

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

@@ -621,12 +621,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+932"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-857"/>
+        <location line="-862"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -649,12 +649,12 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-607"/>
+        <location line="-606"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -790,7 +790,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -991,12 +991,12 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+16"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+14"/>
         <source>About Avidemux</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+93"/>
         <source>Avidemux </source>
         <translation type="unfinished"></translation>
     </message>
@@ -1007,7 +1007,7 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2016  Mean</source>
+        <source>© 2001 - 2017  Mean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1016,7 +1016,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+45"/>
         <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1321,7 +1321,7 @@
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-38"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="+281"/>
+        <location filename="../../common/gui_save.cpp" line="+282"/>
         <location line="+21"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+403"/>
@@ -1844,7 +1844,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1874,12 +1880,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Set Marker A</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2051,7 +2058,7 @@
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+138"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="+1309"/>
+        <location filename="../../common/gui_main.cpp" line="+1330"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
@@ -2151,12 +2158,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1217"/>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2171,18 +2178,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+67"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
         <source>Not coded in this version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
-        <location line="+65"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-43"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2192,7 +2204,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2264,7 +2276,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2394,12 +2406,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-326"/>
+        <location filename="../../common/gui_save.cpp" line="-327"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2459,7 +2471,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3006,7 +3018,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+142"/>
         <source>Too short</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3138,6 +3150,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
@@ -3804,7 +3829,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+34"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3814,8 +3839,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3895,7 +3920,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3941,36 +3966,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4369,7 +4401,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
         <source>MPlayer eq2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4378,6 +4410,11 @@
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -5794,7 +5831,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+57"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+60"/>
         <source>Mplayer Hue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5880,7 +5917,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5890,37 +5927,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6300,7 +6349,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6571,7 +6620,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+32"/>
         <source>_Spatial luma strength:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6582,13 +6631,17 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>_Temporal luma strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>Luma _Temporal strength:</source>
+        <source>T_emporal chroma strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <source>MPlayer denoise3d</source>
+        <source>MPlayer Denoise 3D HQ</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -6621,7 +6674,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <source>MPlayer denoise3d</source>
+        <source>MPlayer Denoise 3D</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -6629,15 +6682,9 @@
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
-        <source>No stts table</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>mp4muxer</name>
@@ -6809,7 +6856,7 @@
 <context>
     <name>msharpen</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+48"/>
         <source>Msharpen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6865,7 +6912,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6941,7 +6988,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7205,19 +7252,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation type="unfinished"></translation>
     </message>
@@ -7225,12 +7272,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+223"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7240,7 +7287,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7305,7 +7352,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+491"/>
+        <location line="+605"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
@@ -7316,7 +7363,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+315"/>
         <source> (%d track(s))</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7464,7 +7511,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7474,22 +7521,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7499,12 +7546,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8260,12 +8307,7 @@
         <translation type="unfinished">Visualizar</translation>
     </message>
     <message>
-        <location line="+48"/>
-        <source>00:00:00.000</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8299,11 +8341,6 @@
         <source>Forward one minute</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>A&amp;utoZoom</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>separateFields</name>
@@ -8563,7 +8600,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8908,7 +8945,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8919,7 +8956,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10246,7 +10283,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10257,7 +10294,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11660,7 +11697,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation type="unfinished"></translation>
     </message>

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

@@ -3454,7 +3454,7 @@
         <translation type="obsolete">&amp;Авто</translation>
     </message>
     <message>
-        <location line="+1540"/>
+        <location line="+1545"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Открыть...</translation>
     </message>
@@ -3806,7 +3806,7 @@
         <translation type="unfinished">&amp;Сверху</translation>
     </message>
     <message>
-        <location line="-1636"/>
+        <location line="-1641"/>
         <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
         <translation>&lt;b&gt;Декодер видео&lt;/b&gt;</translation>
     </message>
@@ -3816,7 +3816,7 @@
         <translation type="unfinished">Тип кадра:</translation>
     </message>
     <message>
-        <location line="+499"/>
+        <location line="+504"/>
         <source>&amp;Separate</source>
         <translation type="unfinished">&amp;Отделить</translation>
     </message>
@@ -3825,7 +3825,7 @@
         <translation type="obsolete">&amp;Закрыть</translation>
     </message>
     <message>
-        <location line="-1867"/>
+        <location line="-1872"/>
         <source>Avidemux</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3886,12 +3886,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+932"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished">&amp;Навигация</translation>
     </message>
     <message>
-        <location line="-857"/>
+        <location line="-862"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished">Воспроизвести [SPACE]</translation>
     </message>
@@ -3914,12 +3914,12 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-607"/>
+        <location line="-606"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished">Предыдущий кадр [LEFT]</translation>
     </message>
@@ -4045,7 +4045,7 @@
         <translation type="unfinished">&amp;Громкость</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished">&amp;Аудиометр</translation>
     </message>
@@ -4437,12 +4437,12 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+16"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+14"/>
         <source>About Avidemux</source>
         <translation type="unfinished">О программе</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+112"/>
         <source>Multi-platform Video Editor</source>
         <translation type="unfinished">Мультиплатформенный видеоредактор</translation>
     </message>
@@ -4453,7 +4453,7 @@
     </message>
     <message>
         <location line="+29"/>
-        <source>© 2001 - 2016  Mean</source>
+        <source>© 2001 - 2017  Mean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4462,7 +4462,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+45"/>
         <source>&amp;License</source>
         <translation type="unfinished">&amp;Лицензия</translation>
     </message>
@@ -4785,7 +4785,7 @@
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="+281"/>
+        <location filename="../../common/gui_save.cpp" line="+282"/>
         <location line="+21"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+403"/>
@@ -4806,7 +4806,7 @@
         <translation type="unfinished">Многопоточность</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+65"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+80"/>
         <source>Pr&amp;eferences</source>
         <translation>&amp;Настройки</translation>
     </message>
@@ -4816,17 +4816,17 @@
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-20"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-35"/>
         <source>Connect to avsproxy</source>
         <translation type="unfinished">Соединиться с avsproxy</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+23"/>
         <source>Copy</source>
         <translation type="unfinished">Копировать</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+8"/>
         <source>Set Marker A</source>
         <translation type="unfinished">Установить маркер А</translation>
     </message>
@@ -4965,7 +4965,7 @@
         <translation type="unfinished">Ошибка аудиокодера</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+337"/>
+        <location filename="../../common/gui_main.cpp" line="+352"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">Нет в этой версии</translation>
     </message>
@@ -4978,7 +4978,7 @@
         <translation type="obsolete">Выберите файл для присоединения</translation>
     </message>
     <message>
-        <location line="+238"/>
+        <location line="+241"/>
         <source>Are you sure?</source>
         <translation type="unfinished">Вы уверены?</translation>
     </message>
@@ -5036,7 +5036,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Ошибка при обновлении видео</translation>
     </message>
@@ -5132,7 +5132,7 @@
         <translation type="unfinished">Поменять U и V</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-221"/>
+        <location filename="../../common/gui_save.cpp" line="-222"/>
         <source>Select Workbench to Save</source>
         <translation type="unfinished">Выберите файл для сохранения</translation>
     </message>
@@ -5157,7 +5157,7 @@
         <translation type="unfinished">Выберите файл для сохранения</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation type="unfinished">Укажите файл для сохранения</translation>
     </message>
@@ -5725,7 +5725,7 @@
         <translation type="unfinished">Порт по умолчанию</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-78"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-93"/>
         <source>Open</source>
         <translation>&amp;Открыть...</translation>
     </message>
@@ -5784,7 +5784,13 @@
         <translation type="unfinished">В&amp;ыйти из Avidemux</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation>Очистить список</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Undo</source>
         <translation type="unfinished">Отменить</translation>
     </message>
@@ -5809,12 +5815,13 @@
         <translation type="unfinished">Вставить</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
         <source>Delete</source>
         <translation type="unfinished">Удалить</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Reset Markers</source>
         <translation>Сброс маркеров</translation>
     </message>
@@ -6018,12 +6025,12 @@
 Он требуется для создания видео, совместимого с PSP.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1217"/>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
         <source>Select script/project to run</source>
         <translation type="unfinished">Выбрать скрипт/проект для запуска</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation type="unfinished">Выбрать скрипт для запуска</translation>
     </message>
@@ -6038,13 +6045,18 @@
         <translation type="unfinished">Выбрать скрипт для сохранения</translation>
     </message>
     <message>
-        <location line="+162"/>
-        <location line="+65"/>
+        <location line="+67"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation>Вы собираетесь очистить список недавно открытых файлов и проектов. Этот шаг необратим. Продолжить?</translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation type="unfinished">Выбрать файл видео...</translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-43"/>
         <source>No engine</source>
         <translation type="unfinished">Нет движка</translation>
     </message>
@@ -6054,7 +6066,7 @@
         <translation type="unfinished">Скрипт tinyPy не включен в эту сборку</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished">Выбрать файл видео для присоединения...</translation>
     </message>
@@ -6069,7 +6081,7 @@
         <translation type="unfinished">Ошибка обрезки</translation>
     </message>
     <message>
-        <location line="+660"/>
+        <location line="+663"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished">Неверный индекс аудио</translation>
@@ -6120,12 +6132,12 @@
         <translation type="unfinished">Функция отключена или более недействительна</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">Проблема при инициализации аудиоустройства.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-390"/>
+        <location filename="../../common/gui_save.cpp" line="-391"/>
         <source>No</source>
         <translation type="unfinished">Нет</translation>
     </message>
@@ -6160,7 +6172,7 @@
         <translation type="unfinished">Добавить операцию в очередь</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+209"/>
         <source>Function not implemented
 </source>
         <translation type="unfinished">Функция не включена</translation>
@@ -6612,7 +6624,7 @@
         <translation type="unfinished">Сохранение</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+142"/>
         <source>Too short</source>
         <translation type="unfinished">Слишком коротко</translation>
     </message>
@@ -6750,6 +6762,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
@@ -7498,13 +7523,13 @@
     <message>
         <location line="-1"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation type="unfinished">Контраст</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation type="unfinished">Яркость</translation>
     </message>
@@ -7584,7 +7609,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation type="unfinished">Загрузить</translation>
     </message>
@@ -7642,36 +7667,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
         <source>Crop</source>
         <translation>Кадрирование</translation>
     </message>
     <message>
         <location line="+88"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+88"/>
         <source>Reset</source>
         <translation>Сброс</translation>
     </message>
     <message>
         <location line="+58"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+58"/>
         <source>Auto Crop</source>
         <translation>Автокадрирование</translation>
     </message>
     <message>
         <location line="-108"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-108"/>
         <source>Right:</source>
         <translation>Справа:</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation>Сверху:</translation>
     </message>
     <message>
         <location line="+64"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+64"/>
         <source>Bottom:</source>
         <translation>Снизу:</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation>Слева:</translation>
     </message>
@@ -8121,7 +8153,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+60"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+65"/>
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation type="unfinished">Настройка контраста, яркости, насыщенности и гаммы.</translation>
     </message>
@@ -8130,6 +8162,11 @@
         <source>MPlayer eq2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -9606,7 +9643,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+58"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+61"/>
         <source>Adjust hue and saturation.</source>
         <translation type="unfinished">Настройка оттенка (hue) и насыщености.</translation>
     </message>
@@ -9692,7 +9729,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation type="unfinished">Удалить IVTC dupe.</translation>
     </message>
@@ -9702,37 +9739,49 @@
         <translation type="unfinished">Удалить удвоенные кадры после ivtc.</translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation type="unfinished">Шум:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation type="unfinished">_Показать:</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation type="unfinished">Полностью</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation type="unfinished">Быстро</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation type="unfinished">Очень быстро</translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">Изменить частоту:</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10276,7 +10325,7 @@
         <translation type="unfinished">Добавить на видео логотип с альфа-наложением.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation type="unfinished">Выбрать изображение для логотипа</translation>
     </message>
@@ -10606,7 +10655,7 @@
         <translation type="unfinished">Уменьшение шума, сглаживание изображения, увеличение сжатия. Версия в высоком качестве.</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+32"/>
         <source>_Spatial luma strength:</source>
         <translation type="unfinished">_Пространственная сила luma:</translation>
     </message>
@@ -10617,15 +10666,23 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>_Temporal luma strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
-        <source>Luma _Temporal strength:</source>
-        <translation type="unfinished">_Временная сила luma:</translation>
+        <source>T_emporal chroma strength:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <source>MPlayer denoise3d</source>
+        <source>MPlayer Denoise 3D HQ</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Luma _Temporal strength:</source>
+        <translation type="obsolete">_Временная сила luma:</translation>
+    </message>
 </context>
 <context>
     <name>mp3dlow</name>
@@ -10656,7 +10713,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <source>MPlayer denoise3d</source>
+        <source>MPlayer Denoise 3D</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10664,14 +10721,12 @@
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Ошибка чтения заголовков SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
-        <translation type="unfinished">Нет таблицы stts</translation>
+        <translation type="obsolete">Нет таблицы stts</translation>
     </message>
 </context>
 <context>
@@ -10869,7 +10924,7 @@
         <translation type="obsolete">Резкость</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+48"/>
         <source>Msharpen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10925,7 +10980,7 @@
         <translation type="unfinished">Перейти</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation type="unfinished">Ошибка</translation>
     </message>
@@ -11035,7 +11090,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation type="unfinished">Начальное время (мс):</translation>
     </message>
@@ -11335,19 +11390,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation>Все файлы (*.*)</translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation> файлы (*.</translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation>Перезаписать файл </translation>
     </message>
@@ -11355,12 +11410,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+223"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Новая версия&lt;/b&gt;&lt;br&gt;Версия %1&lt;br&gt;Выпущена %2.&lt;br&gt;Доступна для загрузки с адреса&lt;br&gt;&lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt;Вы можете отключить автоматическую проверку обновлений в настройках.&lt;/small&gt;</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>Recent Files</source>
         <translation type="unfinished">Предыдущие файлы</translation>
     </message>
@@ -11370,7 +11425,7 @@
         <translation type="unfinished">Предыдущие проекты</translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation type="unfinished">Старт/стоп</translation>
     </message>
@@ -11435,7 +11490,7 @@
         <translation>Вперед на 1 минуту</translation>
     </message>
     <message>
-        <location line="+491"/>
+        <location line="+605"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished">Приложение столкнулось с критической проблемой
@@ -11447,7 +11502,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+315"/>
         <source> (%d track(s))</source>
         <translation type="unfinished"> (%d дорожек)</translation>
     </message>
@@ -11595,7 +11650,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation type="unfinished">Частичное наложение</translation>
     </message>
@@ -11605,22 +11660,22 @@
         <translation type="unfinished">Этот фильтр не может быть применен частично</translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation type="unfinished">Добавить</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation type="unfinished">Удалить</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation type="unfinished">Настройка</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation type="unfinished">Переместить вверх</translation>
     </message>
@@ -11630,12 +11685,12 @@
         <translation type="unfinished">Переместить вниз</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation type="unfinished">Сделать частичным</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation type="unfinished">Загрузить фильтры видео...</translation>
     </message>
@@ -12424,12 +12479,7 @@
         <translation type="obsolete">дальше</translation>
     </message>
     <message>
-        <location line="+48"/>
-        <source>00:00:00.000</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished">Назад на 1 мин</translation>
     </message>
@@ -12464,9 +12514,8 @@
         <translation type="unfinished">Вперед на 1 мин</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A&amp;utoZoom</source>
-        <translation type="unfinished">&amp;Автоматическое увеличение</translation>
+        <translation type="obsolete">&amp;Автоматическое увеличение</translation>
     </message>
 </context>
 <context>
@@ -12760,7 +12809,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13181,7 +13230,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation type="unfinished">Не разработано</translation>
     </message>
@@ -13192,7 +13241,7 @@
         <translation type="unfinished">этот режим еще не разработан</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
         <translation type="unfinished">нет</translation>
     </message>
@@ -14529,7 +14578,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation type="unfinished">Не разработано</translation>
     </message>
@@ -14541,7 +14590,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
         <translation type="unfinished">нет</translation>
     </message>
@@ -15950,7 +15999,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation type="unfinished"></translation>
     </message>

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

@@ -3517,12 +3517,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+932"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-857"/>
+        <location line="-862"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3545,12 +3545,12 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-607"/>
+        <location line="-606"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3655,7 +3655,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4240,17 +4240,17 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+139"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+155"/>
         <source>http://www.avidemux.org</source>
         <translation type="unfinished">http://www.avidemux.org</translation>
     </message>
     <message>
-        <location line="-123"/>
+        <location line="-141"/>
         <source>About Avidemux</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+93"/>
         <source>Avidemux </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4261,11 +4261,11 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2016  Mean</source>
+        <source>© 2001 - 2017  Mean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+64"/>
         <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4615,7 +4615,7 @@
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="+281"/>
+        <location filename="../../common/gui_save.cpp" line="+282"/>
         <location line="+21"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+403"/>
@@ -4654,12 +4654,12 @@
         <translation type="unfinished">-</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+22"/>
         <source>Copy</source>
         <translation type="unfinished">Без измене</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <location line="+8"/>
         <source>Filters</source>
         <translation type="unfinished">Филтери</translation>
@@ -4828,7 +4828,7 @@
         <translation type="unfinished">Грешка у кодецима</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+337"/>
+        <location filename="../../common/gui_main.cpp" line="+352"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">Није кодирано у овој верзији</translation>
     </message>
@@ -4841,7 +4841,7 @@
         <translation type="obsolete">Изабери датотеку да додам...</translation>
     </message>
     <message>
-        <location line="+238"/>
+        <location line="+241"/>
         <source>Are you sure?</source>
         <translation type="unfinished">Да ли си сигуран?</translation>
     </message>
@@ -4899,7 +4899,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Нешто лоше се десило (II)</translation>
     </message>
@@ -5004,7 +5004,7 @@
         <translation type="unfinished">_Дерингинг</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-221"/>
+        <location filename="../../common/gui_save.cpp" line="-222"/>
         <source>Select Workbench to Save</source>
         <translation type="unfinished">Изабери датотеку да сачувам тезгу</translation>
     </message>
@@ -5029,7 +5029,7 @@
         <translation type="unfinished">Изабери BMP за чување</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation type="unfinished">Изабери датотеку за чување</translation>
     </message>
@@ -5484,7 +5484,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-50"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-65"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5541,7 +5541,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5566,12 +5572,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Set Marker A</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5809,12 +5816,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1217"/>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5829,13 +5836,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
-        <location line="+65"/>
+        <location line="+67"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-43"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5845,7 +5857,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5860,7 +5872,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+660"/>
+        <location line="+663"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -5901,12 +5913,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">Проблеми при покретању звучне картице</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-390"/>
+        <location filename="../../common/gui_save.cpp" line="-391"/>
         <source>No</source>
         <translation type="unfinished">Не</translation>
     </message>
@@ -5941,7 +5953,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+209"/>
         <source>Function not implemented
 </source>
         <translation type="unfinished"></translation>
@@ -6404,7 +6416,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+142"/>
         <source>Too short</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6536,6 +6548,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
@@ -7217,7 +7242,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+34"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation type="unfinished">Контраст</translation>
     </message>
@@ -7227,8 +7252,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7308,7 +7333,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation type="unfinished">Учитај га</translation>
     </message>
@@ -7357,36 +7382,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+102"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+102"/>
         <source>Reset</source>
         <translation type="unfinished">Поништи</translation>
     </message>
     <message>
         <location line="-88"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-88"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+64"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+64"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7827,7 +7859,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
         <source>MPlayer eq2</source>
         <translation type="unfinished">МPlayer еквилајзер 2</translation>
     </message>
@@ -7836,6 +7868,11 @@
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -9309,7 +9346,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+57"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+60"/>
         <source>Mplayer Hue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9395,7 +9432,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9405,37 +9442,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation type="unfinished">_Шум:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation type="unfinished">Потпуно</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation type="unfinished">Брзо</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">Промена _учестаности кадрова:</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9944,7 +9993,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10228,7 +10277,7 @@
 <context>
     <name>mp3d</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+235"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+234"/>
         <source>_Spatial luma strength:</source>
         <translation type="unfinished">Просторна _лума јачина:</translation>
     </message>
@@ -10238,24 +10287,28 @@
         <translation type="unfinished">Просторна _хрома јачина:</translation>
     </message>
     <message>
-        <location line="-35"/>
-        <source>Mplayer Denoise 3D HQ</source>
+        <location line="+1"/>
+        <source>_Temporal luma strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
+        <source>T_emporal chroma strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location line="+1"/>
-        <source>Luma _Temporal strength:</source>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D HQ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>MPlayer denoise3d</source>
+        <location line="-40"/>
+        <source>Mplayer Denoise 3D HQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10277,18 +10330,18 @@
         <translation type="unfinished">_Темпорална јачина:</translation>
     </message>
     <message>
-        <location line="-35"/>
-        <source>Mplayer Denoise 3D</source>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Reduce noise, smooth image, increase compressibility.</source>
+        <location line="-39"/>
+        <source>Mplayer Denoise 3D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>MPlayer denoise3d</source>
+        <location line="+1"/>
+        <source>Reduce noise, smooth image, increase compressibility.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10296,14 +10349,12 @@
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Проблем при читању SVQ3 заглавља</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
-        <translation type="unfinished">Не постоји stts табела</translation>
+        <translation type="obsolete">Не постоји stts табела</translation>
     </message>
 </context>
 <context>
@@ -10492,7 +10543,7 @@
         <translation type="obsolete">_Јачина :</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+48"/>
         <source>Msharpen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10548,7 +10599,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation type="unfinished">Грешка</translation>
     </message>
@@ -10658,7 +10709,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10957,19 +11008,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10977,12 +11028,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+223"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10992,7 +11043,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11057,7 +11108,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+491"/>
+        <location line="+605"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
@@ -11068,7 +11119,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+315"/>
         <source> (%d track(s))</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11216,7 +11267,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation type="unfinished">Половично</translation>
     </message>
@@ -11226,22 +11277,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation type="unfinished">Поставке</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11251,12 +11302,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12039,12 +12090,11 @@
         <translation type="unfinished">Преглед</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>00:00:00.000</source>
-        <translation type="unfinished">00:00:00.000</translation>
+        <translation type="obsolete">00:00:00.000</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12078,11 +12128,6 @@
         <source>Forward one minute</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>A&amp;utoZoom</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>separateFields</name>
@@ -12365,7 +12410,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12792,7 +12837,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12803,7 +12848,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14134,7 +14179,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14145,7 +14190,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15548,7 +15593,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation type="unfinished"></translation>
     </message>

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

@@ -3517,12 +3517,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+932"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-857"/>
+        <location line="-862"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3545,12 +3545,12 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-607"/>
+        <location line="-606"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3655,7 +3655,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4240,17 +4240,17 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+139"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+155"/>
         <source>http://www.avidemux.org</source>
         <translation type="unfinished">http://www.avidemux.org</translation>
     </message>
     <message>
-        <location line="-123"/>
+        <location line="-141"/>
         <source>About Avidemux</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+93"/>
         <source>Avidemux </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4261,11 +4261,11 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2016  Mean</source>
+        <source>© 2001 - 2017  Mean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+64"/>
         <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4615,7 +4615,7 @@
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="+281"/>
+        <location filename="../../common/gui_save.cpp" line="+282"/>
         <location line="+21"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+403"/>
@@ -4654,12 +4654,12 @@
         <translation type="unfinished">-</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+22"/>
         <source>Copy</source>
         <translation type="unfinished">Bez izmene</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <location line="+8"/>
         <source>Filters</source>
         <translation type="unfinished">Filteri</translation>
@@ -4828,7 +4828,7 @@
         <translation type="unfinished">Greška u kodecima</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+337"/>
+        <location filename="../../common/gui_main.cpp" line="+352"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">Nije kodirano u ovoj verziji</translation>
     </message>
@@ -4841,7 +4841,7 @@
         <translation type="obsolete">Izaberi datoteku da dodam...</translation>
     </message>
     <message>
-        <location line="+238"/>
+        <location line="+241"/>
         <source>Are you sure?</source>
         <translation type="unfinished">Da li si siguran?</translation>
     </message>
@@ -4899,7 +4899,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Nešto loše se desilo (II)</translation>
     </message>
@@ -5004,7 +5004,7 @@
         <translation type="unfinished">_Deringing</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-221"/>
+        <location filename="../../common/gui_save.cpp" line="-222"/>
         <source>Select Workbench to Save</source>
         <translation type="unfinished">Izaberi datoteku da sačuvam tezgu</translation>
     </message>
@@ -5029,7 +5029,7 @@
         <translation type="unfinished">Izaberi BMP za čuvanje</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation type="unfinished">Izaberi datoteku za čuvanje</translation>
     </message>
@@ -5484,7 +5484,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-50"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-65"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5541,7 +5541,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5566,12 +5572,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Set Marker A</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5809,12 +5816,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1217"/>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5829,13 +5836,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
-        <location line="+65"/>
+        <location line="+67"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-43"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5845,7 +5857,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5860,7 +5872,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+660"/>
+        <location line="+663"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -5901,12 +5913,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">Problemi pri pokretanju zvučne kartice</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-390"/>
+        <location filename="../../common/gui_save.cpp" line="-391"/>
         <source>No</source>
         <translation type="unfinished">Ne</translation>
     </message>
@@ -5941,7 +5953,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+209"/>
         <source>Function not implemented
 </source>
         <translation type="unfinished"></translation>
@@ -6404,7 +6416,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+142"/>
         <source>Too short</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6536,6 +6548,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
@@ -7217,7 +7242,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+34"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation type="unfinished">Kontrast</translation>
     </message>
@@ -7227,8 +7252,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7308,7 +7333,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation type="unfinished">Učitaj ga</translation>
     </message>
@@ -7357,36 +7382,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+102"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+102"/>
         <source>Reset</source>
         <translation type="unfinished">Poništi</translation>
     </message>
     <message>
         <location line="-88"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-88"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+64"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+64"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7827,7 +7859,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
         <source>MPlayer eq2</source>
         <translation type="unfinished">MPlayer ekvilajzer 2</translation>
     </message>
@@ -7836,6 +7868,11 @@
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -9309,7 +9346,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+57"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+60"/>
         <source>Mplayer Hue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9395,7 +9432,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9405,37 +9442,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation type="unfinished">_Šum:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation type="unfinished">Potpuno</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation type="unfinished">Brzo</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">Promena _učestanosti kadrova:</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9944,7 +9993,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10228,7 +10277,7 @@
 <context>
     <name>mp3d</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+235"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+234"/>
         <source>_Spatial luma strength:</source>
         <translation type="unfinished">Prostorna _luma jačina:</translation>
     </message>
@@ -10238,24 +10287,28 @@
         <translation type="unfinished">Prostorna _hroma jačina:</translation>
     </message>
     <message>
-        <location line="-35"/>
-        <source>Mplayer Denoise 3D HQ</source>
+        <location line="+1"/>
+        <source>_Temporal luma strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
+        <source>T_emporal chroma strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location line="+1"/>
-        <source>Luma _Temporal strength:</source>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D HQ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>MPlayer denoise3d</source>
+        <location line="-40"/>
+        <source>Mplayer Denoise 3D HQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10277,18 +10330,18 @@
         <translation type="unfinished">_Temporalna jačina:</translation>
     </message>
     <message>
-        <location line="-35"/>
-        <source>Mplayer Denoise 3D</source>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Reduce noise, smooth image, increase compressibility.</source>
+        <location line="-39"/>
+        <source>Mplayer Denoise 3D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>MPlayer denoise3d</source>
+        <location line="+1"/>
+        <source>Reduce noise, smooth image, increase compressibility.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10296,14 +10349,12 @@
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Problem pri čitanju SVQ3 zaglavlja</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
-        <translation type="unfinished">Ne postoji stts tabela</translation>
+        <translation type="obsolete">Ne postoji stts tabela</translation>
     </message>
 </context>
 <context>
@@ -10492,7 +10543,7 @@
         <translation type="obsolete">_Jačina :</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+48"/>
         <source>Msharpen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10548,7 +10599,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation type="unfinished">Greška</translation>
     </message>
@@ -10658,7 +10709,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10957,19 +11008,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10977,12 +11028,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+223"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10992,7 +11043,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11057,7 +11108,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+491"/>
+        <location line="+605"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
@@ -11068,7 +11119,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+315"/>
         <source> (%d track(s))</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11216,7 +11267,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation type="unfinished">Polovično</translation>
     </message>
@@ -11226,22 +11277,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation type="unfinished">Postavke</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11251,12 +11302,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12039,12 +12090,11 @@
         <translation type="unfinished">Pregled</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>00:00:00.000</source>
-        <translation type="unfinished">00:00:00.000</translation>
+        <translation type="obsolete">00:00:00.000</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12078,11 +12128,6 @@
         <source>Forward one minute</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>A&amp;utoZoom</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>separateFields</name>
@@ -12365,7 +12410,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12792,7 +12837,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12803,7 +12848,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14134,7 +14179,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14145,7 +14190,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15548,7 +15593,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation type="unfinished"></translation>
     </message>

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

@@ -3820,12 +3820,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+932"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-857"/>
+        <location line="-862"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3848,12 +3848,12 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-607"/>
+        <location line="-606"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3958,7 +3958,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4588,17 +4588,17 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+139"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+155"/>
         <source>http://www.avidemux.org</source>
         <translation type="unfinished">http://www.avidemux.org</translation>
     </message>
     <message>
-        <location line="-123"/>
+        <location line="-141"/>
         <source>About Avidemux</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+93"/>
         <source>Avidemux </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4609,11 +4609,11 @@
     </message>
     <message>
         <location line="+10"/>
-        <source>© 2001 - 2016  Mean</source>
+        <source>© 2001 - 2017  Mean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+64"/>
         <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5000,7 +5000,7 @@
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="+281"/>
+        <location filename="../../common/gui_save.cpp" line="+282"/>
         <location line="+21"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+403"/>
@@ -5042,12 +5042,12 @@
             </translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+22"/>
         <source>Copy</source>
         <translation type="unfinished">Kopyala</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <location line="+8"/>
         <source>Filters</source>
         <translation type="unfinished">Süzgeçler</translation>
@@ -5239,7 +5239,7 @@
         <translation type="unfinished">Kodek Hatası</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+337"/>
+        <location filename="../../common/gui_main.cpp" line="+352"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">Bu sürümde kodlanmamış</translation>
     </message>
@@ -5254,7 +5254,7 @@
             </translation>
     </message>
     <message>
-        <location line="+238"/>
+        <location line="+241"/>
         <source>Are you sure?</source>
         <translation type="unfinished">
             </translation>
@@ -5313,7 +5313,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Kötü birşeyler oldu (II)</translation>
     </message>
@@ -5427,7 +5427,7 @@
         <translation type="unfinished">_Halka Azaltma</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-221"/>
+        <location filename="../../common/gui_save.cpp" line="-222"/>
         <source>Select Workbench to Save</source>
         <translation type="unfinished">
             </translation>
@@ -5457,7 +5457,7 @@
             </translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation type="unfinished">
             </translation>
@@ -5918,7 +5918,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-50"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-65"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5975,7 +5975,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6000,12 +6006,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Set Marker A</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6243,12 +6250,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1217"/>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6263,13 +6270,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
-        <location line="+65"/>
+        <location line="+67"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-43"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6279,7 +6291,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6294,7 +6306,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+660"/>
+        <location line="+663"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -6335,12 +6347,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">Ses aygıtının başlatılmasında hata</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-390"/>
+        <location filename="../../common/gui_save.cpp" line="-391"/>
         <source>No</source>
         <translation type="unfinished">
             </translation>
@@ -6376,7 +6388,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+209"/>
         <source>Function not implemented
 </source>
         <translation type="unfinished"></translation>
@@ -6840,7 +6852,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+142"/>
         <source>Too short</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6977,6 +6989,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
@@ -7667,7 +7692,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+34"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation type="unfinished">Fark</translation>
     </message>
@@ -7677,8 +7702,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7758,7 +7783,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation type="unfinished">
             </translation>
@@ -7807,36 +7832,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+102"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+102"/>
         <source>Reset</source>
         <translation type="unfinished">Sıfırla</translation>
     </message>
     <message>
         <location line="-88"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-88"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+64"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+64"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8298,7 +8330,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
         <source>MPlayer eq2</source>
         <translation type="unfinished">MPlayer ekolayzır2</translation>
     </message>
@@ -8307,6 +8339,11 @@
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -9792,7 +9829,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+57"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+60"/>
         <source>Mplayer Hue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9879,7 +9916,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9889,38 +9926,50 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation type="unfinished">_Gürültü:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation type="unfinished">Tam</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation type="unfinished">Hızlı</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">
             </translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10442,7 +10491,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10726,7 +10775,7 @@
 <context>
     <name>mp3d</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+235"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+234"/>
         <source>_Spatial luma strength:</source>
         <translation type="unfinished">_Uzamsal parlaklık gücü:</translation>
     </message>
@@ -10736,24 +10785,28 @@
         <translation type="unfinished">Uza_msal berraklık gücü:</translation>
     </message>
     <message>
-        <location line="-35"/>
-        <source>Mplayer Denoise 3D HQ</source>
+        <location line="+1"/>
+        <source>_Temporal luma strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
+        <source>T_emporal chroma strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location line="+1"/>
-        <source>Luma _Temporal strength:</source>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D HQ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>MPlayer denoise3d</source>
+        <location line="-40"/>
+        <source>Mplayer Denoise 3D HQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10775,18 +10828,18 @@
         <translation type="unfinished">_Zamansal güç:</translation>
     </message>
     <message>
-        <location line="-35"/>
-        <source>Mplayer Denoise 3D</source>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Reduce noise, smooth image, increase compressibility.</source>
+        <location line="-39"/>
+        <source>Mplayer Denoise 3D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>MPlayer denoise3d</source>
+        <location line="+1"/>
+        <source>Reduce noise, smooth image, increase compressibility.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10794,14 +10847,12 @@
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">SVQ3 başlıklarının okunmasında hata</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
-        <translation type="unfinished">Stts tablosu yok</translation>
+        <translation type="obsolete">Stts tablosu yok</translation>
     </message>
 </context>
 <context>
@@ -10990,7 +11041,7 @@
         <translation type="obsolete">_Güç:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+42"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+48"/>
         <source>Msharpen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11046,7 +11097,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation type="unfinished">Hata</translation>
     </message>
@@ -11158,7 +11209,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11477,19 +11528,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11497,12 +11548,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+223"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11512,7 +11563,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11577,7 +11628,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+491"/>
+        <location line="+605"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
@@ -11588,7 +11639,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+315"/>
         <source> (%d track(s))</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11736,7 +11787,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation type="unfinished">Parçalı</translation>
     </message>
@@ -11746,22 +11797,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation type="unfinished">Yapılandır</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11771,12 +11822,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12566,12 +12617,11 @@
         <translation type="unfinished">Önizleme</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>00:00:00.000</source>
-        <translation type="unfinished">00:00:00.000</translation>
+        <translation type="obsolete">00:00:00.000</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12605,11 +12655,6 @@
         <source>Forward one minute</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>A&amp;utoZoom</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>separateFields</name>
@@ -12915,7 +12960,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13348,7 +13393,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13359,7 +13404,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14693,7 +14738,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14704,7 +14749,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16114,7 +16159,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation type="unfinished"></translation>
     </message>

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

@@ -5110,7 +5110,7 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+345"/>
+        <location line="+344"/>
         <source>...</source>
         <translation type="unfinished">...</translation>
     </message>
@@ -5127,7 +5127,7 @@
         <translation type="obsolete">/ 0</translation>
     </message>
     <message>
-        <location line="-290"/>
+        <location line="-289"/>
         <source>Time:</source>
         <translation type="unfinished">時間:</translation>
     </message>
@@ -5232,7 +5232,7 @@
         <translation type="obsolete">儲存(&amp;S)</translation>
     </message>
     <message>
-        <location line="+1525"/>
+        <location line="+1530"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">開啟(&amp;O)...</translation>
     </message>
@@ -5764,7 +5764,7 @@
         <translation type="obsolete">DVD</translation>
     </message>
     <message>
-        <location line="-499"/>
+        <location line="-504"/>
         <source>Frame type:</source>
         <translation type="unfinished">畫格類型:</translation>
     </message>
@@ -5816,12 +5816,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+932"/>
+        <location line="+937"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-857"/>
+        <location line="-862"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5926,7 +5926,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+89"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6540,12 +6540,12 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+16"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+14"/>
         <source>About Avidemux</source>
         <translation type="unfinished">關於 Avidemux</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+93"/>
         <source>Avidemux </source>
         <translation type="unfinished">Avidemux </translation>
     </message>
@@ -6555,22 +6555,22 @@
         <translation type="unfinished">跨平台影片編輯工具</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+10"/>
+        <source>© 2001 - 2017  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>http://www.avidemux.org</source>
         <translation type="unfinished">http://www.avidemux.org</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+45"/>
         <source>&amp;License</source>
         <translation type="unfinished">授權(&amp;L)</translation>
     </message>
     <message>
-        <location line="-55"/>
-        <source>© 2001 - 2016  Mean</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+20"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6928,7 +6928,7 @@
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+6"/>
         <location line="+3"/>
         <location line="+5"/>
-        <location filename="../../common/gui_save.cpp" line="+281"/>
+        <location filename="../../common/gui_save.cpp" line="+282"/>
         <location line="+21"/>
         <location line="+7"/>
         <location filename="../../common/gui_savenew.cpp" line="+403"/>
@@ -6977,17 +6977,18 @@
         <translation type="unfinished">連線至 avsproxy</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+23"/>
         <source>Copy</source>
         <translation type="unfinished">複製</translation>
     </message>
     <message>
+        <location line="+3"/>
         <location line="+2"/>
         <source>Delete</source>
         <translation type="unfinished">刪除</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Set Marker A</source>
         <translation type="unfinished">設定標記 A</translation>
     </message>
@@ -7246,7 +7247,7 @@
         <translation type="unfinished">編解碼器錯誤</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+337"/>
+        <location filename="../../common/gui_main.cpp" line="+352"/>
         <source>Not coded in this version</source>
         <translation type="unfinished">沒有編進這個版本</translation>
     </message>
@@ -7259,7 +7260,7 @@
         <translation type="obsolete">選擇 AVI 檔進行添加...</translation>
     </message>
     <message>
-        <location line="+238"/>
+        <location line="+241"/>
         <source>Are you sure?</source>
         <translation type="unfinished">確定嗎?</translation>
     </message>
@@ -7317,7 +7318,7 @@
     </message>
     <message>
         <location line="+5"/>
-        <location line="+265"/>
+        <location line="+268"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">不幸的事情發生 (II)</translation>
     </message>
@@ -7416,7 +7417,7 @@
         <translation type="unfinished">置換 U 和 V(_S)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-221"/>
+        <location filename="../../common/gui_save.cpp" line="-222"/>
         <source>Select Workbench to Save</source>
         <translation type="unfinished">選擇工作台進行儲存</translation>
     </message>
@@ -7441,7 +7442,7 @@
         <translation type="unfinished">選擇 JPG 進行儲存</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+9"/>
         <source>Select File to Save</source>
         <translation type="unfinished">選擇檔案進行儲存</translation>
     </message>
@@ -7926,7 +7927,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-78"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-93"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7973,7 +7974,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7998,7 +8005,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Reset Markers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8201,12 +8208,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1217"/>
+        <location filename="../../common/gui_main.cpp" line="-1237"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>Select script to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8221,13 +8228,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
-        <location line="+65"/>
+        <location line="+67"/>
+        <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <location line="+68"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-43"/>
         <source>No engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8237,7 +8249,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8252,7 +8264,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+540"/>
+        <location line="+543"/>
         <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+104"/>
         <source>Something bad happened</source>
         <translation type="unfinished"></translation>
@@ -8299,12 +8311,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+415"/>
+        <location filename="../../common/gui_play.cpp" line="+413"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">音訊裝置初始化時發生問題</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="-390"/>
+        <location filename="../../common/gui_save.cpp" line="-391"/>
         <source>No</source>
         <translation type="unfinished">否</translation>
     </message>
@@ -8339,7 +8351,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+209"/>
         <source>Function not implemented
 </source>
         <translation type="unfinished"></translation>
@@ -8772,7 +8784,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+142"/>
         <source>Too short</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8904,6 +8916,19 @@
     </message>
 </context>
 <context>
+    <name>admIvtc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
+        <source>ADM ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All in one ivtc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aften</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
@@ -9649,13 +9674,13 @@
     <message>
         <location line="-1"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+64"/>
-        <location line="+86"/>
+        <location line="+89"/>
         <source>Contrast</source>
         <translation type="unfinished">對比</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-85"/>
-        <location line="+86"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-88"/>
+        <location line="+89"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9735,7 +9760,7 @@
 <context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
         <translation type="unfinished">載入它</translation>
     </message>
@@ -9783,36 +9808,43 @@
     <name>cropDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+14"/>
         <source>Crop</source>
         <translation type="unfinished">剪裁</translation>
     </message>
     <message>
         <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
         <source>Right:</source>
         <translation type="unfinished">右:</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Top:</source>
         <translation type="unfinished">頂部:</translation>
     </message>
     <message>
         <location line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+43"/>
         <source>Reset</source>
         <translation type="unfinished">重設</translation>
     </message>
     <message>
         <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+21"/>
         <source>Bottom:</source>
         <translation type="unfinished">底部:</translation>
     </message>
     <message>
         <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Left:</source>
         <translation type="unfinished">左:</translation>
     </message>
     <message>
         <location line="+30"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+30"/>
         <source>Auto Crop</source>
         <translation type="unfinished">自動剪裁</translation>
     </message>
@@ -10320,7 +10352,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="+64"/>
         <source>MPlayer eq2</source>
         <translation type="unfinished">MPlayer eq2</translation>
     </message>
@@ -10329,6 +10361,11 @@
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation type="unfinished">調整對比、亮度、飽和度和伽馬。</translation>
     </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+51"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>eq2Dialog</name>
@@ -11835,7 +11872,7 @@
 <context>
     <name>hue</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+58"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+61"/>
         <source>Adjust hue and saturation.</source>
         <translation type="unfinished">調整色相和飽和度。</translation>
     </message>
@@ -11921,7 +11958,7 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11931,37 +11968,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
         <translation type="unfinished">雜訊(_N):</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Remove duplicate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
         <source>Full</source>
         <translation type="unfinished">全部</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
         <translation type="unfinished">快</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">畫格率改變(_F):</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12537,7 +12586,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+110"/>
         <source>Select Logo Image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12913,7 +12962,7 @@
 <context>
     <name>mp3d</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+235"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+234"/>
         <source>_Spatial luma strength:</source>
         <translation type="unfinished">空間的明度強度(_S):</translation>
     </message>
@@ -12923,24 +12972,32 @@
         <translation type="unfinished">空間的色度強度(_P):</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>MPlayer denoise3d</source>
-        <translation type="unfinished">MPlayer denoise3d</translation>
+        <location line="+1"/>
+        <source>_Temporal luma strength:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
-        <source>Mplayer Denoise 3D HQ</source>
+        <location line="+1"/>
+        <source>T_emporal chroma strength:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
+        <location line="+4"/>
+        <source>MPlayer Denoise 3D HQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MPlayer denoise3d</source>
+        <translation type="obsolete">MPlayer denoise3d</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <source>Mplayer Denoise 3D HQ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
         <location line="+1"/>
-        <source>Luma _Temporal strength:</source>
+        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -12968,8 +13025,12 @@
     </message>
     <message>
         <location line="+4"/>
+        <source>MPlayer Denoise 3D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>MPlayer denoise3d</source>
-        <translation type="unfinished">MPlayer denoise3d</translation>
+        <translation type="obsolete">MPlayer denoise3d</translation>
     </message>
     <message>
         <location line="-39"/>
@@ -12981,14 +13042,12 @@
     <name>mp4demuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+791"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="+735"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">讀取 SVQ3 檔頭時發生問題</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
-        <translation type="unfinished">沒有 stts 表</translation>
+        <translation type="obsolete">沒有 stts 表</translation>
     </message>
 </context>
 <context>
@@ -13161,7 +13220,7 @@
 <context>
     <name>msharpen</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+49"/>
         <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
         <translation type="unfinished">沒有放大雜訊下銳利化邊緣。作者為 Donald Graft。</translation>
     </message>
@@ -13237,7 +13296,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+65"/>
         <source>Error</source>
         <translation type="unfinished">錯誤</translation>
     </message>
@@ -13347,7 +13406,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+299"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+307"/>
         <source>Start time (ms):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13650,19 +13709,19 @@
 <context>
     <name>qfile</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+40"/>
-        <location line="+101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/file_qt4.cpp" line="+50"/>
+        <location line="+139"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+67"/>
+        <location line="-54"/>
+        <location line="+96"/>
         <source> files (*.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-39"/>
+        <location line="-68"/>
         <source>Overwrite file </source>
         <translation type="unfinished"></translation>
     </message>
@@ -13670,12 +13729,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+223"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+211"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13685,7 +13744,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+516"/>
+        <location line="+627"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13750,7 +13809,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+491"/>
+        <location line="+605"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
@@ -13761,7 +13820,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+305"/>
+        <location line="+315"/>
         <source> (%d track(s))</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13909,7 +13968,7 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+321"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+430"/>
         <source>Partial</source>
         <translation type="unfinished">區段</translation>
     </message>
@@ -13919,22 +13978,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+177"/>
+        <location line="+244"/>
         <source>Add</source>
         <translation type="unfinished">加入</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-96"/>
         <source>Remove</source>
         <translation type="unfinished">移除</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>Configure</source>
         <translation type="unfinished">設定</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-2"/>
         <source>Move up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13944,12 +14003,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+224"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14763,12 +14822,11 @@
         <translation type="unfinished">預覽</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>00:00:00.000</source>
-        <translation type="unfinished">00:00:00.000</translation>
+        <translation type="obsolete">00:00:00.000</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+81"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+74"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14802,11 +14860,6 @@
         <source>Forward one minute</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>A&amp;utoZoom</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>separateFields</name>
@@ -15108,7 +15161,7 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+196"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+198"/>
         <source>X11</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15555,7 +15608,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+186"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15566,7 +15619,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+176"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16939,7 +16992,7 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+162"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16950,7 +17003,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+184"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18368,7 +18421,7 @@
 <context>
     <name>yadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+83"/>
         <source>Yadif</source>
         <translation type="unfinished"></translation>
     </message>

avidemux_2.7.0.tar.gz/avidemux/qt4/i18n/qtbase_da.ts Added

@@ -0,0 +1,6675 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="da">
+<context>
+    <name>CloseButton</name>
+    <message>
+        <source>Close Tab</source>
+        <translation>Luk faneblad</translation>
+    </message>
+</context>
+<context>
+    <name>MAC_APPLICATION_MENU</name>
+    <message>
+        <source>Services</source>
+        <translation>Tjenester</translation>
+    </message>
+    <message>
+        <source>Hide %1</source>
+        <translation>Skjul %1</translation>
+    </message>
+    <message>
+        <source>Hide Others</source>
+        <translation>Skjul andre</translation>
+    </message>
+    <message>
+        <source>Show All</source>
+        <translation>Vis alle</translation>
+    </message>
+    <message>
+        <source>Preferences...</source>
+        <translation>Præferencer...</translation>
+    </message>
+    <message>
+        <source>Quit %1</source>
+        <translation>Afslut %1</translation>
+    </message>
+    <message>
+        <source>About %1</source>
+        <translation>Om %1</translation>
+    </message>
+</context>
+<context>
+    <name>QAbstractSocket</name>
+    <message>
+        <source>Socket operation timed out</source>
+        <translation>Socket-handlingen fik timeout</translation>
+    </message>
+    <message>
+        <source>Operation on socket is not supported</source>
+        <translation>Handling på socket understøttes ikke</translation>
+    </message>
+    <message>
+        <source>Host not found</source>
+        <translation>Værten blev ikke fundet</translation>
+    </message>
+    <message>
+        <source>Connection refused</source>
+        <translation>Forbindelsen blev afvist</translation>
+    </message>
+    <message>
+        <source>Connection timed out</source>
+        <translation>Forbindelsen fik timeout</translation>
+    </message>
+    <message>
+        <source>Trying to connect while connection is in progress</source>
+        <translation>Prøver at oprette forbindelse mens forbindelse er under oprettelse</translation>
+    </message>
+    <message>
+        <source>Socket is not connected</source>
+        <translation>Socket er ikke forbundet</translation>
+    </message>
+    <message>
+        <source>Network unreachable</source>
+        <translation>Netværket kan ikke tilgås</translation>
+    </message>
+</context>
+<context>
+    <name>QAbstractSpinBox</name>
+    <message>
+        <source>&amp;Select All</source>
+        <translation>&amp;Markér alt</translation>
+    </message>
+    <message>
+        <source>&amp;Step up</source>
+        <translation>&amp;Trin op</translation>
+    </message>
+    <message>
+        <source>Step &amp;down</source>
+        <translation>Trin &amp;ned</translation>
+    </message>
+</context>
+<context>
+    <name>QAccessibleActionInterface</name>
+    <message>
+        <source>Press</source>
+        <translation>Tryk på</translation>
+    </message>
+    <message>
+        <source>Increase</source>
+        <translation>Forøg</translation>
+    </message>
+    <message>
+        <source>Decrease</source>
+        <translation>Formindsk</translation>
+    </message>
+    <message>
+        <source>ShowMenu</source>
+        <translation>Vis menu</translation>
+    </message>
+    <message>
+        <source>SetFocus</source>
+        <translation>SætFokus</translation>
+    </message>
+    <message>
+        <source>Toggle</source>
+        <translation>Til/fra</translation>
+    </message>
+    <message>
+        <source>Scroll Left</source>
+        <translation>Rul til venstre</translation>
+    </message>
+    <message>
+        <source>Scroll Right</source>
+        <translation>Rul til højre</translation>
+    </message>
+    <message>
+        <source>Scroll Up</source>
+        <translation>Rul op</translation>
+    </message>
+    <message>
+        <source>Scroll Down</source>
+        <translation>Rul ned</translation>
+    </message>
+    <message>
+        <source>Previous Page</source>
+        <translation>Forrige side</translation>
+    </message>
+    <message>
+        <source>Next Page</source>
+        <translation>Næste side</translation>
+    </message>
+    <message>
+        <source>Triggers the action</source>
+        <translation>Udløser handlingen</translation>
+    </message>
+    <message>
+        <source>Increase the value</source>
+        <translation>Forøg værdien</translation>
+    </message>
+    <message>
+        <source>Decrease the value</source>
+        <translation>Formindsk værdien</translation>
+    </message>
+    <message>
+        <source>Shows the menu</source>
+        <translation>Viser menuen</translation>
+    </message>
+    <message>
+        <source>Sets the focus</source>
+        <translation>Sæt fokussen</translation>
+    </message>
+    <message>
+        <source>Toggles the state</source>
+        <translation>Slår tilstanden til/fra</translation>
+    </message>
+    <message>
+        <source>Scrolls to the left</source>
+        <translation>Ruller til venstre</translation>
+    </message>
+    <message>
+        <source>Scrolls to the right</source>
+        <translation>Ruller til højre</translation>
+    </message>
+    <message>
+        <source>Scrolls up</source>
+        <translation>Ruller op</translation>
+    </message>
+    <message>
+        <source>Scrolls down</source>
+        <translation>Ruller ned</translation>
+    </message>
+    <message>
+        <source>Goes back a page</source>
+        <translation>Går en side tilbage</translation>
+    </message>
+    <message>
+        <source>Goes to the next page</source>
+        <translation>Går til den næste side</translation>
+    </message>
+</context>
+<context>
+    <name>QAndroidPlatformTheme</name>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>Yes to All</source>
+        <translation>Ja til alle</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nej</translation>
+    </message>
+    <message>
+        <source>No to All</source>
+        <translation>Nej til alle</translation>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>Executable &apos;%1&apos; requires Qt %2, found Qt %3.</source>
+        <translation>Eksekverbar &apos;%1&apos; kræver Qt %2, fandt Qt %3.</translation>
+    </message>
+    <message>
+        <source>Incompatible Qt Library Error</source>
+        <translation>Fejl om inkompatibelt Qt-bibliotek</translation>
+    </message>
+</context>
+<context>
+    <name>QCocoaMenuItem</name>
+    <message>
+        <source>About Qt</source>
+        <translation>Om Qt</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation>Om</translation>
+    </message>
+    <message>
+        <source>Config</source>
+        <translation>Konfig</translation>
+    </message>
+    <message>
+        <source>Preference</source>
+        <translation>Præference</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Valgmuligheder</translation>
+    </message>
+    <message>
+        <source>Setting</source>
+        <translation>Indstilling</translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation>Opsætning</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation>Afslut</translation>
+    </message>
+    <message>
+        <source>Exit</source>
+        <translation>Afslut</translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation>Klip</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Kopiér</translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation>Sæt ind</translation>
+    </message>
+    <message>
+        <source>Select All</source>
+        <translation>Markér alt</translation>
+    </message>
+</context>
+<context>
+    <name>QCocoaTheme</name>
+    <message>
+        <source>Don&apos;t Save</source>
+        <translation>Gem ikke</translation>
+    </message>
+</context>
+<context>
+    <name>QColorDialog</name>
+    <message>
+        <source>Hu&amp;e:</source>
+        <translation>Farveton&amp;e:</translation>
+    </message>
+    <message>
+        <source>&amp;Sat:</source>
+        <translation>&amp;Mætning:</translation>
+    </message>
+    <message>
+        <source>&amp;Val:</source>
+        <translation>&amp;Værdi:</translation>
+    </message>
+    <message>
+        <source>&amp;Red:</source>
+        <translation>&amp;Rød:</translation>
+    </message>
+    <message>
+        <source>&amp;Green:</source>
+        <translation>&amp;Grøn:</translation>
+    </message>
+    <message>
+        <source>Bl&amp;ue:</source>
+        <translation>Bl&amp;å:</translation>
+    </message>
+    <message>
+        <source>A&amp;lpha channel:</source>
+        <translation>Al&amp;fa-kanal:</translation>
+    </message>
+    <message>
+        <source>&amp;HTML:</source>
+        <translation>&amp;HTML:</translation>
+    </message>
+    <message>
+        <source>Cursor at %1, %2
+Press ESC to cancel</source>
+        <translation>Markør ved %1, %2
+Tryk på ESC for at annullere</translation>
+    </message>
+    <message>
+        <source>Select Color</source>
+        <translation>Vælg farve</translation>
+    </message>
+    <message>
+        <source>&amp;Basic colors</source>
+        <translation>&amp;Grundlæggende farver</translation>
+    </message>
+    <message>
+        <source>&amp;Custom colors</source>
+        <translation>&amp;Brugerdefineret farver</translation>
+    </message>
+    <message>
+        <source>&amp;Add to Custom Colors</source>
+        <translation>&amp;Føj til brugerdefineret farver</translation>
+    </message>
+    <message>
+        <source>&amp;Pick Screen Color</source>
+        <translation>&amp;Vælg farve på skærmen</translation>
+    </message>
+</context>
+<context>
+    <name>QComboBox</name>
+    <message>
+        <source>Open the combo box selection popup</source>
+        <translation>Åbn komboboksens valg-pop op</translation>
+    </message>
+    <message>
+        <source>False</source>
+        <translation>Falsk</translation>
+    </message>
+    <message>
+        <source>True</source>
+        <translation>Sand</translation>
+    </message>
+</context>
+<context>
+    <name>QCommandLineParser</name>
+    <message>
+        <source>Displays version information.</source>
+        <translation>Viser versionsinformation.</translation>
+    </message>
+    <message>
+        <source>Displays this help.</source>
+        <translation>Viser denne hjælp.</translation>
+    </message>
+    <message>
+        <source>Unknown option &apos;%1&apos;.</source>
+        <translation>Ukendt valgmulighed &apos;%1&apos;.</translation>
+    </message>
+    <message>
+        <source>Unknown options: %1.</source>
+        <translation>Ukendte valgmuligheder: %1.</translation>
+    </message>
+    <message>
+        <source>Missing value after &apos;%1&apos;.</source>
+        <translation>Manglende værdi efter &apos;%1&apos;.</translation>
+    </message>
+    <message>
+        <source>Unexpected value after &apos;%1&apos;.</source>
+        <translation>Uventet værdi efter &apos;%1&apos;.</translation>
+    </message>
+    <message>
+        <source>[options]</source>
+        <translation>[valgmuligheder]</translation>
+    </message>
+    <message>
+        <source>Usage: %1</source>
+        <translation>Brug: %1</translation>
+    </message>
+    <message>
+        <source>Options:</source>
+        <translation>Valgmuligheder:</translation>
+    </message>
+    <message>
+        <source>Arguments:</source>
+        <translation>Argumenter:</translation>
+    </message>
+</context>
+<context>
+    <name>QCoreApplication</name>
+    <message>
+        <source>%1: key is empty</source>
+        <comment>QSystemSemaphore</comment>
+        <translation>%1: nøglen er tom</translation>
+    </message>
+    <message>
+        <source>%1: unable to make key</source>
+        <comment>QSystemSemaphore</comment>
+        <translation>%1: kunne ikke lave nøglen</translation>
+    </message>
+    <message>
+        <source>%1: ftok failed</source>
+        <comment>QSystemSemaphore</comment>
+        <translation>%1: ftok fejlede</translation>
+    </message>
+</context>
+<context>
+    <name>QCupsJobWidget</name>
+    <message>
+        <source>Job</source>
+        <translation>Job</translation>
+    </message>
+    <message>
+        <source>Job Control</source>
+        <translation>Jobstyring</translation>
+    </message>
+    <message>
+        <source>Scheduled printing:</source>
+        <translation>Planlagt udskrivning:</translation>
+    </message>
+    <message>
+        <source>Billing information:</source>
+        <translation>Betalingsinformation:</translation>
+    </message>
+    <message>
+        <source>Job priority:</source>
+        <translation>Jobprioritet:</translation>
+    </message>
+    <message>
+        <source>Banner Pages</source>
+        <translation>Bannersider</translation>
+    </message>
+    <message>
+        <source>End:</source>
+        <comment>Banner page at end</comment>
+        <translation>Slut:</translation>
+    </message>
+    <message>
+        <source>Start:</source>
+        <comment>Banner page at start</comment>
+        <translation>Start:</translation>
+    </message>
+    <message>
+        <source>Print Immediately</source>
+        <translation>Udskriv med det samme</translation>
+    </message>
+    <message>
+        <source>Hold Indefinitely</source>
+        <translation>Hold på ubestemt tid</translation>
+    </message>
+    <message>
+        <source>Day (06:00 to 17:59)</source>
+        <translation>Dag (06:00 til 17:59)</translation>
+    </message>
+    <message>
+        <source>Night (18:00 to 05:59)</source>
+        <translation>Nat (18:00 til 05:59)</translation>
+    </message>
+    <message>
+        <source>Second Shift (16:00 to 23:59)</source>
+        <translation>Andet skiftehold (16:00 til 23:59)</translation>
+    </message>
+    <message>
+        <source>Third Shift (00:00 to 07:59)</source>
+        <translation>Tredje skiftehold (00:00 til 07:59)</translation>
+    </message>
+    <message>
+        <source>Weekend (Saturday to Sunday)</source>
+        <translation>Weekend (lørdag til søndag)</translation>
+    </message>
+    <message>
+        <source>Specific Time</source>
+        <translation>Bestemt tid</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <comment>CUPS Banner page</comment>
+        <translation>Intet</translation>
+    </message>
+    <message>
+        <source>Standard</source>
+        <comment>CUPS Banner page</comment>
+        <translation>Standard</translation>
+    </message>
+    <message>
+        <source>Unclassified</source>
+        <comment>CUPS Banner page</comment>
+        <translation>Uklassificeret</translation>
+    </message>
+    <message>
+        <source>Confidential</source>
+        <comment>CUPS Banner page</comment>
+        <translation>Fortroligt</translation>
+    </message>
+    <message>
+        <source>Classified</source>
+        <comment>CUPS Banner page</comment>
+        <translation>Klassificeret</translation>
+    </message>
+    <message>
+        <source>Secret</source>
+        <comment>CUPS Banner page</comment>
+        <translation>Hemmeligt</translation>
+    </message>
+    <message>
+        <source>Top Secret</source>
+        <comment>CUPS Banner page</comment>
+        <translation>Top hemmeligt</translation>
+    </message>
+</context>
+<context>
+    <name>QDB2Driver</name>
+    <message>
+        <source>Unable to connect</source>
+        <translation>Kunne ikke oprette forbindelse</translation>
+    </message>
+    <message>
+        <source>Unable to commit transaction</source>
+        <translation>Kunne ikke gennemføre transaktionen</translation>
+    </message>
+    <message>
+        <source>Unable to rollback transaction</source>
+        <translation>Kunne ikke tilbagetrække transaktionen</translation>
+    </message>
+    <message>
+        <source>Unable to set autocommit</source>
+        <translation>Kunne ikke sætte auto-gennemfør</translation>
+    </message>
+</context>
+<context>
+    <name>QDB2Result</name>
+    <message>
+        <source>Unable to execute statement</source>
+        <translation>Kunne ikke eksekvere udsagn</translation>
+    </message>
+    <message>
+        <source>Unable to prepare statement</source>
+        <translation>Kunne ikke forberede udsagn</translation>
+    </message>
+    <message>
+        <source>Unable to bind variable</source>
+        <translation>Kunne ikke binde variablen</translation>
+    </message>
+    <message>
+        <source>Unable to fetch record %1</source>
+        <translation>Kunne ikke hente record&apos;en %1</translation>
+    </message>
+    <message>
+        <source>Unable to fetch next</source>
+        <translation>Kunne ikke hente næste</translation>
+    </message>
+    <message>
+        <source>Unable to fetch first</source>
+        <translation>Kunne ikke hente første</translation>
+    </message>
+</context>
+<context>
+    <name>QDBusTrayIcon</name>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
+    <name>QDateTimeParser</name>
+    <message>
+        <source>AM</source>
+        <translation>AM</translation>
+    </message>
+    <message>
+        <source>am</source>
+        <translation>am</translation>
+    </message>
+    <message>
+        <source>PM</source>
+        <translation>PM</translation>
+    </message>
+    <message>
+        <source>pm</source>
+        <translation>pm</translation>
+    </message>
+</context>
+<context>
+    <name>QDialog</name>
+    <message>
+        <source>What&apos;s This?</source>
+        <translation>Hvad er det?</translation>
+    </message>
+</context>
+<context>
+    <name>QDialogButtonBox</name>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
+    <name>QDirModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Navn</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Størrelse</translation>
+    </message>
+    <message>
+        <source>Kind</source>
+        <comment>Match OS X Finder</comment>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <comment>All other platforms</comment>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <source>Date Modified</source>
+        <translation>Ændringsdato</translation>
+    </message>
+</context>
+<context>
+    <name>QDnsLookup</name>
+    <message>
+        <source>Operation cancelled</source>
+        <translation>Handlingen blev annulleret</translation>
+    </message>
+</context>
+<context>
+    <name>QDnsLookupRunnable</name>
+    <message>
+        <source>IPv6 addresses for nameservers are currently not supported</source>
+        <translation>IPv6-adresser for navneservere understøttes ikke aktuelt</translation>
+    </message>
+    <message>
+        <source>Invalid domain name</source>
+        <translation>Ugyldigt domænenavn</translation>
+    </message>
+    <message>
+        <source>Not yet supported on Android</source>
+        <translation>Endnu ikke understøttet på Android</translation>
+    </message>
+    <message>
+        <source>Resolver functions not found</source>
+        <translation>Løser-funktioner ikke fundet</translation>
+    </message>
+    <message>
+        <source>Resolver initialization failed</source>
+        <translation>Løser initialisering fejlede</translation>
+    </message>
+    <message>
+        <source>Server could not process query</source>
+        <translation>Serveren kunne ikke behandle forespørgsel</translation>
+    </message>
+    <message>
+        <source>Server failure</source>
+        <translation>Serverfejl</translation>
+    </message>
+    <message>
+        <source>Non existent domain</source>
+        <translation>Ikke eksisterende domæne</translation>
+    </message>
+    <message>
+        <source>Server refused to answer</source>
+        <translation>Serveren nægtede at svare</translation>
+    </message>
+    <message>
+        <source>Invalid reply received</source>
+        <translation>Ugyldigt svar modtaget</translation>
+    </message>
+    <message>
+        <source>Could not expand domain name</source>
+        <translation>Kunne ikke udvide domænenavn</translation>
+    </message>
+    <message>
+        <source>Invalid IPv4 address record</source>
+        <translation>Ugyldig IPv4-adresse-record</translation>
+    </message>
+    <message>
+        <source>Invalid IPv6 address record</source>
+        <translation>Ugyldig IPv6-adresse-record</translation>
+    </message>
+    <message>
+        <source>Invalid canonical name record</source>
+        <translation>Ugyldig kanonisk navn-record</translation>
+    </message>
+    <message>
+        <source>Invalid name server record</source>
+        <translation>Ugyldig navneserver-record</translation>
+    </message>
+    <message>
+        <source>Invalid pointer record</source>
+        <translation>Ugyldig pointer-record</translation>
+    </message>
+    <message>
+        <source>Invalid mail exchange record</source>
+        <translation>Ugyldig mail exchange-record</translation>
+    </message>
+    <message>
+        <source>Invalid service record</source>
+        <translation>Ugyldig service-record</translation>
+    </message>
+    <message>
+        <source>Invalid text record</source>
+        <translation>Ugyldig tekst-record</translation>
+    </message>
+    <message>
+        <source>Resolver library can&apos;t be loaded: No runtime library loading support</source>
+        <translation>Løser-bibliotek kan ikke indlæses: ingen understøttelse af rumtime-bibliotek indlæsning</translation>
+    </message>
+    <message>
+        <source>No hostname given</source>
+        <translation>Intet værtsnavn givet</translation>
+    </message>
+    <message>
+        <source>Invalid hostname</source>
+        <translation>Ugyldigt værtsnavn</translation>
+    </message>
+    <message>
+        <source>Host %1 could not be found.</source>
+        <translation>Værten %1 kunne ikke findes.</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Ukendt fejl</translation>
+    </message>
+</context>
+<context>
+    <name>QDockWidget</name>
+    <message>
+        <source>Float</source>
+        <extracomment>Accessible name for button undocking a dock widget (floating state)</extracomment>
+        <translation>Flyd</translation>
+    </message>
+    <message>
+        <source>Undocks and re-attaches the dock widget</source>
+        <translation>Frigør og gentilkobler dok-widget&apos;en</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <extracomment>Accessible name for button closing a dock widget</extracomment>
+        <translation>Luk</translation>
+    </message>
+    <message>
+        <source>Closes the dock widget</source>
+        <translation>Lukker dok-widget&apos;en</translation>
+    </message>
+</context>
+<context>
+    <name>QErrorMessage</name>
+    <message>
+        <source>Debug Message:</source>
+        <translation>Fejlretningsmeddelelse:</translation>
+    </message>
+    <message>
+        <source>Warning:</source>
+        <translation>Advarsel:</translation>
+    </message>
+    <message>
+        <source>Fatal Error:</source>
+        <translation>Fatal fejl:</translation>
+    </message>
+    <message>
+        <source>&amp;Show this message again</source>
+        <translation>&amp;Vis denne meddelelse igen</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
+    </message>
+</context>
+<context>
+    <name>QFile</name>
+    <message>
+        <source>Destination file is the same file.</source>
+        <translation>Destinationsfilen er den samme fil.</translation>
+    </message>
+    <message>
+        <source>Source file does not exist.</source>
+        <translation>Kildefilen findes ikke.</translation>
+    </message>
+    <message>
+        <source>Destination file exists</source>
+        <translation>Destinationsfilen findes</translation>
+    </message>
+    <message>
+        <source>Error while renaming.</source>
+        <translation>Fejl under omdøbning.</translation>
+    </message>
+    <message>
+        <source>Unable to restore from %1: %2</source>
+        <translation>Kunne ikke genskabe fra %1: %2</translation>
+    </message>
+    <message>
+        <source>Will not rename sequential file using block copy</source>
+        <translation>Vil ikke omdøbe fortløbende fil ved brug af blokkopiering</translation>
+    </message>
+    <message>
+        <source>Cannot remove source file</source>
+        <translation>Kan ikke fjerne kildefilen</translation>
+    </message>
+    <message>
+        <source>Cannot open %1 for input</source>
+        <translation>Kan ikke åbne %1 for input</translation>
+    </message>
+    <message>
+        <source>Cannot open for output</source>
+        <translation>Kan ikke åbne for output</translation>
+    </message>
+    <message>
+        <source>Failure to write block</source>
+        <translation>Kunne ikke skrive blok</translation>
+    </message>
+    <message>
+        <source>Cannot create %1 for output</source>
+        <translation>Kan ikke oprette %1 for output</translation>
+    </message>
+</context>
+<context>
+    <name>QFileDevice</name>
+    <message>
+        <source>No file engine available or engine does not support UnMapExtension</source>
+        <translation>Ingen tilgængelig fil-motor eller motor understøtter ikke UnMapExtension</translation>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>All Files (*)</source>
+        <translation>Alle filer (*)</translation>
+    </message>
+    <message>
+        <source>Look in:</source>
+        <translation>Kig i:</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Tilbage</translation>
+    </message>
+    <message>
+        <source>Go back</source>
+        <translation>Gå tilbage</translation>
+    </message>
+    <message>
+        <source>Alt+Left</source>
+        <translation>Alt+Venstre</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Frem</translation>
+    </message>
+    <message>
+        <source>Go forward</source>
+        <translation>Gå fremad</translation>
+    </message>
+    <message>
+        <source>Alt+Right</source>
+        <translation>Alt+Højre</translation>
+    </message>
+    <message>
+        <source>Parent Directory</source>
+        <translation>Ovenliggende mappe</translation>
+    </message>
+    <message>
+        <source>Go to the parent directory</source>
+        <translation>Gå til den overliggende mappe</translation>
+    </message>
+    <message>
+        <source>Alt+Up</source>
+        <translation>Alt+Op</translation>
+    </message>
+    <message>
+        <source>Create New Folder</source>
+        <translation>Opret ny mappe</translation>
+    </message>
+    <message>
+        <source>Create a New Folder</source>
+        <translation>Opret en ny mappe</translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation>Listevisning</translation>
+    </message>
+    <message>
+        <source>Change to list view mode</source>
+        <translation>Skift til listevisningstilstand</translation>
+    </message>
+    <message>
+        <source>Detail View</source>
+        <translation>Detaljeret visning</translation>
+    </message>
+    <message>
+        <source>Change to detail view mode</source>
+        <translation>Skift til detaljeret visningstilstand</translation>
+    </message>
+    <message>
+        <source>Sidebar</source>
+        <translation>Sidebjælke</translation>
+    </message>
+    <message>
+        <source>List of places and bookmarks</source>
+        <translation>Liste med steder og bogmærker</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation>Filer</translation>
+    </message>
+    <message>
+        <source>Files of type:</source>
+        <translation>Filer af type:</translation>
+    </message>
+    <message>
+        <source>Find Directory</source>
+        <translation>Find mappe</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Åbn</translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation>Gem som</translation>
+    </message>
+    <message>
+        <source>Directory:</source>
+        <translation>Mappe:</translation>
+    </message>
+    <message>
+        <source>File &amp;name:</source>
+        <translation>&amp;Filnavn:</translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation>&amp;Åbn</translation>
+    </message>
+    <message>
+        <source>&amp;Choose</source>
+        <translation>&amp;Vælg</translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation>&amp;Gem</translation>
+    </message>
+    <message>
+        <source>Show </source>
+        <translation>Vis </translation>
+    </message>
+    <message>
+        <source>&amp;Rename</source>
+        <translation>&amp;Omdøb</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation>&amp;Slet</translation>
+    </message>
+    <message>
+        <source>Show &amp;hidden files</source>
+        <translation>Vis s&amp;kjulte filer</translation>
+    </message>
+    <message>
+        <source>&amp;New Folder</source>
+        <translation>&amp;Ny mappe</translation>
+    </message>
+    <message>
+        <source>All files (*)</source>
+        <translation>Alle filer (*)</translation>
+    </message>
+    <message>
+        <source>Directories</source>
+        <translation>Mapper</translation>
+    </message>
+    <message>
+        <source>%1
+Directory not found.
+Please verify the correct directory name was given.</source>
+        <translation>%1
+Mappen blev ikke fundet.
+Kontrollér, at det korrekte mappenavn blev givet.</translation>
+    </message>
+    <message>
+        <source>%1 already exists.
+Do you want to replace it?</source>
+        <translation>%1 findes allerede.
+Vil du erstatte den?</translation>
+    </message>
+    <message>
+        <source>%1
+File not found.
+Please verify the correct file name was given.</source>
+        <translation>%1
+Filen blev ikke fundet.
+Kontrollér, at det korrekte filnavn blev givet.</translation>
+    </message>
+    <message>
+        <source>New Folder</source>
+        <translation>Ny mappe</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Slet</translation>
+    </message>
+    <message>
+        <source>&apos;%1&apos; is write protected.
+Do you want to delete it anyway?</source>
+        <translation>&apos;%1&apos; er skrivebeskyttet.
+Vil du slette den alligevel?</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete &apos;%1&apos;?</source>
+        <translation>Er du sikker på, at du vil slette &apos;%1&apos;?</translation>
+    </message>
+    <message>
+        <source>Could not delete directory.</source>
+        <translation>Kunne ikke slette mappen.</translation>
+    </message>
+    <message>
+        <source>Recent Places</source>
+        <translation>Nylige steder</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Fjern</translation>
+    </message>
+    <message>
+        <source>My Computer</source>
+        <translation>Denne Computer</translation>
+    </message>
+    <message>
+        <source>Drive</source>
+        <translation>Drev</translation>
+    </message>
+    <message>
+        <source>%1 File</source>
+        <extracomment>%1 is a file name suffix, for example txt</extracomment>
+        <translation>%1-fil</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Fil</translation>
+    </message>
+    <message>
+        <source>File Folder</source>
+        <comment>Match Windows Explorer</comment>
+        <translation>Filmappe</translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <comment>All other platforms</comment>
+        <translation>Mappe</translation>
+    </message>
+    <message>
+        <source>Alias</source>
+        <comment>OS X Finder</comment>
+        <translation>Alias</translation>
+    </message>
+    <message>
+        <source>Shortcut</source>
+        <comment>All other platforms</comment>
+        <translation>Genvej</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>Ukendt</translation>
+    </message>
+</context>
+<context>
+    <name>QFileSystemModel</name>
+    <message>
+        <source>%1 TB</source>
+        <translation>%1 TB</translation>
+    </message>
+    <message>
+        <source>%1 GB</source>
+        <translation>%1 GB</translation>
+    </message>
+    <message>
+        <source>%1 MB</source>
+        <translation>%1 MB</translation>
+    </message>
+    <message>
+        <source>%1 KB</source>
+        <translation>%1 KB</translation>
+    </message>
+    <message>
+        <source>%1 bytes</source>
+        <translation>%1 byte</translation>
+    </message>
+    <message>
+        <source>Invalid filename</source>
+        <translation>Ugyldigt filnavn</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The name &quot;%1&quot; can not be used.&lt;/b&gt;&lt;p&gt;Try using another name, with fewer characters or no punctuations marks.</source>
+        <translation>&lt;b&gt;Navnet &quot;%1&quot; kan ikke bruges.&lt;/b&gt;&lt;p&gt;Prøv et andet navn, med færre tegn eller ingen tegnsætningstegn.</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Navn</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Størrelse</translation>
+    </message>
+    <message>
+        <source>Kind</source>
+        <comment>Match OS X Finder</comment>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <comment>All other platforms</comment>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <source>Date Modified</source>
+        <translation>Ændringsdato</translation>
+    </message>
+    <message>
+        <source>My Computer</source>
+        <translation>Denne Computer</translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation>Computer</translation>
+    </message>
+    <message>
+        <source>%1 byte(s)</source>
+        <translation>%1 byte</translation>
+    </message>
+</context>
+<context>
+    <name>QFontDatabase</name>
+    <message>
+        <source>Normal</source>
+        <comment>The Normal or Regular font weight</comment>
+        <translation>Normal</translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation>Fed</translation>
+    </message>
+    <message>
+        <source>Demi Bold</source>
+        <translation>Semi fed</translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <comment>The Medium font weight</comment>
+        <translation>Medium</translation>
+    </message>
+    <message>
+        <source>Black</source>
+        <translation>Sort</translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation>Let</translation>
+    </message>
+    <message>
+        <source>Thin</source>
+        <translation>Tynd</translation>
+    </message>
+    <message>
+        <source>Extra Light</source>
+        <translation>Ekstra let</translation>
+    </message>
+    <message>
+        <source>Extra Bold</source>
+        <translation>Ekstra fed</translation>
+    </message>
+    <message>
+        <source>Extra</source>
+        <extracomment>The word for &quot;Extra&quot; as in &quot;Extra Bold, Extra Thin&quot; used as a pattern for string searches</extracomment>
+        <translation>Ekstra</translation>
+    </message>
+    <message>
+        <source>Demi</source>
+        <extracomment>The word for &quot;Demi&quot; as in &quot;Demi Bold&quot; used as a pattern for string searches</extracomment>
+        <translation>Semi</translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation>Kursiv</translation>
+    </message>
+    <message>
+        <source>Oblique</source>
+        <translation>Skæv</translation>
+    </message>
+    <message>
+        <source>Any</source>
+        <translation>Vilkårligt</translation>
+    </message>
+    <message>
+        <source>Latin</source>
+        <translation>Latinsk</translation>
+    </message>
+    <message>
+        <source>Greek</source>
+        <translation>Græsk</translation>
+    </message>
+    <message>
+        <source>Cyrillic</source>
+        <translation>Kyrillisk</translation>
+    </message>
+    <message>
+        <source>Armenian</source>
+        <translation>Armensk</translation>
+    </message>
+    <message>
+        <source>Hebrew</source>
+        <translation>Hebraisk</translation>
+    </message>
+    <message>
+        <source>Arabic</source>
+        <translation>Arabisk</translation>
+    </message>
+    <message>
+        <source>Syriac</source>
+        <translation>Syrisk</translation>
+    </message>
+    <message>
+        <source>Thaana</source>
+        <translation>Thaana</translation>
+    </message>
+    <message>
+        <source>Devanagari</source>
+        <translation>Devanagari</translation>
+    </message>
+    <message>
+        <source>Bengali</source>
+        <translation>Bengalsk</translation>
+    </message>
+    <message>
+        <source>Gurmukhi</source>
+        <translation>Gurmukhi</translation>
+    </message>
+    <message>
+        <source>Gujarati</source>
+        <translation>Gujarati</translation>
+    </message>
+    <message>
+        <source>Oriya</source>
+        <translation>Orija</translation>
+    </message>
+    <message>
+        <source>Tamil</source>
+        <translation>Tamilsk</translation>
+    </message>
+    <message>
+        <source>Telugu</source>
+        <translation>Telugu</translation>
+    </message>
+    <message>
+        <source>Kannada</source>
+        <translation>Kannaresisk</translation>
+    </message>
+    <message>
+        <source>Malayalam</source>
+        <translation>Malayalam</translation>
+    </message>
+    <message>
+        <source>Sinhala</source>
+        <translation>Sinhala</translation>
+    </message>
+    <message>
+        <source>Thai</source>
+        <translation>Thailandsk</translation>
+    </message>
+    <message>
+        <source>Lao</source>
+        <translation>Laotisk</translation>
+    </message>
+    <message>
+        <source>Tibetan</source>
+        <translation>Tibetansk</translation>
+    </message>
+    <message>
+        <source>Myanmar</source>
+        <translation>Myanmar</translation>
+    </message>
+    <message>
+        <source>Georgian</source>
+        <translation>Georgisk</translation>
+    </message>
+    <message>
+        <source>Khmer</source>
+        <translation>Khmer</translation>
+    </message>
+    <message>
+        <source>Simplified Chinese</source>
+        <translation>Kinesisk (forenklet)</translation>
+    </message>
+    <message>
+        <source>Traditional Chinese</source>
+        <translation>Kinesisk (traditionelt)</translation>
+    </message>
+    <message>
+        <source>Japanese</source>
+        <translation>Japansk</translation>
+    </message>
+    <message>
+        <source>Korean</source>
+        <translation>Koreansk</translation>
+    </message>
+    <message>
+        <source>Vietnamese</source>
+        <translation>Vietnamesisk</translation>
+    </message>
+    <message>
+        <source>Symbol</source>
+        <translation>Symboler</translation>
+    </message>
+    <message>
+        <source>Ogham</source>
+        <translation>Ogham</translation>
+    </message>
+    <message>
+        <source>Runic</source>
+        <translation>Runer</translation>
+    </message>
+    <message>
+        <source>N&apos;Ko</source>
+        <translation>N&apos;Ko</translation>
+    </message>
+</context>
+<context>
+    <name>QFontDialog</name>
+    <message>
+        <source>Select Font</source>
+        <translation>Vælg skrifttype</translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation>S&amp;krifttype</translation>
+    </message>
+    <message>
+        <source>Font st&amp;yle</source>
+        <translation>Skrifts&amp;til</translation>
+    </message>
+    <message>
+        <source>&amp;Size</source>
+        <translation>&amp;Størrelse</translation>
+    </message>
+    <message>
+        <source>Effects</source>
+        <translation>Effekter</translation>
+    </message>
+    <message>
+        <source>Stri&amp;keout</source>
+        <translation>&amp;Overstreget</translation>
+    </message>
+    <message>
+        <source>&amp;Underline</source>
+        <translation>&amp;Understreget</translation>
+    </message>
+    <message>
+        <source>Sample</source>
+        <translation>Prøve</translation>
+    </message>
+    <message>
+        <source>Wr&amp;iting System</source>
+        <translation>Skr&amp;ivesystem</translation>
+    </message>
+</context>
+<context>
+    <name>QFtp</name>
+    <message>
+        <source>Not connected</source>
+        <translation>Ikke forbundet</translation>
+    </message>
+    <message>
+        <source>Host %1 not found</source>
+        <translation>Værten %1 blev ikke fundet</translation>
+    </message>
+    <message>
+        <source>Connection refused to host %1</source>
+        <translation>Forbindelse til værten %1 afvist</translation>
+    </message>
+    <message>
+        <source>Connection timed out to host %1</source>
+        <translation>Forbindelsen fik timeout til værten %1</translation>
+    </message>
+    <message>
+        <source>Connected to host %1</source>
+        <translation>Forbundet til værten %1</translation>
+    </message>
+    <message>
+        <source>Data Connection refused</source>
+        <translation>Dataforbindelsen blev afvist</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Ukendt fejl</translation>
+    </message>
+    <message>
+        <source>Connecting to host failed:
+%1</source>
+        <translation>Forbindelsen til værten fejlede:
+%1</translation>
+    </message>
+    <message>
+        <source>Login failed:
+%1</source>
+        <translation>Login fejlede:
+%1</translation>
+    </message>
+    <message>
+        <source>Listing directory failed:
+%1</source>
+        <translation>Mappevisning fejlede:
+%1</translation>
+    </message>
+    <message>
+        <source>Changing directory failed:
+%1</source>
+        <translation>Ændring af mappe fejlede:
+%1</translation>
+    </message>
+    <message>
+        <source>Downloading file failed:
+%1</source>
+        <translation>Download af fil fejlede:
+%1</translation>
+    </message>
+    <message>
+        <source>Uploading file failed:
+%1</source>
+        <translation>Upload af fil fejlede:
+%1</translation>
+    </message>
+    <message>
+        <source>Removing file failed:
+%1</source>
+        <translation>Fjernelse af fil fejlede:
+%1</translation>
+    </message>
+    <message>
+        <source>Creating directory failed:
+%1</source>
+        <translation>Oprettelse af mappe fejlede:
+%1</translation>
+    </message>
+    <message>
+        <source>Removing directory failed:
+%1</source>
+        <translation>Fjernelse af mappe fejlede:
+%1</translation>
+    </message>
+    <message>
+        <source>Connection closed</source>
+        <translation>Forbindelsen lukket</translation>
+    </message>
+</context>
+<context>
+    <name>QGnomeTheme</name>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation>&amp;Gem</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Annuller</translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation>&amp;Luk</translation>
+    </message>
+    <message>
+        <source>Close without Saving</source>
+        <translation>Luk uden at gemme</translation>
+    </message>
+</context>
+<context>
+    <name>QGuiApplication</name>
+    <message>
+        <source>QT_LAYOUT_DIRECTION</source>
+        <comment>Translate this string to the string &apos;LTR&apos; in left-to-right languages or to &apos;RTL&apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment>
+        <translation>LTR</translation>
+    </message>
+</context>
+<context>
+    <name>QHostInfo</name>
+    <message>
+        <source>No host name given</source>
+        <translation>Intet værtsnavn givet</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Ukendt fejl</translation>
+    </message>
+</context>
+<context>
+    <name>QHostInfoAgent</name>
+    <message>
+        <source>No host name given</source>
+        <translation>Intet værtsnavn givet</translation>
+    </message>
+    <message>
+        <source>Invalid hostname</source>
+        <translation>Ugyldigt værtsnavn</translation>
+    </message>
+    <message>
+        <source>Unknown address type</source>
+        <translation>Ukendt adressetype</translation>
+    </message>
+    <message>
+        <source>Host not found</source>
+        <translation>Værten blev ikke fundet</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Ukendt fejl</translation>
+    </message>
+    <message>
+        <source>Unknown error (%1)</source>
+        <translation>Ukendt fejl (%1)</translation>
+    </message>
+</context>
+<context>
+    <name>QHttp</name>
+    <message>
+        <source>Host %1 not found</source>
+        <translation>Værten %1 blev ikke fundet</translation>
+    </message>
+    <message>
+        <source>Connection refused</source>
+        <translation>Forbindelsen blev afvist</translation>
+    </message>
+    <message>
+        <source>Connection closed</source>
+        <translation>Forbindelsen blev lukket</translation>
+    </message>
+    <message>
+        <source>Proxy requires authentication</source>
+        <translation>Proxyen kræver autentifikation</translation>
+    </message>
+    <message>
+        <source>Host requires authentication</source>
+        <translation>Værten kræver autentifikation</translation>
+    </message>
+    <message>
+        <source>Data corrupted</source>
+        <translation>Data er ødelagt</translation>
+    </message>
+    <message>
+        <source>Unknown protocol specified</source>
+        <translation>Ukendt protokol specificeret</translation>
+    </message>
+    <message>
+        <source>SSL handshake failed</source>
+        <translation>SSL-håndtryk fejlede</translation>
+    </message>
+    <message>
+        <source>Too many redirects</source>
+        <translation>For mange omdirigeringer</translation>
+    </message>
+    <message>
+        <source>Insecure redirect</source>
+        <translation>Usikker omdirigering</translation>
+    </message>
+</context>
+<context>
+    <name>QHttpSocketEngine</name>
+    <message>
+        <source>Did not receive HTTP response from proxy</source>
+        <translation>Modtog ikke HTTP-svar fra proxyen</translation>
+    </message>
+    <message>
+        <source>Error parsing authentication request from proxy</source>
+        <translation>Fejl under fortolkning af autentifikationsanmodning fra proxyen</translation>
+    </message>
+    <message>
+        <source>Authentication required</source>
+        <translation>Autentifikation kræves</translation>
+    </message>
+    <message>
+        <source>Proxy denied connection</source>
+        <translation>Proxyen nægtede forbindelsen</translation>
+    </message>
+    <message>
+        <source>Error communicating with HTTP proxy</source>
+        <translation>Fejl under kommunikation med HTTP-proxyen</translation>
+    </message>
+    <message>
+        <source>Proxy server not found</source>
+        <translation>Proxy-serveren blev ikke fundet</translation>
+    </message>
+    <message>
+        <source>Proxy connection refused</source>
+        <translation>Proxy-forbindelsen blev afvist</translation>
+    </message>
+    <message>
+        <source>Proxy server connection timed out</source>
+        <translation>Proxy-serverforbindelsen fik timeout</translation>
+    </message>
+    <message>
+        <source>Proxy connection closed prematurely</source>
+        <translation>Proxy-forbindelsen lukkede i utide</translation>
+    </message>
+</context>
+<context>
+    <name>QIBaseDriver</name>
+    <message>
+        <source>Error opening database</source>
+        <translation>Fejl ved åbning af databasen</translation>
+    </message>
+    <message>
+        <source>Could not start transaction</source>
+        <translation>Kunne ikke påbegynde transaktionen</translation>
+    </message>
+    <message>
+        <source>Unable to commit transaction</source>
+        <translation>Kunne ikke gennemføre transaktionen</translation>
+    </message>
+    <message>
+        <source>Unable to rollback transaction</source>
+        <translation>Kunne ikke tilbagetrække transaktionen</translation>
+    </message>
+</context>
+<context>
+    <name>QIBaseResult</name>
+    <message>
+        <source>Unable to create BLOB</source>
+        <translation>Kunne ikke oprette BLOB</translation>
+    </message>
+    <message>
+        <source>Unable to write BLOB</source>
+        <translation>Kunne ikke skrive BLOB</translation>
+    </message>
+    <message>
+        <source>Unable to open BLOB</source>
+        <translation>Kunne ikke åbne BLOB</translation>
+    </message>
+    <message>
+        <source>Unable to read BLOB</source>
+        <translation>Kunne ikke læse BLOB</translation>
+    </message>
+    <message>
+        <source>Could not find array</source>
+        <translation>Kunne ikke finde array</translation>
+    </message>
+    <message>
+        <source>Could not get array data</source>
+        <translation>Kunne ikke hente array-data</translation>
+    </message>
+    <message>
+        <source>Could not get query info</source>
+        <translation>Kunne ikke hente forespørgselsinfo</translation>
+    </message>
+    <message>
+        <source>Could not start transaction</source>
+        <translation>Kunne ikke påbegynde transaktion</translation>
+    </message>
+    <message>
+        <source>Unable to commit transaction</source>
+        <translation>Kunne ikke gennemføre transaktionen</translation>
+    </message>
+    <message>
+        <source>Could not allocate statement</source>
+        <translation>Kunne ikke allokere udsagn</translation>
+    </message>
+    <message>
+        <source>Could not prepare statement</source>
+        <translation>Kunne ikke forberede udsagn</translation>
+    </message>
+    <message>
+        <source>Could not describe input statement</source>
+        <translation>Kunne ikke beskrive input-udsagn</translation>
+    </message>
+    <message>
+        <source>Could not describe statement</source>
+        <translation>Kunne ikke beskrive udsagn</translation>
+    </message>
+    <message>
+        <source>Unable to close statement</source>
+        <translation>Kunne ikke lukke udsagn</translation>
+    </message>
+    <message>
+        <source>Unable to execute query</source>
+        <translation>Kunne ikke eksekvere forespørgsel</translation>
+    </message>
+    <message>
+        <source>Could not fetch next item</source>
+        <translation>Kunne ikke hente næste punkt</translation>
+    </message>
+    <message>
+        <source>Could not get statement info</source>
+        <translation>Kunne ikke hente udsagnsinformation</translation>
+    </message>
+</context>
+<context>
+    <name>QIODevice</name>
+    <message>
+        <source>Permission denied</source>
+        <translation>Tilladelse nægtet</translation>
+    </message>
+    <message>
+        <source>Too many open files</source>
+        <translation>For mange åbne filer</translation>
+    </message>
+    <message>
+        <source>No such file or directory</source>
+        <translation>Filen eller mappen findes ikke</translation>
+    </message>
+    <message>
+        <source>No space left on device</source>
+        <translation>Ingen ledig plads på enheden</translation>
+    </message>
+    <message>
+        <source>file to open is a directory</source>
+        <translation>filen der skal åbnes er en mappe</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Ukendt fejl</translation>
+    </message>
+</context>
+<context>
+    <name>QImageReader</name>
+    <message>
+        <source>Invalid device</source>
+        <translation>Ugyldig enhed</translation>
+    </message>
+    <message>
+        <source>File not found</source>
+        <translation>Filen blev ikke fundet</translation>
+    </message>
+    <message>
+        <source>Unsupported image format</source>
+        <translation>Billedformatet understøttes ikke</translation>
+    </message>
+    <message>
+        <source>Unable to read image data</source>
+        <translation>Kunne ikke læse billeddata</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Ukendt fejl</translation>
+    </message>
+</context>
+<context>
+    <name>QImageWriter</name>
+    <message>
+        <source>Unknown error</source>
+        <translation>Ukendt fejl</translation>
+    </message>
+    <message>
+        <source>Device is not set</source>
+        <translation>Enheden er ikke sat</translation>
+    </message>
+    <message>
+        <source>Device not writable</source>
+        <translation>Der kan ikke skrives til enheden</translation>
+    </message>
+    <message>
+        <source>Unsupported image format</source>
+        <translation>Billedformatet understøttes ikke</translation>
+    </message>
+</context>
+<context>
+    <name>QInputDialog</name>
+    <message>
+        <source>Enter a value:</source>
+        <translation>Indtast en værdi:</translation>
+    </message>
+</context>
+<context>
+    <name>QJsonParseError</name>
+    <message>
+        <source>no error occurred</source>
+        <translation>der opstod ingen fejl</translation>
+    </message>
+    <message>
+        <source>unterminated object</source>
+        <translation>utermineret objekt</translation>
+    </message>
+    <message>
+        <source>missing name separator</source>
+        <translation>manglende navneseparator</translation>
+    </message>
+    <message>
+        <source>unterminated array</source>
+        <translation>utermineret array</translation>
+    </message>
+    <message>
+        <source>missing value separator</source>
+        <translation>manglende værdiseparator</translation>
+    </message>
+    <message>
+        <source>illegal value</source>
+        <translation>forbudt værdi</translation>
+    </message>
+    <message>
+        <source>invalid termination by number</source>
+        <translation>ugyldig terminering af tal</translation>
+    </message>
+    <message>
+        <source>illegal number</source>
+        <translation>forbudt nummer</translation>
+    </message>
+    <message>
+        <source>invalid escape sequence</source>
+        <translation>ugyldig undvigesekvens</translation>
+    </message>
+    <message>
+        <source>invalid UTF8 string</source>
+        <translation>ugyldig UTF8-streng</translation>
+    </message>
+    <message>
+        <source>unterminated string</source>
+        <translation>utermineret streng</translation>
+    </message>
+    <message>
+        <source>object is missing after a comma</source>
+        <translation>objekt mangler efter et komma</translation>
+    </message>
+    <message>
+        <source>too deeply nested document</source>
+        <translation>for dybt indlejret dokument</translation>
+    </message>
+    <message>
+        <source>too large document</source>
+        <translation>for stort dokument</translation>
+    </message>
+    <message>
+        <source>garbage at the end of the document</source>
+        <translation>affald ved slutningen af dokumentet</translation>
+    </message>
+</context>
+<context>
+    <name>QKeySequenceEdit</name>
+    <message>
+        <source>Press shortcut</source>
+        <translation>Tryk på genvej</translation>
+    </message>
+    <message>
+        <source>%1, ...</source>
+        <extracomment>This text is an &quot;unfinished&quot; shortcut, expands like &quot;Ctrl+A, ...&quot;</extracomment>
+        <translation>%1, ...</translation>
+    </message>
+</context>
+<context>
+    <name>QLibrary</name>
+    <message>
+        <source>&apos;%1&apos; is not an ELF object (%2)</source>
+        <translation>&apos;%1&apos; er ikke et ELF-objekt (%2)</translation>
+    </message>
+    <message>
+        <source>&apos;%1&apos; is not an ELF object</source>
+        <translation>&apos;%1&apos; er ikke et ELF-objekt</translation>
+    </message>
+    <message>
+        <source>&apos;%1&apos; is an invalid ELF object (%2)</source>
+        <translation>&apos;%1&apos; er et ugyldigt ELF-objekt (%2)</translation>
+    </message>
+    <message>
+        <source>Failed to extract plugin meta data from &apos;%1&apos;</source>
+        <translation>Kunne ikke udtrække plugin-metadata fra &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>The shared library was not found.</source>
+        <translation>Det delte bibliotek blev ikke fundet.</translation>
+    </message>
+    <message>
+        <source>The file &apos;%1&apos; is not a valid Qt plugin.</source>
+        <translation>Filen &apos;%1&apos; er ikke et gyldigt Qt-plugin.</translation>
+    </message>
+    <message>
+        <source>The plugin &apos;%1&apos; uses incompatible Qt library. (%2.%3.%4) [%5]</source>
+        <translation>Pluginet &apos;%1&apos; bruger inkompatibelt Qt-bibliotek. (%2.%3.%4) [%5]</translation>
+    </message>
+    <message>
+        <source>The plugin &apos;%1&apos; uses incompatible Qt library. (Cannot mix debug and release libraries.)</source>
+        <translation>Pluginet &apos;%1&apos; bruger inkompatibelt Qt-bibliotek. (kan ikke blande debug- og release-biblioteker).</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Ukendt fejl</translation>
+    </message>
+    <message>
+        <source>Cannot load library %1: %2</source>
+        <translation>Kan ikke indlæse biblioteket %1: %2</translation>
+    </message>
+    <message>
+        <source>Cannot unload library %1: %2</source>
+        <translation>Kan ikke afregistrere biblioteket %1: %2</translation>
+    </message>
+    <message>
+        <source>Cannot resolve symbol &quot;%1&quot; in %2: %3</source>
+        <translation>Kan ikke løse symbolet &quot;%1&quot; i %2: %3</translation>
+    </message>
+    <message>
+        <source>&apos;%1&apos; is not a valid Mach-O binary (%2)</source>
+        <translation>&apos;%1&apos; er ikke en gyldig Mach-O-binær (%2)</translation>
+    </message>
+    <message>
+        <source>file is corrupt</source>
+        <translation>filen er ødelagt</translation>
+    </message>
+    <message>
+        <source>file too small</source>
+        <translation>filen er for lille</translation>
+    </message>
+    <message>
+        <source>no suitable architecture in fat binary</source>
+        <translation>ingen egnede arkitektur i fat-binær</translation>
+    </message>
+    <message>
+        <source>invalid magic %1</source>
+        <translation>ugyldig magisk %1</translation>
+    </message>
+    <message>
+        <source>wrong architecture</source>
+        <translation>forkert arkitektur</translation>
+    </message>
+    <message>
+        <source>not a dynamic library</source>
+        <translation>ikke et dynamisk bibliotek</translation>
+    </message>
+    <message>
+        <source>&apos;%1&apos; is not a Qt plugin</source>
+        <translation>&apos;%1&apos; er ikke et Qt-plugin</translation>
+    </message>
+</context>
+<context>
+    <name>QLineEdit</name>
+    <message>
+        <source>&amp;Undo</source>
+        <translation>&amp;Fortryd</translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation>&amp;Omgør</translation>
+    </message>
+    <message>
+        <source>Cu&amp;t</source>
+        <translation>K&amp;lip</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;Kopiér</translation>
+    </message>
+    <message>
+        <source>&amp;Paste</source>
+        <translation>&amp;Sæt ind</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Slet</translation>
+    </message>
+    <message>
+        <source>Select All</source>
+        <translation>Markér alt</translation>
+    </message>
+</context>
+<context>
+    <name>QLocalServer</name>
+    <message>
+        <source>%1: Name error</source>
+        <translation>%1: navnefejl</translation>
+    </message>
+    <message>
+        <source>%1: Permission denied</source>
+        <translation>%1: tilladelse nægtet</translation>
+    </message>
+    <message>
+        <source>%1: Address in use</source>
+        <translation>%1: adresse i brug</translation>
+    </message>
+    <message>
+        <source>%1: Unknown error %2</source>
+        <translation>%1: ukendt fejl %2</translation>
+    </message>
+</context>
+<context>
+    <name>QLocalSocket</name>
+    <message>
+        <source>%1: Connection refused</source>
+        <translation>%1: forbindelsen blev afvist</translation>
+    </message>
+    <message>
+        <source>%1: Remote closed</source>
+        <translation>%1: fjern lukkede</translation>
+    </message>
+    <message>
+        <source>%1: Invalid name</source>
+        <translation>%1: ugyldigt navn</translation>
+    </message>
+    <message>
+        <source>%1: Socket access error</source>
+        <translation>%1: socket adgangsfejl</translation>
+    </message>
+    <message>
+        <source>%1: Socket resource error</source>
+        <translation>%1: socket ressourcefejl</translation>
+    </message>
+    <message>
+        <source>%1: Socket operation timed out</source>
+        <translation>%1: socket-handlingen fik timeout</translation>
+    </message>
+    <message>
+        <source>%1: Datagram too large</source>
+        <translation>%1: datagram er for stort</translation>
+    </message>
+    <message>
+        <source>%1: Connection error</source>
+        <translation>%1: forbindelsesfejl</translation>
+    </message>
+    <message>
+        <source>%1: The socket operation is not supported</source>
+        <translation>%1: socket-handlingen understøttes ikke</translation>
+    </message>
+    <message>
+        <source>%1: Operation not permitted when socket is in this state</source>
+        <translation>%1: handlingen er ikke tilladt når socket er i denne tilstand</translation>
+    </message>
+    <message>
+        <source>%1: Unknown error</source>
+        <translation>%1: ukendt fejl</translation>
+    </message>
+    <message>
+        <source>Trying to connect while connection is in progress</source>
+        <translation>Prøver at oprette forbindelse mens forbindelse er under oprettelse</translation>
+    </message>
+    <message>
+        <source>%1: Unknown error %2</source>
+        <translation>%1: ukendt fejl %2</translation>
+    </message>
+    <message>
+        <source>%1: Access denied</source>
+        <translation>%1: adgang nægtet</translation>
+    </message>
+</context>
+<context>
+    <name>QMYSQLDriver</name>
+    <message>
+        <source>Unable to allocate a MYSQL object</source>
+        <translation>Kunne ikke allokere et MYSQL-objekt</translation>
+    </message>
+    <message>
+        <source>Unable to open database &apos;%1&apos;</source>
+        <translation>Kunne ikke åbne databasen &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Unable to connect</source>
+        <translation>Kunne ikke oprette forbindelse</translation>
+    </message>
+    <message>
+        <source>Unable to begin transaction</source>
+        <translation>Kunne ikke påbegynde transaktionen</translation>
+    </message>
+    <message>
+        <source>Unable to commit transaction</source>
+        <translation>Kunne ikke gennemføre transaktionen</translation>
+    </message>
+    <message>
+        <source>Unable to rollback transaction</source>
+        <translation>Kunne ikke tilbagetrække transaktionen</translation>
+    </message>
+</context>
+<context>
+    <name>QMYSQLResult</name>
+    <message>
+        <source>Unable to fetch data</source>
+        <translation>Kunne ikke hente data</translation>
+    </message>
+    <message>
+        <source>Unable to execute query</source>
+        <translation>Kunne ikke eksekvere forespørgsel</translation>
+    </message>
+    <message>
+        <source>Unable to store result</source>
+        <translation>Kunne ikke lagre resultatet</translation>
+    </message>
+    <message>
+        <source>Unable to execute next query</source>
+        <translation>Kunne ikke eksekvere næste forespørgsel</translation>
+    </message>
+    <message>
+        <source>Unable to store next result</source>
+        <translation>Kunne ikke lagre næste resultat</translation>
+    </message>
+    <message>
+        <source>Unable to prepare statement</source>
+        <translation>Kunne ikke forberede udsagn</translation>
+    </message>
+    <message>
+        <source>Unable to reset statement</source>
+        <translation>Kunne ikke nulstille udsagn</translation>
+    </message>
+    <message>
+        <source>Unable to bind value</source>
+        <translation>Kunne ikke binde værdi</translation>
+    </message>
+    <message>
+        <source>Unable to execute statement</source>
+        <translation>Kunne ikke eksekvere udsagn</translation>
+    </message>
+    <message>
+        <source>Unable to bind outvalues</source>
+        <translation>Kunne ikke binde ud-værdier</translation>
+    </message>
+    <message>
+        <source>Unable to store statement results</source>
+        <translation>Kunne ikke lagre udsagnsresultater</translation>
+    </message>
+</context>
+<context>
+    <name>QMdiArea</name>
+    <message>
+        <source>(Untitled)</source>
+        <translation>(unavngivet)</translation>
+    </message>
+</context>
+<context>
+    <name>QMdiSubWindow</name>
+    <message>
+        <source>- [%1]</source>
+        <translation>- [%1]</translation>
+    </message>
+    <message>
+        <source>%1 - [%2]</source>
+        <translation>%1 - [%2]</translation>
+    </message>
+    <message>
+        <source>Minimize</source>
+        <translation>Minimer</translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation>Maksimer</translation>
+    </message>
+    <message>
+        <source>Unshade</source>
+        <translation>Rul ud</translation>
+    </message>
+    <message>
+        <source>Shade</source>
+        <translation>Rul sammen</translation>
+    </message>
+    <message>
+        <source>Restore Down</source>
+        <translation>Genskab ned</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation>Genskab</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Luk</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Hjælp</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation>Menu</translation>
+    </message>
+    <message>
+        <source>&amp;Restore</source>
+        <translation>&amp;Genskab</translation>
+    </message>
+    <message>
+        <source>&amp;Move</source>
+        <translation>&amp;Flyt</translation>
+    </message>
+    <message>
+        <source>&amp;Size</source>
+        <translation>&amp;Størrelse</translation>
+    </message>
+    <message>
+        <source>Mi&amp;nimize</source>
+        <translation>Mi&amp;nimer</translation>
+    </message>
+    <message>
+        <source>Ma&amp;ximize</source>
+        <translation>Ma&amp;ksimer</translation>
+    </message>
+    <message>
+        <source>Stay on &amp;Top</source>
+        <translation>Altid &amp;øverst</translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation>&amp;Luk</translation>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Show Details...</source>
+        <translation>Vis detaljer...</translation>
+    </message>
+    <message>
+        <source>Hide Details...</source>
+        <translation>Skjul detaljer...</translation>
+    </message>
+    <message>
+        <source>&lt;h3&gt;About Qt&lt;/h3&gt;&lt;p&gt;This program uses Qt version %1.&lt;/p&gt;</source>
+        <translation>&lt;h3&gt;Om Qt&lt;/h3&gt;&lt;p&gt;Dette program bruger Qt version %1.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across all major desktop operating systems. It is also available for embedded Linux and other embedded and mobile operating systems.&lt;/p&gt;&lt;p&gt;Qt is available under three different licensing options designed to accommodate the needs of our various users.&lt;/p&gt;&lt;p&gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 3.&lt;/p&gt;&lt;p&gt;Qt licensed under the GNU LGPL version 3 is appropriate for the development of Qt&amp;nbsp;applications provided you can comply with the terms and conditions of the GNU LGPL version 3.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) %1 The Qt Company Ltd and other contributors.&lt;/p&gt;&lt;p&gt;Qt and the Qt logo are trademarks of The Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Qt is The Qt Company Ltd product developed as an open source project. See &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt; for more information.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Qt er et C++-værktøjskit til programudvikling på tværs af platforme.&lt;/p&gt;&lt;p&gt;Qt giver enkelt-kilde portability på tværs af alle større skrivebordsstyresystemer. Det er også tilgængeligt til Embedded Linux og andre indlejrede og mobile styresystemer.&lt;/p&gt;&lt;p&gt;Qt er tilgængelig under tre forskellige licenseringsmuligheder, designet til at rumme behovene af vores forskellige brugere.&lt;/p&gt;&lt;p&gt;Qt licenseret under vores kommercielle licensaftale er passende til udvikling af proprietær/kommerciel software, hvor du ikke vil dele kildekode med tredjeparter eller på anden måde ikke kan efterleve vilkårene i GNU LGPL version 3.&lt;/p&gt;&lt;p&gt;Qt licenseret under GNU LGPL version 3 er passende til udvikling af Qt-programmer, på forudsætning af at du kan efterleve vilkårene og betingelserne i GNU LGPL version 3.&lt;/p&gt;&lt;p&gt;Se venligst &lt;a href=&quot;http://%2/&quot;&gt;%2&lt;/a&gt; for en oversigt af Qt-licensering.&lt;/p&gt;&lt;p&gt;Ophavsret (C) %1 Qt Company Ltd og andre bidragydere.&lt;/p&gt;&lt;p&gt;Qt og Qt-logoet er varemærker af Qt Company Ltd.&lt;/p&gt;&lt;p&gt;Qt er Qt Company Ltd-produktet, udviklet som et open source projekt. Se &lt;a href=&quot;http://%3/&quot;&gt;%3&lt;/a&gt; for mere information.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>About Qt</source>
+        <translation>Om Qt</translation>
+    </message>
+</context>
+<context>
+    <name>QNativeSocketEngine</name>
+    <message>
+        <source>Unable to initialize non-blocking socket</source>
+        <translation>Kunne ikke initialisere ikke-blokerende socket</translation>
+    </message>
+    <message>
+        <source>Unable to initialize broadcast socket</source>
+        <translation>Kunne ikke initialisere broadcast-socket</translation>
+    </message>
+    <message>
+        <source>Attempt to use IPv6 socket on a platform with no IPv6 support</source>
+        <translation>Forsøg på at bruge IPv6-socket på en platform uden IPv6-understøttelse</translation>
+    </message>
+    <message>
+        <source>The remote host closed the connection</source>
+        <translation>Fjern-værten lukkede forbindelsen</translation>
+    </message>
+    <message>
+        <source>Network operation timed out</source>
+        <translation>Netværkshandlingen fik timeout</translation>
+    </message>
+    <message>
+        <source>Out of resources</source>
+        <translation>Ikke flere ressourcer</translation>
+    </message>
+    <message>
+        <source>Unsupported socket operation</source>
+        <translation>Socket-handlingen understøttes ikke</translation>
+    </message>
+    <message>
+        <source>Protocol type not supported</source>
+        <translation>Protokoltypen understøttes ikke</translation>
+    </message>
+    <message>
+        <source>Invalid socket descriptor</source>
+        <translation>Ugyldig socket-deskriptor</translation>
+    </message>
+    <message>
+        <source>Host unreachable</source>
+        <translation>Værten kan ikke tilgås</translation>
+    </message>
+    <message>
+        <source>Network unreachable</source>
+        <translation>Netværket kan ikke tilgås</translation>
+    </message>
+    <message>
+        <source>Permission denied</source>
+        <translation>Tilladelse nægtet</translation>
+    </message>
+    <message>
+        <source>Connection timed out</source>
+        <translation>Forbindelsen fik timeout</translation>
+    </message>
+    <message>
+        <source>Connection refused</source>
+        <translation>Forbindelsen blev afvist</translation>
+    </message>
+    <message>
+        <source>The bound address is already in use</source>
+        <translation>Den bundne adresse er allerede i brug</translation>
+    </message>
+    <message>
+        <source>The address is not available</source>
+        <translation>Adressen er ikke tilgængelig</translation>
+    </message>
+    <message>
+        <source>The address is protected</source>
+        <translation>Adressen er beskyttet</translation>
+    </message>
+    <message>
+        <source>Datagram was too large to send</source>
+        <translation>Datagrammet var for stort til at blive sendt</translation>
+    </message>
+    <message>
+        <source>Unable to send a message</source>
+        <translation>Kunne ikke sende en meddelelse</translation>
+    </message>
+    <message>
+        <source>Unable to receive a message</source>
+        <translation>Kunne ikke modtage en meddelelse</translation>
+    </message>
+    <message>
+        <source>Unable to write</source>
+        <translation>Kunne ikke skrive</translation>
+    </message>
+    <message>
+        <source>Network error</source>
+        <translation>Netværksfejl</translation>
+    </message>
+    <message>
+        <source>Another socket is already listening on the same port</source>
+        <translation>En anden socket lytter allerede på den samme port</translation>
+    </message>
+    <message>
+        <source>Operation on non-socket</source>
+        <translation>Handling på ikke-socket</translation>
+    </message>
+    <message>
+        <source>The proxy type is invalid for this operation</source>
+        <translation>Proxytypen er ugyldig for denne handling</translation>
+    </message>
+    <message>
+        <source>Temporary error</source>
+        <translation>Midlertidig fejl</translation>
+    </message>
+    <message>
+        <source>Network dropped connection on reset</source>
+        <translation>Netværket droppede forbindelsen ved nulstilling</translation>
+    </message>
+    <message>
+        <source>Connection reset by peer</source>
+        <translation>Forbindelsen blev nulstillet af peer</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Ukendt fejl</translation>
+    </message>
+</context>
+<context>
+    <name>QNetworkAccessCacheBackend</name>
+    <message>
+        <source>Error opening %1</source>
+        <translation>Fejl under åbning af %1</translation>
+    </message>
+</context>
+<context>
+    <name>QNetworkAccessDataBackend</name>
+    <message>
+        <source>Invalid URI: %1</source>
+        <translation>Ugyldig URI: %1</translation>
+    </message>
+</context>
+<context>
+    <name>QNetworkAccessDebugPipeBackend</name>
+    <message>
+        <source>Write error writing to %1: %2</source>
+        <translation>Skrivefejl ved skrivning til %1: %2</translation>
+    </message>
+    <message>
+        <source>Socket error on %1: %2</source>
+        <translation>Socket-fejl på %1: %2</translation>
+    </message>
+    <message>
+        <source>Remote host closed the connection prematurely on %1</source>
+        <translation>Fjern-værten lukkede forbindelsen i utide på %1</translation>
+    </message>
+</context>
+<context>
+    <name>QNetworkAccessFileBackend</name>
+    <message>
+        <source>Request for opening non-local file %1</source>
+        <translation>Anmodning om at åbne ikke-lokal fil %1</translation>
+    </message>
+    <message>
+        <source>Error opening %1: %2</source>
+        <translation>Fejl ved åbning af %1: %2</translation>
+    </message>
+    <message>
+        <source>Write error writing to %1: %2</source>
+        <translation>Skrivefejl ved skrivning til %1: %2</translation>
+    </message>
+    <message>
+        <source>Cannot open %1: Path is a directory</source>
+        <translation>Kan ikke åbne %1: stien er en mappe</translation>
+    </message>
+    <message>
+        <source>Read error reading from %1: %2</source>
+        <translation>Læsefejl ved læsning fra %1: %2</translation>
+    </message>
+</context>
+<context>
+    <name>QNetworkAccessFtpBackend</name>
+    <message>
+        <source>No suitable proxy found</source>
+        <translation>Der blev ikke fundet en egnet proxy</translation>
+    </message>
+    <message>
+        <source>Cannot open %1: is a directory</source>
+        <translation>Kan ikke åbne %1: er en mappe</translation>
+    </message>
+    <message>
+        <source>Logging in to %1 failed: authentication required</source>
+        <translation>Logning til %1 fejlede: autentifikation kræves</translation>
+    </message>
+    <message>
+        <source>Error while downloading %1: %2</source>
+        <translation>Fejl under download af %1: %2</translation>
+    </message>
+    <message>
+        <source>Error while uploading %1: %2</source>
+        <translation>Fejl under upload af %1: %2</translation>
+    </message>
+</context>
+<context>
+    <name>QNetworkAccessManager</name>
+    <message>
+        <source>Network access is disabled.</source>
+        <translation>Netværksadgang er deaktiveret.</translation>
+    </message>
+</context>
+<context>
+    <name>QNetworkReply</name>
+    <message>
+        <source>Error transferring %1 - server replied: %2</source>
+        <translation>Fejl ved overførsel af %1 - serveren svarede: %2</translation>
+    </message>
+    <message>
+        <source>Background request not allowed.</source>
+        <translation>Baggrundsanmodning ikke tilladt.</translation>
+    </message>
+    <message>
+        <source>Network session error.</source>
+        <translation>Netværkssessionsfejl.</translation>
+    </message>
+    <message>
+        <source>backend start error.</source>
+        <translation>backend startfejl.</translation>
+    </message>
+    <message>
+        <source>Temporary network failure.</source>
+        <translation>Midlertidig netværksfejl.</translation>
+    </message>
+    <message>
+        <source>Protocol &quot;%1&quot; is unknown</source>
+        <translation>Protokollen &quot;%1&quot; er ukendt</translation>
+    </message>
+</context>
+<context>
+    <name>QNetworkReplyHttpImpl</name>
+    <message>
+        <source>Operation canceled</source>
+        <translation>Handlingen blev annulleret</translation>
+    </message>
+    <message>
+        <source>No suitable proxy found</source>
+        <translation>Der blev ikke fundet en egnet proxy</translation>
+    </message>
+</context>
+<context>
+    <name>QNetworkReplyImpl</name>
+    <message>
+        <source>Operation canceled</source>
+        <translation>Handlingen blev annulleret</translation>
+    </message>
+</context>
+<context>
+    <name>QNetworkSession</name>
+    <message>
+        <source>Invalid configuration.</source>
+        <translation>Ugyldig konfiguration.</translation>
+    </message>
+</context>
+<context>
+    <name>QNetworkSessionPrivateImpl</name>
+    <message>
+        <source>Unknown session error.</source>
+        <translation>Ukendt sessionsfejl.</translation>
+    </message>
+    <message>
+        <source>The session was aborted by the user or system.</source>
+        <translation>Sessionen blev afbrudt af brugeren eller systemet.</translation>
+    </message>
+    <message>
+        <source>The requested operation is not supported by the system.</source>
+        <translation>Den anmodede handling understøttes ikke af systemet.</translation>
+    </message>
+    <message>
+        <source>The specified configuration cannot be used.</source>
+        <translation>Den specificerede konfiguration kan ikke bruges.</translation>
+    </message>
+    <message>
+        <source>Roaming was aborted or is not possible.</source>
+        <translation>Roaming blev afbrudt eller er ikke mulig.</translation>
+    </message>
+</context>
+<context>
+    <name>QOCIDriver</name>
+    <message>
+        <source>Unable to initialize</source>
+        <comment>QOCIDriver</comment>
+        <translation>Kunne ikke initialisere</translation>
+    </message>
+    <message>
+        <source>Unable to logon</source>
+        <translation>Kunne ikke logge ind</translation>
+    </message>
+    <message>
+        <source>Unable to begin transaction</source>
+        <translation>Kunne ikke påbegynde transaktionen</translation>
+    </message>
+    <message>
+        <source>Unable to commit transaction</source>
+        <translation>Kunne ikke gennemføre transaktionen</translation>
+    </message>
+    <message>
+        <source>Unable to rollback transaction</source>
+        <translation>Kunne ikke tilbagetrække transaktionen</translation>
+    </message>
+</context>
+<context>
+    <name>QOCIResult</name>
+    <message>
+        <source>Unable to bind column for batch execute</source>
+        <translation>Kunne ikke binde kolonne til batch-eksekvering</translation>
+    </message>
+    <message>
+        <source>Unable to execute batch statement</source>
+        <translation>Kunne ikke eksekvere batch-udsagn</translation>
+    </message>
+    <message>
+        <source>Unable to goto next</source>
+        <translation>Kunne ikke gå til næste</translation>
+    </message>
+    <message>
+        <source>Unable to alloc statement</source>
+        <translation>Kunne ikke allokere udsagn</translation>
+    </message>
+    <message>
+        <source>Unable to prepare statement</source>
+        <translation>Kunne ikke forberede udsagn</translation>
+    </message>
+    <message>
+        <source>Unable to get statement type</source>
+        <translation>Kunne ikke hente udsagnstype</translation>
+    </message>
+    <message>
+        <source>Unable to bind value</source>
+        <translation>Kunne ikke binde værdi</translation>
+    </message>
+    <message>
+        <source>Unable to execute statement</source>
+        <translation>Kunne ikke eksekvere udsagn</translation>
+    </message>
+</context>
+<context>
+    <name>QODBCDriver</name>
+    <message>
+        <source>Unable to connect</source>
+        <translation>Kunne ikke oprette forbindelsen</translation>
+    </message>
+    <message>
+        <source>Unable to connect - Driver doesn&apos;t support all functionality required</source>
+        <translation>Kunne ikke oprette forbindelsen - driveren understøtter ikke alle de krævede funktionaliteter</translation>
+    </message>
+    <message>
+        <source>Unable to disable autocommit</source>
+        <translation>Kunne ikke deaktivere auto-gennemfør</translation>
+    </message>
+    <message>
+        <source>Unable to commit transaction</source>
+        <translation>Kunne ikke gennemføre transaktionen</translation>
+    </message>
+    <message>
+        <source>Unable to rollback transaction</source>
+        <translation>Kunne ikke tilbagetrække transaktionen</translation>
+    </message>
+    <message>
+        <source>Unable to enable autocommit</source>
+        <translation>Kunne ikke aktivere auto-gennemfør</translation>
+    </message>
+</context>
+<context>
+    <name>QODBCResult</name>
+    <message>
+        <source>Unable to fetch last</source>
+        <translation>Kunne ikke hente sidste</translation>
+    </message>
+    <message>
+        <source>QODBCResult::reset: Unable to set &apos;SQL_CURSOR_STATIC&apos; as statement attribute. Please check your ODBC driver configuration</source>
+        <translation>QODBCResult::reset: kunne ikke sætte &apos;SQL_CURSOR_STATIC&apos; som udsagnsattribut. Tjek venligst din ODBC-driverkonfiguration</translation>
+    </message>
+    <message>
+        <source>Unable to execute statement</source>
+        <translation>Kunne ikke eksekvere udsagn</translation>
+    </message>
+    <message>
+        <source>Unable to fetch</source>
+        <translation>Kunne ikke hente</translation>
+    </message>
+    <message>
+        <source>Unable to fetch next</source>
+        <translation>Kunne ikke hente næste</translation>
+    </message>
+    <message>
+        <source>Unable to fetch first</source>
+        <translation>Kunne ikke hente første</translation>
+    </message>
+    <message>
+        <source>Unable to fetch previous</source>
+        <translation>Kunne ikke hente forrige</translation>
+    </message>
+    <message>
+        <source>Unable to prepare statement</source>
+        <translation>Kunne ikke forberede udsagn</translation>
+    </message>
+    <message>
+        <source>Unable to bind variable</source>
+        <translation>Kunne ikke binde variablen</translation>
+    </message>
+</context>
+<context>
+    <name>QPSQLDriver</name>
+    <message>
+        <source>Unable to connect</source>
+        <translation>Kunne ikke oprette forbindelse</translation>
+    </message>
+    <message>
+        <source>Could not begin transaction</source>
+        <translation>Kunne ikke påbegynde transaktionen</translation>
+    </message>
+    <message>
+        <source>Could not commit transaction</source>
+        <translation>Kunne ikke gennemføre transaktionen</translation>
+    </message>
+    <message>
+        <source>Could not rollback transaction</source>
+        <translation>Kunne ikke tilbagetrække transaktionen</translation>
+    </message>
+    <message>
+        <source>Unable to subscribe</source>
+        <translation>Kunne ikke tilmelde</translation>
+    </message>
+    <message>
+        <source>Unable to unsubscribe</source>
+        <translation>Kunne ikke afmelde</translation>
+    </message>
+</context>
+<context>
+    <name>QPSQLResult</name>
+    <message>
+        <source>Unable to create query</source>
+        <translation>Kunne ikke oprette forespørgsel</translation>
+    </message>
+    <message>
+        <source>Unable to prepare statement</source>
+        <translation>Kunne ikke forberede udsagn</translation>
+    </message>
+</context>
+<context>
+    <name>QPageSetupWidget</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Paper</source>
+        <translation>Papir</translation>
+    </message>
+    <message>
+        <source>Page size:</source>
+        <translation>Sidestørrelse:</translation>
+    </message>
+    <message>
+        <source>Width:</source>
+        <translation>Bredde:</translation>
+    </message>
+    <message>
+        <source>Height:</source>
+        <translation>Højde:</translation>
+    </message>
+    <message>
+        <source>Paper source:</source>
+        <translation>Papirkilde:</translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation>Orientering</translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation>Portræt</translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation>Landskab</translation>
+    </message>
+    <message>
+        <source>Reverse landscape</source>
+        <translation>Omvendt landskab</translation>
+    </message>
+    <message>
+        <source>Reverse portrait</source>
+        <translation>Omvendt portræt</translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation>Margener</translation>
+    </message>
+    <message>
+        <source>top margin</source>
+        <translation>øverste margen</translation>
+    </message>
+    <message>
+        <source>left margin</source>
+        <translation>venstre margen</translation>
+    </message>
+    <message>
+        <source>right margin</source>
+        <translation>højre margen</translation>
+    </message>
+    <message>
+        <source>bottom margin</source>
+        <translation>nederste margen</translation>
+    </message>
+    <message>
+        <source>Page Layout</source>
+        <translation>Sidelayout</translation>
+    </message>
+    <message>
+        <source>Page order:</source>
+        <translation>Sideorden:</translation>
+    </message>
+    <message>
+        <source>Pages per sheet:</source>
+        <translation>Sider pr. ark:</translation>
+    </message>
+    <message>
+        <source>Millimeters (mm)</source>
+        <translation>Millimeter (mm)</translation>
+    </message>
+    <message>
+        <source>Inches (in)</source>
+        <translation>Tommer (tommer)</translation>
+    </message>
+    <message>
+        <source>Points (pt)</source>
+        <translation>Punkter (pt)</translation>
+    </message>
+    <message>
+        <source>Pica (P̸)</source>
+        <translation>Pica (P̸)</translation>
+    </message>
+    <message>
+        <source>Didot (DD)</source>
+        <translation>Didot (DD)</translation>
+    </message>
+    <message>
+        <source>Cicero (CC)</source>
+        <translation>Cicero (CC)</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation>Brugerdefineret</translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <extracomment>Unit &apos;Millimeter&apos;</extracomment>
+        <translation>mm</translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <extracomment>Unit &apos;Points&apos;</extracomment>
+        <translation>pt</translation>
+    </message>
+    <message>
+        <source>in</source>
+        <extracomment>Unit &apos;Inch&apos;</extracomment>
+        <translation>tommer</translation>
+    </message>
+    <message>
+        <source>P̸</source>
+        <extracomment>Unit &apos;Pica&apos;</extracomment>
+        <translation>P̸</translation>
+    </message>
+    <message>
+        <source>DD</source>
+        <extracomment>Unit &apos;Didot&apos;</extracomment>
+        <translation>DD</translation>
+    </message>
+    <message>
+        <source>CC</source>
+        <extracomment>Unit &apos;Cicero&apos;</extracomment>
+        <translation>CC</translation>
+    </message>
+</context>
+<context>
+    <name>QPageSize</name>
+    <message>
+        <source>Custom (%1mm x %2mm)</source>
+        <extracomment>Custom size name in millimeters</extracomment>
+        <translation>Brugerdefineret (%1 mm x %2 mm)</translation>
+    </message>
+    <message>
+        <source>Custom (%1pt x %2pt)</source>
+        <extracomment>Custom size name in points</extracomment>
+        <translation>Brugerdefineret (%1 pt x %2 pt)</translation>
+    </message>
+    <message>
+        <source>Custom (%1in x %2in)</source>
+        <extracomment>Custom size name in inches</extracomment>
+        <translation>Brugerdefineret (%1 tommer x %2 tommer)</translation>
+    </message>
+    <message>
+        <source>Custom (%1pc x %2pc)</source>
+        <extracomment>Custom size name in picas</extracomment>
+        <translation>Brugerdefineret (%1 pc x %2 pc)</translation>
+    </message>
+    <message>
+        <source>Custom (%1DD x %2DD)</source>
+        <extracomment>Custom size name in didots</extracomment>
+        <translation>Brugerdefineret (%1 DD x %2 DD)</translation>
+    </message>
+    <message>
+        <source>Custom (%1CC x %2CC)</source>
+        <extracomment>Custom size name in ciceros</extracomment>
+        <translation>Brugerdefineret (%1 CC x %2 CC)</translation>
+    </message>
+    <message>
+        <source>%1 x %2 in</source>
+        <extracomment>Page size in &apos;Inch&apos;.</extracomment>
+        <translation>%1 x %2 tommer</translation>
+    </message>
+    <message>
+        <source>A0</source>
+        <translation>A0</translation>
+    </message>
+    <message>
+        <source>A1</source>
+        <translation>A1</translation>
+    </message>
+    <message>
+        <source>A2</source>
+        <translation>A2</translation>
+    </message>
+    <message>
+        <source>A3</source>
+        <translation>A3</translation>
+    </message>
+    <message>
+        <source>A4</source>
+        <translation>A4</translation>
+    </message>
+    <message>
+        <source>A5</source>
+        <translation>A5</translation>
+    </message>
+    <message>
+        <source>A6</source>
+        <translation>A6</translation>
+    </message>
+    <message>
+        <source>A7</source>
+        <translation>A7</translation>
+    </message>
+    <message>
+        <source>A8</source>
+        <translation>A8</translation>
+    </message>
+    <message>
+        <source>A9</source>
+        <translation>A9</translation>
+    </message>
+    <message>
+        <source>A10</source>
+        <translation>A10</translation>
+    </message>
+    <message>
+        <source>B0</source>
+        <translation>B0</translation>
+    </message>
+    <message>
+        <source>B1</source>
+        <translation>B1</translation>
+    </message>
+    <message>
+        <source>B2</source>
+        <translation>B2</translation>
+    </message>
+    <message>
+        <source>B3</source>
+        <translation>B3</translation>
+    </message>
+    <message>
+        <source>B4</source>
+        <translation>B4</translation>
+    </message>
+    <message>
+        <source>B5</source>
+        <translation>B5</translation>
+    </message>
+    <message>
+        <source>B6</source>
+        <translation>B6</translation>
+    </message>
+    <message>
+        <source>B7</source>
+        <translation>B7</translation>
+    </message>
+    <message>
+        <source>B8</source>
+        <translation>B8</translation>
+    </message>
+    <message>
+        <source>B9</source>
+        <translation>B9</translation>
+    </message>
+    <message>
+        <source>B10</source>
+        <translation>B10</translation>
+    </message>
+    <message>
+        <source>Executive (7.5 x 10 in)</source>
+        <translation>Executive (7,5 x 10 tommer)</translation>
+    </message>
+    <message>
+        <source>Executive (7.25 x 10.5 in)</source>
+        <translation>Executive (7,25 x 10,5 tommer)</translation>
+    </message>
+    <message>
+        <source>Folio (8.27 x 13 in)</source>
+        <translation>Folio (8,27 x 13 tommer)</translation>
+    </message>
+    <message>
+        <source>Legal</source>
+        <translation>Juridisk</translation>
+    </message>
+    <message>
+        <source>Letter / ANSI A</source>
+        <translation>Brev/ANSI A</translation>
+    </message>
+    <message>
+        <source>Tabloid / ANSI B</source>
+        <translation>Tabloid/ANSI B</translation>
+    </message>
+    <message>
+        <source>Ledger / ANSI B</source>
+        <translation>Ledger/ANSI B</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation>Brugerdefineret</translation>
+    </message>
+    <message>
+        <source>A3 Extra</source>
+        <translation>A3 ekstra</translation>
+    </message>
+    <message>
+        <source>A4 Extra</source>
+        <translation>A4 ekstra</translation>
+    </message>
+    <message>
+        <source>A4 Plus</source>
+        <translation>A4 plus</translation>
+    </message>
+    <message>
+        <source>A4 Small</source>
+        <translation>A4 lille</translation>
+    </message>
+    <message>
+        <source>A5 Extra</source>
+        <translation>A5 ekstra</translation>
+    </message>
+    <message>
+        <source>B5 Extra</source>
+        <translation>B5 ekstra</translation>
+    </message>
+    <message>
+        <source>JIS B0</source>
+        <translation>JIS B0</translation>
+    </message>
+    <message>
+        <source>JIS B1</source>
+        <translation>JIS B1</translation>
+    </message>
+    <message>
+        <source>JIS B2</source>
+        <translation>JIS B2</translation>
+    </message>
+    <message>
+        <source>JIS B3</source>
+        <translation>JIS B3</translation>
+    </message>
+    <message>
+        <source>JIS B4</source>
+        <translation>JIS B4</translation>
+    </message>
+    <message>
+        <source>JIS B5</source>
+        <translation>JIS B5</translation>
+    </message>
+    <message>
+        <source>JIS B6</source>
+        <translation>JIS B6</translation>
+    </message>
+    <message>
+        <source>JIS B7</source>
+        <translation>JIS B7</translation>
+    </message>
+    <message>
+        <source>JIS B8</source>
+        <translation>JIS B8</translation>
+    </message>
+    <message>
+        <source>JIS B9</source>
+        <translation>JIS B9</translation>
+    </message>
+    <message>
+        <source>JIS B10</source>
+        <translation>JIS B10</translation>
+    </message>
+    <message>
+        <source>ANSI C</source>
+        <translation>ANSI C</translation>
+    </message>
+    <message>
+        <source>ANSI D</source>
+        <translation>ANSI D</translation>
+    </message>
+    <message>
+        <source>ANSI E</source>
+        <translation>ANSI E</translation>
+    </message>
+    <message>
+        <source>Legal Extra</source>
+        <translation>Juridisk ekstra</translation>
+    </message>
+    <message>
+        <source>Letter Extra</source>
+        <translation>Brev ekstra</translation>
+    </message>
+    <message>
+        <source>Letter Plus</source>
+        <translation>Brev plus</translation>
+    </message>
+    <message>
+        <source>Letter Small</source>
+        <translation>Brev lille</translation>
+    </message>
+    <message>
+        <source>Tabloid Extra</source>
+        <translation>Tabloid ekstra</translation>
+    </message>
+    <message>
+        <source>Architect A</source>
+        <translation>Arkitekt A</translation>
+    </message>
+    <message>
+        <source>Architect B</source>
+        <translation>Arkitekt B</translation>
+    </message>
+    <message>
+        <source>Architect C</source>
+        <translation>Arkitekt C</translation>
+    </message>
+    <message>
+        <source>Architect D</source>
+        <translation>Arkitekt D</translation>
+    </message>
+    <message>
+        <source>Architect E</source>
+        <translation>Arkitekt E</translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation>Notits</translation>
+    </message>
+    <message>
+        <source>Quarto</source>
+        <translation>Quarto</translation>
+    </message>
+    <message>
+        <source>Statement</source>
+        <translation>Erklæring</translation>
+    </message>
+    <message>
+        <source>Super A</source>
+        <translation>Super A</translation>
+    </message>
+    <message>
+        <source>Super B</source>
+        <translation>Super B</translation>
+    </message>
+    <message>
+        <source>Postcard</source>
+        <translation>Postkort</translation>
+    </message>
+    <message>
+        <source>Double Postcard</source>
+        <translation>Dobbelt postkort</translation>
+    </message>
+    <message>
+        <source>PRC 16K</source>
+        <translation>PRC 16K</translation>
+    </message>
+    <message>
+        <source>PRC 32K</source>
+        <translation>PRC 32K</translation>
+    </message>
+    <message>
+        <source>PRC 32K Big</source>
+        <translation>PRC 32K stor</translation>
+    </message>
+    <message>
+        <source>Fan-fold US (14.875 x 11 in)</source>
+        <translation>Fan-fold US (14,875 x 11 tommer)</translation>
+    </message>
+    <message>
+        <source>Fan-fold German (8.5 x 12 in)</source>
+        <translation>Fan-fold tysk (8,5 x 12 tommer)</translation>
+    </message>
+    <message>
+        <source>Fan-fold German Legal (8.5 x 13 in)</source>
+        <translation>Fan-fold tysk juridisk (8,5 x 13 tommer)</translation>
+    </message>
+    <message>
+        <source>Envelope B4</source>
+        <translation>Konvolut B4</translation>
+    </message>
+    <message>
+        <source>Envelope B5</source>
+        <translation>Konvolut B5</translation>
+    </message>
+    <message>
+        <source>Envelope B6</source>
+        <translation>Konvolut B6</translation>
+    </message>
+    <message>
+        <source>Envelope C0</source>
+        <translation>Konvolut C0</translation>
+    </message>
+    <message>
+        <source>Envelope C1</source>
+        <translation>Konvolut C1</translation>
+    </message>
+    <message>
+        <source>Envelope C2</source>
+        <translation>Konvolut C2</translation>
+    </message>
+    <message>
+        <source>Envelope C3</source>
+        <translation>Konvolut C3</translation>
+    </message>
+    <message>
+        <source>Envelope C4</source>
+        <translation>Konvolut C4</translation>
+    </message>
+    <message>
+        <source>Envelope C5</source>
+        <translation>Konvolut C5</translation>
+    </message>
+    <message>
+        <source>Envelope C6</source>
+        <translation>Konvolut C6</translation>
+    </message>
+    <message>
+        <source>Envelope C65</source>
+        <translation>Konvolut C65</translation>
+    </message>
+    <message>
+        <source>Envelope C7</source>
+        <translation>Konvolut C7</translation>
+    </message>
+    <message>
+        <source>Envelope DL</source>
+        <translation>Konvolut DL</translation>
+    </message>
+    <message>
+        <source>Envelope US 9</source>
+        <translation>Konvolut US 9</translation>
+    </message>
+    <message>
+        <source>Envelope US 10</source>
+        <translation>Konvolut US 10</translation>
+    </message>
+    <message>
+        <source>Envelope US 11</source>
+        <translation>Konvolut US 11</translation>
+    </message>
+    <message>
+        <source>Envelope US 12</source>
+        <translation>Konvolut US 12</translation>
+    </message>
+    <message>
+        <source>Envelope US 14</source>
+        <translation>Konvolut US 14</translation>
+    </message>
+    <message>
+        <source>Envelope Monarch</source>
+        <translation>Konvolut monark</translation>
+    </message>
+    <message>
+        <source>Envelope Personal</source>
+        <translation>Konvolut personlig</translation>
+    </message>
+    <message>
+        <source>Envelope Chou 3</source>
+        <translation>Konvolut chou 3</translation>
+    </message>
+    <message>
+        <source>Envelope Chou 4</source>
+        <translation>Konvolut chou 4</translation>
+    </message>
+    <message>
+        <source>Envelope Invite</source>
+        <translation>Konvolut invitation</translation>
+    </message>
+    <message>
+        <source>Envelope Italian</source>
+        <translation>Konvolut italiensk</translation>
+    </message>
+    <message>
+        <source>Envelope Kaku 2</source>
+        <translation>Konvolut kaku 2</translation>
+    </message>
+    <message>
+        <source>Envelope Kaku 3</source>
+        <translation>Konvolut kaku 3</translation>
+    </message>
+    <message>
+        <source>Envelope PRC 1</source>
+        <translation>Konvolut PRC 1</translation>
+    </message>
+    <message>
+        <source>Envelope PRC 2</source>
+        <translation>Konvolut PRC 2</translation>
+    </message>
+    <message>
+        <source>Envelope PRC 3</source>
+        <translation>Konvolut PRC 3</translation>
+    </message>
+    <message>
+        <source>Envelope PRC 4</source>
+        <translation>Konvolut PRC 4</translation>
+    </message>
+    <message>
+        <source>Envelope PRC 5</source>
+        <translation>Konvolut PRC 5</translation>
+    </message>
+    <message>
+        <source>Envelope PRC 6</source>
+        <translation>Konvolut PRC 6</translation>
+    </message>
+    <message>
+        <source>Envelope PRC 7</source>
+        <translation>Konvolut PRC 7</translation>
+    </message>
+    <message>
+        <source>Envelope PRC 8</source>
+        <translation>Konvolut PRC 8</translation>
+    </message>
+    <message>
+        <source>Envelope PRC 9</source>
+        <translation>Konvolut PRC 9</translation>
+    </message>
+    <message>
+        <source>Envelope PRC 10</source>
+        <translation>Konvolut PRC 10</translation>
+    </message>
+    <message>
+        <source>Envelope You 4</source>
+        <translation>Konvolut you 4</translation>
+    </message>
+</context>
+<context>
+    <name>QPlatformTheme</name>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Gem</translation>
+    </message>
+    <message>
+        <source>Save All</source>
+        <translation>Gem alle</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Åbn</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation>&amp;Ja</translation>
+    </message>
+    <message>
+        <source>Yes to &amp;All</source>
+        <translation>Ja til &amp;alle</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation>&amp;Nej</translation>
+    </message>
+    <message>
+        <source>N&amp;o to All</source>
+        <translation>Ne&amp;j til alle</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Afbryd</translation>
+    </message>
+    <message>
+        <source>Retry</source>
+        <translation>Prøv igen</translation>
+    </message>
+    <message>
+        <source>Ignore</source>
+        <translation>Ignorer</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Luk</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuller</translation>
+    </message>
+    <message>
+        <source>Discard</source>
+        <translation>Forkast</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Hjælp</translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation>Anvend</translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation>Nulstil</translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation>Genskab standarder</translation>
+    </message>
+</context>
+<context>
+    <name>QPluginLoader</name>
+    <message>
+        <source>The plugin was not loaded.</source>
+        <translation>Pluginet blev ikke indlæst.</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Ukendt fejl</translation>
+    </message>
+</context>
+<context>
+    <name>QPrintDialog</name>
+    <message>
+        <source>Print</source>
+        <translation>Udskriv</translation>
+    </message>
+    <message>
+        <source>Left to Right, Top to Bottom</source>
+        <translation>Venstre til højre, øverst til nederst</translation>
+    </message>
+    <message>
+        <source>Left to Right, Bottom to Top</source>
+        <translation>Venstre til højre, nederst til øverst</translation>
+    </message>
+    <message>
+        <source>Right to Left, Bottom to Top</source>
+        <translation>Højre til venstre, nederst til øverst</translation>
+    </message>
+    <message>
+        <source>Right to Left, Top to Bottom</source>
+        <translation>Højre til venstre, øverst til nederst</translation>
+    </message>
+    <message>
+        <source>Bottom to Top, Left to Right</source>
+        <translation>Nederst til øverst, venstre til højre</translation>
+    </message>
+    <message>
+        <source>Bottom to Top, Right to Left</source>
+        <translation>Nederst til øverst, højre til venstre</translation>
+    </message>
+    <message>
+        <source>Top to Bottom, Left to Right</source>
+        <translation>Øverst til nederst, venstre til højre</translation>
+    </message>
+    <message>
+        <source>Top to Bottom, Right to Left</source>
+        <translation>Øverst til nederst, højre til venstre</translation>
+    </message>
+    <message>
+        <source>1 (1x1)</source>
+        <translation>1 (1x1)</translation>
+    </message>
+    <message>
+        <source>2 (2x1)</source>
+        <translation>2 (2x1)</translation>
+    </message>
+    <message>
+        <source>4 (2x2)</source>
+        <translation>4 (2x2)</translation>
+    </message>
+    <message>
+        <source>6 (2x3)</source>
+        <translation>6 (2x3)</translation>
+    </message>
+    <message>
+        <source>9 (3x3)</source>
+        <translation>9 (3x3)</translation>
+    </message>
+    <message>
+        <source>16 (4x4)</source>
+        <translation>16 (4x4)</translation>
+    </message>
+    <message>
+        <source>All Pages</source>
+        <translation>Alle sider</translation>
+    </message>
+    <message>
+        <source>Odd Pages</source>
+        <translation>Ulige sider</translation>
+    </message>
+    <message>
+        <source>Even Pages</source>
+        <translation>Lige sider</translation>
+    </message>
+    <message>
+        <source>&amp;Options &gt;&gt;</source>
+        <translation>&amp;Valgmuligheder &gt;&gt;</translation>
+    </message>
+    <message>
+        <source>&amp;Print</source>
+        <translation>&amp;Udskriv</translation>
+    </message>
+    <message>
+        <source>&amp;Options &lt;&lt;</source>
+        <translation>&amp;Valgmuligheder &lt;&lt;</translation>
+    </message>
+    <message>
+        <source>Print to File (PDF)</source>
+        <translation>Udskriv til fil (PDF)</translation>
+    </message>
+    <message>
+        <source>Local file</source>
+        <translation>Lokal fil</translation>
+    </message>
+    <message>
+        <source>Write PDF file</source>
+        <translation>Skriv PDF-fil</translation>
+    </message>
+    <message>
+        <source>Print To File ...</source>
+        <translation>Udskriv til fil...</translation>
+    </message>
+    <message>
+        <source>%1 is a directory.
+Please choose a different file name.</source>
+        <translation>%1 er en mappe.
+Vælg venligst et andet filnavn.</translation>
+    </message>
+    <message>
+        <source>File %1 is not writable.
+Please choose a different file name.</source>
+        <translation>Der kan ikke skrives til filen %1.
+Vælg venligst et andet filnavn.</translation>
+    </message>
+    <message>
+        <source>%1 already exists.
+Do you want to overwrite it?</source>
+        <translation>%1 findes allerede.
+Vil du overskrive den?</translation>
+    </message>
+    <message>
+        <source>Options &apos;Pages Per Sheet&apos; and &apos;Page Set&apos; cannot be used together.
+Please turn one of those options off.</source>
+        <translation>Valgmuligheder &apos;Sider pr. ark&apos; og &apos;Sidesæt&apos; kan ikke bruges sammen.
+Slå venligst en at disse valgmuligheder fra.</translation>
+    </message>
+    <message>
+        <source>The &apos;From&apos; value cannot be greater than the &apos;To&apos; value.</source>
+        <translation>&apos;Fra&apos;-værdien kan ikke være større end &apos;Til&apos;-værdien.</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation>Automatisk</translation>
+    </message>
+</context>
+<context>
+    <name>QPrintPreviewDialog</name>
+    <message>
+        <source>Page Setup</source>
+        <translation>Sideopsætning</translation>
+    </message>
+    <message>
+        <source>%1%</source>
+        <translation>%1%</translation>
+    </message>
+    <message>
+        <source>Print Preview</source>
+        <translation>Forhåndsvis udskrift</translation>
+    </message>
+    <message>
+        <source>Next page</source>
+        <translation>Næste side</translation>
+    </message>
+    <message>
+        <source>Previous page</source>
+        <translation>Forrige side</translation>
+    </message>
+    <message>
+        <source>First page</source>
+        <translation>Første side</translation>
+    </message>
+    <message>
+        <source>Last page</source>
+        <translation>Sidste side</translation>
+    </message>
+    <message>
+        <source>Fit width</source>
+        <translation>Tilpas bredde</translation>
+    </message>
+    <message>
+        <source>Fit page</source>
+        <translation>Tilpas side</translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation>Zoom ind</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation>Zoom ud</translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation>Portræt</translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation>Landskab</translation>
+    </message>
+    <message>
+        <source>Show single page</source>
+        <translation>Vis enkelt side</translation>
+    </message>
+    <message>
+        <source>Show facing pages</source>
+        <translation>Vis sideopslag</translation>
+    </message>
+    <message>
+        <source>Show overview of all pages</source>
+        <translation>Vis oversigt af alle sider</translation>
+    </message>
+    <message>
+        <source>Print</source>
+        <translation>Udskriv</translation>
+    </message>
+    <message>
+        <source>Page setup</source>
+        <translation>Sideopsætning</translation>
+    </message>
+    <message>
+        <source>Export to PDF</source>
+        <translation>Eksportér til PDF</translation>
+    </message>
+</context>
+<context>
+    <name>QPrintPropertiesDialog</name>
+    <message>
+        <source>Printer Properties</source>
+        <translation>Printeregenskaber</translation>
+    </message>
+    <message>
+        <source>Job Options</source>
+        <translation>Job-valgmuligheder</translation>
+    </message>
+</context>
+<context>
+    <name>QPrintPropertiesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation>Udformning</translation>
+    </message>
+    <message>
+        <source>Page</source>
+        <translation>Side</translation>
+    </message>
+</context>
+<context>
+    <name>QPrintSettingsOutput</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Copies</source>
+        <translation>Kopier</translation>
+    </message>
+    <message>
+        <source>Print range</source>
+        <translation>Udskriftsområde</translation>
+    </message>
+    <message>
+        <source>Print all</source>
+        <translation>Udskriv alle</translation>
+    </message>
+    <message>
+        <source>Pages from</source>
+        <translation>Sider fra</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation>til</translation>
+    </message>
+    <message>
+        <source>Current Page</source>
+        <translation>Aktuelle side</translation>
+    </message>
+    <message>
+        <source>Selection</source>
+        <translation>Valg</translation>
+    </message>
+    <message>
+        <source>Page Set:</source>
+        <translation>Sidesæt:</translation>
+    </message>
+    <message>
+        <source>Output Settings</source>
+        <translation>Outputindstillinger</translation>
+    </message>
+    <message>
+        <source>Copies:</source>
+        <translation>Kopier:</translation>
+    </message>
+    <message>
+        <source>Collate</source>
+        <translation>Sætvis</translation>
+    </message>
+    <message>
+        <source>Reverse</source>
+        <translation>Omvendt</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Valgmuligheder</translation>
+    </message>
+    <message>
+        <source>Color Mode</source>
+        <translation>Farvetilstand</translation>
+    </message>
+    <message>
+        <source>Color</source>
+        <translation>Farve</translation>
+    </message>
+    <message>
+        <source>Grayscale</source>
+        <translation>Gråtone</translation>
+    </message>
+    <message>
+        <source>Duplex Printing</source>
+        <translation>Dupleksudskrivning</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Ingen</translation>
+    </message>
+    <message>
+        <source>Long side</source>
+        <translation>Lang side</translation>
+    </message>
+    <message>
+        <source>Short side</source>
+        <translation>Kort side</translation>
+    </message>
+</context>
+<context>
+    <name>QPrintWidget</name>
+    <message>
+        <source>Form</source>
+        <translation>Udformning</translation>
+    </message>
+    <message>
+        <source>Printer</source>
+        <translation>Printer</translation>
+    </message>
+    <message>
+        <source>&amp;Name:</source>
+        <translation>&amp;Navn:</translation>
+    </message>
+    <message>
+        <source>P&amp;roperties</source>
+        <translation>&amp;Egenskaber</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation>Placering:</translation>
+    </message>
+    <message>
+        <source>Preview</source>
+        <translation>Forhåndsvis</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation>Type:</translation>
+    </message>
+    <message>
+        <source>Output &amp;file:</source>
+        <translation>Output&amp;fil:</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>QProcess</name>
+    <message>
+        <source>Process failed to start</source>
+        <translation>Processen kunne ikke starte</translation>
+    </message>
+    <message>
+        <source>Process crashed</source>
+        <translation>Processen holdt op med at virke</translation>
+    </message>
+    <message>
+        <source>Process operation timed out</source>
+        <translation>Proceshandlingen fik timeout</translation>
+    </message>
+    <message>
+        <source>Error reading from process</source>
+        <translation>Fejl ved læsning fra proces</translation>
+    </message>
+    <message>
+        <source>Error writing to process</source>
+        <translation>Fejl ved skrivning til proces</translation>
+    </message>
+    <message>
+        <source>No program defined</source>
+        <translation>Intet program defineret</translation>
+    </message>
+    <message>
+        <source>Could not open input redirection for reading</source>
+        <translation>Kunne ikke åbne input-omdirigering for læsning</translation>
+    </message>
+    <message>
+        <source>Resource error (fork failure): %1</source>
+        <translation>Ressourcefejl (fork fejl): %1</translation>
+    </message>
+    <message>
+        <source>Could not open output redirection for writing</source>
+        <translation>Kunne ikke åbne output-omdirigering for skrivning</translation>
+    </message>
+    <message>
+        <source>Process failed to start: %1</source>
+        <translation>Processen kunne ikke starte: %1</translation>
+    </message>
+</context>
+<context>
+    <name>QProgressDialog</name>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuller</translation>
+    </message>
+</context>
+<context>
+    <name>QRegExp</name>
+    <message>
+        <source>no error occurred</source>
+        <translation>der opstod ingen fejl</translation>
+    </message>
+    <message>
+        <source>disabled feature used</source>
+        <translation>deaktiveret facilitet blev brugt</translation>
+    </message>
+    <message>
+        <source>bad char class syntax</source>
+        <translation>dårlig tegnklasse-syntaks</translation>
+    </message>
+    <message>
+        <source>bad lookahead syntax</source>
+        <translation>dårlig fremadseende syntaks</translation>
+    </message>
+    <message>
+        <source>lookbehinds not supported, see QTBUG-2371</source>
+        <translation>lookbehinds understøttes ikke, se QTBUG-2371</translation>
+    </message>
+    <message>
+        <source>bad repetition syntax</source>
+        <translation>dårlig gentagelsessyntaks</translation>
+    </message>
+    <message>
+        <source>invalid octal value</source>
+        <translation>ugyldigt oktal-værdi</translation>
+    </message>
+    <message>
+        <source>missing left delim</source>
+        <translation>manglende venstre afgrænser</translation>
+    </message>
+    <message>
+        <source>unexpected end</source>
+        <translation>uventet afslutning</translation>
+    </message>
+    <message>
+        <source>met internal limit</source>
+        <translation>mødte intern grænse</translation>
+    </message>
+    <message>
+        <source>invalid interval</source>
+        <translation>ugyldigt interval</translation>
+    </message>
+    <message>
+        <source>invalid category</source>
+        <translation>ugyldig kategori</translation>
+    </message>
+</context>
+<context>
+    <name>QRegularExpression</name>
+    <message>
+        <source>no error</source>
+        <translation>ingen fejl</translation>
+    </message>
+    <message>
+        <source>\ at end of pattern</source>
+        <translation>\ i slutningen af mønster</translation>
+    </message>
+    <message>
+        <source>\c at end of pattern</source>
+        <translation>\c i slutningen af mønster</translation>
+    </message>
+    <message>
+        <source>unrecognized character follows \</source>
+        <translation>ikke genkendt tegn efterfølger \</translation>
+    </message>
+    <message>
+        <source>numbers out of order in {} quantifier</source>
+        <translation>numre udenfor rækkefølge i {}-kvantor</translation>
+    </message>
+    <message>
+        <source>number too big in {} quantifier</source>
+        <translation>nummer for stort i {}-kvantor</translation>
+    </message>
+    <message>
+        <source>missing terminating ] for character class</source>
+        <translation>manglende afsluttende ] for tegnklasse</translation>
+    </message>
+    <message>
+        <source>invalid escape sequence in character class</source>
+        <translation>ugyldig undvigesekvens i tegnklasse</translation>
+    </message>
+    <message>
+        <source>range out of order in character class</source>
+        <translation>område udenfor rækkefølge i tegnklasse</translation>
+    </message>
+    <message>
+        <source>nothing to repeat</source>
+        <translation>intet at gentage</translation>
+    </message>
+    <message>
+        <source>internal error: unexpected repeat</source>
+        <translation>intern fejl: uventet gentag</translation>
+    </message>
+    <message>
+        <source>unrecognized character after (? or (?-</source>
+        <translation>ikke genkendt tegn efter (? eller (?-</translation>
+    </message>
+    <message>
+        <source>POSIX named classes are supported only within a class</source>
+        <translation>POSIX-navngivne klasser understøttes kun inden i en klasse</translation>
+    </message>
+    <message>
+        <source>missing )</source>
+        <translation>mangler )</translation>
+    </message>
+    <message>
+        <source>reference to non-existent subpattern</source>
+        <translation>reference til ikke-eksisterende undermønster</translation>
+    </message>
+    <message>
+        <source>erroffset passed as NULL</source>
+        <translation>erroffset givet som NULL</translation>
+    </message>
+    <message>
+        <source>unknown option bit(s) set</source>
+        <translation>ukendt valgmulighed bit sat</translation>
+    </message>
+    <message>
+        <source>missing ) after comment</source>
+        <translation>manglende ) efter kommentar</translation>
+    </message>
+    <message>
+        <source>regular expression is too large</source>
+        <translation>regulært udtryk er for stort</translation>
+    </message>
+    <message>
+        <source>failed to get memory</source>
+        <translation>kunne ikke få hukommelse</translation>
+    </message>
+    <message>
+        <source>unmatched parentheses</source>
+        <translation>umatchede parenteser</translation>
+    </message>
+    <message>
+        <source>internal error: code overflow</source>
+        <translation>intern fejl: kodeoverløb</translation>
+    </message>
+    <message>
+        <source>unrecognized character after (?&lt;</source>
+        <translation>ikke genkendt tegn efter (?&lt;</translation>
+    </message>
+    <message>
+        <source>lookbehind assertion is not fixed length</source>
+        <translation>lookbehind-påstand er ikke fast længde</translation>
+    </message>
+    <message>
+        <source>malformed number or name after (?(</source>
+        <translation>forkert udformet nummer eller navn efter (?(</translation>
+    </message>
+    <message>
+        <source>conditional group contains more than two branches</source>
+        <translation>betinget gruppe indeholder mere end to grene</translation>
+    </message>
+    <message>
+        <source>assertion expected after (?(</source>
+        <translation>påstand ventet efter (?(</translation>
+    </message>
+    <message>
+        <source>(?R or (?[+-]digits must be followed by )</source>
+        <translation>(?R eller (?[+-]cifre skal efterfølges af )</translation>
+    </message>
+    <message>
+        <source>unknown POSIX class name</source>
+        <translation>ukendt POSIX-klassenavn</translation>
+    </message>
+    <message>
+        <source>POSIX collating elements are not supported</source>
+        <translation>POSIX-arrangerende elementer understøttes ikke</translation>
+    </message>
+    <message>
+        <source>this version of PCRE is not compiled with PCRE_UTF8 support</source>
+        <translation>denne version af PCRE er ikke kompileret med PCRE_UTF8-understøttelse</translation>
+    </message>
+    <message>
+        <source>character value in \x{...} sequence is too large</source>
+        <translation>tegnværdi i \x{...}-sekvens er for stor</translation>
+    </message>
+    <message>
+        <source>invalid condition (?(0)</source>
+        <translation>ugyldig betingelse (?(0)</translation>
+    </message>
+    <message>
+        <source>\C not allowed in lookbehind assertion</source>
+        <translation>\C ikke tillad i lookbehind-påstand</translation>
+    </message>
+    <message>
+        <source>PCRE does not support \L, \l, \N{name}, \U, or \u</source>
+        <translation>PCRE understøtter ikke \L, \l, \N{navn}, \U eller \u</translation>
+    </message>
+    <message>
+        <source>number after (?C is &gt; 255</source>
+        <translation>nummer efter (?C er &gt; 255</translation>
+    </message>
+    <message>
+        <source>closing ) for (?C expected</source>
+        <translation>lukkende ) til (?C ventet</translation>
+    </message>
+    <message>
+        <source>recursive call could loop indefinitely</source>
+        <translation>rekursive kald kan danne uendelig løkke</translation>
+    </message>
+    <message>
+        <source>unrecognized character after (?P</source>
+        <translation>ikke genkendt tegn efter (?P</translation>
+    </message>
+    <message>
+        <source>syntax error in subpattern name (missing terminator)</source>
+        <translation>syntaksfejl i undermønsternavn (manglende terminator)</translation>
+    </message>
+    <message>
+        <source>two named subpatterns have the same name</source>
+        <translation>to navngivne undermønstre har det samme navn</translation>
+    </message>
+    <message>
+        <source>invalid UTF-8 string</source>
+        <translation>ugyldig UTF-8-streng</translation>
+    </message>
+    <message>
+        <source>support for \P, \p, and \X has not been compiled</source>
+        <translation>understøttelse af \P, \p og \X er ikke blevet kompileret</translation>
+    </message>
+    <message>
+        <source>malformed \P or \p sequence</source>
+        <translation>forkert udformet \P- eller \p-sekvens</translation>
+    </message>
+    <message>
+        <source>unknown property name after \P or \p</source>
+        <translation>ukendt egenskabsnavn efter \P eller \p</translation>
+    </message>
+    <message>
+        <source>subpattern name is too long (maximum 32 characters)</source>
+        <translation>undermønsternavn er for langt (maksimum 32 tegn)</translation>
+    </message>
+    <message>
+        <source>too many named subpatterns (maximum 10000)</source>
+        <translation>for mange navngivne undermønstre (maksimum 10000)</translation>
+    </message>
+    <message>
+        <source>octal value is greater than \377 (not in UTF-8 mode)</source>
+        <translation>oktal-værdi er større end \377 (ikke i UTF-8-tilstand)</translation>
+    </message>
+    <message>
+        <source>internal error: overran compiling workspace</source>
+        <translation>intern fejl: overløb kompileringsarbejdsområde</translation>
+    </message>
+    <message>
+        <source>internal error: previously-checked referenced subpattern not found</source>
+        <translation>intern fejl: tidligere tjekket, refereret undermønster ikke fundet</translation>
+    </message>
+    <message>
+        <source>DEFINE group contains more than one branch</source>
+        <translation>DEFINE-gruppe indeholder mere end én gren</translation>
+    </message>
+    <message>
+        <source>repeating a DEFINE group is not allowed</source>
+        <translation>gentagelse a en DEFINE-gruppe er ikke tilladt</translation>
+    </message>
+    <message>
+        <source>inconsistent NEWLINE options</source>
+        <translation>inkonsistente NEWLINE-valgmuligheder</translation>
+    </message>
+    <message>
+        <source>\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number</source>
+        <translation>\g efterfølges ikke af et navn/nummer i klammer, vinkelklammer, citationstegn eller af et almindeligt nummer</translation>
+    </message>
+    <message>
+        <source>a numbered reference must not be zero</source>
+        <translation>en nummereret reference må ikke være nul</translation>
+    </message>
+    <message>
+        <source>an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)</source>
+        <translation>et argument er ikke tilladt for (*ACCEPT), (*FAIL) eller (*COMMIT)</translation>
+    </message>
+    <message>
+        <source>(*VERB) not recognized</source>
+        <translation>(*VERB) ikke genkendt</translation>
+    </message>
+    <message>
+        <source>number is too big</source>
+        <translation>nummer er for stort</translation>
+    </message>
+    <message>
+        <source>subpattern name expected</source>
+        <translation>undermønsternavn ventet</translation>
+    </message>
+    <message>
+        <source>digit expected after (?+</source>
+        <translation>ciffer ventet efter (?+</translation>
+    </message>
+    <message>
+        <source>] is an invalid data character in JavaScript compatibility mode</source>
+        <translation>] er et ugyldigt datategn i JavaScript-kompatibilitetstilstand</translation>
+    </message>
+    <message>
+        <source>different names for subpatterns of the same number are not allowed</source>
+        <translation>forskellige navne til undermønstre af det samme nummer er ikke tilladt</translation>
+    </message>
+    <message>
+        <source>(*MARK) must have an argument</source>
+        <translation>(*MARK) skal have et argument</translation>
+    </message>
+    <message>
+        <source>this version of PCRE is not compiled with PCRE_UCP support</source>
+        <translation>denne version af PCRE er ikke kompileret med PCRE_UCP-understøttelse</translation>
+    </message>
+    <message>
+        <source>\c must be followed by an ASCII character</source>
+        <translation>\c skal være efterfulgt af et ASCII-tegn</translation>
+    </message>
+    <message>
+        <source>\k is not followed by a braced, angle-bracketed, or quoted name</source>
+        <translation>\k efterfølges ikke af et navn i klammer, vinkelklammer eller citationstegn</translation>
+    </message>
+    <message>
+        <source>internal error: unknown opcode in find_fixedlength()</source>
+        <translation>intern fejl: ukendt opcode i find_fixedlength()</translation>
+    </message>
+    <message>
+        <source>\N is not supported in a class</source>
+        <translation>\N understøttes ikke i en klasse</translation>
+    </message>
+    <message>
+        <source>too many forward references</source>
+        <translation>for mange fremad-referencer</translation>
+    </message>
+    <message>
+        <source>disallowed Unicode code point (&gt;= 0xd800 &amp;&amp; &lt;= 0xdfff)</source>
+        <translation>ikke tilladt unicode-kodepunkt (&gt;= 0xd800 &amp;&amp; &lt;= 0xdfff)</translation>
+    </message>
+    <message>
+        <source>invalid UTF-16 string</source>
+        <translation>ugyldig UTF-16-streng</translation>
+    </message>
+    <message>
+        <source>name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)</source>
+        <translation>navn er for langt i (*MARK), (*PRUNE), (*SKIP) eller (*THEN)</translation>
+    </message>
+    <message>
+        <source>character value in \u.... sequence is too large</source>
+        <translation>tegnværdi i \u...-sekvens er for stor</translation>
+    </message>
+    <message>
+        <source>invalid UTF-32 string</source>
+        <translation>ugyldig UTF-32-streng</translation>
+    </message>
+    <message>
+        <source>setting UTF is disabled by the application</source>
+        <translation>sættelse af UTF er deaktiveret af programmet</translation>
+    </message>
+    <message>
+        <source>non-hex character in \x{} (closing brace missing?)</source>
+        <translation>ikke-heksadecimal-tegn i \x{} (lukkende klamme mangler?)</translation>
+    </message>
+    <message>
+        <source>non-octal character in \o{} (closing brace missing?)</source>
+        <translation>ikke-oktal-tegn i \o{} (lukkende klamme mangler?)</translation>
+    </message>
+    <message>
+        <source>missing opening brace after \o</source>
+        <translation>manglende åbningsklamme efter \o</translation>
+    </message>
+    <message>
+        <source>parentheses are too deeply nested</source>
+        <translation>parenteser er for dybt indlejret</translation>
+    </message>
+    <message>
+        <source>invalid range in character class</source>
+        <translation>ugyldigt område i tegnklasse</translation>
+    </message>
+    <message>
+        <source>group name must start with a non-digit</source>
+        <translation>gruppenavn skal begynde med et ikke-ciffer</translation>
+    </message>
+    <message>
+        <source>parentheses are too deeply nested (stack check)</source>
+        <translation>parenteser er for dybt indlejret (staktjek)</translation>
+    </message>
+    <message>
+        <source>digits missing in \x{} or \o{}</source>
+        <translation>cifre mangler i \x{} eller \o{}</translation>
+    </message>
+</context>
+<context>
+    <name>QSQLite2Driver</name>
+    <message>
+        <source>Error opening database</source>
+        <translation>Fejl ved åbning af databasen</translation>
+    </message>
+    <message>
+        <source>Unable to begin transaction</source>
+        <translation>Kunne ikke påbegynde transaktionen</translation>
+    </message>
+    <message>
+        <source>Unable to commit transaction</source>
+        <translation>Kunne ikke gennemføre transaktionen</translation>
+    </message>
+    <message>
+        <source>Unable to rollback transaction</source>
+        <translation>Kunne ikke tilbagetrække transaktionen</translation>
+    </message>
+</context>
+<context>
+    <name>QSQLite2Result</name>
+    <message>
+        <source>Unable to fetch results</source>
+        <translation>Kunne ikke hente resultater</translation>
+    </message>
+    <message>
+        <source>Unable to execute statement</source>
+        <translation>Kunne ikke eksekvere udsagn</translation>
+    </message>
+</context>
+<context>
+    <name>QSQLiteDriver</name>
+    <message>
+        <source>Error opening database</source>
+        <translation>Fejl ved åbning af databasen</translation>
+    </message>
+    <message>
+        <source>Error closing database</source>
+        <translation>Fejl ved lukning af databasen</translation>
+    </message>
+    <message>
+        <source>Unable to begin transaction</source>
+        <translation>Kunne ikke påbegynde transaktionen</translation>
+    </message>
+    <message>
+        <source>Unable to commit transaction</source>
+        <translation>Kunne ikke gennemføre transaktionen</translation>
+    </message>
+    <message>
+        <source>Unable to rollback transaction</source>
+        <translation>Kunne ikke tilbagetrække transaktionen</translation>
+    </message>
+</context>
+<context>
+    <name>QSQLiteResult</name>
+    <message>
+        <source>Unable to fetch row</source>
+        <translation>Kunne ikke hente række</translation>
+    </message>
+    <message>
+        <source>No query</source>
+        <translation>Ingen forespørgsel</translation>
+    </message>
+    <message>
+        <source>Unable to execute statement</source>
+        <translation>Kunne ikke eksekvere udsagn</translation>
+    </message>
+    <message>
+        <source>Unable to execute multiple statements at a time</source>
+        <translation>Kunne ikke eksekvere flere udsagn på samme tid</translation>
+    </message>
+    <message>
+        <source>Unable to reset statement</source>
+        <translation>Kunne ikke nulstille udsagn</translation>
+    </message>
+    <message>
+        <source>Unable to bind parameters</source>
+        <translation>Kunne ikke binde parametre</translation>
+    </message>
+    <message>
+        <source>Parameter count mismatch</source>
+        <translation>Uoverensstemmende parameter antal</translation>
+    </message>
+</context>
+<context>
+    <name>QSaveFile</name>
+    <message>
+        <source>Existing file %1 is not writable</source>
+        <translation>Der kan ikke skrives til den eksisterende fil %1</translation>
+    </message>
+    <message>
+        <source>Filename refers to a directory</source>
+        <translation>Filnavnet refererer til en mappe</translation>
+    </message>
+    <message>
+        <source>Writing canceled by application</source>
+        <translation>Skrivning annulleret af program</translation>
+    </message>
+</context>
+<context>
+    <name>QScrollBar</name>
+    <message>
+        <source>Scroll here</source>
+        <translation>Rul her</translation>
+    </message>
+    <message>
+        <source>Left edge</source>
+        <translation>Venstre kant</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation>Øverst</translation>
+    </message>
+    <message>
+        <source>Right edge</source>
+        <translation>Højre kant</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation>Nederst</translation>
+    </message>
+    <message>
+        <source>Page left</source>
+        <translation>Side til venstre</translation>
+    </message>
+    <message>
+        <source>Page up</source>
+        <translation>Side op</translation>
+    </message>
+    <message>
+        <source>Page right</source>
+        <translation>Side til højre</translation>
+    </message>
+    <message>
+        <source>Page down</source>
+        <translation>Side ned</translation>
+    </message>
+    <message>
+        <source>Scroll left</source>
+        <translation>Rul til venstre</translation>
+    </message>
+    <message>
+        <source>Scroll up</source>
+        <translation>Rul op</translation>
+    </message>
+    <message>
+        <source>Scroll right</source>
+        <translation>Rul til højre</translation>
+    </message>
+    <message>
+        <source>Scroll down</source>
+        <translation>Rul ned</translation>
+    </message>
+</context>
+<context>
+    <name>QSctpSocket</name>
+    <message>
+        <source>The remote host closed the connection</source>
+        <translation>Fjern-værten lukkede forbindelsen</translation>
+    </message>
+</context>
+<context>
+    <name>QSharedMemory</name>
+    <message>
+        <source>%1: unable to set key on lock</source>
+        <translation>%1: kunne ikke sætte nøgle på lås</translation>
+    </message>
+    <message>
+        <source>%1: create size is less then 0</source>
+        <translation>%1: oprettelsesstørrelse er mindre end 0</translation>
+    </message>
+    <message>
+        <source>%1: unable to lock</source>
+        <translation>%1: kunne ikke låse</translation>
+    </message>
+    <message>
+        <source>%1: unable to unlock</source>
+        <translation>%1: kunne ikke låse op</translation>
+    </message>
+    <message>
+        <source>%1: key is empty</source>
+        <translation>%1: nøglen er tom</translation>
+    </message>
+    <message>
+        <source>%1: bad name</source>
+        <translation>%1: dårligt navn</translation>
+    </message>
+    <message>
+        <source>%1: UNIX key file doesn&apos;t exist</source>
+        <translation>%1: UNIX-nøglefil findes ikke</translation>
+    </message>
+    <message>
+        <source>%1: ftok failed</source>
+        <translation>%1: ftok fejlede</translation>
+    </message>
+    <message>
+        <source>%1: unable to make key</source>
+        <translation>%1: kunne ikke lave nøgle</translation>
+    </message>
+    <message>
+        <source>%1: system-imposed size restrictions</source>
+        <translation>%1: system-pålagte størrelsesrestriktioner</translation>
+    </message>
+    <message>
+        <source>%1: not attached</source>
+        <translation>%1: ikke tilkoblet</translation>
+    </message>
+    <message>
+        <source>%1: permission denied</source>
+        <translation>%1: tilladelse nægtet</translation>
+    </message>
+    <message>
+        <source>%1: already exists</source>
+        <translation>%1: findes allerede</translation>
+    </message>
+    <message>
+        <source>%1: doesn&apos;t exist</source>
+        <translation>%1: findes ikke</translation>
+    </message>
+    <message>
+        <source>%1: out of resources</source>
+        <translation>%1: ikke flere ressourcer</translation>
+    </message>
+    <message>
+        <source>%1: unknown error %2</source>
+        <translation>%1: ukendt fejl %2</translation>
+    </message>
+    <message>
+        <source>%1: invalid size</source>
+        <translation>%1: ugyldig størrelse</translation>
+    </message>
+    <message>
+        <source>%1: key error</source>
+        <translation>%1: nøglefejl</translation>
+    </message>
+    <message>
+        <source>%1: size query failed</source>
+        <translation>%1: størrelsesforespørgsel fejlede</translation>
+    </message>
+</context>
+<context>
+    <name>QShortcut</name>
+    <message>
+        <source>Space</source>
+        <extracomment>This and all following &quot;incomprehensible&quot; strings in QShortcut context are key names. Please use the localized names appearing on actual keyboards or whatever is commonly used.</extracomment>
+        <translation>Mellemrum</translation>
+    </message>
+    <message>
+        <source>Esc</source>
+        <translation>Esc</translation>
+    </message>
+    <message>
+        <source>Tab</source>
+        <translation>Tabulator</translation>
+    </message>
+    <message>
+        <source>Backtab</source>
+        <translation>Tilbage-tabulator</translation>
+    </message>
+    <message>
+        <source>Backspace</source>
+        <translation>Tilbage</translation>
+    </message>
+    <message>
+        <source>Return</source>
+        <translation>Retur</translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation>Enter</translation>
+    </message>
+    <message>
+        <source>Ins</source>
+        <translation>Ins</translation>
+    </message>
+    <message>
+        <source>Del</source>
+        <translation>Del</translation>
+    </message>
+    <message>
+        <source>Pause</source>
+        <translation>Pause</translation>
+    </message>
+    <message>
+        <source>Print</source>
+        <translation>Udskriv</translation>
+    </message>
+    <message>
+        <source>SysReq</source>
+        <translation>SysReq</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Home</translation>
+    </message>
+    <message>
+        <source>End</source>
+        <translation>End</translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation>Venstre</translation>
+    </message>
+    <message>
+        <source>Up</source>
+        <translation>Op</translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation>Højre</translation>
+    </message>
+    <message>
+        <source>Down</source>
+        <translation>Ned</translation>
+    </message>
+    <message>
+        <source>PgUp</source>
+        <translation>PgUp</translation>
+    </message>
+    <message>
+        <source>PgDown</source>
+        <translation>PgDown</translation>
+    </message>
+    <message>
+        <source>CapsLock</source>
+        <translation>CapsLock</translation>
+    </message>
+    <message>
+        <source>NumLock</source>
+        <translation>NumLock</translation>
+    </message>
+    <message>
+        <source>ScrollLock</source>
+        <translation>ScrollLock</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation>Menu</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Hjælp</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Tilbage</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Fremad</translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation>Stop</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Opdater</translation>
+    </message>
+    <message>
+        <source>Volume Down</source>
+        <translation>Lydstyrke ned</translation>
+    </message>
+    <message>
+        <source>Volume Mute</source>
+        <translation>Lydstyrke mute</translation>
+    </message>
+    <message>
+        <source>Volume Up</source>
+        <translation>Lydstyrke op</translation>
+    </message>
+    <message>
+        <source>Bass Boost</source>
+        <translation>Bas boost</translation>
+    </message>
+    <message>
+        <source>Bass Up</source>
+        <translation>Bas op</translation>
+    </message>
+    <message>
+        <source>Bass Down</source>
+        <translation>Bas ned</translation>
+    </message>
+    <message>
+        <source>Treble Up</source>
+        <translation>Diskant op</translation>
+    </message>
+    <message>
+        <source>Treble Down</source>
+        <translation>Diskant ned</translation>
+    </message>
+    <message>
+        <source>Media Play</source>
+        <translation>Medie afspil</translation>
+    </message>
+    <message>
+        <source>Media Stop</source>
+        <translation>Medie stop</translation>
+    </message>
+    <message>
+        <source>Media Previous</source>
+        <translation>Medie forrige</translation>
+    </message>
+    <message>
+        <source>Media Next</source>
+        <translation>Medie næste</translation>
+    </message>
+    <message>
+        <source>Media Record</source>
+        <translation>Medie optag</translation>
+    </message>
+    <message>
+        <source>Media Pause</source>
+        <extracomment>Media player pause button</extracomment>
+        <translation>Medie pause</translation>
+    </message>
+    <message>
+        <source>Toggle Media Play/Pause</source>
+        <extracomment>Media player button to toggle between playing and paused</extracomment>
+        <translation>Medie afspil/pause til/fra</translation>
+    </message>
+    <message>
+        <source>Home Page</source>
+        <translation>Startside</translation>
+    </message>
+    <message>
+        <source>Favorites</source>
+        <translation>Favoritter</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Søg</translation>
+    </message>
+    <message>
+        <source>Standby</source>
+        <translation>Standby</translation>
+    </message>
+    <message>
+        <source>Open URL</source>
+        <translation>Åbn URL</translation>
+    </message>
+    <message>
+        <source>Launch Mail</source>
+        <translation>Start mail</translation>
+    </message>
+    <message>
+        <source>Launch Media</source>
+        <translation>Start medie</translation>
+    </message>
+    <message>
+        <source>Launch (0)</source>
+        <translation>Start (0)</translation>
+    </message>
+    <message>
+        <source>Launch (1)</source>
+        <translation>Start (1)</translation>
+    </message>
+    <message>
+        <source>Launch (2)</source>
+        <translation>Start (2)</translation>
+    </message>
+    <message>
+        <source>Launch (3)</source>
+        <translation>Start (3)</translation>
+    </message>
+    <message>
+        <source>Launch (4)</source>
+        <translation>Start (4)</translation>
+    </message>
+    <message>
+        <source>Launch (5)</source>
+        <translation>Start (5)</translation>
+    </message>
+    <message>
+        <source>Launch (6)</source>
+        <translation>Start (6)</translation>
+    </message>
+    <message>
+        <source>Launch (7)</source>
+        <translation>Start (7)</translation>
+    </message>
+    <message>
+        <source>Launch (8)</source>
+        <translation>Start (8)</translation>
+    </message>
+    <message>
+        <source>Launch (9)</source>
+        <translation>Start (9)</translation>
+    </message>
+    <message>
+        <source>Launch (A)</source>
+        <translation>Start (A)</translation>
+    </message>
+    <message>
+        <source>Launch (B)</source>
+        <translation>Start (B)</translation>
+    </message>
+    <message>
+        <source>Launch (C)</source>
+        <translation>Start (C)</translation>
+    </message>
+    <message>
+        <source>Launch (D)</source>
+        <translation>Start (D)</translation>
+    </message>
+    <message>
+        <source>Launch (E)</source>
+        <translation>Start (E)</translation>
+    </message>
+    <message>
+        <source>Launch (F)</source>
+        <translation>Start (F)</translation>
+    </message>
+    <message>
+        <source>Monitor Brightness Up</source>
+        <translation>Skærm lysstyrke op</translation>
+    </message>
+    <message>
+        <source>Monitor Brightness Down</source>
+        <translation>Skærm lysstyrke ned</translation>
+    </message>
+    <message>
+        <source>Keyboard Light On/Off</source>
+        <translation>Tastaturlys til/fra</translation>
+    </message>
+    <message>
+        <source>Keyboard Brightness Up</source>
+        <translation>Tastatur lysstyrke op</translation>
+    </message>
+    <message>
+        <source>Keyboard Brightness Down</source>
+        <translation>Tastatur lysstyrke ned</translation>
+    </message>
+    <message>
+        <source>Power Off</source>
+        <translation>Sluk computer</translation>
+    </message>
+    <message>
+        <source>Wake Up</source>
+        <translation>Vågn op</translation>
+    </message>
+    <message>
+        <source>Eject</source>
+        <translation>Skub ud</translation>
+    </message>
+    <message>
+        <source>Screensaver</source>
+        <translation>Pauseskærm</translation>
+    </message>
+    <message>
+        <source>WWW</source>
+        <translation>WWW</translation>
+    </message>
+    <message>
+        <source>Sleep</source>
+        <translation>Sov</translation>
+    </message>
+    <message>
+        <source>LightBulb</source>
+        <translation>Pære</translation>
+    </message>
+    <message>
+        <source>Shop</source>
+        <translation>Shop</translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation>Historik</translation>
+    </message>
+    <message>
+        <source>Add Favorite</source>
+        <translation>Tilføj favorit</translation>
+    </message>
+    <message>
+        <source>Hot Links</source>
+        <translation>Hotte links</translation>
+    </message>
+    <message>
+        <source>Adjust Brightness</source>
+        <translation>Juster lysstyrke</translation>
+    </message>
+    <message>
+        <source>Finance</source>
+        <translation>Finans</translation>
+    </message>
+    <message>
+        <source>Community</source>
+        <translation>Fællesskab</translation>
+    </message>
+    <message>
+        <source>Media Rewind</source>
+        <translation>Medie spol tilbage</translation>
+    </message>
+    <message>
+        <source>Back Forward</source>
+        <translation>Tilbage fremad</translation>
+    </message>
+    <message>
+        <source>Application Left</source>
+        <translation>Program venstre</translation>
+    </message>
+    <message>
+        <source>Application Right</source>
+        <translation>Program højre</translation>
+    </message>
+    <message>
+        <source>Book</source>
+        <translation>Bog</translation>
+    </message>
+    <message>
+        <source>CD</source>
+        <translation>CD</translation>
+    </message>
+    <message>
+        <source>Calculator</source>
+        <translation>Lommeregner</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Ryd</translation>
+    </message>
+    <message>
+        <source>Clear Grab</source>
+        <translation>Clear Grab</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Luk</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Kopiér</translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation>Klip</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation>Skærm</translation>
+    </message>
+    <message>
+        <source>DOS</source>
+        <translation>DOS</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation>Dokumenter</translation>
+    </message>
+    <message>
+        <source>Spreadsheet</source>
+        <translation>Regneark</translation>
+    </message>
+    <message>
+        <source>Browser</source>
+        <translation>Browser</translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation>Spil</translation>
+    </message>
+    <message>
+        <source>Go</source>
+        <translation>Gå</translation>
+    </message>
+    <message>
+        <source>iTouch</source>
+        <translation>iTouch</translation>
+    </message>
+    <message>
+        <source>Logoff</source>
+        <translation>Log af</translation>
+    </message>
+    <message>
+        <source>Market</source>
+        <translation>Marked</translation>
+    </message>
+    <message>
+        <source>Meeting</source>
+        <translation>Møde</translation>
+    </message>
+    <message>
+        <source>Keyboard Menu</source>
+        <translation>Tastaturmenu</translation>
+    </message>
+    <message>
+        <source>Menu PB</source>
+        <translation>Menu PB</translation>
+    </message>
+    <message>
+        <source>My Sites</source>
+        <translation>Mine steder</translation>
+    </message>
+    <message>
+        <source>News</source>
+        <translation>Nyheder</translation>
+    </message>
+    <message>
+        <source>Home Office</source>
+        <translation>Hjemmekontor</translation>
+    </message>
+    <message>
+        <source>Option</source>
+        <translation>Valgmulighed</translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation>Sæt ind</translation>
+    </message>
+    <message>
+        <source>Phone</source>
+        <translation>Telefon</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation>Svar</translation>
+    </message>
+    <message>
+        <source>Reload</source>
+        <translation>Genindlæs</translation>
+    </message>
+    <message>
+        <source>Rotate Windows</source>
+        <translation>Roter vinduer</translation>
+    </message>
+    <message>
+        <source>Rotation PB</source>
+        <translation>Rotation PB</translation>
+    </message>
+    <message>
+        <source>Rotation KB</source>
+        <translation>Rotation KB</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Gem</translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation>Send</translation>
+    </message>
+    <message>
+        <source>Spellchecker</source>
+        <translation>Stavekontrol</translation>
+    </message>
+    <message>
+        <source>Split Screen</source>
+        <translation>Opdel skærm</translation>
+    </message>
+    <message>
+        <source>Support</source>
+        <translation>Support</translation>
+    </message>
+    <message>
+        <source>Task Panel</source>
+        <translation>Opgavepanel</translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation>Terminal</translation>
+    </message>
+    <message>
+        <source>Tools</source>
+        <translation>Værktøjer</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation>Rejse</translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation>Video</translation>
+    </message>
+    <message>
+        <source>Word Processor</source>
+        <translation>Tekstbehandling</translation>
+    </message>
+    <message>
+        <source>XFer</source>
+        <translation>XFer</translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation>Zoom ind</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation>Zoom ud</translation>
+    </message>
+    <message>
+        <source>Away</source>
+        <translation>Væk</translation>
+    </message>
+    <message>
+        <source>Messenger</source>
+        <translation>Messenger</translation>
+    </message>
+    <message>
+        <source>WebCam</source>
+        <translation>Webcam</translation>
+    </message>
+    <message>
+        <source>Mail Forward</source>
+        <translation>Mail Forward</translation>
+    </message>
+    <message>
+        <source>Pictures</source>
+        <translation>Billeder</translation>
+    </message>
+    <message>
+        <source>Music</source>
+        <translation>Musik</translation>
+    </message>
+    <message>
+        <source>Battery</source>
+        <translation>Batteri</translation>
+    </message>
+    <message>
+        <source>Bluetooth</source>
+        <translation>Bluetooth</translation>
+    </message>
+    <message>
+        <source>Wireless</source>
+        <translation>Trådlås</translation>
+    </message>
+    <message>
+        <source>Ultra Wide Band</source>
+        <translation>Ultra Wide Band</translation>
+    </message>
+    <message>
+        <source>Media Fast Forward</source>
+        <translation>Medie spol fremad</translation>
+    </message>
+    <message>
+        <source>Audio Repeat</source>
+        <translation>Lyd gentag</translation>
+    </message>
+    <message>
+        <source>Audio Random Play</source>
+        <translation>Lyd tilfældig afspil</translation>
+    </message>
+    <message>
+        <source>Subtitle</source>
+        <translation>Undertekst</translation>
+    </message>
+    <message>
+        <source>Audio Cycle Track</source>
+        <translation>Lyd gennemløb spor</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Tid</translation>
+    </message>
+    <message>
+        <source>Hibernate</source>
+        <translation>Dvale</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Vis</translation>
+    </message>
+    <message>
+        <source>Top Menu</source>
+        <translation>Topmenu</translation>
+    </message>
+    <message>
+        <source>Power Down</source>
+        <translation>Sluk</translation>
+    </message>
+    <message>
+        <source>Suspend</source>
+        <translation>Hvile</translation>
+    </message>
+    <message>
+        <source>Microphone Mute</source>
+        <translation>Mikrofon mute</translation>
+    </message>
+    <message>
+        <source>Red</source>
+        <translation>Rød</translation>
+    </message>
+    <message>
+        <source>Green</source>
+        <translation>Grøn</translation>
+    </message>
+    <message>
+        <source>Yellow</source>
+        <translation>Gul</translation>
+    </message>
+    <message>
+        <source>Blue</source>
+        <translation>Blå</translation>
+    </message>
+    <message>
+        <source>Channel Up</source>
+        <translation>Kanal op</translation>
+    </message>
+    <message>
+        <source>Channel Down</source>
+        <translation>Kanal ned</translation>
+    </message>
+    <message>
+        <source>Guide</source>
+        <translation>Guide</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Indstillinger</translation>
+    </message>
+    <message>
+        <source>Microphone Volume Up</source>
+        <translation>Mikrofon lydstyrke op</translation>
+    </message>
+    <message>
+        <source>Microphone Volume Down</source>
+        <translation>Mikrofon lydstyrke ned</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Ny</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Åbn</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation>Find</translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation>Fortryd</translation>
+    </message>
+    <message>
+        <source>Redo</source>
+        <translation>Omgør</translation>
+    </message>
+    <message>
+        <source>Print Screen</source>
+        <translation>Print Screen</translation>
+    </message>
+    <message>
+        <source>Page Up</source>
+        <translation>Side op</translation>
+    </message>
+    <message>
+        <source>Page Down</source>
+        <translation>Side ned</translation>
+    </message>
+    <message>
+        <source>Caps Lock</source>
+        <translation>Caps Lock</translation>
+    </message>
+    <message>
+        <source>Num Lock</source>
+        <translation>Num Lock</translation>
+    </message>
+    <message>
+        <source>Number Lock</source>
+        <translation>Number Lock</translation>
+    </message>
+    <message>
+        <source>Scroll Lock</source>
+        <translation>Scroll Lock</translation>
+    </message>
+    <message>
+        <source>Insert</source>
+        <translation>Indsæt</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Slet</translation>
+    </message>
+    <message>
+        <source>Escape</source>
+        <translation>Escape</translation>
+    </message>
+    <message>
+        <source>System Request</source>
+        <translation>System Request</translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation>Vælg</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nej</translation>
+    </message>
+    <message>
+        <source>Context1</source>
+        <translation>Kontekst1</translation>
+    </message>
+    <message>
+        <source>Context2</source>
+        <translation>Kontekst2</translation>
+    </message>
+    <message>
+        <source>Context3</source>
+        <translation>Kontekst3</translation>
+    </message>
+    <message>
+        <source>Context4</source>
+        <translation>Kontekst4</translation>
+    </message>
+    <message>
+        <source>Call</source>
+        <extracomment>Button to start a call (note: a separate button is used to end the call)</extracomment>
+        <translation>Ring op</translation>
+    </message>
+    <message>
+        <source>Hangup</source>
+        <extracomment>Button to end a call (note: a separate button is used to start the call)</extracomment>
+        <translation>Læg på</translation>
+    </message>
+    <message>
+        <source>Toggle Call/Hangup</source>
+        <extracomment>Button that will hang up if we&apos;re in call, or make a call if we&apos;re not.</extracomment>
+        <translation>Ring op/læg på til/fra</translation>
+    </message>
+    <message>
+        <source>Flip</source>
+        <translation>Vend</translation>
+    </message>
+    <message>
+        <source>Voice Dial</source>
+        <extracomment>Button to trigger voice dialing</extracomment>
+        <translation>Stemmeopkald</translation>
+    </message>
+    <message>
+        <source>Last Number Redial</source>
+        <extracomment>Button to redial the last number called</extracomment>
+        <translation>Sidste kaldte nummer</translation>
+    </message>
+    <message>
+        <source>Camera Shutter</source>
+        <extracomment>Button to trigger the camera shutter (take a picture)</extracomment>
+        <translation>Kameralukker</translation>
+    </message>
+    <message>
+        <source>Camera Focus</source>
+        <extracomment>Button to focus the camera</extracomment>
+        <translation>Kamerafokus</translation>
+    </message>
+    <message>
+        <source>Kanji</source>
+        <translation>Kanji</translation>
+    </message>
+    <message>
+        <source>Muhenkan</source>
+        <translation>Muhenkan</translation>
+    </message>
+    <message>
+        <source>Henkan</source>
+        <translation>Henkan</translation>
+    </message>
+    <message>
+        <source>Romaji</source>
+        <translation>Romaji</translation>
+    </message>
+    <message>
+        <source>Hiragana</source>
+        <translation>Hiragana</translation>
+    </message>
+    <message>
+        <source>Katakana</source>
+        <translation>Katakana</translation>
+    </message>
+    <message>
+        <source>Hiragana Katakana</source>
+        <translation>Hiragana Katakana</translation>
+    </message>
+    <message>
+        <source>Zenkaku</source>
+        <translation>Zenkaku</translation>
+    </message>
+    <message>
+        <source>Hankaku</source>
+        <translation>Hankaku</translation>
+    </message>
+    <message>
+        <source>Zenkaku Hankaku</source>
+        <translation>Zenkaku Hankaku</translation>
+    </message>
+    <message>
+        <source>Touroku</source>
+        <translation>Touroku</translation>
+    </message>
+    <message>
+        <source>Massyo</source>
+        <translation>Massyo</translation>
+    </message>
+    <message>
+        <source>Kana Lock</source>
+        <translation>Kana lås</translation>
+    </message>
+    <message>
+        <source>Kana Shift</source>
+        <translation>Kana skift</translation>
+    </message>
+    <message>
+        <source>Eisu Shift</source>
+        <translation>Eisu skift</translation>
+    </message>
+    <message>
+        <source>Eisu toggle</source>
+        <translation>Eisu til/fra</translation>
+    </message>
+    <message>
+        <source>Code input</source>
+        <translation>Kodeinput</translation>
+    </message>
+    <message>
+        <source>Multiple Candidate</source>
+        <translation>Flere kandidat</translation>
+    </message>
+    <message>
+        <source>Previous Candidate</source>
+        <translation>Forrige kandidat</translation>
+    </message>
+    <message>
+        <source>Hangul</source>
+        <translation>Hangul</translation>
+    </message>
+    <message>
+        <source>Hangul Start</source>
+        <translation>Hangul start</translation>
+    </message>
+    <message>
+        <source>Hangul End</source>
+        <translation>Hangul slut</translation>
+    </message>
+    <message>
+        <source>Hangul Hanja</source>
+        <translation>Hangul Hanja</translation>
+    </message>
+    <message>
+        <source>Hangul Jamo</source>
+        <translation>Hangul Jamo</translation>
+    </message>
+    <message>
+        <source>Hangul Romaja</source>
+        <translation>Hangul Romaja</translation>
+    </message>
+    <message>
+        <source>Hangul Jeonja</source>
+        <translation>Hangul Jeonja</translation>
+    </message>
+    <message>
+        <source>Hangul Banja</source>
+        <translation>Hangul Banja</translation>
+    </message>
+    <message>
+        <source>Hangul PreHanja</source>
+        <translation>Hangul præ-Hanja</translation>
+    </message>
+    <message>
+        <source>Hangul PostHanja</source>
+        <translation>Hangul post-Hanja</translation>
+    </message>
+    <message>
+        <source>Hangul Special</source>
+        <translation>Hangul speciel</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuller</translation>
+    </message>
+    <message>
+        <source>Printer</source>
+        <translation>Printer</translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation>Eksekver</translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation>Afspil</translation>
+    </message>
+    <message>
+        <source>Zoom</source>
+        <translation>Zoom</translation>
+    </message>
+    <message>
+        <source>Exit</source>
+        <translation>Afslut</translation>
+    </message>
+    <message>
+        <source>Touchpad Toggle</source>
+        <translation>Pegeplade til/fra</translation>
+    </message>
+    <message>
+        <source>Touchpad On</source>
+        <translation>Pegeplade til</translation>
+    </message>
+    <message>
+        <source>Touchpad Off</source>
+        <translation>Pegeplade fra</translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <translation>Ctrl</translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation>Skift</translation>
+    </message>
+    <message>
+        <source>Alt</source>
+        <translation>Alt</translation>
+    </message>
+    <message>
+        <source>Meta</source>
+        <translation>Meta</translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation>Num</translation>
+    </message>
+    <message>
+        <source>+</source>
+        <translation>+</translation>
+    </message>
+    <message>
+        <source>F%1</source>
+        <translation>F%1</translation>
+    </message>
+</context>
+<context>
+    <name>QSocks5SocketEngine</name>
+    <message>
+        <source>Connection to proxy refused</source>
+        <translation>Proxy-forbindelsen blev nægtet</translation>
+    </message>
+    <message>
+        <source>Connection to proxy closed prematurely</source>
+        <translation>Proxy-forbindelsen lukkede i utide</translation>
+    </message>
+    <message>
+        <source>Proxy host not found</source>
+        <translation>Proxy-værten blev ikke fundet</translation>
+    </message>
+    <message>
+        <source>Connection to proxy timed out</source>
+        <translation>Proxy-forbindelsen fik timeout</translation>
+    </message>
+    <message>
+        <source>Proxy authentication failed</source>
+        <translation>Proxy-autentifikation fejlede</translation>
+    </message>
+    <message>
+        <source>Proxy authentication failed: %1</source>
+        <translation>Proxy-autentifikation fejlede: %1</translation>
+    </message>
+    <message>
+        <source>SOCKS version 5 protocol error</source>
+        <translation>SOCKS version 5 protokolfejl</translation>
+    </message>
+    <message>
+        <source>General SOCKSv5 server failure</source>
+        <translation>General SOCKSv5 serverfejl</translation>
+    </message>
+    <message>
+        <source>Connection not allowed by SOCKSv5 server</source>
+        <translation>Forbindelse ikke tilladt a SOCKSv5-server</translation>
+    </message>
+    <message>
+        <source>TTL expired</source>
+        <translation>TTL udløbet</translation>
+    </message>
+    <message>
+        <source>SOCKSv5 command not supported</source>
+        <translation>SOCKSv5-kommando understøttes ikke</translation>
+    </message>
+    <message>
+        <source>Address type not supported</source>
+        <translation>Adressetypen understøttes ikke</translation>
+    </message>
+    <message>
+        <source>Unknown SOCKSv5 proxy error code 0x%1</source>
+        <translation>Ukendt SOCKSv5-proxy fejlkode 0x%1</translation>
+    </message>
+    <message>
+        <source>Network operation timed out</source>
+        <translation>Netværkshandlingen fik timeout</translation>
+    </message>
+</context>
+<context>
+    <name>QSpiAccessibleBridge</name>
+    <message>
+        <source>invalid role</source>
+        <extracomment>Role of an accessible object - the object is in an invalid state or could not be constructed</extracomment>
+        <translation>ugyldig rolle</translation>
+    </message>
+    <message>
+        <source>title bar</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>titellinje</translation>
+    </message>
+    <message>
+        <source>menu bar</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>menulinje</translation>
+    </message>
+    <message>
+        <source>scroll bar</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>rullebjælke</translation>
+    </message>
+    <message>
+        <source>grip</source>
+        <extracomment>Role of an accessible object - the grip is usually used for resizing another object</extracomment>
+        <translation>greb</translation>
+    </message>
+    <message>
+        <source>sound</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>lyd</translation>
+    </message>
+    <message>
+        <source>cursor</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>markør</translation>
+    </message>
+    <message>
+        <source>text caret</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>tekstmarkør</translation>
+    </message>
+    <message>
+        <source>alert message</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>beskedmeddelelse</translation>
+    </message>
+    <message>
+        <source>frame</source>
+        <extracomment>Role of an accessible object: a window with frame and title
+----------
+Role of an accessible object</extracomment>
+        <translation>ramme</translation>
+    </message>
+    <message>
+        <source>filler</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>udfylder</translation>
+    </message>
+    <message>
+        <source>popup menu</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>pop op-menu</translation>
+    </message>
+    <message>
+        <source>menu item</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>menupunkt</translation>
+    </message>
+    <message>
+        <source>tool tip</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>værktøjstip</translation>
+    </message>
+    <message>
+        <source>application</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>program</translation>
+    </message>
+    <message>
+        <source>document</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>dokument</translation>
+    </message>
+    <message>
+        <source>panel</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>panel</translation>
+    </message>
+    <message>
+        <source>chart</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>graf</translation>
+    </message>
+    <message>
+        <source>dialog</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>dialog</translation>
+    </message>
+    <message>
+        <source>separator</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>separator</translation>
+    </message>
+    <message>
+        <source>tool bar</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>værktøjslinje</translation>
+    </message>
+    <message>
+        <source>status bar</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>statuslinje</translation>
+    </message>
+    <message>
+        <source>table</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>tabel</translation>
+    </message>
+    <message>
+        <source>column header</source>
+        <extracomment>Role of an accessible object - part of a table</extracomment>
+        <translation>kolonnehoved</translation>
+    </message>
+    <message>
+        <source>row header</source>
+        <extracomment>Role of an accessible object - part of a table</extracomment>
+        <translation>rækkehoved</translation>
+    </message>
+    <message>
+        <source>column</source>
+        <extracomment>Role of an accessible object - part of a table</extracomment>
+        <translation>kolonne</translation>
+    </message>
+    <message>
+        <source>row</source>
+        <extracomment>Role of an accessible object - part of a table</extracomment>
+        <translation>række</translation>
+    </message>
+    <message>
+        <source>cell</source>
+        <extracomment>Role of an accessible object - part of a table</extracomment>
+        <translation>celle</translation>
+    </message>
+    <message>
+        <source>link</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>link</translation>
+    </message>
+    <message>
+        <source>help balloon</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>hjælp-ballon</translation>
+    </message>
+    <message>
+        <source>assistant</source>
+        <extracomment>Role of an accessible object - a helper dialog</extracomment>
+        <translation>assistent</translation>
+    </message>
+    <message>
+        <source>list</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>liste</translation>
+    </message>
+    <message>
+        <source>list item</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>listepunkt</translation>
+    </message>
+    <message>
+        <source>tree</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>træ</translation>
+    </message>
+    <message>
+        <source>tree item</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>træpunkt</translation>
+    </message>
+    <message>
+        <source>page tab</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>sidefaneblad</translation>
+    </message>
+    <message>
+        <source>property page</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>egenskabsside</translation>
+    </message>
+    <message>
+        <source>indicator</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>indikator</translation>
+    </message>
+    <message>
+        <source>graphic</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>grafik</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>etiket</translation>
+    </message>
+    <message>
+        <source>text</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>tekst</translation>
+    </message>
+    <message>
+        <source>push button</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>trykknap</translation>
+    </message>
+    <message>
+        <source>check box</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>afkrydsningsboks</translation>
+    </message>
+    <message>
+        <source>radio button</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>radioknap</translation>
+    </message>
+    <message>
+        <source>combo box</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>komboboks</translation>
+    </message>
+    <message>
+        <source>progress bar</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>fremgangslinje</translation>
+    </message>
+    <message>
+        <source>dial</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>drejeskive</translation>
+    </message>
+    <message>
+        <source>hotkey field</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>genvejstastfelt</translation>
+    </message>
+    <message>
+        <source>slider</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>skyder</translation>
+    </message>
+    <message>
+        <source>spin box</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>rotationsboks</translation>
+    </message>
+    <message>
+        <source>canvas</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>lærred</translation>
+    </message>
+    <message>
+        <source>animation</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>animation</translation>
+    </message>
+    <message>
+        <source>equation</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>ligning</translation>
+    </message>
+    <message>
+        <source>button with drop down</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>knap med rullegardin</translation>
+    </message>
+    <message>
+        <source>button menu</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>knapmenu</translation>
+    </message>
+    <message>
+        <source>button with drop down grid</source>
+        <extracomment>Role of an accessible object - a button that expands a grid.</extracomment>
+        <translation>knap med rullegardinsgitter</translation>
+    </message>
+    <message>
+        <source>space</source>
+        <extracomment>Role of an accessible object - blank space between other objects.</extracomment>
+        <translation>mellemrum</translation>
+    </message>
+    <message>
+        <source>page tab list</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>sidefanebladsliste</translation>
+    </message>
+    <message>
+        <source>clock</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>ur</translation>
+    </message>
+    <message>
+        <source>splitter</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>adskiller</translation>
+    </message>
+    <message>
+        <source>layered pane</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>laglagt rude</translation>
+    </message>
+    <message>
+        <source>web document</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>webdokument</translation>
+    </message>
+    <message>
+        <source>paragraph</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>afsnit</translation>
+    </message>
+    <message>
+        <source>section</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>sektion</translation>
+    </message>
+    <message>
+        <source>color chooser</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>farvevælger</translation>
+    </message>
+    <message>
+        <source>footer</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>sidefod</translation>
+    </message>
+    <message>
+        <source>form</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>formular</translation>
+    </message>
+    <message>
+        <source>heading</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>overskrift</translation>
+    </message>
+    <message>
+        <source>note</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>bemærkning</translation>
+    </message>
+    <message>
+        <source>complementary content</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>supplerende indhold</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <extracomment>Role of an accessible object</extracomment>
+        <translation>ukendt</translation>
+    </message>
+</context>
+<context>
+    <name>QSslDiffieHellmanParameter</name>
+    <message>
+        <source>No error</source>
+        <translation>Ingen fejl</translation>
+    </message>
+    <message>
+        <source>Invalid input data</source>
+        <translation>Ugyldig inputdata</translation>
+    </message>
+    <message>
+        <source>The given Diffie-Hellman parameters are deemed unsafe</source>
+        <translation>De givne Diffie-Hellman-parametre skønnes usikre</translation>
+    </message>
+</context>
+<context>
+    <name>QSslSocket</name>
+    <message>
+        <source>Error when setting the elliptic curves (%1)</source>
+        <translation>Fejl under indstilling af de elliptiske kurver (%1)</translation>
+    </message>
+    <message>
+        <source>Error creating SSL context (%1)</source>
+        <translation>Fejl under oprettelse af SSL-kontekst (%1)</translation>
+    </message>
+    <message>
+        <source>unsupported protocol</source>
+        <translation>protokollen understøttes ikke</translation>
+    </message>
+    <message>
+        <source>Invalid or empty cipher list (%1)</source>
+        <translation>Ugyldig eller tom chifferliste (%1)</translation>
+    </message>
+    <message>
+        <source>Cannot provide a certificate with no key, %1</source>
+        <translation>Kan ikke give et certifikat uden nøgle, %1</translation>
+    </message>
+    <message>
+        <source>Error loading local certificate, %1</source>
+        <translation>Fejl under indlæsning af lokalt certifikat, %1</translation>
+    </message>
+    <message>
+        <source>Error loading private key, %1</source>
+        <translation>Fejl under indlæsning af privat nøgle, %1</translation>
+    </message>
+    <message>
+        <source>Private key does not certify public key, %1</source>
+        <translation>Privat nøgle certificere ikke offentlig nøgle, %1</translation>
+    </message>
+    <message>
+        <source>Diffie-Hellman parameters are not valid</source>
+        <translation>Diffie-Hellman-parametre er ikke gyldige</translation>
+    </message>
+    <message>
+        <source>OpenSSL version too old, need at least v1.0.2</source>
+        <translation>OpenSSL-version for gammel, skal mindst være v1.0.2</translation>
+    </message>
+    <message>
+        <source>No error</source>
+        <translation>Ingen fejl</translation>
+    </message>
+    <message>
+        <source>The issuer certificate could not be found</source>
+        <translation>Udstedercertifikatet kunne ikke findes</translation>
+    </message>
+    <message>
+        <source>The certificate signature could not be decrypted</source>
+        <translation>Certifikatsignaturen kunne ikke dekrypteres</translation>
+    </message>
+    <message>
+        <source>The public key in the certificate could not be read</source>
+        <translation>Den offentlige nøgle i certifikatet kunne ikke læses</translation>
+    </message>
+    <message>
+        <source>The signature of the certificate is invalid</source>
+        <translation>Signaturen på certifikatet er ugyldigt</translation>
+    </message>
+    <message>
+        <source>The certificate is not yet valid</source>
+        <translation>Certifikatet er endnu ikke gyldigt</translation>
+    </message>
+    <message>
+        <source>The certificate has expired</source>
+        <translation>Certifikatet er udløbet</translation>
+    </message>
+    <message>
+        <source>The certificate&apos;s notBefore field contains an invalid time</source>
+        <translation>Certifikatets notBefore-felt indeholder en ugyldig tid</translation>
+    </message>
+    <message>
+        <source>The certificate&apos;s notAfter field contains an invalid time</source>
+        <translation>Certifikatets notAfter-felt indeholder en ugyldig tid</translation>
+    </message>
+    <message>
+        <source>The certificate is self-signed, and untrusted</source>
+        <translation>Certifikatet er selv-signeret, og ikke betroet</translation>
+    </message>
+    <message>
+        <source>The root certificate of the certificate chain is self-signed, and untrusted</source>
+        <translation>Rod-certifikatet af certifikatskæden er selv-signeret, og ikke betroet</translation>
+    </message>
+    <message>
+        <source>The issuer certificate of a locally looked up certificate could not be found</source>
+        <translation>Udstedercertifikatet af en lokalt opslået certifikat kunne ikke findes</translation>
+    </message>
+    <message>
+        <source>No certificates could be verified</source>
+        <translation>Ingen certifikater kunne verificeres</translation>
+    </message>
+    <message>
+        <source>One of the CA certificates is invalid</source>
+        <translation>Et af CA-certifikaterne er ugyldigt</translation>
+    </message>
+    <message>
+        <source>The basicConstraints path length parameter has been exceeded</source>
+        <translation>Stilængde-parameteren basicConstraints er blevet overskredet</translation>
+    </message>
+    <message>
+        <source>The supplied certificate is unsuitable for this purpose</source>
+        <translation>Det givet certifikat er uegnet til dette formål</translation>
+    </message>
+    <message>
+        <source>The root CA certificate is not trusted for this purpose</source>
+        <translation>Rod-CA-certifikatet er ikke betroet til dette formål</translation>
+    </message>
+    <message>
+        <source>The root CA certificate is marked to reject the specified purpose</source>
+        <translation>Rod-CA-certifikatet er markeret til at afvise det specifikke formål</translation>
+    </message>
+    <message>
+        <source>The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate</source>
+        <translation>Det aktuelle kandidat-udstedercertifikat blev afvist fordi dets subjektnavn ikke matchede udstedernavnet på det aktuelle certifikat</translation>
+    </message>
+    <message>
+        <source>The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate</source>
+        <translation>Det aktuelle kandidat-udstedercertifikat blev afvist fordi dets udstedernavn og serienummer var tilstede og ikke matchede myndighedsnøgle-identifikatoren på det aktuelle certifikat</translation>
+    </message>
+    <message>
+        <source>The peer did not present any certificate</source>
+        <translation>Peer&apos;en præsenterede ikke noget certifikat</translation>
+    </message>
+    <message>
+        <source>The host name did not match any of the valid hosts for this certificate</source>
+        <translation>Værtsnavnet matchede ikke nogen af de gyldige værter for dette certifikat</translation>
+    </message>
+    <message>
+        <source>The peer certificate is blacklisted</source>
+        <translation>Peer-certifikatet er sortlistet</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Ukendt fejl</translation>
+    </message>
+    <message>
+        <source>The TLS/SSL connection has been closed</source>
+        <translation>TLS-/SSL-forbindelsen er blevet lukket</translation>
+    </message>
+    <message>
+        <source>Error creating SSL session, %1</source>
+        <translation>Fejl under oprettelse af SSL-session, %1</translation>
+    </message>
+    <message>
+        <source>Error creating SSL session: %1</source>
+        <translation>Fejl under oprettelse af SSL-session: %1</translation>
+    </message>
+    <message>
+        <source>Unable to init SSL Context: %1</source>
+        <translation>Kunne ikke initialisere SSL-kontekst: %1</translation>
+    </message>
+    <message>
+        <source>Unable to write data: %1</source>
+        <translation>Kunne ikke skrive data: %1</translation>
+    </message>
+    <message>
+        <source>Unable to decrypt data: %1</source>
+        <translation>Kunne ikke dekryptere data: %1</translation>
+    </message>
+    <message>
+        <source>Error while reading: %1</source>
+        <translation>Fejl under læsning af: %1</translation>
+    </message>
+    <message>
+        <source>Error during SSL handshake: %1</source>
+        <translation>Fejl under SSL-håndtryk: %1</translation>
+    </message>
+</context>
+<context>
+    <name>QStandardPaths</name>
+    <message>
+        <source>Desktop</source>
+        <translation>Skrivebord</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation>Dokumenter</translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation>Skrifttyper</translation>
+    </message>
+    <message>
+        <source>Applications</source>
+        <translation>Programmer</translation>
+    </message>
+    <message>
+        <source>Music</source>
+        <translation>Musik</translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation>Film</translation>
+    </message>
+    <message>
+        <source>Pictures</source>
+        <translation>Billeder</translation>
+    </message>
+    <message>
+        <source>Temporary Directory</source>
+        <translation>Midlertidig mappe</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Hjem</translation>
+    </message>
+    <message>
+        <source>Cache</source>
+        <translation>Mellemlager</translation>
+    </message>
+    <message>
+        <source>Shared Data</source>
+        <translation>Delte data</translation>
+    </message>
+    <message>
+        <source>Runtime</source>
+        <translation>Runtime</translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation>Konfiguration</translation>
+    </message>
+    <message>
+        <source>Shared Configuration</source>
+        <translation>Delte konfiguration</translation>
+    </message>
+    <message>
+        <source>Shared Cache</source>
+        <translation>Delte mellemlager</translation>
+    </message>
+    <message>
+        <source>Download</source>
+        <translation>Download</translation>
+    </message>
+    <message>
+        <source>Application Data</source>
+        <translation>Programdata</translation>
+    </message>
+    <message>
+        <source>Application Configuration</source>
+        <translation>Programkonfiguration</translation>
+    </message>
+</context>
+<context>
+    <name>QStateMachine</name>
+    <message>
+        <source>Missing initial state in compound state &apos;%1&apos;</source>
+        <translation>Manglende indledende tilstand i den sammensatte tilstand &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Missing default state in history state &apos;%1&apos;</source>
+        <translation>Manglende standardtilstand i historiktilstanden &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>No common ancestor for targets and source of transition from state &apos;%1&apos;</source>
+        <translation>Ingen fælles forfader for mål og kilde af overgang fra tilstanden &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Ukendt fejl</translation>
+    </message>
+</context>
+<context>
+    <name>QSystemSemaphore</name>
+    <message>
+        <source>%1: permission denied</source>
+        <translation>%1: tilladelse nægtet</translation>
+    </message>
+    <message>
+        <source>%1: already exists</source>
+        <translation>%1: findes allerede</translation>
+    </message>
+    <message>
+        <source>%1: does not exist</source>
+        <translation>%1: findes ikke</translation>
+    </message>
+    <message>
+        <source>%1: out of resources</source>
+        <translation>%1: ikke flere ressourcer</translation>
+    </message>
+    <message>
+        <source>%1: unknown error %2</source>
+        <translation>%1: ukendt fejl %2</translation>
+    </message>
+</context>
+<context>
+    <name>QTDSDriver</name>
+    <message>
+        <source>Unable to open connection</source>
+        <translation>Kunne ikke åbne forbindelsen</translation>
+    </message>
+    <message>
+        <source>Unable to use database</source>
+        <translation>Kunne ikke bruge databasen</translation>
+    </message>
+</context>
+<context>
+    <name>QTabBar</name>
+    <message>
+        <source>Scroll Left</source>
+        <translation>Rul til venstre</translation>
+    </message>
+    <message>
+        <source>Scroll Right</source>
+        <translation>Rul til højre</translation>
+    </message>
+</context>
+<context>
+    <name>QTcpServer</name>
+    <message>
+        <source>Operation on socket is not supported</source>
+        <translation>Handling på socket understøttes ikke</translation>
+    </message>
+</context>
+<context>
+    <name>QTgaFile</name>
+    <message>
+        <source>Could not read image data</source>
+        <translation>Kunne ikke læse billeddata</translation>
+    </message>
+    <message>
+        <source>Sequential device (eg socket) for image read not supported</source>
+        <translation>Fortløbende enhed (såsom socket) for billedlæsning understøttes ikke</translation>
+    </message>
+    <message>
+        <source>Seek file/device for image read failed</source>
+        <translation>Søgefil/enhed for billedlæsning fejlede</translation>
+    </message>
+    <message>
+        <source>Image header read failed</source>
+        <translation>Billedfilhoved læsefejl</translation>
+    </message>
+    <message>
+        <source>Image type not supported</source>
+        <translation>Billedtypen understøttes ikke</translation>
+    </message>
+    <message>
+        <source>Image depth not valid</source>
+        <translation>Billeddybden er ikke gyldig</translation>
+    </message>
+    <message>
+        <source>Could not seek to image read footer</source>
+        <translation>Kunne ikke søge til billedlæsningsfilfod</translation>
+    </message>
+    <message>
+        <source>Could not read footer</source>
+        <translation>Kunne ikke læse filfod</translation>
+    </message>
+    <message>
+        <source>Image type (non-TrueVision 2.0) not supported</source>
+        <translation>Billedtype (ikke-TrueVision 2.0) understøttes ikke</translation>
+    </message>
+    <message>
+        <source>Could not reset to read data</source>
+        <translation>Kunne ikke nulstille læsedata</translation>
+    </message>
+</context>
+<context>
+    <name>QUdpSocket</name>
+    <message>
+        <source>Unable to send a datagram</source>
+        <translation>Kunne ikke sende et datagram</translation>
+    </message>
+    <message>
+        <source>No datagram available for reading</source>
+        <translation>Intet tilgængeligt datagram til læsning</translation>
+    </message>
+</context>
+<context>
+    <name>QUndoGroup</name>
+    <message>
+        <source>Undo %1</source>
+        <translation>Fortryd %1</translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <comment>Default text for undo action</comment>
+        <translation>Fortryd</translation>
+    </message>
+    <message>
+        <source>Redo %1</source>
+        <translation>Omgør %1</translation>
+    </message>
+    <message>
+        <source>Redo</source>
+        <comment>Default text for redo action</comment>
+        <translation>Omgør</translation>
+    </message>
+</context>
+<context>
+    <name>QUndoModel</name>
+    <message>
+        <source>&lt;empty&gt;</source>
+        <translation>&lt;tom&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>QUndoStack</name>
+    <message>
+        <source>Undo %1</source>
+        <translation>Fortryd %1</translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <comment>Default text for undo action</comment>
+        <translation>Fortryd</translation>
+    </message>
+    <message>
+        <source>Redo %1</source>
+        <translation>Omgør %1</translation>
+    </message>
+    <message>
+        <source>Redo</source>
+        <comment>Default text for redo action</comment>
+        <translation>Omgør</translation>
+    </message>
+</context>
+<context>
+    <name>QUnicodeControlCharacterMenu</name>
+    <message>
+        <source>LRM Left-to-right mark</source>
+        <translation>LRM Left-to-right mark (venstre-til-højre-mærkat)</translation>
+    </message>
+    <message>
+        <source>RLM Right-to-left mark</source>
+        <translation>RLM Right-to-left mark (højre-til-venstre-mærkat)</translation>
+    </message>
+    <message>
+        <source>ZWJ Zero width joiner</source>
+        <translation>ZWJ Zero width joiner (nul-bredde-sammenslutter)</translation>
+    </message>
+    <message>
+        <source>ZWNJ Zero width non-joiner</source>
+        <translation>ZWNJ Zero width non-joiner (nul-bredde-ikke-sammenslutter)</translation>
+    </message>
+    <message>
+        <source>ZWSP Zero width space</source>
+        <translation>ZWSP Zero width space (nul med mellemrum)</translation>
+    </message>
+    <message>
+        <source>LRE Start of left-to-right embedding</source>
+        <translation>LRE Start of left-to-right embedding (start på venstre-til-højre-indlejring)</translation>
+    </message>
+    <message>
+        <source>RLE Start of right-to-left embedding</source>
+        <translation>RLE Start of right-to-left embedding (start på højre-til-venstre-indlejring)</translation>
+    </message>
+    <message>
+        <source>LRO Start of left-to-right override</source>
+        <translation>LRO Start of left-to-right override (start på venstre-til-højre-tilsidesætning)</translation>
+    </message>
+    <message>
+        <source>RLO Start of right-to-left override</source>
+        <translation>RLO Start of right-to-left override (start på højre-til-venstre-tilsidesætning)</translation>
+    </message>
+    <message>
+        <source>PDF Pop directional formatting</source>
+        <translation>PDF Pop directional formatting (glem retningsformatering)</translation>
+    </message>
+    <message>
+        <source>LRI Left-to-right isolate</source>
+        <translation>LRI Left-to-right isolate (venstre-til-højre-isolering)</translation>
+    </message>
+    <message>
+        <source>RLI Right-to-left isolate</source>
+        <translation>RLI Right-to-left isolate (højre-til-venstre-indlejring)</translation>
+    </message>
+    <message>
+        <source>FSI First strong isolate</source>
+        <translation>FSI First strong isolate (første stærke isolering)</translation>
+    </message>
+    <message>
+        <source>PDI Pop directional isolate</source>
+        <translation>PDI Pop directional isolate (glem retningsisolering)</translation>
+    </message>
+    <message>
+        <source>Insert Unicode control character</source>
+        <translation>Indsæt unicode-kontroltegn</translation>
+    </message>
+</context>
+<context>
+    <name>QWhatsThisAction</name>
+    <message>
+        <source>What&apos;s This?</source>
+        <translation>Hvad er det?</translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>*</source>
+        <translation>*</translation>
+    </message>
+</context>
+<context>
+    <name>QWidgetTextControl</name>
+    <message>
+        <source>&amp;Undo</source>
+        <translation>&amp;Fortryd</translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation>&amp;Omgør</translation>
+    </message>
+    <message>
+        <source>Cu&amp;t</source>
+        <translation>K&amp;lip</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;Kopiér</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Link Location</source>
+        <translation>Kopiér l&amp;inkplacering</translation>
+    </message>
+    <message>
+        <source>&amp;Paste</source>
+        <translation>&amp;Sæt ind</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Slet</translation>
+    </message>
+    <message>
+        <source>Select All</source>
+        <translation>Markér alt</translation>
+    </message>
+</context>
+<context>
+    <name>QWindowsDirect2DIntegration</name>
+    <message>
+        <source>Qt cannot load the direct2d platform plugin because the Direct2D version on this system is too old. The minimum system requirement for this platform plugin is Windows 7 SP1 with Platform Update.
+
+The minimum Direct2D version required is %1.%2.%3.%4. The Direct2D version on this system is %5.%6.%7.%8.</source>
+        <translation>Qt kan ikke indlæse direct2d-platform-pluginet fordi Direct2D-versionen på dette system er for gammel. Minimum systemkrav for dette platform-plugin er Windows 7 SP1 med platformsopdatering.
+
+Direct2D-versionen skal minimum være %1.%2.%3.%4. Direct2D-versionen på dette system er %5.%6.%7.%8.</translation>
+    </message>
+    <message>
+        <source>Cannot load direct2d platform plugin</source>
+        <translation>Kan ikke indlæse direct2d-platform-plugin</translation>
+    </message>
+</context>
+<context>
+    <name>QWizard</name>
+    <message>
+        <source>Go Back</source>
+        <translation>Gå tilbage</translation>
+    </message>
+    <message>
+        <source>&lt; &amp;Back</source>
+        <translation>&lt; &amp;Tilbage</translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation>Fortsæt</translation>
+    </message>
+    <message>
+        <source>&amp;Next</source>
+        <translation>&amp;Næste</translation>
+    </message>
+    <message>
+        <source>&amp;Next &gt;</source>
+        <translation>&amp;Næste &gt;</translation>
+    </message>
+    <message>
+        <source>Commit</source>
+        <translation>Gennemfør</translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation>Færdig</translation>
+    </message>
+    <message>
+        <source>&amp;Finish</source>
+        <translation>&amp;Slut</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuller</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Hjælp</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Hjælp</translation>
+    </message>
+</context>
+<context>
+    <name>QXml</name>
+    <message>
+        <source>no error occurred</source>
+        <translation>der opstod ingen fejl</translation>
+    </message>
+    <message>
+        <source>error triggered by consumer</source>
+        <translation>fejl udløst af forbruger</translation>
+    </message>
+    <message>
+        <source>unexpected end of file</source>
+        <translation>uventet afslutning på fil</translation>
+    </message>
+    <message>
+        <source>more than one document type definition</source>
+        <translation>mere end én dokumenttypedefinition</translation>
+    </message>
+    <message>
+        <source>error occurred while parsing element</source>
+        <translation>fejl under fortolkning af element</translation>
+    </message>
+    <message>
+        <source>tag mismatch</source>
+        <translation>uoverensstemmende tag</translation>
+    </message>
+    <message>
+        <source>error occurred while parsing content</source>
+        <translation>fejl under fortolkning af indhold</translation>
+    </message>
+    <message>
+        <source>unexpected character</source>
+        <translation>uventet tegn</translation>
+    </message>
+    <message>
+        <source>invalid name for processing instruction</source>
+        <translation>ugyldigt navn for behandlende instruktion</translation>
+    </message>
+    <message>
+        <source>version expected while reading the XML declaration</source>
+        <translation>version forventet under læsning af XML-deklaration</translation>
+    </message>
+    <message>
+        <source>wrong value for standalone declaration</source>
+        <translation>forkert værdi for selvstændig deklaration</translation>
+    </message>
+    <message>
+        <source>encoding declaration or standalone declaration expected while reading the XML declaration</source>
+        <translation>kodningsdeklaration eller selvstændig deklaration ventet ved læsning af XML-deklaration</translation>
+    </message>
+    <message>
+        <source>standalone declaration expected while reading the XML declaration</source>
+        <translation>selvstændig deklaration ventet ved læsning af XML-deklaration</translation>
+    </message>
+    <message>
+        <source>error occurred while parsing document type definition</source>
+        <translation>fejl under fortolkning af dokumenttypedefinition</translation>
+    </message>
+    <message>
+        <source>letter is expected</source>
+        <translation>bogstav er ventet</translation>
+    </message>
+    <message>
+        <source>error occurred while parsing comment</source>
+        <translation>fejl under fortolkning af kommentar</translation>
+    </message>
+    <message>
+        <source>error occurred while parsing reference</source>
+        <translation>fejl under fortolkning af reference</translation>
+    </message>
+    <message>
+        <source>internal general entity reference not allowed in DTD</source>
+        <translation>intern generel entitetsreference ikke tilladt i DTD</translation>
+    </message>
+    <message>
+        <source>external parsed general entity reference not allowed in attribute value</source>
+        <translation>eksternt fortolket generel entitetsreference ikke tilladt i attributværdi</translation>
+    </message>
+    <message>
+        <source>external parsed general entity reference not allowed in DTD</source>
+        <translation>eksternt fortolket generel entitetsreference ikke tilladt i DTD</translation>
+    </message>
+    <message>
+        <source>unparsed entity reference in wrong context</source>
+        <translation>ufortolket enhedsreference i forkert kontekst</translation>
+    </message>
+    <message>
+        <source>recursive entities</source>
+        <translation>rekursive entiteter</translation>
+    </message>
+    <message>
+        <source>error in the text declaration of an external entity</source>
+        <translation>fejl i tekstdeklaration på en ekstern entitet</translation>
+    </message>
+</context>
+<context>
+    <name>QXmlStream</name>
+    <message>
+        <source>Extra content at end of document.</source>
+        <translation>Ekstra indhold sidst i dokumentet.</translation>
+    </message>
+    <message>
+        <source>Invalid entity value.</source>
+        <translation>Ugyldig entitetværdi.</translation>
+    </message>
+    <message>
+        <source>Invalid XML character.</source>
+        <translation>Ugyldigt XML-tegn.</translation>
+    </message>
+    <message>
+        <source>Sequence &apos;]]&gt;&apos; not allowed in content.</source>
+        <translation>Sekvensen &apos;]]&gt;&apos; ikke tilladt i indhold.</translation>
+    </message>
+    <message>
+        <source>Encountered incorrectly encoded content.</source>
+        <translation>Mødte forkert kodet indhold.</translation>
+    </message>
+    <message>
+        <source>Namespace prefix &apos;%1&apos; not declared</source>
+        <translation>Navnerumspræfikset &apos;%1&apos; ikke deklareret</translation>
+    </message>
+    <message>
+        <source>Illegal namespace declaration.</source>
+        <translation>Ulovligt navnerumsdeklaration.</translation>
+    </message>
+    <message>
+        <source>Attribute &apos;%1&apos; redefined.</source>
+        <translation>Attributten &apos;%1&apos; redefineret.</translation>
+    </message>
+    <message>
+        <source>Unexpected character &apos;%1&apos; in public id literal.</source>
+        <translation>Uventet tegn &apos;%1&apos; i offentlig id-literal.</translation>
+    </message>
+    <message>
+        <source>Invalid XML version string.</source>
+        <translation>Ugyldig XML-versionsstreng.</translation>
+    </message>
+    <message>
+        <source>Unsupported XML version.</source>
+        <translation>XML-versionen understøttes ikke.</translation>
+    </message>
+    <message>
+        <source>The standalone pseudo attribute must appear after the encoding.</source>
+        <translation>Den selvstændige pseudo-attribut skal optræde efter kodningen.</translation>
+    </message>
+    <message>
+        <source>%1 is an invalid encoding name.</source>
+        <translation>%1 er et ugyldigt kodningsnavn.</translation>
+    </message>
+    <message>
+        <source>Encoding %1 is unsupported</source>
+        <translation>Kodningen %1 understøttes ikke</translation>
+    </message>
+    <message>
+        <source>Standalone accepts only yes or no.</source>
+        <translation>Selvstændig accepterer kun ja eller nej.</translation>
+    </message>
+    <message>
+        <source>Invalid attribute in XML declaration.</source>
+        <translation>Ugyldig attribut i XML-deklaration.</translation>
+    </message>
+    <message>
+        <source>Premature end of document.</source>
+        <translation>For tidlig slutning på dokument.</translation>
+    </message>
+    <message>
+        <source>Invalid document.</source>
+        <translation>Ugyldigt dokument.</translation>
+    </message>
+    <message>
+        <source>Expected </source>
+        <translation>Forventede </translation>
+    </message>
+    <message>
+        <source>, but got &apos;</source>
+        <translation>, men fik &apos;</translation>
+    </message>
+    <message>
+        <source>Unexpected &apos;</source>
+        <translation>Uventet &apos;</translation>
+    </message>
+    <message>
+        <source>Expected character data.</source>
+        <translation>Ventet tegndata.</translation>
+    </message>
+    <message>
+        <source>Recursive entity detected.</source>
+        <translation>Rekursiv entitet registreret.</translation>
+    </message>
+    <message>
+        <source>Start tag expected.</source>
+        <translation>Start-tag forventet.</translation>
+    </message>
+    <message>
+        <source>NDATA in parameter entity declaration.</source>
+        <translation>NDATA i parameterentitetsdeklaration.</translation>
+    </message>
+    <message>
+        <source>XML declaration not at start of document.</source>
+        <translation>XML-deklaration ikke i start af dokument.</translation>
+    </message>
+    <message>
+        <source>%1 is an invalid processing instruction name.</source>
+        <translation>%1 er et ugyldigt behandlende instruktionsnavn.</translation>
+    </message>
+    <message>
+        <source>Invalid processing instruction name.</source>
+        <translation>Ugyldigt behandlende instruktionsnavn.</translation>
+    </message>
+    <message>
+        <source>%1 is an invalid PUBLIC identifier.</source>
+        <translation>%1 er en ugyldig PUBLIC-identifikator.</translation>
+    </message>
+    <message>
+        <source>Invalid XML name.</source>
+        <translation>Ugyldigt XML-navn.</translation>
+    </message>
+    <message>
+        <source>Opening and ending tag mismatch.</source>
+        <translation>Uoverensstemmende åbnende og afsluttende tag.</translation>
+    </message>
+    <message>
+        <source>Entity &apos;%1&apos; not declared.</source>
+        <translation>Entiteten &apos;%1&apos; ikke deklareret.</translation>
+    </message>
+    <message>
+        <source>Reference to unparsed entity &apos;%1&apos;.</source>
+        <translation>Reference to ufortolket entitet &apos;%1&apos;.</translation>
+    </message>
+    <message>
+        <source>Reference to external entity &apos;%1&apos; in attribute value.</source>
+        <translation>Reference til ekstern enhed &apos;%1&apos; i attributværdi.</translation>
+    </message>
+    <message>
+        <source>Invalid character reference.</source>
+        <translation>Ugyldig tegnreference.</translation>
+    </message>
+</context>
+</TS>

avidemux_2.7.0.tar.gz/avidemux/qt4/installMsvcRunTime.cmake Added

@@ -0,0 +1,28 @@
+#
+# Runtime
+#
+SET(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ${AVIDEMUX_BIN_DIR})
+include(InstallRequiredSystemLibraries)
+MESSAGE(STATUS "MSVC Runtime files = ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}")
+ADM_INSTALL_LIB_FILES( "${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}")
+#
+# Qt5
+#
+macro(COPY_QT5_DLL module)
+    #get_target_property( Qt5_${module}Location ${Qt5${module}_LIBRARIES} LOCATION)
+    get_target_property(Qt5_${module}Location Qt5::${module} LOCATION) 
+    MESSAGE(STATUS "Adding ${Qt5_${module}Location} as lib to install")
+    ADM_INSTALL_LIB_FILES( "${Qt5_${module}Location}")
+endmacro(COPY_QT5_DLL module)
+
+COPY_QT5_DLL(Core)
+COPY_QT5_DLL(Gui)
+COPY_QT5_DLL(OpenGL)
+COPY_QT5_DLL(Widgets)
+COPY_QT5_DLL(Network)
+COPY_QT5_DLL(WinExtras)
+
+# Need the platform one too => TODO
+
+INSTALL(FILES "${QT_PLUGINS_DIR}/platforms/qminimal.dll" DESTINATION "${AVIDEMUX_BIN_DIR}/platforms")
+INSTALL(FILES "${QT_PLUGINS_DIR}/platforms/qwindows.dll" DESTINATION "${AVIDEMUX_BIN_DIR}/platforms")

avidemux_2.7.0.tar.gz/avidemux/qt4/old.cmake Added

@@ -0,0 +1,304 @@
+cmake_minimum_required(VERSION 3.0)
+SET(AVIDEMUX_API_VERSION 2.7)
+SET(ADM_PROJECT Avidemux_qt4)
+
+MESSAGE("")
+MESSAGE("#########################################")
+MESSAGE("Configure for Avidemux Qt Started")
+MESSAGE("#########################################")
+MESSAGE("")
+#fedora 
+ADD_DEFINITIONS("-std=c++11")
+MESSAGE(STATUS "Checking for avidemux development files ..")
+
+IF(NOT FAKEROOT)
+	SET(AVIDEMUX_FAKEROOT "")
+else(NOT FAKEROOT)
+	SET(AVIDEMUX_FAKEROOT "${FAKEROOT}/")
+endif(NOT FAKEROOT)
+
+
+IF(WIN32)
+        IF(MSVC) 
+                include(adm_win32_vs.cmake)
+        ELSEIF(MINGW)
+                include(adm_win32_mingw.cmake)
+ELSE(WIN32)
+        IF(APPLE)
+                include(adm_osx.cmake)
+        ELSE(APPLE)
+                include(adm_default.cmake)
+        ENDIF(APPLE)
+ENDIF(WIN32)
+#-----------------------------------
+# Set extra libs, system dependant
+#-----------------------------------
+# -- Windows --
+IF(WIN32)
+	IF(MSVC)
+			LIST(APPEND PlatformLibs  Qt5::WinMain)
+	ENDIF(MSVC)
+	IF(MINGW)
+		LIST(APPEND PlatformLibs   "-lm -lstdc++")
+		LIST(APPEND PlatformLibs   "winmm -mwindows -Wl,--export-all-symbols")
+	ENDIF (MINGW)
+# -- Windows --
+ELSE(WIN32) # OSx, linux, BSD
+		LIST(APPEND PlatformLibs   "-lm -lstdc++")
+		IF(APPLE)  # OSX
+				LIST(APPEND PlatformLibs  "-framework CoreServices -framework CoreAudio -framework AudioUnit -framework Carbon")
+				LIST(APPEND PlatformLibs  "-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
+		ELSE(APPLE)
+			LIST(APPEND PlatformLibs   "X11") # Linux, BSD
+		ENDIF(APPLE)
+ENDIF(WIN32)
+
+#
+#
+SET(ADM_HEADER_DIR ${AVIDEMUX_FAKEROOT}${CMAKE_INSTALL_PREFIX}/include/avidemux/${AVIDEMUX_API_VERSION})
+SET(ADM_CMAKE_DIR  ${ADM_HEADER_DIR}/cmake)
+# Common definitions...
+SET(CMAKE_MODULE_PATH "${ADM_CMAKE_DIR}" "${CMAKE_MODULE_PATH}")
+MESSAGE(STATUS  "Checking for avidemux include folder (i.e. CMAKE_INSTALL_PREFIX/include/avidemux/${AVIDEMUX_API_VERSION}, looking in ${ADM_HEADER_DIR}")
+if(NOT EXISTS "${ADM_HEADER_DIR}")
+        MESSAGE(STATUS  "Make sure you installed all the files.\n i cannot find avidemux include folder.cmake .\nSet CMAKE_INSTALL_PREFIX to the install folder, current value is ${CMAKE_INSTALL_PREFIX}")
+        MESSAGE(FATAL_ERROR  "Aborting")
+endif(NOT EXISTS "${ADM_HEADER_DIR}")
+
+MESSAGE(STATUS "Found avidemux include folder. good.")
+MESSAGE(STATUS "Checking for cmake subfolder")
+
+if(NOT EXISTS "${ADM_CMAKE_DIR}/commonCmakeApplication.cmake")
+        MESSAGE(STATUS  "Make sure you installed all the files.\n I cannot find content of the cmake subfolder .\n")
+        MESSAGE(STATUS  "Set CMAKE_INSTALL_PREFIX to the install folder, current value is ${CMAKE_INSTALL_PREFIX}")
+        MESSAGE(STATUS  "I was looking for commonCmakeApplication.cmake in  ${ADM_CMAKE_DIR}")
+        MESSAGE(FATAL_ERROR  "Aborting")
+endif(NOT EXISTS "${ADM_CMAKE_DIR}/commonCmakeApplication.cmake")
+MESSAGE(STATUS "Found cmake subfolder.good.")
+
+include(commonCmakeApplication)
+include(../admAppSettings.cmake)
+INCLUDE(admCheckQt)
+INCLUDE(admWindRes)
+
+MESSAGE(STATUS "Checking Qt")
+checkQt()
+
+IF (NOT QT_FOUND)
+	MESSAGE(FATAL_ERROR "Qt NOT FOUND")
+ENDIF (NOT QT_FOUND)
+
+# Qt4 openGL
+include(admCheckOpenGl)
+#
+#--
+MESSAGE(STATUS "Adding Qt inc paths : <${QT_INCLUDES}> and definitions <${QT_DEFINITIONS}>")
+INCLUDE_DIRECTORIES(${QT_INCLUDES})
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+#--
+
+#
+##########################################
+# Config
+##########################################
+ADD_DEFINITIONS(-DADM_UI_TYPE_BUILD=ADM_UI_QT4)
+SET(CONFIG_HEADER_TYPE ADM_BUILD_QT4)
+SET(UI_SUFFIX ${QT_EXTENSION})
+
+CONFIGURE_FILE("${ADM_CMAKE_DIR}/config.h.cmake" "${CMAKE_BINARY_DIR}/config/${QT_EXTENSION}/config.h")
+MESSAGE(STATUS "${QT_EXTENSION} config.h generated")
+
+INCLUDE_DIRECTORIES(BEFORE "${CMAKE_BINARY_DIR}/config/${QT_EXTENSION}/")
+
+
+###########################################
+# Add job control
+###########################################
+IF(NOT MSVC)
+    ADD_SUBDIRECTORY(ADM_jobs)
+ENDIF(NOT MSVC)
+ADD_SUBDIRECTORY(ADM_update)
+IF(USE_OPENGL)
+    ADD_SUBDIRECTORY(ADM_openGL)
+ENDIF(USE_OPENGL)
+
+########################################
+# Add common as a symlink or directly
+########################################
+INCLUDE_DIRECTORIES(ADM_UIs/include/)
+
+if (WIN32 AND NOT CROSS)
+	ADD_SUBDIRECTORY(../common ./commonQt4)
+else (WIN32 AND NOT CROSS)
+	# Make symlink else eclipe and kdev4 are puzzled by the tree structure
+	# Not needed for plain build
+	MESSAGE(STATUS "Creating common symlink in ${CMAKE_CURRENT_SOURCE_DIR}")
+
+	execute_process(COMMAND rm -f common
+                                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+	execute_process(COMMAND ln -s ../common .
+                                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
+	ADD_SUBDIRECTORY(common ./commonQt4)
+endif (WIN32 AND NOT CROSS)
+
+# Add misc subdirs
+ADD_SUBDIRECTORY(ADM_UIs ./ADM_UIsQt4)
+ADD_SUBDIRECTORY(ADM_userInterfaces ./ADM_userInterfaces${QT_LIBRARY_EXTENSION})
+
+SDLify(../common/main.cpp)
+if (ADM_SUBVERSION)
+        ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
+endif (ADM_SUBVERSION)
+ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_VERSION=\"${AVIDEMUX_VERSION}\"")
+ADD_SOURCE_CFLAGS(../common/main.cpp "-DQT_FLAVOR=\"${QT_EXTENSION}\"")
+
+###########################################
+# Icon for windows
+###########################################
+if (WIN32 )
+        WINDRESIFY(src)
+        SET(ADM_EXE_SRCS ${ADM_EXE_SRCS} ${src})
+endif (WIN32)
+
+###########################################
+# Executable
+###########################################
+include_directories("${PTHREAD_INCLUDE_DIR}")
+IF(MSVC)
+		SET(EXEC_TYPE "WIN32")
+ENDIF(MSVC)
+ADD_EXECUTABLE(avidemux3_${QT_EXTENSION} ${EXEC_TYPE} ${ADM_EXE_SRCS})
+IF(MSVC)
+	set_target_properties(avidemux3_${QT_EXTENSION} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS")
+	set_target_properties(avidemux3_${QT_EXTENSION} PROPERTIES WIN32_EXECUTABLE True)
+ENDIF(MSVC)
+###########################################
+# Construct common libraries
+###########################################
+FOREACH (_libName ${commonLibs1})
+        TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ${_libName})
+ENDFOREACH (_libName ${commonLibs1})
+
+FOREACH (_libName ${commonLibs2})
+        TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ${_libName})
+ENDFOREACH (_libName ${commonLibs2})
+
+FOREACH (_libName ${coreLibs})
+	TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ${_libName})
+ENDFOREACH (_libName ${coreLibs})
+
+
+
+#############################################
+# Add qt specific libs
+#############################################
+TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION}
+	ADM_gui${QT_LIBRARY_EXTENSION}
+	ADM_filters${QT_LIBRARY_EXTENSION}
+	ADM_UI${QT_LIBRARY_EXTENSION}6
+	ADM_dialogQt4
+  ADM_update${QT_LIBRARY_EXTENSION}6
+	ADM_internalVideoFilter6
+	ADM_UI${QT_LIBRARY_EXTENSION}6
+	ADM_gui${QT_LIBRARY_EXTENSION}
+	ADM_UI_${QT_LIBRARY_EXTENSION}6
+	ADM_shell${QT_LIBRARY_EXTENSION}
+	ADM_toolkit6
+	ADM_coreAudio6
+	ADM_coreAudioDevice6
+	ADM_osSupport6
+)
+
+###########################################
+# External libs
+###########################################
+# gettext
+IF (GETTEXT_FOUND)
+	TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ${GETTEXT_LIBRARY_DIR})
+ENDIF (GETTEXT_FOUND)
+
+
+# SDL
+IF (USE_SDL)
+	TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ${SDL2_LIBRARY} ${SDL2_MAIN})
+ENDIF (USE_SDL)
+
+
+###########################################
+# UI Specific
+###########################################
+TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${PTHREAD_LIBRARIES})
+
+###########################################
+# OS Specific
+###########################################
+if (WIN32 OR APPLE)
+	set_property(TARGET avidemux3_${QT_EXTENSION} PROPERTY OUTPUT_NAME avidemux)
+endif (WIN32 OR APPLE)
+
+
+IF (APPLE)
+	IF (USE_SDL)
+		TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_libsdl)
+	ENDIF(USE_SDL)
+ENDIF (APPLE)
+#
+# Needed for cross compiling
+#
+if(CROSS)
+        TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_UI_${QT_LIBRARY_EXTENSION}6)
+        TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_UI_${QT_LIBRARY_EXTENSION}6)
+        TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_render6_${QT_LIBRARY_EXTENSION})
+        TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_coreUtils6)
+        TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_core6)
+        TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ADM_core6)
+endif(CROSS)
+
+TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} ${PlatformLibs})
+
+
+IF(QT_QTOPENGL_FOUND)
+        target_link_libraries(avidemux3_${QT_EXTENSION} ${QT_QTOPENGL_LIBRARIES})
+ENDIF(QT_QTOPENGL_FOUND)
+#
+# i18n
+#
+ADD_SUBDIRECTORY(i18n)
+###########################################
+# Install
+###########################################
+ADM_LINK_THREAD(avidemux3_${QT_EXTENSION})
+ADM_INSTALL_BIN(avidemux3_${QT_EXTENSION})
+
+DISPLAY_SUMMARY_LIST()
+
+IF(MSVC)
+    include(./installMsvcRunTime.cmake)
+ENDIF(MSVC)
+include(admPackager)
+admPackager(qt4Package)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/config/${QT_EXTENSION}/config.h DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_API_VERSION}/${QT_EXTENSION}" COMPONENT dev)
+
+
+# install headers
+ADM_INSTALL_QT_INCLUDE_FOLDER("${CMAKE_CURRENT_SOURCE_DIR}/ADM_openGL/include/"  ADM_openGL)
+ADM_INSTALL_QT_INCLUDE_FOLDER("${CMAKE_CURRENT_SOURCE_DIR}/ADM_UIs/include/"  ADM_UIs)
+
+#
+IF(WIN32)
+        include(FindBourne)
+        IF(RELEASE)
+                configure_file(
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/ChangeLog.release 
+                                ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/ChangeLog.html
+                                COPYONLY)
+        ELSE(RELEASE)
+                execute_process(
+                        COMMAND ${BASH_EXECUTABLE} genlog.sh
+                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../winInstaller/
+                        )
+        ENDIF(RELEASE)
+ENDIF(WIN32)
+
+MESSAGE("")

avidemux_2.7.0.tar.gz/avidemux/winInstaller/.gitignore Added

avidemux_2.6.20.tar.gz/avidemux/winInstaller/ChangeLog.release -> avidemux_2.7.0.tar.gz/avidemux/winInstaller/ChangeLog.release Changed

@@ -2,71 +2,27 @@
 <html>
 <head>
     <meta content="text/html; charset=UTF-8" http-equiv="content-type">
-    <style type="text/css">
-        body {
-            margin: 0;
-            height: 100%;
-            font-family: Tahoma,Helvetica,Arial,sans-serif;
-            color: #333;
-        }
-
-        #inner {
-            margin: 0% 1% 0% 1%;
-        }
-
-        h1 {
-            padding: 0.5em;
-            font-family: Helvetica,Arial,sans-serif;
-            font-size: 1.8em;
-            font-weight: bold;
-            color: #1B57B1;
-            vertical-align: middle;
-            margin: 1em;
-        }
-
-        ul li {
-            list-style: inside;
-            padding: 0.8em;
-            margin: 0.2em;
-            border: 1px solid #ddd;
-            border-radius: 0.2em;
-            font-size: 0.8em;
-        }
-
-        ul li:nth-child(odd) {
-            background-color: #fafafa;
-        }
-
-        ul li:nth-child(even) {
-            background-color: #f0f0f0;
-        }
-
-    </style>
+    <link rel="stylesheet" type="text/css" href="change.css">
     <title>Avidemux Changelog</title>
 </head>
 <body>
     <div id="inner">
-        <h1>Changes in Avidemux v2.6.19 – v2.6.20</h1>
+        <h1>Changes in Avidemux v2.6.20/21 – v2.7.0</h1>
         <ul>
-            <li><strong>Core:</strong> The bundled FFmpeg has been updated to version 3.0.7</li>
-            <li><strong>Core Encoder:</strong> A crash encoding MPEG-2 with B-frames disabled has been fixed</li>
-            <li><strong>Core Encoder:</strong> An error due to invalid decoding timestamps at the end of encoding with MPEG-2 has been fixed</li>
-            <li><strong>Core Audio:</strong> Sound issues including audio dropouts with AAC in MPEG TS fixed</li>
-            <li><strong>Core Audio:</strong> External AAC audio misidentified as E-AC3 fixed</li>
-            <li><strong>MKV Demuxer:</strong> FPS calculation improved</li>
-            <li><strong>MKV Demuxer:</strong> A crash with audio tracks using lacing extensively fixed</li>
-            <li><strong>MKV Muxer:</strong> The FPS value is set correctly now</li>
-            <li><strong>FLV Demuxer:</strong> File kept open preventing deletion fixed</li>
-            <li><strong>VPX Decoder:</strong> Swapped colors fixed, support for VP9 added</li>
-            <li><strong>macOS:</strong> Passing command line arguments to the application fixed</li>
-            <li><strong>VDPAU:</strong> Decode MPEG-1 instead of crashing</li>
-            <li><strong>Qt / Properties Dialog:</strong> A button to copy the data to clipboard added</li>
-            <li><strong>Qt / Filter Manager:</strong> Dynamically disable not applicable context menu entries in the list of active filters</li>
-            <li><strong>Qt / Filter Manager:</strong> Horizontal scrolling in the list of available filters eliminated</li>
-            <li><strong>Qt / MPlayer eq2 Plugin:</strong> The sliders on the right becoming squeezed horizontally fixed</li>
-            <li><strong>UI:</strong> File dialog not adding a file name extension when saving projects fixed (not in 64 bit builds for Windows yet)</li>
-            <li><strong>i18n:</strong> Russian and German translations updated (TotalCaesar659 / eumagga0x2a)</li>
-            <li><strong>Debug:</strong> Avidemux now prints the correct version string to the console or to the application log</li>
+            <li><strong>Core:</strong><br><tab>FFmpeg switched to the 3.3.x branch</tab></li>
+            <li><strong>Editing:</strong><br><tab>Fixed frame computation bug that led to bad cutting (euma)</tab></li>
+            <li><strong>i18n:</strong><br><tab>Korean translation (sheppaul)</tab></li>
+            <li><strong>win32:</strong><br><tab>Put log files into the local folder (achim71)</tab></li>
+            <li><strong>Jobs:</strong><br><tab>Fix name of the executable search</tab></li>
+            <li><strong>UI:</strong><br><tab>Steplessly zoom paused video when the window is resized (euma)</tab></li>
+            <li><strong>UI:</strong><br><tab>Added Ctrl+Shift+C shortcut to copy the current PTS to clipboard (euma)</tab></li>
+            <li><strong>Filter:</strong><br><tab>eq2: UI improvements (euma)</tab></li>
+            <li><strong>Decoding:</strong><br><tab>Fix VP9 decoding</tab></li>
+            <li><strong>Filter:</strong><br><tab>Using rubber bands for crop too (me+euma)</tab></li>
+            <li><strong>Build:</strong><br><tab>Redone packaging on macOS</tab></li>
+            <li><strong>Decoding:</strong><br><tab>HEVC decoding via DXVA2 blacklisted on win32, active on win64</tab></li>
+            <li><strong>New Filter:</strong><br><tab>ADM ivtc</tab></li>
+            <li><strong>Audio:</strong><br><tab>Distinguish between AC3 and EAC3 when importing</tab></li>
         </ul>
     </div>
 </body>

avidemux_2.6.20.tar.gz/avidemux/winInstaller/avidemux_cross32Qt5.nsi -> avidemux_2.7.0.tar.gz/avidemux/winInstaller/avidemux_cross32Qt5.nsi Changed

@@ -21,9 +21,9 @@
     ${File} ${ROOT_FOLDER}/libiconv-2.dll # MXE libiconv.dll
     ${File} ${ROOT_FOLDER}/libpcre16-0.dll
     ${File} ${ROOT_FOLDER}/libpcre-1.dll
-    ${File} ${ROOT_FOLDER}/libfaad-2.dll
-    ${File} ${ROOT_FOLDER}/libfaac-0.dll
-    ${File} ${ROOT_FOLDER}/libtwolame-0.dll
+    #${File} ${ROOT_FOLDER}/libfaad-2.dll
+    #${File} ${ROOT_FOLDER}/libfaac-0.dll
+    ${File} ${ROOT_FOLDER}/libtwolame.dll
     ${File} ${ROOT_FOLDER}/libbz2.dll
     ${File} ${ROOT_FOLDER}/libpng16-16.dll
     ${File} ${ROOT_FOLDER}/libsqlite3-0.dll
@@ -41,13 +41,13 @@
     ${File} ${ROOT_FOLDER}/Qt5Network.dll
     ${File} ${ROOT_FOLDER}/Qt5OpenGL.dll
     ${File} ${ROOT_FOLDER}/Qt5WinExtras.dll
-    ${File} ${ROOT_FOLDER}/icudt56.dll 
-    ${File} ${ROOT_FOLDER}/icuin56.dll  
-    ${File} ${ROOT_FOLDER}/icuio56.dll  
-    ${File} ${ROOT_FOLDER}/icule56.dll  
-    ${File} ${ROOT_FOLDER}/iculx56.dll  
-    ${File} ${ROOT_FOLDER}/icutu56.dll  
-    ${File} ${ROOT_FOLDER}/icuuc56.dll
+    #${File} ${ROOT_FOLDER}/icudt56.dll 
+    #${File} ${ROOT_FOLDER}/icuin56.dll  
+    #${File} ${ROOT_FOLDER}/icuio56.dll  
+    #${File} ${ROOT_FOLDER}/icule56.dll  
+    #${File} ${ROOT_FOLDER}/iculx56.dll  
+    #${File} ${ROOT_FOLDER}/icutu56.dll  
+    #${File} ${ROOT_FOLDER}/icuuc56.dll
     ${File} ${ROOT_FOLDER}/libintl-8.dll
 # SSL
     ${File} ${ROOT_FOLDER}/libeay32.dll
@@ -88,6 +88,11 @@
     ${File} ${ROOT_FOLDER}/postproc-*.dll
     ${File} ${ROOT_FOLDER}/swscale-*.dll
 
+    ${File} ${ROOT_FOLDER}/libfribidi*.dll
+    ${File} ${ROOT_FOLDER}/libfontconfig*.dll
+    ${File} ${ROOT_FOLDER}/libfreetype*.dll
+    ${File} ${ROOT_FOLDER}/libharfbuzz*.dll
+
 	WriteRegStr HKLM "${REGKEY}" CreateDesktopIcon $CreateDesktopIcon
 	WriteRegStr HKLM "${REGKEY}" CreateStartMenuGroup $CreateStartMenuGroup

avidemux_2.6.20.tar.gz/avidemux/winInstaller/avidemux_cross64Qt5.nsi -> avidemux_2.7.0.tar.gz/avidemux/winInstaller/avidemux_cross64Qt5.nsi Changed

@@ -18,10 +18,10 @@
     ${File} ${ROOT_FOLDER}/libglib-2.0-0.dll
     ${File} ${ROOT_FOLDER}/libgobject-2.0-0.dll
     ${File} ${ROOT_FOLDER}/libharfbuzz-0.dll
-    ${File} ${ROOT_FOLDER}/libiconv.dll
+    ${File} ${ROOT_FOLDER}/libiconv-2.dll
     ${File} ${ROOT_FOLDER}/libpcre16-0.dll
-    ${File} ${ROOT_FOLDER}/libpng14-14.dll
-    ${File} ${ROOT_FOLDER}/libsqlite3.dll
+    ${File} ${ROOT_FOLDER}/libpng16-16.dll
+    ${File} ${ROOT_FOLDER}/libsqlite3-0.dll
     ${File} ${ROOT_FOLDER}/libstdc++-6.dll
     ${File} ${ROOT_FOLDER}/libwinpthread-1.dll
     ${File} ${ROOT_FOLDER}/libz-1.dll
@@ -29,7 +29,7 @@
     ${File} ${ROOT_FOLDER}/libgcc_s_seh-1.dll
     ${File} ${ROOT_FOLDER}/libintl-8.dll
     ${File} ${ROOT_FOLDER}/SDL2.dll
-    ${File} ${ROOT_FOLDER}/libfdk-aac-0.dll
+    ${File} ${ROOT_FOLDER}/libfdk-aac-*.dll
 # Qt
     ${File} ${ROOT_FOLDER}/Qt5Core.dll  
     ${File} ${ROOT_FOLDER}/Qt5Gui.dll  
@@ -37,13 +37,13 @@
     ${File} ${ROOT_FOLDER}/Qt5Widgets.dll
     ${File} ${ROOT_FOLDER}/Qt5Network.dll
     ${File} ${ROOT_FOLDER}/Qt5WinExtras.dll
-    ${File} ${ROOT_FOLDER}/libicudt51.dll 
-    ${File} ${ROOT_FOLDER}/libicuin51.dll  
-    ${File} ${ROOT_FOLDER}/libicuio51.dll  
-    ${File} ${ROOT_FOLDER}/libicule51.dll  
-    ${File} ${ROOT_FOLDER}/libiculx51.dll  
-    ${File} ${ROOT_FOLDER}/libicutu51.dll  
-    ${File} ${ROOT_FOLDER}/libicuuc51.dll
+    #${File} ${ROOT_FOLDER}/libicudt51.dll 
+    #${File} ${ROOT_FOLDER}/libicuin51.dll  
+    #${File} ${ROOT_FOLDER}/libicuio51.dll  
+    #${File} ${ROOT_FOLDER}/libicule51.dll  
+    #${File} ${ROOT_FOLDER}/libiculx51.dll  
+    #${File} ${ROOT_FOLDER}/libicutu51.dll  
+    #${File} ${ROOT_FOLDER}/libicuuc51.dll
     SetOutPath $INSTDIR\platforms
     ${File} ${ROOT_FOLDER}/platforms/qminimal.dll  
     ${File} ${ROOT_FOLDER}/platforms/qwindows.dll
@@ -79,6 +79,12 @@
     ${File} ${ROOT_FOLDER}/postproc-*.dll
     ${File} ${ROOT_FOLDER}/swscale-*.dll
 
+    ${File} ${ROOT_FOLDER}/libfribidi*.dll
+    ${File} ${ROOT_FOLDER}/libfontconfig*.dll
+    ${File} ${ROOT_FOLDER}/libfreetype*.dll
+    ${File} ${ROOT_FOLDER}/libharfbuzz*.dll
+
+
 	WriteRegStr HKLM "${REGKEY}" CreateDesktopIcon $CreateDesktopIcon
 	WriteRegStr HKLM "${REGKEY}" CreateStartMenuGroup $CreateStartMenuGroup

avidemux_2.6.20.tar.gz/avidemux/winInstaller/avidemux_crossQt5.nsi -> avidemux_2.7.0.tar.gz/avidemux/winInstaller/avidemux_crossQt5.nsi Changed

@@ -248,12 +248,12 @@
 !macroend
 #
 !macro InstallDev xname
-         SetOutPath $INSTDIR\include\avidemux\2.6\${xname}
-         ${File} ${DEV_FOLDER}/include/avidemux/2.6/${xname}/*
+         SetOutPath $INSTDIR\include\avidemux\${API_VERSION}\${xname}
+         ${File} ${DEV_FOLDER}/include/avidemux/${API_VERSION}/${xname}/*
 !macroend
 !macro InstallDevQt5 xname
-         SetOutPath $INSTDIR\include\avidemux\2.6\qt5\${xname}
-         ${File} ${DEV_FOLDER}/include/avidemux/2.6/qt5/${xname}/*
+         SetOutPath $INSTDIR\include\avidemux\${API_VERSION}\qt5\${xname}
+         ${File} ${DEV_FOLDER}/include/avidemux/${API_VERSION}/qt5/${xname}/*
 !macroend
 
 
@@ -325,8 +325,8 @@
         SetOverwrite on
         ${File} ${ROOT_FOLDER}/avsproxy.exe
         ${File} ${ROOT_FOLDER}/avsproxy_gui.exe
-        ${File} ${ROOT_FOLDER}/vsProxy.exe
-        ${File} ${ROOT_FOLDER}/vsProxy_gui_qt5.exe
+        # TMP ${File} ${ROOT_FOLDER}/vsProxy.exe
+        # TMP ${File} ${ROOT_FOLDER}/vsProxy_gui_qt5.exe
 SectionEnd
 #
 Section "ShaderDemo" SecShaderDemo
@@ -349,10 +349,10 @@
         SetOverwrite on
         SetOutPath $INSTDIR
         ${File} ${DEV_FOLDER}/*.dll.a
-        SetOutPath $INSTDIR\include\avidemux\2.6
-        ${File} ${DEV_FOLDER}/include/avidemux/2.6/*
-        SetOutPath $INSTDIR\include\avidemux\2.6
-        ${File} ${DEV_FOLDER}/include/avidemux/2.6/*
+        SetOutPath $INSTDIR\include\avidemux\${API_VERSION}
+        ${File} ${DEV_FOLDER}/include/avidemux/${API_VERSION}/*
+        SetOutPath $INSTDIR\include\avidemux\${API_VERSION}
+        ${File} ${DEV_FOLDER}/include/avidemux/${API_VERSION}/*
         !insertmacro InstallDev cmake
         !insertmacro InstallDev ADM_core
         !insertmacro InstallDev ADM_coreAudio

avidemux_2.7.0.tar.gz/avidemux/winInstaller/change.css.devbuild Changed

avidemux_2.7.0.tar.gz/avidemux/winInstaller/change.css.release Added

avidemux_2.6.20.tar.gz/avidemux/winInstaller/createNsis32Qt5.sh -> avidemux_2.7.0.tar.gz/avidemux/winInstaller/createNsis32Qt5.sh Changed

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

avidemux_2.6.20.tar.gz/avidemux_core/ADM_core/include/ADM_cpuCap.h -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/include/ADM_cpuCap.h Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_core/include/ADM_files.h -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/include/ADM_files.h Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_core/include/ADM_mangle.h -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/include/ADM_mangle.h Changed

@@ -8,111 +8,8 @@
 #pragma once
 
 #include "ADM_coreConfig.h"
-
-#if ( defined(__PIC__) || defined(__pic__) ) && ! defined(PIC)
-#    define PIC
-#endif
-
-// Use rip-relative addressing if compiling PIC code on x86-64.
-#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__DJGPP__) || \
-    defined(__OS2__) || (defined (__OpenBSD__) && !defined(__ELF__))
-#    if defined(ADM_CPU_X86_64)
-#        define MANGLE(a)  #a
-#        define LOCAL_MANGLE(a) #a
-#        define FUNNY_MANGLE(x) x asm(MANGLE(x))
-#        define FUNNY_MANGLE_ARRAY(x, y) x[y] asm(MANGLE(x))
-#    else
-#        define LOCAL_MANGLE(a) #a
-#        define MANGLE(a) "_" #a
-#        define FUNNY_MANGLE(x) x asm(MANGLE(x))
-#        define FUNNY_MANGLE_ARRAY(x, y) x[y] asm(MANGLE(x))
-#    endif
-#else /////////////////  64 BITS UNICES
-#    if defined(ADM_CPU_X86_64) && defined(PIC)
-#        define MANGLE(a) #a"(%%rip)"
-#        define LOCAL_MANGLE(a) #a"(%%rip)"
-#        define FUNNY_MANGLE(x) x asm(#x)
-#        define FUNNY_MANGLE_ARRAY(x, y)  x[y] asm(#x)
-#    elif defined(__APPLE__) /////////////// MACOSX
-#        define MANGLE(a) "_" #a
-#        define LOCAL_MANGLE(a) #a
-#        define FUNNY_MANGLE(x) x asm(MANGLE(x))
-#        define FUNNY_MANGLE_ARRAY(x, y) x[y] asm(MANGLE(x))
-#     else /////////////// LINUX //////////////
-#                   define MANGLE(a) #a
-#                   define LOCAL_MANGLE(a) #a
-#                   define FUNNY_MANGLE(x) x asm(MANGLE(x))
-#                   define FUNNY_MANGLE_ARRAY(x, y) x[y] asm(MANGLE(x))
-#    endif
-#endif
-
-#define Mangle MANGLE
-
-#define ADM_ASM_ALIGN16 ".p2align 4\n"
-/* Regiter renaming */
-#ifdef ADM_CPU_X86_64
-#define REG_a  "rax" 
-#define REGa    rax 
-#define REGb    rbx 
-#define REGc    rcx 
-#define REG_b  "rbx"
-#define REG_c  "rcx" 
-#define REG_d  "rdx" 
-#define REG_S  "rsi" 
-#define REG_D  "rdi" 
-#define REGSP   rsp  
-#define REG_SP "rsp" 
-#define REG_BP "rbp" 
-#else
-#define REGa    eax  
-#define REGb    ebx 
-#define REGc    ecx 
-#define REG_a  "eax"  
-#define REG_b  "ebx" 
-#define REG_c  "ecx" 
-#define REG_d  "edx" 
-#define REG_S  "esi" 
-#define REG_D  "edi" 
-#if defined(__sun__) && defined(REG_SP)
-#undef REG_SP
-#endif /* : defined(__sun__) */
-#define REG_SP "esp"
-#define REGSP   esp  
-#define REG_BP "ebp" 
-#endif
-
-#define REG_ax "%%" REG_a
-#define REG_bx "%%" REG_b
-#define REG_cx "%%" REG_c
-#define REG_dx "%%" REG_d
-
-#define REG_si "%%" REG_S
-#define REG_di "%%" REG_D
-
-#define REG_sp "%%" REG_SP
-#define REG_bp "%%" REG_BP
-
-#ifndef attribute_used
-#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
-#    define attribute_used __attribute__((used))
-#else
-#    define attribute_used
-#endif
-#endif
-
-#define ASM_CONST attribute_used __attribute__ ((aligned(8)))
-/**
-        In some assembly part, gcc optimize way too much and reorganize the code
-        The right fix would be to use yasm for those, but i' m lazy
-*/
-#if defined(__clang__) && (__clang__==3 && __clang_minor__ >=7)
-        #define ADM_NO_OPTIMIZE  __attribute__((optnone)) 
-#elif defined(__GNUC__) && (__GNUC__ == 5 || (__GNUC__ ==4   && __GNUC_MINOR__ > 4))
-        #define ADM_NO_OPTIMIZE __attribute__((optimize("O0"))) 
+#ifdef _MSC_VER
+#include "ADM_mangle_vs.h"
 #else
-        #define ADM_NO_OPTIMIZE 
+#include "ADM_mangle_gcc.h"
 #endif
-
-
-
-

avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/include/ADM_mangle_gcc.h Added

@@ -0,0 +1,119 @@
+/** *************************************************************************
+    \fn ADM_mangle.h
+    \brief Handle symbol mangling & register name for inline asm
+                      
+    copyright            : (C) 2008 by mean
+    
+ ***************************************************************************/
+#pragma once
+
+#include "ADM_coreConfig.h"
+
+#if ( defined(__PIC__) || defined(__pic__) ) && ! defined(PIC)
+#    define PIC
+#endif
+
+// Use rip-relative addressing if compiling PIC code on x86-64.
+#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__DJGPP__) || \
+    defined(__OS2__) || (defined (__OpenBSD__) && !defined(__ELF__))
+#    if defined(ADM_CPU_X86_64)
+#        define MANGLE(a)  #a
+#        define LOCAL_MANGLE(a) #a
+#        define FUNNY_MANGLE(x) x asm(MANGLE(x))
+#        define FUNNY_MANGLE_ARRAY(x, y) x[y] asm(MANGLE(x))
+#    else
+#        define LOCAL_MANGLE(a) #a
+#        define MANGLE(a) "_" #a
+#        define FUNNY_MANGLE(x) x asm(MANGLE(x))
+#        define FUNNY_MANGLE_ARRAY(x, y) x[y] asm(MANGLE(x))
+#    endif
+#else /////////////////  64 BITS UNICES
+#    if defined(ADM_CPU_X86_64) && defined(PIC)
+#        define MANGLE(a) #a"(%%rip)"
+#        define LOCAL_MANGLE(a) #a"(%%rip)"
+#        define FUNNY_MANGLE(x) x asm(#x)
+#        define FUNNY_MANGLE_ARRAY(x, y)  x[y] asm(#x)
+#    elif defined(__APPLE__) /////////////// MACOSX
+#        define MANGLE(a) "_" #a
+#        define LOCAL_MANGLE(a) #a
+#        define FUNNY_MANGLE(x) x asm(MANGLE(x))
+#        define FUNNY_MANGLE_ARRAY(x, y) x[y] asm(MANGLE(x))
+#     else /////////////// LINUX //////////////
+#                   define MANGLE(a) #a
+#                   define LOCAL_MANGLE(a) #a
+#                   define FUNNY_MANGLE(x) x asm(MANGLE(x))
+#                   define FUNNY_MANGLE_ARRAY(x, y) x[y] asm(MANGLE(x))
+#    endif
+#endif
+
+#define Mangle MANGLE
+
+#define ADM_ASM_ALIGN16 ".p2align 4\n"
+/* Regiter renaming */
+#ifdef ADM_CPU_X86_64
+#define REG_a  "rax" 
+#define REGa    rax 
+#define REGb    rbx 
+#define REGc    rcx 
+#define REG_b  "rbx"
+#define REG_c  "rcx" 
+#define REG_d  "rdx" 
+#define REG_S  "rsi" 
+#define REG_D  "rdi" 
+#define REGSP   rsp  
+#define REG_SP "rsp" 
+#define REG_BP "rbp" 
+#else
+#define REGa    eax  
+#define REGb    ebx 
+#define REGc    ecx 
+#define REG_a  "eax"  
+#define REG_b  "ebx" 
+#define REG_c  "ecx" 
+#define REG_d  "edx" 
+#define REG_S  "esi" 
+#define REG_D  "edi" 
+#if defined(__sun__) && defined(REG_SP)
+#undef REG_SP
+#endif /* : defined(__sun__) */
+#define REG_SP "esp"
+#define REGSP   esp  
+#define REG_BP "ebp" 
+#endif
+
+#define REG_ax "%%" REG_a
+#define REG_bx "%%" REG_b
+#define REG_cx "%%" REG_c
+#define REG_dx "%%" REG_d
+
+#define REG_si "%%" REG_S
+#define REG_di "%%" REG_D
+
+#define REG_sp "%%" REG_SP
+#define REG_bp "%%" REG_BP
+
+#ifndef attribute_used
+#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
+#    define attribute_used __attribute__((used))
+#else
+#    define attribute_used
+#endif
+#endif
+
+#define ASM_CONST attribute_used __attribute__ ((aligned(8)))
+#define ASM_ALIGNED(x)  __attribute__((__aligned__(x))) 
+/**
+        In some assembly part, gcc optimize way too much and reorganize the code
+        The right fix would be to use yasm for those, but i' m lazy
+*/
+#if defined(__clang__) && (__clang__==3 && __clang_minor__ >=7)
+        #define ADM_NO_OPTIMIZE  __attribute__((optnone)) 
+#elif defined(__GNUC__) && (__GNUC__ == 5 || (__GNUC__ ==4   && __GNUC_MINOR__ > 4))
+        #define ADM_NO_OPTIMIZE __attribute__((optimize("O0"))) 
+#else
+        #define ADM_NO_OPTIMIZE 
+#endif
+
+
+
+

avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/include/ADM_mangle_vs.h Added

avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/include/admx86inc.asm Added

@@ -0,0 +1,1545 @@
+;*****************************************************************************
+;* x86inc.asm: x264asm abstraction layer
+;*****************************************************************************
+;* Copyright (C) 2005-2016 x264 project
+;*
+;* Authors: Loren Merritt <lorenm@u.washington.edu>
+;*          Anton Mitrofanov <BugMaster@narod.ru>
+;*          Fiona Glaser <fiona@x264.com>
+;*          Henrik Gramner <henrik@gramner.com>
+;*
+;* Permission to use, copy, modify, and/or distribute this software for any
+;* purpose with or without fee is hereby granted, provided that the above
+;* copyright notice and this permission notice appear in all copies.
+;*
+;* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+;* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+;* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+;* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+;* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+;* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+;* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+;*****************************************************************************
+
+; This is a header file for the x264ASM assembly language, which uses
+; NASM/YASM syntax combined with a large number of macros to provide easy
+; abstraction between different calling conventions (x86_32, win64, linux64).
+; It also has various other useful features to simplify writing the kind of
+; DSP functions that are most often used in x264.
+
+; Unlike the rest of x264, this file is available under an ISC license, as it
+; has significant usefulness outside of x264 and we want it to be available
+; to the largest audience possible.  Of course, if you modify it for your own
+; purposes to add a new feature, we strongly encourage contributing a patch
+; as this feature might be useful for others as well.  Send patches or ideas
+; to x264-devel@videolan.org .
+
+%ifndef private_prefix
+    %define private_prefix x264
+%endif
+
+%ifndef public_prefix
+    %define public_prefix private_prefix
+%endif
+
+%if HAVE_ALIGNED_STACK
+    %define STACK_ALIGNMENT 16
+%endif
+%ifndef STACK_ALIGNMENT
+    %if ARCH_X86_64
+        %define STACK_ALIGNMENT 16
+    %else
+        %define STACK_ALIGNMENT 4
+    %endif
+%endif
+
+%define WIN64  0
+%define UNIX64 0
+%if ARCH_X86_64
+    %ifidn __OUTPUT_FORMAT__,win32
+        %define WIN64  1
+    %elifidn __OUTPUT_FORMAT__,win64
+        %define WIN64  1
+    %elifidn __OUTPUT_FORMAT__,x64
+        %define WIN64  1
+    %else
+        %define UNIX64 1
+    %endif
+%endif
+
+%define FORMAT_ELF 0
+%ifidn __OUTPUT_FORMAT__,elf
+    %define FORMAT_ELF 1
+%elifidn __OUTPUT_FORMAT__,elf32
+    %define FORMAT_ELF 1
+%elifidn __OUTPUT_FORMAT__,elf64
+    %define FORMAT_ELF 1
+%endif
+
+%ifdef PREFIX
+    %define mangle(x) _ %+ x
+%else
+    %define mangle(x) x
+%endif
+
+; aout does not support align=
+; NOTE: This section is out of sync with x264, in order to
+; keep supporting OS/2.
+%macro SECTION_RODATA 0-1 16
+    %ifidn __OUTPUT_FORMAT__,aout
+        section .text
+    %else
+        SECTION .rodata align=%1
+    %endif
+%endmacro
+
+%if WIN64
+    %define PIC
+%elif ARCH_X86_64 == 0
+; x86_32 doesn't require PIC.
+; Some distros prefer shared objects to be PIC, but nothing breaks if
+; the code contains a few textrels, so we'll skip that complexity.
+    %undef PIC
+%endif
+%ifdef PIC
+    default rel
+%endif
+
+%macro CPUNOP 1
+    %if HAVE_CPUNOP
+        CPU %1
+    %endif
+%endmacro
+
+; Macros to eliminate most code duplication between x86_32 and x86_64:
+; Currently this works only for leaf functions which load all their arguments
+; into registers at the start, and make no other use of the stack. Luckily that
+; covers most of x264's asm.
+
+; PROLOGUE:
+; %1 = number of arguments. loads them from stack if needed.
+; %2 = number of registers used. pushes callee-saved regs if needed.
+; %3 = number of xmm registers used. pushes callee-saved xmm regs if needed.
+; %4 = (optional) stack size to be allocated. The stack will be aligned before
+;      allocating the specified stack size. If the required stack alignment is
+;      larger than the known stack alignment the stack will be manually aligned
+;      and an extra register will be allocated to hold the original stack
+;      pointer (to not invalidate r0m etc.). To prevent the use of an extra
+;      register as stack pointer, request a negative stack size.
+; %4+/%5+ = list of names to define to registers
+; PROLOGUE can also be invoked by adding the same options to cglobal
+
+; e.g.
+; cglobal foo, 2,3,7,0x40, dst, src, tmp
+; declares a function (foo) that automatically loads two arguments (dst and
+; src) into registers, uses one additional register (tmp) plus 7 vector
+; registers (m0-m6) and allocates 0x40 bytes of stack space.
+
+; TODO Some functions can use some args directly from the stack. If they're the
+; last args then you can just not declare them, but if they're in the middle
+; we need more flexible macro.
+
+; RET:
+; Pops anything that was pushed by PROLOGUE, and returns.
+
+; REP_RET:
+; Use this instead of RET if it's a branch target.
+
+; registers:
+; rN and rNq are the native-size register holding function argument N
+; rNd, rNw, rNb are dword, word, and byte size
+; rNh is the high 8 bits of the word size
+; rNm is the original location of arg N (a register or on the stack), dword
+; rNmp is native size
+
+%macro DECLARE_REG 2-3
+    %define r%1q %2
+    %define r%1d %2d
+    %define r%1w %2w
+    %define r%1b %2b
+    %define r%1h %2h
+    %define %2q %2
+    %if %0 == 2
+        %define r%1m  %2d
+        %define r%1mp %2
+    %elif ARCH_X86_64 ; memory
+        %define r%1m [rstk + stack_offset + %3]
+        %define r%1mp qword r %+ %1 %+ m
+    %else
+        %define r%1m [rstk + stack_offset + %3]
+        %define r%1mp dword r %+ %1 %+ m
+    %endif
+    %define r%1  %2
+%endmacro
+
+%macro DECLARE_REG_SIZE 3
+    %define r%1q r%1
+    %define e%1q r%1
+    %define r%1d e%1
+    %define e%1d e%1
+    %define r%1w %1
+    %define e%1w %1
+    %define r%1h %3
+    %define e%1h %3
+    %define r%1b %2
+    %define e%1b %2
+    %if ARCH_X86_64 == 0
+        %define r%1 e%1
+    %endif
+%endmacro
+
+DECLARE_REG_SIZE ax, al, ah
+DECLARE_REG_SIZE bx, bl, bh
+DECLARE_REG_SIZE cx, cl, ch
+DECLARE_REG_SIZE dx, dl, dh
+DECLARE_REG_SIZE si, sil, null
+DECLARE_REG_SIZE di, dil, null
+DECLARE_REG_SIZE bp, bpl, null
+
+; t# defines for when per-arch register allocation is more complex than just function arguments
+
+%macro DECLARE_REG_TMP 1-*
+    %assign %%i 0
+    %rep %0
+        CAT_XDEFINE t, %%i, r%1
+        %assign %%i %%i+1
+        %rotate 1
+    %endrep
+%endmacro
+
+%macro DECLARE_REG_TMP_SIZE 0-*
+    %rep %0
+        %define t%1q t%1 %+ q
+        %define t%1d t%1 %+ d
+        %define t%1w t%1 %+ w
+        %define t%1h t%1 %+ h
+        %define t%1b t%1 %+ b
+        %rotate 1
+    %endrep
+%endmacro
+
+DECLARE_REG_TMP_SIZE 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14
+
+%if ARCH_X86_64
+    %define gprsize 8
+%else
+    %define gprsize 4
+%endif
+
+%macro PUSH 1
+    push %1
+    %ifidn rstk, rsp
+        %assign stack_offset stack_offset+gprsize
+    %endif
+%endmacro
+
+%macro POP 1
+    pop %1
+    %ifidn rstk, rsp
+        %assign stack_offset stack_offset-gprsize
+    %endif
+%endmacro
+
+%macro PUSH_IF_USED 1-*
+    %rep %0
+        %if %1 < regs_used
+            PUSH r%1
+        %endif
+        %rotate 1
+    %endrep
+%endmacro
+
+%macro POP_IF_USED 1-*
+    %rep %0
+        %if %1 < regs_used
+            pop r%1
+        %endif
+        %rotate 1
+    %endrep
+%endmacro
+
+%macro LOAD_IF_USED 1-*
+    %rep %0
+        %if %1 < num_args
+            mov r%1, r %+ %1 %+ mp
+        %endif
+        %rotate 1
+    %endrep
+%endmacro
+
+%macro SUB 2
+    sub %1, %2
+    %ifidn %1, rstk
+        %assign stack_offset stack_offset+(%2)
+    %endif
+%endmacro
+
+%macro ADD 2
+    add %1, %2
+    %ifidn %1, rstk
+        %assign stack_offset stack_offset-(%2)
+    %endif
+%endmacro
+
+%macro movifnidn 2
+    %ifnidn %1, %2
+        mov %1, %2
+    %endif
+%endmacro
+
+%macro movsxdifnidn 2
+    %ifnidn %1, %2
+        movsxd %1, %2
+    %endif
+%endmacro
+
+%macro ASSERT 1
+    %if (%1) == 0
+        %error assertion ``%1'' failed
+    %endif
+%endmacro
+
+%macro DEFINE_ARGS 0-*
+    %ifdef n_arg_names
+        %assign %%i 0
+        %rep n_arg_names
+            CAT_UNDEF arg_name %+ %%i, q
+            CAT_UNDEF arg_name %+ %%i, d
+            CAT_UNDEF arg_name %+ %%i, w
+            CAT_UNDEF arg_name %+ %%i, h
+            CAT_UNDEF arg_name %+ %%i, b
+            CAT_UNDEF arg_name %+ %%i, m
+            CAT_UNDEF arg_name %+ %%i, mp
+            CAT_UNDEF arg_name, %%i
+            %assign %%i %%i+1
+        %endrep
+    %endif
+
+    %xdefine %%stack_offset stack_offset
+    %undef stack_offset ; so that the current value of stack_offset doesn't get baked in by xdefine
+    %assign %%i 0
+    %rep %0
+        %xdefine %1q r %+ %%i %+ q
+        %xdefine %1d r %+ %%i %+ d
+        %xdefine %1w r %+ %%i %+ w
+        %xdefine %1h r %+ %%i %+ h
+        %xdefine %1b r %+ %%i %+ b
+        %xdefine %1m r %+ %%i %+ m
+        %xdefine %1mp r %+ %%i %+ mp
+        CAT_XDEFINE arg_name, %%i, %1
+        %assign %%i %%i+1
+        %rotate 1
+    %endrep
+    %xdefine stack_offset %%stack_offset
+    %assign n_arg_names %0
+%endmacro
+
+%define required_stack_alignment ((mmsize + 15) & ~15)
+
+%macro ALLOC_STACK 1-2 0 ; stack_size, n_xmm_regs (for win64 only)
+    %ifnum %1
+        %if %1 != 0
+            %assign %%pad 0
+            %assign stack_size %1
+            %if stack_size < 0
+                %assign stack_size -stack_size
+            %endif
+            %if WIN64
+                %assign %%pad %%pad + 32 ; shadow space
+                %if mmsize != 8
+                    %assign xmm_regs_used %2
+                    %if xmm_regs_used > 8
+                        %assign %%pad %%pad + (xmm_regs_used-8)*16 ; callee-saved xmm registers
+                    %endif
+                %endif
+            %endif
+            %if required_stack_alignment <= STACK_ALIGNMENT
+                ; maintain the current stack alignment
+                %assign stack_size_padded stack_size + %%pad + ((-%%pad-stack_offset-gprsize) & (STACK_ALIGNMENT-1))
+                SUB rsp, stack_size_padded
+            %else
+                %assign %%reg_num (regs_used - 1)
+                %xdefine rstk r %+ %%reg_num
+                ; align stack, and save original stack location directly above
+                ; it, i.e. in [rsp+stack_size_padded], so we can restore the
+                ; stack in a single instruction (i.e. mov rsp, rstk or mov
+                ; rsp, [rsp+stack_size_padded])
+                %if %1 < 0 ; need to store rsp on stack
+                    %xdefine rstkm [rsp + stack_size + %%pad]
+                    %assign %%pad %%pad + gprsize
+                %else ; can keep rsp in rstk during whole function
+                    %xdefine rstkm rstk
+                %endif
+                %assign stack_size_padded stack_size + ((%%pad + required_stack_alignment-1) & ~(required_stack_alignment-1))
+                mov rstk, rsp
+                and rsp, ~(required_stack_alignment-1)
+                sub rsp, stack_size_padded
+                movifnidn rstkm, rstk
+            %endif
+            WIN64_PUSH_XMM
+        %endif
+    %endif
+%endmacro
+
+%macro SETUP_STACK_POINTER 1
+    %ifnum %1
+        %if %1 != 0 && required_stack_alignment > STACK_ALIGNMENT
+            %if %1 > 0
+                %assign regs_used (regs_used + 1)
+            %endif
+            %if ARCH_X86_64 && regs_used < 5 + UNIX64 * 3
+                ; Ensure that we don't clobber any registers containing arguments. For UNIX64 we also preserve r6 (rax)
+                ; since it's used as a hidden argument in vararg functions to specify the number of vector registers used.
+                %assign regs_used 5 + UNIX64 * 3
+            %endif
+        %endif
+    %endif
+%endmacro
+
+%macro DEFINE_ARGS_INTERNAL 3+
+    %ifnum %2
+        DEFINE_ARGS %3
+    %elif %1 == 4
+        DEFINE_ARGS %2
+    %elif %1 > 4
+        DEFINE_ARGS %2, %3
+    %endif
+%endmacro
+
+%if WIN64 ; Windows x64 ;=================================================
+
+DECLARE_REG 0,  rcx
+DECLARE_REG 1,  rdx
+DECLARE_REG 2,  R8
+DECLARE_REG 3,  R9
+DECLARE_REG 4,  R10, 40
+DECLARE_REG 5,  R11, 48
+DECLARE_REG 6,  rax, 56
+DECLARE_REG 7,  rdi, 64
+DECLARE_REG 8,  rsi, 72
+DECLARE_REG 9,  rbx, 80
+DECLARE_REG 10, rbp, 88
+DECLARE_REG 11, R12, 96
+DECLARE_REG 12, R13, 104
+DECLARE_REG 13, R14, 112
+DECLARE_REG 14, R15, 120
+
+%macro PROLOGUE 2-5+ 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
+    %assign num_args %1
+    %assign regs_used %2
+    ASSERT regs_used >= num_args
+    SETUP_STACK_POINTER %4
+    ASSERT regs_used <= 15
+    PUSH_IF_USED 7, 8, 9, 10, 11, 12, 13, 14
+    ALLOC_STACK %4, %3
+    %if mmsize != 8 && stack_size == 0
+        WIN64_SPILL_XMM %3
+    %endif
+    LOAD_IF_USED 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
+    DEFINE_ARGS_INTERNAL %0, %4, %5
+%endmacro
+
+%macro WIN64_PUSH_XMM 0
+    ; Use the shadow space to store XMM6 and XMM7, the rest needs stack space allocated.
+    %if xmm_regs_used > 6
+        movaps [rstk + stack_offset +  8], xmm6
+    %endif
+    %if xmm_regs_used > 7
+        movaps [rstk + stack_offset + 24], xmm7
+    %endif
+    %if xmm_regs_used > 8
+        %assign %%i 8
+        %rep xmm_regs_used-8
+            movaps [rsp + (%%i-8)*16 + stack_size + 32], xmm %+ %%i
+            %assign %%i %%i+1
+        %endrep
+    %endif
+%endmacro
+
+%macro WIN64_SPILL_XMM 1
+    %assign xmm_regs_used %1
+    ASSERT xmm_regs_used <= 16
+    %if xmm_regs_used > 8
+        ; Allocate stack space for callee-saved xmm registers plus shadow space and align the stack.
+        %assign %%pad (xmm_regs_used-8)*16 + 32
+        %assign stack_size_padded %%pad + ((-%%pad-stack_offset-gprsize) & (STACK_ALIGNMENT-1))
+        SUB rsp, stack_size_padded
+    %endif
+    WIN64_PUSH_XMM
+%endmacro
+
+%macro WIN64_RESTORE_XMM_INTERNAL 1
+    %assign %%pad_size 0
+    %if xmm_regs_used > 8
+        %assign %%i xmm_regs_used
+        %rep xmm_regs_used-8
+            %assign %%i %%i-1
+            movaps xmm %+ %%i, [%1 + (%%i-8)*16 + stack_size + 32]
+        %endrep
+    %endif
+    %if stack_size_padded > 0
+        %if stack_size > 0 && required_stack_alignment > STACK_ALIGNMENT
+            mov rsp, rstkm
+        %else
+            add %1, stack_size_padded
+            %assign %%pad_size stack_size_padded
+        %endif
+    %endif
+    %if xmm_regs_used > 7
+        movaps xmm7, [%1 + stack_offset - %%pad_size + 24]
+    %endif
+    %if xmm_regs_used > 6
+        movaps xmm6, [%1 + stack_offset - %%pad_size +  8]
+    %endif
+%endmacro
+
+%macro WIN64_RESTORE_XMM 1
+    WIN64_RESTORE_XMM_INTERNAL %1
+    %assign stack_offset (stack_offset-stack_size_padded)
+    %assign xmm_regs_used 0
+%endmacro
+
+%define has_epilogue regs_used > 7 || xmm_regs_used > 6 || mmsize == 32 || stack_size > 0
+
+%macro RET 0
+    WIN64_RESTORE_XMM_INTERNAL rsp
+    POP_IF_USED 14, 13, 12, 11, 10, 9, 8, 7
+    %if mmsize == 32
+        vzeroupper
+    %endif
+    AUTO_REP_RET
+%endmacro
+
+%elif ARCH_X86_64 ; *nix x64 ;=============================================
+
+DECLARE_REG 0,  rdi
+DECLARE_REG 1,  rsi
+DECLARE_REG 2,  rdx
+DECLARE_REG 3,  rcx
+DECLARE_REG 4,  R8
+DECLARE_REG 5,  R9
+DECLARE_REG 6,  rax, 8
+DECLARE_REG 7,  R10, 16
+DECLARE_REG 8,  R11, 24
+DECLARE_REG 9,  rbx, 32
+DECLARE_REG 10, rbp, 40
+DECLARE_REG 11, R12, 48
+DECLARE_REG 12, R13, 56
+DECLARE_REG 13, R14, 64
+DECLARE_REG 14, R15, 72
+
+%macro PROLOGUE 2-5+ ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
+    %assign num_args %1
+    %assign regs_used %2
+    ASSERT regs_used >= num_args
+    SETUP_STACK_POINTER %4
+    ASSERT regs_used <= 15
+    PUSH_IF_USED 9, 10, 11, 12, 13, 14
+    ALLOC_STACK %4
+    LOAD_IF_USED 6, 7, 8, 9, 10, 11, 12, 13, 14
+    DEFINE_ARGS_INTERNAL %0, %4, %5
+%endmacro
+
+%define has_epilogue regs_used > 9 || mmsize == 32 || stack_size > 0
+
+%macro RET 0
+    %if stack_size_padded > 0
+        %if required_stack_alignment > STACK_ALIGNMENT
+            mov rsp, rstkm
+        %else
+            add rsp, stack_size_padded
+        %endif
+    %endif
+    POP_IF_USED 14, 13, 12, 11, 10, 9
+    %if mmsize == 32
+        vzeroupper
+    %endif
+    AUTO_REP_RET
+%endmacro
+
+%else ; X86_32 ;==============================================================
+
+DECLARE_REG 0, eax, 4
+DECLARE_REG 1, ecx, 8
+DECLARE_REG 2, edx, 12
+DECLARE_REG 3, ebx, 16
+DECLARE_REG 4, esi, 20
+DECLARE_REG 5, edi, 24
+DECLARE_REG 6, ebp, 28
+%define rsp esp
+
+%macro DECLARE_ARG 1-*
+    %rep %0
+        %define r%1m [rstk + stack_offset + 4*%1 + 4]
+        %define r%1mp dword r%1m
+        %rotate 1
+    %endrep
+%endmacro
+
+DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14
+
+%macro PROLOGUE 2-5+ ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
+    %assign num_args %1
+    %assign regs_used %2
+    ASSERT regs_used >= num_args
+    %if num_args > 7
+        %assign num_args 7
+    %endif
+    %if regs_used > 7
+        %assign regs_used 7
+    %endif
+    SETUP_STACK_POINTER %4
+    ASSERT regs_used <= 7
+    PUSH_IF_USED 3, 4, 5, 6
+    ALLOC_STACK %4
+    LOAD_IF_USED 0, 1, 2, 3, 4, 5, 6
+    DEFINE_ARGS_INTERNAL %0, %4, %5
+%endmacro
+
+%define has_epilogue regs_used > 3 || mmsize == 32 || stack_size > 0
+
+%macro RET 0
+    %if stack_size_padded > 0
+        %if required_stack_alignment > STACK_ALIGNMENT
+            mov rsp, rstkm
+        %else
+            add rsp, stack_size_padded
+        %endif
+    %endif
+    POP_IF_USED 6, 5, 4, 3
+    %if mmsize == 32
+        vzeroupper
+    %endif
+    AUTO_REP_RET
+%endmacro
+
+%endif ;======================================================================
+
+%if WIN64 == 0
+    %macro WIN64_SPILL_XMM 1
+    %endmacro
+    %macro WIN64_RESTORE_XMM 1
+    %endmacro
+    %macro WIN64_PUSH_XMM 0
+    %endmacro
+%endif
+
+; On AMD cpus <=K10, an ordinary ret is slow if it immediately follows either
+; a branch or a branch target. So switch to a 2-byte form of ret in that case.
+; We can automatically detect "follows a branch", but not a branch target.
+; (SSSE3 is a sufficient condition to know that your cpu doesn't have this problem.)
+%macro REP_RET 0
+    %if has_epilogue
+        RET
+    %else
+        rep ret
+    %endif
+    annotate_function_size
+%endmacro
+
+%define last_branch_adr $$
+%macro AUTO_REP_RET 0
+    %if notcpuflag(ssse3)
+        times ((last_branch_adr-$)>>31)+1 rep ; times 1 iff $ == last_branch_adr.
+    %endif
+    ret
+    annotate_function_size
+%endmacro
+
+%macro BRANCH_INSTR 0-*
+    %rep %0
+        %macro %1 1-2 %1
+            %2 %1
+            %if notcpuflag(ssse3)
+                %%branch_instr equ $
+                %xdefine last_branch_adr %%branch_instr
+            %endif
+        %endmacro
+        %rotate 1
+    %endrep
+%endmacro
+
+BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae, jna, jnae, jb, jbe, jnb, jnbe, jc, jnc, js, jns, jo, jno, jp, jnp
+
+%macro TAIL_CALL 2 ; callee, is_nonadjacent
+    %if has_epilogue
+        call %1
+        RET
+    %elif %2
+        jmp %1
+    %endif
+    annotate_function_size
+%endmacro
+
+;=============================================================================
+; arch-independent part
+;=============================================================================
+
+%assign function_align 16
+
+; Begin a function.
+; Applies any symbol mangling needed for C linkage, and sets up a define such that
+; subsequent uses of the function name automatically refer to the mangled version.
+; Appends cpuflags to the function name if cpuflags has been specified.
+; The "" empty default parameter is a workaround for nasm, which fails if SUFFIX
+; is empty and we call cglobal_internal with just %1 %+ SUFFIX (without %2).
+%macro cglobal 1-2+ "" ; name, [PROLOGUE args]
+    cglobal_internal 1, %1 %+ SUFFIX, %2
+%endmacro
+%macro cvisible 1-2+ "" ; name, [PROLOGUE args]
+    cglobal_internal 0, %1 %+ SUFFIX, %2
+%endmacro
+%macro cglobal_internal 2-3+
+    annotate_function_size
+    %if %1
+        %xdefine %%FUNCTION_PREFIX private_prefix
+        %xdefine %%VISIBILITY hidden
+    %else
+        %xdefine %%FUNCTION_PREFIX public_prefix
+        %xdefine %%VISIBILITY
+    %endif
+    %ifndef cglobaled_%2
+        %xdefine %2 mangle(%%FUNCTION_PREFIX %+ _ %+ %2)
+        %xdefine %2.skip_prologue %2 %+ .skip_prologue
+        CAT_XDEFINE cglobaled_, %2, 1
+    %endif
+    %xdefine current_function %2
+    %xdefine current_function_section __SECT__
+    %if FORMAT_ELF
+        global %2:function %%VISIBILITY
+    %else
+        global %2
+    %endif
+    align function_align
+    %2:
+    RESET_MM_PERMUTATION        ; needed for x86-64, also makes disassembly somewhat nicer
+    %xdefine rstk rsp           ; copy of the original stack pointer, used when greater alignment than the known stack alignment is required
+    %assign stack_offset 0      ; stack pointer offset relative to the return address
+    %assign stack_size 0        ; amount of stack space that can be freely used inside a function
+    %assign stack_size_padded 0 ; total amount of allocated stack space, including space for callee-saved xmm registers on WIN64 and alignment padding
+    %assign xmm_regs_used 0     ; number of XMM registers requested, used for dealing with callee-saved registers on WIN64
+    %ifnidn %3, ""
+        PROLOGUE %3
+    %endif
+%endmacro
+
+%macro cextern 1
+    %xdefine %1 mangle(private_prefix %+ _ %+ %1)
+    CAT_XDEFINE cglobaled_, %1, 1
+    extern %1
+%endmacro
+
+; like cextern, but without the prefix
+%macro cextern_naked 1
+    %ifdef PREFIX
+        %xdefine %1 mangle(%1)
+    %endif
+    CAT_XDEFINE cglobaled_, %1, 1
+    extern %1
+%endmacro
+
+%macro const 1-2+
+    %xdefine %1 mangle(private_prefix %+ _ %+ %1)
+    %if FORMAT_ELF
+        global %1:data hidden
+    %else
+        global %1
+    %endif
+    %1: %2
+%endmacro
+
+; This is needed for ELF, otherwise the GNU linker assumes the stack is executable by default.
+%if FORMAT_ELF
+    [SECTION .note.GNU-stack noalloc noexec nowrite progbits]
+%endif
+
+; Tell debuggers how large the function was.
+; This may be invoked multiple times per function; we rely on later instances overriding earlier ones.
+; This is invoked by RET and similar macros, and also cglobal does it for the previous function,
+; but if the last function in a source file doesn't use any of the standard macros for its epilogue,
+; then its size might be unspecified.
+%macro annotate_function_size 0
+    %ifdef __YASM_VER__
+        %ifdef current_function
+            %if FORMAT_ELF
+                current_function_section
+                %%ecf equ $
+                size current_function %%ecf - current_function
+                __SECT__
+            %endif
+        %endif
+    %endif
+%endmacro
+
+; cpuflags
+
+%assign cpuflags_mmx      (1<<0)
+%assign cpuflags_mmx2     (1<<1) | cpuflags_mmx
+%assign cpuflags_3dnow    (1<<2) | cpuflags_mmx
+%assign cpuflags_3dnowext (1<<3) | cpuflags_3dnow
+%assign cpuflags_sse      (1<<4) | cpuflags_mmx2
+%assign cpuflags_sse2     (1<<5) | cpuflags_sse
+%assign cpuflags_sse2slow (1<<6) | cpuflags_sse2
+%assign cpuflags_sse3     (1<<7) | cpuflags_sse2
+%assign cpuflags_ssse3    (1<<8) | cpuflags_sse3
+%assign cpuflags_sse4     (1<<9) | cpuflags_ssse3
+%assign cpuflags_sse42    (1<<10)| cpuflags_sse4
+%assign cpuflags_avx      (1<<11)| cpuflags_sse42
+%assign cpuflags_xop      (1<<12)| cpuflags_avx
+%assign cpuflags_fma4     (1<<13)| cpuflags_avx
+%assign cpuflags_fma3     (1<<14)| cpuflags_avx
+%assign cpuflags_avx2     (1<<15)| cpuflags_fma3
+
+%assign cpuflags_cache32  (1<<16)
+%assign cpuflags_cache64  (1<<17)
+%assign cpuflags_slowctz  (1<<18)
+%assign cpuflags_lzcnt    (1<<19)
+%assign cpuflags_aligned  (1<<20) ; not a cpu feature, but a function variant
+%assign cpuflags_atom     (1<<21)
+%assign cpuflags_bmi1     (1<<22)|cpuflags_lzcnt
+%assign cpuflags_bmi2     (1<<23)|cpuflags_bmi1
+%assign cpuflags_aesni    (1<<24)|cpuflags_sse42
+
+; Returns a boolean value expressing whether or not the specified cpuflag is enabled.
+%define    cpuflag(x) (((((cpuflags & (cpuflags_ %+ x)) ^ (cpuflags_ %+ x)) - 1) >> 31) & 1)
+%define notcpuflag(x) (cpuflag(x) ^ 1)
+
+; Takes an arbitrary number of cpuflags from the above list.
+; All subsequent functions (up to the next INIT_CPUFLAGS) is built for the specified cpu.
+; You shouldn't need to invoke this macro directly, it's a subroutine for INIT_MMX &co.
+%macro INIT_CPUFLAGS 0-*
+    %xdefine SUFFIX
+    %undef cpuname
+    %assign cpuflags 0
+
+    %if %0 >= 1
+        %rep %0
+            %ifdef cpuname
+                %xdefine cpuname cpuname %+ _%1
+            %else
+                %xdefine cpuname %1
+            %endif
+            %assign cpuflags cpuflags | cpuflags_%1
+            %rotate 1
+        %endrep
+        %xdefine SUFFIX _ %+ cpuname
+
+        %if cpuflag(avx)
+            %assign avx_enabled 1
+        %endif
+        %if (mmsize == 16 && notcpuflag(sse2)) || (mmsize == 32 && notcpuflag(avx2))
+            %define mova movaps
+            %define movu movups
+            %define movnta movntps
+        %endif
+        %if cpuflag(aligned)
+            %define movu mova
+        %elif cpuflag(sse3) && notcpuflag(ssse3)
+            %define movu lddqu
+        %endif
+    %endif
+
+    %if ARCH_X86_64 || cpuflag(sse2)
+        CPUNOP amdnop
+    %else
+        CPUNOP basicnop
+    %endif
+%endmacro
+
+; Merge mmx and sse*
+; m# is a simd register of the currently selected size
+; xm# is the corresponding xmm register if mmsize >= 16, otherwise the same as m#
+; ym# is the corresponding ymm register if mmsize >= 32, otherwise the same as m#
+; (All 3 remain in sync through SWAP.)
+
+%macro CAT_XDEFINE 3
+    %xdefine %1%2 %3
+%endmacro
+
+%macro CAT_UNDEF 2
+    %undef %1%2
+%endmacro
+
+%macro INIT_MMX 0-1+
+    %assign avx_enabled 0
+    %define RESET_MM_PERMUTATION INIT_MMX %1
+    %define mmsize 8
+    %define num_mmregs 8
+    %define mova movq
+    %define movu movq
+    %define movh movd
+    %define movnta movntq
+    %assign %%i 0
+    %rep 8
+        CAT_XDEFINE m, %%i, mm %+ %%i
+        CAT_XDEFINE nnmm, %%i, %%i
+        %assign %%i %%i+1
+    %endrep
+    %rep 8
+        CAT_UNDEF m, %%i
+        CAT_UNDEF nnmm, %%i
+        %assign %%i %%i+1
+    %endrep
+    INIT_CPUFLAGS %1
+%endmacro
+
+%macro INIT_XMM 0-1+
+    %assign avx_enabled 0
+    %define RESET_MM_PERMUTATION INIT_XMM %1
+    %define mmsize 16
+    %define num_mmregs 8
+    %if ARCH_X86_64
+        %define num_mmregs 16
+    %endif
+    %define mova movdqa
+    %define movu movdqu
+    %define movh movq
+    %define movnta movntdq
+    %assign %%i 0
+    %rep num_mmregs
+        CAT_XDEFINE m, %%i, xmm %+ %%i
+        CAT_XDEFINE nnxmm, %%i, %%i
+        %assign %%i %%i+1
+    %endrep
+    INIT_CPUFLAGS %1
+%endmacro
+
+%macro INIT_YMM 0-1+
+    %assign avx_enabled 1
+    %define RESET_MM_PERMUTATION INIT_YMM %1
+    %define mmsize 32
+    %define num_mmregs 8
+    %if ARCH_X86_64
+        %define num_mmregs 16
+    %endif
+    %define mova movdqa
+    %define movu movdqu
+    %undef movh
+    %define movnta movntdq
+    %assign %%i 0
+    %rep num_mmregs
+        CAT_XDEFINE m, %%i, ymm %+ %%i
+        CAT_XDEFINE nnymm, %%i, %%i
+        %assign %%i %%i+1
+    %endrep
+    INIT_CPUFLAGS %1
+%endmacro
+
+INIT_XMM
+
+%macro DECLARE_MMCAST 1
+    %define  mmmm%1   mm%1
+    %define  mmxmm%1  mm%1
+    %define  mmymm%1  mm%1
+    %define xmmmm%1   mm%1
+    %define xmmxmm%1 xmm%1
+    %define xmmymm%1 xmm%1
+    %define ymmmm%1   mm%1
+    %define ymmxmm%1 xmm%1
+    %define ymmymm%1 ymm%1
+    %define xm%1 xmm %+ m%1
+    %define ym%1 ymm %+ m%1
+%endmacro
+
+%assign i 0
+%rep 16
+    DECLARE_MMCAST i
+    %assign i i+1
+%endrep
+
+; I often want to use macros that permute their arguments. e.g. there's no
+; efficient way to implement butterfly or transpose or dct without swapping some
+; arguments.
+;
+; I would like to not have to manually keep track of the permutations:
+; If I insert a permutation in the middle of a function, it should automatically
+; change everything that follows. For more complex macros I may also have multiple
+; implementations, e.g. the SSE2 and SSSE3 versions may have different permutations.
+;
+; Hence these macros. Insert a PERMUTE or some SWAPs at the end of a macro that
+; permutes its arguments. It's equivalent to exchanging the contents of the
+; registers, except that this way you exchange the register names instead, so it
+; doesn't cost any cycles.
+
+%macro PERMUTE 2-* ; takes a list of pairs to swap
+    %rep %0/2
+        %xdefine %%tmp%2 m%2
+        %rotate 2
+    %endrep
+    %rep %0/2
+        %xdefine m%1 %%tmp%2
+        CAT_XDEFINE nn, m%1, %1
+        %rotate 2
+    %endrep
+%endmacro
+
+%macro SWAP 2+ ; swaps a single chain (sometimes more concise than pairs)
+    %ifnum %1 ; SWAP 0, 1, ...
+        SWAP_INTERNAL_NUM %1, %2
+    %else ; SWAP m0, m1, ...
+        SWAP_INTERNAL_NAME %1, %2
+    %endif
+%endmacro
+
+%macro SWAP_INTERNAL_NUM 2-*
+    %rep %0-1
+        %xdefine %%tmp m%1
+        %xdefine m%1 m%2
+        %xdefine m%2 %%tmp
+        CAT_XDEFINE nn, m%1, %1
+        CAT_XDEFINE nn, m%2, %2
+        %rotate 1
+    %endrep
+%endmacro
+
+%macro SWAP_INTERNAL_NAME 2-*
+    %xdefine %%args nn %+ %1
+    %rep %0-1
+        %xdefine %%args %%args, nn %+ %2
+        %rotate 1
+    %endrep
+    SWAP_INTERNAL_NUM %%args
+%endmacro
+
+; If SAVE_MM_PERMUTATION is placed at the end of a function, then any later
+; calls to that function will automatically load the permutation, so values can
+; be returned in mmregs.
+%macro SAVE_MM_PERMUTATION 0-1
+    %if %0
+        %xdefine %%f %1_m
+    %else
+        %xdefine %%f current_function %+ _m
+    %endif
+    %assign %%i 0
+    %rep num_mmregs
+        CAT_XDEFINE %%f, %%i, m %+ %%i
+        %assign %%i %%i+1
+    %endrep
+%endmacro
+
+%macro LOAD_MM_PERMUTATION 1 ; name to load from
+    %ifdef %1_m0
+        %assign %%i 0
+        %rep num_mmregs
+            CAT_XDEFINE m, %%i, %1_m %+ %%i
+            CAT_XDEFINE nn, m %+ %%i, %%i
+            %assign %%i %%i+1
+        %endrep
+    %endif
+%endmacro
+
+; Append cpuflags to the callee's name iff the appended name is known and the plain name isn't
+%macro call 1
+    call_internal %1 %+ SUFFIX, %1
+%endmacro
+%macro call_internal 2
+    %xdefine %%i %2
+    %ifndef cglobaled_%2
+        %ifdef cglobaled_%1
+            %xdefine %%i %1
+        %endif
+    %endif
+    call %%i
+    LOAD_MM_PERMUTATION %%i
+%endmacro
+
+; Substitutions that reduce instruction size but are functionally equivalent
+%macro add 2
+    %ifnum %2
+        %if %2==128
+            sub %1, -128
+        %else
+            add %1, %2
+        %endif
+    %else
+        add %1, %2
+    %endif
+%endmacro
+
+%macro sub 2
+    %ifnum %2
+        %if %2==128
+            add %1, -128
+        %else
+            sub %1, %2
+        %endif
+    %else
+        sub %1, %2
+    %endif
+%endmacro
+
+;=============================================================================
+; AVX abstraction layer
+;=============================================================================
+
+%assign i 0
+%rep 16
+    %if i < 8
+        CAT_XDEFINE sizeofmm, i, 8
+    %endif
+    CAT_XDEFINE sizeofxmm, i, 16
+    CAT_XDEFINE sizeofymm, i, 32
+    %assign i i+1
+%endrep
+%undef i
+
+%macro CHECK_AVX_INSTR_EMU 3-*
+    %xdefine %%opcode %1
+    %xdefine %%dst %2
+    %rep %0-2
+        %ifidn %%dst, %3
+            %error non-avx emulation of ``%%opcode'' is not supported
+        %endif
+        %rotate 1
+    %endrep
+%endmacro
+
+;%1 == instruction
+;%2 == minimal instruction set
+;%3 == 1 if float, 0 if int
+;%4 == 1 if 4-operand emulation, 0 if 3-operand emulation, 255 otherwise (no emulation)
+;%5 == 1 if commutative (i.e. doesn't matter which src arg is which), 0 if not
+;%6+: operands
+%macro RUN_AVX_INSTR 6-9+
+    %ifnum sizeof%7
+        %assign __sizeofreg sizeof%7
+    %elifnum sizeof%6
+        %assign __sizeofreg sizeof%6
+    %else
+        %assign __sizeofreg mmsize
+    %endif
+    %assign __emulate_avx 0
+    %if avx_enabled && __sizeofreg >= 16
+        %xdefine __instr v%1
+    %else
+        %xdefine __instr %1
+        %if %0 >= 8+%4
+            %assign __emulate_avx 1
+        %endif
+    %endif
+    %ifnidn %2, fnord
+        %ifdef cpuname
+            %if notcpuflag(%2)
+                %error use of ``%1'' %2 instruction in cpuname function: current_function
+            %elif cpuflags_%2 < cpuflags_sse && notcpuflag(sse2) && __sizeofreg > 8
+                %error use of ``%1'' sse2 instruction in cpuname function: current_function
+            %endif
+        %endif
+    %endif
+
+    %if __emulate_avx
+        %xdefine __src1 %7
+        %xdefine __src2 %8
+        %if %5 && %4 == 0
+            %ifnidn %6, %7
+                %ifidn %6, %8
+                    %xdefine __src1 %8
+                    %xdefine __src2 %7
+                %elifnnum sizeof%8
+                    ; 3-operand AVX instructions with a memory arg can only have it in src2,
+                    ; whereas SSE emulation prefers to have it in src1 (i.e. the mov).
+                    ; So, if the instruction is commutative with a memory arg, swap them.
+                    %xdefine __src1 %8
+                    %xdefine __src2 %7
+                %endif
+            %endif
+        %endif
+        %ifnidn %6, __src1
+            %if %0 >= 9
+                CHECK_AVX_INSTR_EMU {%1 %6, %7, %8, %9}, %6, __src2, %9
+            %else
+                CHECK_AVX_INSTR_EMU {%1 %6, %7, %8}, %6, __src2
+            %endif
+            %if __sizeofreg == 8
+                MOVQ %6, __src1
+            %elif %3
+                MOVAPS %6, __src1
+            %else
+                MOVDQA %6, __src1
+            %endif
+        %endif
+        %if %0 >= 9
+            %1 %6, __src2, %9
+        %else
+            %1 %6, __src2
+        %endif
+    %elif %0 >= 9
+        __instr %6, %7, %8, %9
+    %elif %0 == 8
+        __instr %6, %7, %8
+    %elif %0 == 7
+        __instr %6, %7
+    %else
+        __instr %6
+    %endif
+%endmacro
+
+;%1 == instruction
+;%2 == minimal instruction set
+;%3 == 1 if float, 0 if int
+;%4 == 1 if 4-operand emulation, 0 if 3-operand emulation, 255 otherwise (no emulation)
+;%5 == 1 if commutative (i.e. doesn't matter which src arg is which), 0 if not
+%macro AVX_INSTR 1-5 fnord, 0, 255, 0
+    %macro %1 1-10 fnord, fnord, fnord, fnord, %1, %2, %3, %4, %5
+        %ifidn %2, fnord
+            RUN_AVX_INSTR %6, %7, %8, %9, %10, %1
+        %elifidn %3, fnord
+            RUN_AVX_INSTR %6, %7, %8, %9, %10, %1, %2
+        %elifidn %4, fnord
+            RUN_AVX_INSTR %6, %7, %8, %9, %10, %1, %2, %3
+        %elifidn %5, fnord
+            RUN_AVX_INSTR %6, %7, %8, %9, %10, %1, %2, %3, %4
+        %else
+            RUN_AVX_INSTR %6, %7, %8, %9, %10, %1, %2, %3, %4, %5
+        %endif
+    %endmacro
+%endmacro
+
+; Instructions with both VEX and non-VEX encodings
+; Non-destructive instructions are written without parameters
+AVX_INSTR addpd, sse2, 1, 0, 1
+AVX_INSTR addps, sse, 1, 0, 1
+AVX_INSTR addsd, sse2, 1, 0, 0
+AVX_INSTR addss, sse, 1, 0, 0
+AVX_INSTR addsubpd, sse3, 1, 0, 0
+AVX_INSTR addsubps, sse3, 1, 0, 0
+AVX_INSTR aesdec, aesni, 0, 0, 0
+AVX_INSTR aesdeclast, aesni, 0, 0, 0
+AVX_INSTR aesenc, aesni, 0, 0, 0
+AVX_INSTR aesenclast, aesni, 0, 0, 0
+AVX_INSTR aesimc, aesni
+AVX_INSTR aeskeygenassist, aesni
+AVX_INSTR andnpd, sse2, 1, 0, 0
+AVX_INSTR andnps, sse, 1, 0, 0
+AVX_INSTR andpd, sse2, 1, 0, 1
+AVX_INSTR andps, sse, 1, 0, 1
+AVX_INSTR blendpd, sse4, 1, 1, 0
+AVX_INSTR blendps, sse4, 1, 1, 0
+AVX_INSTR blendvpd, sse4 ; can't be emulated
+AVX_INSTR blendvps, sse4 ; can't be emulated
+AVX_INSTR cmppd, sse2, 1, 1, 0
+AVX_INSTR cmpps, sse, 1, 1, 0
+AVX_INSTR cmpsd, sse2, 1, 1, 0
+AVX_INSTR cmpss, sse, 1, 1, 0
+AVX_INSTR comisd, sse2
+AVX_INSTR comiss, sse
+AVX_INSTR cvtdq2pd, sse2
+AVX_INSTR cvtdq2ps, sse2
+AVX_INSTR cvtpd2dq, sse2
+AVX_INSTR cvtpd2ps, sse2
+AVX_INSTR cvtps2dq, sse2
+AVX_INSTR cvtps2pd, sse2
+AVX_INSTR cvtsd2si, sse2
+AVX_INSTR cvtsd2ss, sse2, 1, 0, 0
+AVX_INSTR cvtsi2sd, sse2, 1, 0, 0
+AVX_INSTR cvtsi2ss, sse, 1, 0, 0
+AVX_INSTR cvtss2sd, sse2, 1, 0, 0
+AVX_INSTR cvtss2si, sse
+AVX_INSTR cvttpd2dq, sse2
+AVX_INSTR cvttps2dq, sse2
+AVX_INSTR cvttsd2si, sse2
+AVX_INSTR cvttss2si, sse
+AVX_INSTR divpd, sse2, 1, 0, 0
+AVX_INSTR divps, sse, 1, 0, 0
+AVX_INSTR divsd, sse2, 1, 0, 0
+AVX_INSTR divss, sse, 1, 0, 0
+AVX_INSTR dppd, sse4, 1, 1, 0
+AVX_INSTR dpps, sse4, 1, 1, 0
+AVX_INSTR extractps, sse4
+AVX_INSTR haddpd, sse3, 1, 0, 0
+AVX_INSTR haddps, sse3, 1, 0, 0
+AVX_INSTR hsubpd, sse3, 1, 0, 0
+AVX_INSTR hsubps, sse3, 1, 0, 0
+AVX_INSTR insertps, sse4, 1, 1, 0
+AVX_INSTR lddqu, sse3
+AVX_INSTR ldmxcsr, sse
+AVX_INSTR maskmovdqu, sse2
+AVX_INSTR maxpd, sse2, 1, 0, 1
+AVX_INSTR maxps, sse, 1, 0, 1
+AVX_INSTR maxsd, sse2, 1, 0, 0
+AVX_INSTR maxss, sse, 1, 0, 0
+AVX_INSTR minpd, sse2, 1, 0, 1
+AVX_INSTR minps, sse, 1, 0, 1
+AVX_INSTR minsd, sse2, 1, 0, 0
+AVX_INSTR minss, sse, 1, 0, 0
+AVX_INSTR movapd, sse2
+AVX_INSTR movaps, sse
+AVX_INSTR movd, mmx
+AVX_INSTR movddup, sse3
+AVX_INSTR movdqa, sse2
+AVX_INSTR movdqu, sse2
+AVX_INSTR movhlps, sse, 1, 0, 0
+AVX_INSTR movhpd, sse2, 1, 0, 0
+AVX_INSTR movhps, sse, 1, 0, 0
+AVX_INSTR movlhps, sse, 1, 0, 0
+AVX_INSTR movlpd, sse2, 1, 0, 0
+AVX_INSTR movlps, sse, 1, 0, 0
+AVX_INSTR movmskpd, sse2
+AVX_INSTR movmskps, sse
+AVX_INSTR movntdq, sse2
+AVX_INSTR movntdqa, sse4
+AVX_INSTR movntpd, sse2
+AVX_INSTR movntps, sse
+AVX_INSTR movq, mmx
+AVX_INSTR movsd, sse2, 1, 0, 0
+AVX_INSTR movshdup, sse3
+AVX_INSTR movsldup, sse3
+AVX_INSTR movss, sse, 1, 0, 0
+AVX_INSTR movupd, sse2
+AVX_INSTR movups, sse
+AVX_INSTR mpsadbw, sse4, 0, 1, 0
+AVX_INSTR mulpd, sse2, 1, 0, 1
+AVX_INSTR mulps, sse, 1, 0, 1
+AVX_INSTR mulsd, sse2, 1, 0, 0
+AVX_INSTR mulss, sse, 1, 0, 0
+AVX_INSTR orpd, sse2, 1, 0, 1
+AVX_INSTR orps, sse, 1, 0, 1
+AVX_INSTR pabsb, ssse3
+AVX_INSTR pabsd, ssse3
+AVX_INSTR pabsw, ssse3
+AVX_INSTR packsswb, mmx, 0, 0, 0
+AVX_INSTR packssdw, mmx, 0, 0, 0
+AVX_INSTR packuswb, mmx, 0, 0, 0
+AVX_INSTR packusdw, sse4, 0, 0, 0
+AVX_INSTR paddb, mmx, 0, 0, 1
+AVX_INSTR paddw, mmx, 0, 0, 1
+AVX_INSTR paddd, mmx, 0, 0, 1
+AVX_INSTR paddq, sse2, 0, 0, 1
+AVX_INSTR paddsb, mmx, 0, 0, 1
+AVX_INSTR paddsw, mmx, 0, 0, 1
+AVX_INSTR paddusb, mmx, 0, 0, 1
+AVX_INSTR paddusw, mmx, 0, 0, 1
+AVX_INSTR palignr, ssse3, 0, 1, 0
+AVX_INSTR pand, mmx, 0, 0, 1
+AVX_INSTR pandn, mmx, 0, 0, 0
+AVX_INSTR pavgb, mmx2, 0, 0, 1
+AVX_INSTR pavgw, mmx2, 0, 0, 1
+AVX_INSTR pblendvb, sse4 ; can't be emulated
+AVX_INSTR pblendw, sse4, 0, 1, 0
+AVX_INSTR pclmulqdq, fnord, 0, 1, 0
+AVX_INSTR pclmulhqhqdq, fnord, 0, 0, 0
+AVX_INSTR pclmulhqlqdq, fnord, 0, 0, 0
+AVX_INSTR pclmullqhqdq, fnord, 0, 0, 0
+AVX_INSTR pclmullqlqdq, fnord, 0, 0, 0
+AVX_INSTR pcmpestri, sse42
+AVX_INSTR pcmpestrm, sse42
+AVX_INSTR pcmpistri, sse42
+AVX_INSTR pcmpistrm, sse42
+AVX_INSTR pcmpeqb, mmx, 0, 0, 1
+AVX_INSTR pcmpeqw, mmx, 0, 0, 1
+AVX_INSTR pcmpeqd, mmx, 0, 0, 1
+AVX_INSTR pcmpeqq, sse4, 0, 0, 1
+AVX_INSTR pcmpgtb, mmx, 0, 0, 0
+AVX_INSTR pcmpgtw, mmx, 0, 0, 0
+AVX_INSTR pcmpgtd, mmx, 0, 0, 0
+AVX_INSTR pcmpgtq, sse42, 0, 0, 0
+AVX_INSTR pextrb, sse4
+AVX_INSTR pextrd, sse4
+AVX_INSTR pextrq, sse4
+AVX_INSTR pextrw, mmx2
+AVX_INSTR phaddw, ssse3, 0, 0, 0
+AVX_INSTR phaddd, ssse3, 0, 0, 0
+AVX_INSTR phaddsw, ssse3, 0, 0, 0
+AVX_INSTR phminposuw, sse4
+AVX_INSTR phsubw, ssse3, 0, 0, 0
+AVX_INSTR phsubd, ssse3, 0, 0, 0
+AVX_INSTR phsubsw, ssse3, 0, 0, 0
+AVX_INSTR pinsrb, sse4, 0, 1, 0
+AVX_INSTR pinsrd, sse4, 0, 1, 0
+AVX_INSTR pinsrq, sse4, 0, 1, 0
+AVX_INSTR pinsrw, mmx2, 0, 1, 0
+AVX_INSTR pmaddwd, mmx, 0, 0, 1
+AVX_INSTR pmaddubsw, ssse3, 0, 0, 0
+AVX_INSTR pmaxsb, sse4, 0, 0, 1
+AVX_INSTR pmaxsw, mmx2, 0, 0, 1
+AVX_INSTR pmaxsd, sse4, 0, 0, 1
+AVX_INSTR pmaxub, mmx2, 0, 0, 1
+AVX_INSTR pmaxuw, sse4, 0, 0, 1
+AVX_INSTR pmaxud, sse4, 0, 0, 1
+AVX_INSTR pminsb, sse4, 0, 0, 1
+AVX_INSTR pminsw, mmx2, 0, 0, 1
+AVX_INSTR pminsd, sse4, 0, 0, 1
+AVX_INSTR pminub, mmx2, 0, 0, 1
+AVX_INSTR pminuw, sse4, 0, 0, 1
+AVX_INSTR pminud, sse4, 0, 0, 1
+AVX_INSTR pmovmskb, mmx2
+AVX_INSTR pmovsxbw, sse4
+AVX_INSTR pmovsxbd, sse4
+AVX_INSTR pmovsxbq, sse4
+AVX_INSTR pmovsxwd, sse4
+AVX_INSTR pmovsxwq, sse4
+AVX_INSTR pmovsxdq, sse4
+AVX_INSTR pmovzxbw, sse4
+AVX_INSTR pmovzxbd, sse4
+AVX_INSTR pmovzxbq, sse4
+AVX_INSTR pmovzxwd, sse4
+AVX_INSTR pmovzxwq, sse4
+AVX_INSTR pmovzxdq, sse4
+AVX_INSTR pmuldq, sse4, 0, 0, 1
+AVX_INSTR pmulhrsw, ssse3, 0, 0, 1
+AVX_INSTR pmulhuw, mmx2, 0, 0, 1
+AVX_INSTR pmulhw, mmx, 0, 0, 1
+AVX_INSTR pmullw, mmx, 0, 0, 1
+AVX_INSTR pmulld, sse4, 0, 0, 1
+AVX_INSTR pmuludq, sse2, 0, 0, 1
+AVX_INSTR por, mmx, 0, 0, 1
+AVX_INSTR psadbw, mmx2, 0, 0, 1
+AVX_INSTR pshufb, ssse3, 0, 0, 0
+AVX_INSTR pshufd, sse2
+AVX_INSTR pshufhw, sse2
+AVX_INSTR pshuflw, sse2
+AVX_INSTR psignb, ssse3, 0, 0, 0
+AVX_INSTR psignw, ssse3, 0, 0, 0
+AVX_INSTR psignd, ssse3, 0, 0, 0
+AVX_INSTR psllw, mmx, 0, 0, 0
+AVX_INSTR pslld, mmx, 0, 0, 0
+AVX_INSTR psllq, mmx, 0, 0, 0
+AVX_INSTR pslldq, sse2, 0, 0, 0
+AVX_INSTR psraw, mmx, 0, 0, 0
+AVX_INSTR psrad, mmx, 0, 0, 0
+AVX_INSTR psrlw, mmx, 0, 0, 0
+AVX_INSTR psrld, mmx, 0, 0, 0
+AVX_INSTR psrlq, mmx, 0, 0, 0
+AVX_INSTR psrldq, sse2, 0, 0, 0
+AVX_INSTR psubb, mmx, 0, 0, 0
+AVX_INSTR psubw, mmx, 0, 0, 0
+AVX_INSTR psubd, mmx, 0, 0, 0
+AVX_INSTR psubq, sse2, 0, 0, 0
+AVX_INSTR psubsb, mmx, 0, 0, 0
+AVX_INSTR psubsw, mmx, 0, 0, 0
+AVX_INSTR psubusb, mmx, 0, 0, 0
+AVX_INSTR psubusw, mmx, 0, 0, 0
+AVX_INSTR ptest, sse4
+AVX_INSTR punpckhbw, mmx, 0, 0, 0
+AVX_INSTR punpckhwd, mmx, 0, 0, 0
+AVX_INSTR punpckhdq, mmx, 0, 0, 0
+AVX_INSTR punpckhqdq, sse2, 0, 0, 0
+AVX_INSTR punpcklbw, mmx, 0, 0, 0
+AVX_INSTR punpcklwd, mmx, 0, 0, 0
+AVX_INSTR punpckldq, mmx, 0, 0, 0
+AVX_INSTR punpcklqdq, sse2, 0, 0, 0
+AVX_INSTR pxor, mmx, 0, 0, 1
+AVX_INSTR rcpps, sse
+AVX_INSTR rcpss, sse, 1, 0, 0
+AVX_INSTR roundpd, sse4
+AVX_INSTR roundps, sse4
+AVX_INSTR roundsd, sse4, 1, 1, 0
+AVX_INSTR roundss, sse4, 1, 1, 0
+AVX_INSTR rsqrtps, sse
+AVX_INSTR rsqrtss, sse, 1, 0, 0
+AVX_INSTR shufpd, sse2, 1, 1, 0
+AVX_INSTR shufps, sse, 1, 1, 0
+AVX_INSTR sqrtpd, sse2
+AVX_INSTR sqrtps, sse
+AVX_INSTR sqrtsd, sse2, 1, 0, 0
+AVX_INSTR sqrtss, sse, 1, 0, 0
+AVX_INSTR stmxcsr, sse
+AVX_INSTR subpd, sse2, 1, 0, 0
+AVX_INSTR subps, sse, 1, 0, 0
+AVX_INSTR subsd, sse2, 1, 0, 0
+AVX_INSTR subss, sse, 1, 0, 0
+AVX_INSTR ucomisd, sse2
+AVX_INSTR ucomiss, sse
+AVX_INSTR unpckhpd, sse2, 1, 0, 0
+AVX_INSTR unpckhps, sse, 1, 0, 0
+AVX_INSTR unpcklpd, sse2, 1, 0, 0
+AVX_INSTR unpcklps, sse, 1, 0, 0
+AVX_INSTR xorpd, sse2, 1, 0, 1
+AVX_INSTR xorps, sse, 1, 0, 1
+
+; 3DNow instructions, for sharing code between AVX, SSE and 3DN
+AVX_INSTR pfadd, 3dnow, 1, 0, 1
+AVX_INSTR pfsub, 3dnow, 1, 0, 0
+AVX_INSTR pfmul, 3dnow, 1, 0, 1
+
+; base-4 constants for shuffles
+%assign i 0
+%rep 256
+    %assign j ((i>>6)&3)*1000 + ((i>>4)&3)*100 + ((i>>2)&3)*10 + (i&3)
+    %if j < 10
+        CAT_XDEFINE q000, j, i
+    %elif j < 100
+        CAT_XDEFINE q00, j, i
+    %elif j < 1000
+        CAT_XDEFINE q0, j, i
+    %else
+        CAT_XDEFINE q, j, i
+    %endif
+    %assign i i+1
+%endrep
+%undef i
+%undef j
+
+%macro FMA_INSTR 3
+    %macro %1 4-7 %1, %2, %3
+        %if cpuflag(xop)
+            v%5 %1, %2, %3, %4
+        %elifnidn %1, %4
+            %6 %1, %2, %3
+            %7 %1, %4
+        %else
+            %error non-xop emulation of ``%5 %1, %2, %3, %4'' is not supported
+        %endif
+    %endmacro
+%endmacro
+
+FMA_INSTR  pmacsww,  pmullw, paddw
+FMA_INSTR  pmacsdd,  pmulld, paddd ; sse4 emulation
+FMA_INSTR pmacsdql,  pmuldq, paddq ; sse4 emulation
+FMA_INSTR pmadcswd, pmaddwd, paddd
+
+; tzcnt is equivalent to "rep bsf" and is backwards-compatible with bsf.
+; This lets us use tzcnt without bumping the yasm version requirement yet.
+%define tzcnt rep bsf
+
+; Macros for consolidating FMA3 and FMA4 using 4-operand (dst, src1, src2, src3) syntax.
+; FMA3 is only possible if dst is the same as one of the src registers.
+; Either src2 or src3 can be a memory operand.
+%macro FMA4_INSTR 2-*
+    %push fma4_instr
+    %xdefine %$prefix %1
+    %rep %0 - 1
+        %macro %$prefix%2 4-6 %$prefix, %2
+            %if notcpuflag(fma3) && notcpuflag(fma4)
+                %error use of ``%5%6'' fma instruction in cpuname function: current_function
+            %elif cpuflag(fma4)
+                v%5%6 %1, %2, %3, %4
+            %elifidn %1, %2
+                ; If %3 or %4 is a memory operand it needs to be encoded as the last operand.
+                %ifnum sizeof%3
+                    v%{5}213%6 %2, %3, %4
+                %else
+                    v%{5}132%6 %2, %4, %3
+                %endif
+            %elifidn %1, %3
+                v%{5}213%6 %3, %2, %4
+            %elifidn %1, %4
+                v%{5}231%6 %4, %2, %3
+            %else
+                %error fma3 emulation of ``%5%6 %1, %2, %3, %4'' is not supported
+            %endif
+        %endmacro
+        %rotate 1
+    %endrep
+    %pop
+%endmacro
+
+FMA4_INSTR fmadd,    pd, ps, sd, ss
+FMA4_INSTR fmaddsub, pd, ps
+FMA4_INSTR fmsub,    pd, ps, sd, ss
+FMA4_INSTR fmsubadd, pd, ps
+FMA4_INSTR fnmadd,   pd, ps, sd, ss
+FMA4_INSTR fnmsub,   pd, ps, sd, ss
+
+; workaround: vpbroadcastq is broken in x86_32 due to a yasm bug (fixed in 1.3.0)
+%ifdef __YASM_VER__
+    %if __YASM_VERSION_ID__ < 0x01030000 && ARCH_X86_64 == 0
+        %macro vpbroadcastq 2
+            %if sizeof%1 == 16
+                movddup %1, %2
+            %else
+                vbroadcastsd %1, %2
+            %endif
+        %endmacro
+    %endif
+%endif

avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/include/admx86util.asm Added

@@ -0,0 +1,873 @@
+;*****************************************************************************
+;* x86util.asm
+;*****************************************************************************
+;* Copyright (C) 2008-2010 x264 project
+;*
+;* Authors: Loren Merritt <lorenm@u.washington.edu>
+;*          Holger Lubitz <holger@lubitz.org>
+;*
+;* 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 private_prefix adm
+%define public_prefix  adm2
+%define cpuflags_mmxext cpuflags_mmx2
+
+%include "admx86inc.asm"
+
+%macro SBUTTERFLY 4
+%ifidn %1, dqqq
+    vperm2i128  m%4, m%2, m%3, q0301
+    vinserti128 m%2, m%2, xm%3, 1
+%elif avx_enabled == 0
+    mova      m%4, m%2
+    punpckl%1 m%2, m%3
+    punpckh%1 m%4, m%3
+%else
+    punpckh%1 m%4, m%2, m%3
+    punpckl%1 m%2, m%3
+%endif
+    SWAP %3, %4
+%endmacro
+
+%macro SBUTTERFLY2 4
+    punpckl%1 m%4, m%2, m%3
+    punpckh%1 m%2, m%2, m%3
+    SWAP %2, %4, %3
+%endmacro
+
+%macro SBUTTERFLYPS 3
+    unpcklps m%3, m%1, m%2
+    unpckhps m%1, m%1, m%2
+    SWAP %1, %3, %2
+%endmacro
+
+%macro TRANSPOSE4x4B 5
+    SBUTTERFLY bw, %1, %2, %5
+    SBUTTERFLY bw, %3, %4, %5
+    SBUTTERFLY wd, %1, %3, %5
+    SBUTTERFLY wd, %2, %4, %5
+    SWAP %2, %3
+%endmacro
+
+%macro TRANSPOSE4x4W 5
+    SBUTTERFLY wd, %1, %2, %5
+    SBUTTERFLY wd, %3, %4, %5
+    SBUTTERFLY dq, %1, %3, %5
+    SBUTTERFLY dq, %2, %4, %5
+    SWAP %2, %3
+%endmacro
+
+%macro TRANSPOSE2x4x4B 5
+    SBUTTERFLY bw,  %1, %2, %5
+    SBUTTERFLY bw,  %3, %4, %5
+    SBUTTERFLY wd,  %1, %3, %5
+    SBUTTERFLY wd,  %2, %4, %5
+    SBUTTERFLY dq,  %1, %2, %5
+    SBUTTERFLY dq,  %3, %4, %5
+%endmacro
+
+%macro TRANSPOSE2x4x4W 5
+    SBUTTERFLY wd,  %1, %2, %5
+    SBUTTERFLY wd,  %3, %4, %5
+    SBUTTERFLY dq,  %1, %3, %5
+    SBUTTERFLY dq,  %2, %4, %5
+    SBUTTERFLY qdq, %1, %2, %5
+    SBUTTERFLY qdq, %3, %4, %5
+%endmacro
+
+%macro TRANSPOSE4x4D 5
+    SBUTTERFLY dq,  %1, %2, %5
+    SBUTTERFLY dq,  %3, %4, %5
+    SBUTTERFLY qdq, %1, %3, %5
+    SBUTTERFLY qdq, %2, %4, %5
+    SWAP %2, %3
+%endmacro
+
+; identical behavior to TRANSPOSE4x4D, but using SSE1 float ops
+%macro TRANSPOSE4x4PS 5
+    SBUTTERFLYPS %1, %2, %5
+    SBUTTERFLYPS %3, %4, %5
+    movlhps m%5, m%1, m%3
+    movhlps m%3, m%1
+    SWAP %5, %1
+    movlhps m%5, m%2, m%4
+    movhlps m%4, m%2
+    SWAP %5, %2, %3
+%endmacro
+
+%macro TRANSPOSE8x4D 9-11
+%if ARCH_X86_64
+    SBUTTERFLY dq,  %1, %2, %9
+    SBUTTERFLY dq,  %3, %4, %9
+    SBUTTERFLY dq,  %5, %6, %9
+    SBUTTERFLY dq,  %7, %8, %9
+    SBUTTERFLY qdq, %1, %3, %9
+    SBUTTERFLY qdq, %2, %4, %9
+    SBUTTERFLY qdq, %5, %7, %9
+    SBUTTERFLY qdq, %6, %8, %9
+    SWAP %2, %5
+    SWAP %4, %7
+%else
+; in:  m0..m7
+; out: m0..m7, unless %11 in which case m2 is in %9
+; spills into %9 and %10
+    movdqa %9, m%7
+    SBUTTERFLY dq,  %1, %2, %7
+    movdqa %10, m%2
+    movdqa m%7, %9
+    SBUTTERFLY dq,  %3, %4, %2
+    SBUTTERFLY dq,  %5, %6, %2
+    SBUTTERFLY dq,  %7, %8, %2
+    SBUTTERFLY qdq, %1, %3, %2
+    movdqa %9, m%3
+    movdqa m%2, %10
+    SBUTTERFLY qdq, %2, %4, %3
+    SBUTTERFLY qdq, %5, %7, %3
+    SBUTTERFLY qdq, %6, %8, %3
+    SWAP %2, %5
+    SWAP %4, %7
+%if %0<11
+    movdqa m%3, %9
+%endif
+%endif
+%endmacro
+
+%macro TRANSPOSE8x8W 9-11
+%if ARCH_X86_64
+    SBUTTERFLY wd,  %1, %2, %9
+    SBUTTERFLY wd,  %3, %4, %9
+    SBUTTERFLY wd,  %5, %6, %9
+    SBUTTERFLY wd,  %7, %8, %9
+    SBUTTERFLY dq,  %1, %3, %9
+    SBUTTERFLY dq,  %2, %4, %9
+    SBUTTERFLY dq,  %5, %7, %9
+    SBUTTERFLY dq,  %6, %8, %9
+    SBUTTERFLY qdq, %1, %5, %9
+    SBUTTERFLY qdq, %2, %6, %9
+    SBUTTERFLY qdq, %3, %7, %9
+    SBUTTERFLY qdq, %4, %8, %9
+    SWAP %2, %5
+    SWAP %4, %7
+%else
+; in:  m0..m7, unless %11 in which case m6 is in %9
+; out: m0..m7, unless %11 in which case m4 is in %10
+; spills into %9 and %10
+%if %0<11
+    movdqa %9, m%7
+%endif
+    SBUTTERFLY wd,  %1, %2, %7
+    movdqa %10, m%2
+    movdqa m%7, %9
+    SBUTTERFLY wd,  %3, %4, %2
+    SBUTTERFLY wd,  %5, %6, %2
+    SBUTTERFLY wd,  %7, %8, %2
+    SBUTTERFLY dq,  %1, %3, %2
+    movdqa %9, m%3
+    movdqa m%2, %10
+    SBUTTERFLY dq,  %2, %4, %3
+    SBUTTERFLY dq,  %5, %7, %3
+    SBUTTERFLY dq,  %6, %8, %3
+    SBUTTERFLY qdq, %1, %5, %3
+    SBUTTERFLY qdq, %2, %6, %3
+    movdqa %10, m%2
+    movdqa m%3, %9
+    SBUTTERFLY qdq, %3, %7, %2
+    SBUTTERFLY qdq, %4, %8, %2
+    SWAP %2, %5
+    SWAP %4, %7
+%if %0<11
+    movdqa m%5, %10
+%endif
+%endif
+%endmacro
+
+%macro TRANSPOSE16x16W 18-19
+; in:  m0..m15, unless %19 in which case m6 is in %17
+; out: m0..m15, unless %19 in which case m4 is in %18
+; spills into %17 and %18
+%if %0 < 19
+    mova       %17, m%7
+%endif
+
+    SBUTTERFLY dqqq, %1,  %9, %7
+    SBUTTERFLY dqqq, %2, %10, %7
+    SBUTTERFLY dqqq, %3, %11, %7
+    SBUTTERFLY dqqq, %4, %12, %7
+    SBUTTERFLY dqqq, %5, %13, %7
+    SBUTTERFLY dqqq, %6, %14, %7
+    mova       %18, m%14
+    mova       m%7, %17
+    SBUTTERFLY dqqq, %7, %15, %14
+    SBUTTERFLY dqqq, %8, %16, %14
+
+    SBUTTERFLY  wd,  %1,  %2, %14
+    SBUTTERFLY  wd,  %3,  %4, %14
+    SBUTTERFLY  wd,  %5,  %6, %14
+    SBUTTERFLY  wd,  %7,  %8, %14
+    SBUTTERFLY  wd,  %9, %10, %14
+    SBUTTERFLY  wd, %11, %12, %14
+    mova       %17, m%12
+    mova      m%14, %18
+    SBUTTERFLY  wd, %13, %14, %12
+    SBUTTERFLY  wd, %15, %16, %12
+
+    SBUTTERFLY  dq,  %1,  %3, %12
+    SBUTTERFLY  dq,  %2,  %4, %12
+    SBUTTERFLY  dq,  %5,  %7, %12
+    SBUTTERFLY  dq,  %6,  %8, %12
+    SBUTTERFLY  dq,  %9, %11, %12
+    mova       %18, m%11
+    mova      m%12, %17
+    SBUTTERFLY  dq, %10, %12, %11
+    SBUTTERFLY  dq, %13, %15, %11
+    SBUTTERFLY  dq, %14, %16, %11
+
+    SBUTTERFLY qdq,  %1,  %5, %11
+    SBUTTERFLY qdq,  %2,  %6, %11
+    SBUTTERFLY qdq,  %3,  %7, %11
+    SBUTTERFLY qdq,  %4,  %8, %11
+
+    SWAP        %2, %5
+    SWAP        %4, %7
+
+    SBUTTERFLY qdq,  %9, %13, %11
+    SBUTTERFLY qdq, %10, %14, %11
+    mova      m%11, %18
+    mova       %18, m%5
+    SBUTTERFLY qdq, %11, %15, %5
+    SBUTTERFLY qdq, %12, %16, %5
+
+%if %0 < 19
+    mova       m%5, %18
+%endif
+
+    SWAP       %10, %13
+    SWAP       %12, %15
+%endmacro
+
+; PABSW macro assumes %1 != %2, while ABS1/2 macros work in-place
+%macro PABSW 2
+%if cpuflag(ssse3)
+    pabsw      %1, %2
+%elif cpuflag(mmxext)
+    pxor    %1, %1
+    psubw   %1, %2
+    pmaxsw  %1, %2
+%else
+    pxor       %1, %1
+    pcmpgtw    %1, %2
+    pxor       %2, %1
+    psubw      %2, %1
+    SWAP       %1, %2
+%endif
+%endmacro
+
+%macro PSIGNW 2
+%if cpuflag(ssse3)
+    psignw     %1, %2
+%else
+    pxor       %1, %2
+    psubw      %1, %2
+%endif
+%endmacro
+
+%macro ABS1 2
+%if cpuflag(ssse3)
+    pabsw   %1, %1
+%elif cpuflag(mmxext) ; a, tmp
+    pxor    %2, %2
+    psubw   %2, %1
+    pmaxsw  %1, %2
+%else ; a, tmp
+    pxor       %2, %2
+    pcmpgtw    %2, %1
+    pxor       %1, %2
+    psubw      %1, %2
+%endif
+%endmacro
+
+%macro ABS2 4
+%if cpuflag(ssse3)
+    pabsw   %1, %1
+    pabsw   %2, %2
+%elif cpuflag(mmxext) ; a, b, tmp0, tmp1
+    pxor    %3, %3
+    pxor    %4, %4
+    psubw   %3, %1
+    psubw   %4, %2
+    pmaxsw  %1, %3
+    pmaxsw  %2, %4
+%else ; a, b, tmp0, tmp1
+    pxor       %3, %3
+    pxor       %4, %4
+    pcmpgtw    %3, %1
+    pcmpgtw    %4, %2
+    pxor       %1, %3
+    pxor       %2, %4
+    psubw      %1, %3
+    psubw      %2, %4
+%endif
+%endmacro
+
+%macro ABSB 2 ; source mmreg, temp mmreg (unused for ssse3)
+%if cpuflag(ssse3)
+    pabsb   %1, %1
+%else
+    pxor    %2, %2
+    psubb   %2, %1
+    pminub  %1, %2
+%endif
+%endmacro
+
+%macro ABSB2 4 ; src1, src2, tmp1, tmp2 (tmp1/2 unused for SSSE3)
+%if cpuflag(ssse3)
+    pabsb   %1, %1
+    pabsb   %2, %2
+%else
+    pxor    %3, %3
+    pxor    %4, %4
+    psubb   %3, %1
+    psubb   %4, %2
+    pminub  %1, %3
+    pminub  %2, %4
+%endif
+%endmacro
+
+%macro ABSD2_MMX 4
+    pxor    %3, %3
+    pxor    %4, %4
+    pcmpgtd %3, %1
+    pcmpgtd %4, %2
+    pxor    %1, %3
+    pxor    %2, %4
+    psubd   %1, %3
+    psubd   %2, %4
+%endmacro
+
+%macro ABS4 6
+    ABS2 %1, %2, %5, %6
+    ABS2 %3, %4, %5, %6
+%endmacro
+
+%macro SPLATB_LOAD 3
+%if cpuflag(ssse3)
+    movd      %1, [%2-3]
+    pshufb    %1, %3
+%else
+    movd      %1, [%2-3] ;to avoid crossing a cacheline
+    punpcklbw %1, %1
+    SPLATW    %1, %1, 3
+%endif
+%endmacro
+
+%macro SPLATB_REG 3
+%if cpuflag(ssse3)
+    movd      %1, %2d
+    pshufb    %1, %3
+%else
+    movd      %1, %2d
+    punpcklbw %1, %1
+    SPLATW    %1, %1, 0
+%endif
+%endmacro
+
+%macro HADDD 2 ; sum junk
+%if sizeof%1 == 32
+%define %2 xmm%2
+    vextracti128 %2, %1, 1
+%define %1 xmm%1
+    paddd   %1, %2
+%endif
+%if mmsize >= 16
+%if cpuflag(xop) && sizeof%1 == 16
+    vphadddq %1, %1
+%endif
+    movhlps %2, %1
+    paddd   %1, %2
+%endif
+%if notcpuflag(xop) || sizeof%1 != 16
+%if cpuflag(mmxext)
+    PSHUFLW %2, %1, q0032
+%else ; mmx
+    mova    %2, %1
+    psrlq   %2, 32
+%endif
+    paddd   %1, %2
+%endif
+%undef %1
+%undef %2
+%endmacro
+
+%macro HADDW 2 ; reg, tmp
+%if cpuflag(xop) && sizeof%1 == 16
+    vphaddwq  %1, %1
+    movhlps   %2, %1
+    paddd     %1, %2
+%else
+    pmaddwd %1, [pw_1]
+    HADDD   %1, %2
+%endif
+%endmacro
+
+%macro HADDPS 3 ; dst, src, tmp
+%if cpuflag(sse3)
+    haddps  %1, %1, %2
+%else
+    movaps  %3, %1
+    shufps  %1, %2, q2020
+    shufps  %3, %2, q3131
+    addps   %1, %3
+%endif
+%endmacro
+
+%macro PALIGNR 4-5
+%if cpuflag(ssse3)
+%if %0==5
+    palignr %1, %2, %3, %4
+%else
+    palignr %1, %2, %3
+%endif
+%elif cpuflag(mmx) ; [dst,] src1, src2, imm, tmp
+    %define %%dst %1
+%if %0==5
+%ifnidn %1, %2
+    mova    %%dst, %2
+%endif
+    %rotate 1
+%endif
+%ifnidn %4, %2
+    mova    %4, %2
+%endif
+%if mmsize==8
+    psllq   %%dst, (8-%3)*8
+    psrlq   %4, %3*8
+%else
+    pslldq  %%dst, 16-%3
+    psrldq  %4, %3
+%endif
+    por     %%dst, %4
+%endif
+%endmacro
+
+%macro PAVGB 2-4
+%if cpuflag(mmxext)
+    pavgb   %1, %2
+%elif cpuflag(3dnow)
+    pavgusb %1, %2
+%elif cpuflag(mmx)
+    movu   %3, %2
+    por    %3, %1
+    pxor   %1, %2
+    pand   %1, %4
+    psrlq  %1, 1
+    psubb  %3, %1
+    SWAP   %1, %3
+%endif
+%endmacro
+
+%macro PSHUFLW 1+
+    %if mmsize == 8
+        pshufw %1
+    %else
+        pshuflw %1
+    %endif
+%endmacro
+
+%macro PSWAPD 2
+%if cpuflag(mmxext)
+    pshufw    %1, %2, q1032
+%elif cpuflag(3dnowext)
+    pswapd    %1, %2
+%elif cpuflag(3dnow)
+    movq      %1, %2
+    psrlq     %1, 32
+    punpckldq %1, %2
+%endif
+%endmacro
+
+%macro DEINTB 5 ; mask, reg1, mask, reg2, optional src to fill masks from
+%ifnum %5
+    pand   m%3, m%5, m%4 ; src .. y6 .. y4
+    pand   m%1, m%5, m%2 ; dst .. y6 .. y4
+%else
+    mova   m%1, %5
+    pand   m%3, m%1, m%4 ; src .. y6 .. y4
+    pand   m%1, m%1, m%2 ; dst .. y6 .. y4
+%endif
+    psrlw  m%2, 8        ; dst .. y7 .. y5
+    psrlw  m%4, 8        ; src .. y7 .. y5
+%endmacro
+
+%macro SUMSUB_BA 3-4
+%if %0==3
+    padd%1  m%2, m%3
+    padd%1  m%3, m%3
+    psub%1  m%3, m%2
+%else
+%if avx_enabled == 0
+    mova    m%4, m%2
+    padd%1  m%2, m%3
+    psub%1  m%3, m%4
+%else
+    padd%1  m%4, m%2, m%3
+    psub%1  m%3, m%2
+    SWAP    %2, %4
+%endif
+%endif
+%endmacro
+
+%macro SUMSUB_BADC 5-6
+%if %0==6
+    SUMSUB_BA %1, %2, %3, %6
+    SUMSUB_BA %1, %4, %5, %6
+%else
+    padd%1  m%2, m%3
+    padd%1  m%4, m%5
+    padd%1  m%3, m%3
+    padd%1  m%5, m%5
+    psub%1  m%3, m%2
+    psub%1  m%5, m%4
+%endif
+%endmacro
+
+%macro SUMSUB2_AB 4
+%ifnum %3
+    psub%1  m%4, m%2, m%3
+    psub%1  m%4, m%3
+    padd%1  m%2, m%2
+    padd%1  m%2, m%3
+%else
+    mova    m%4, m%2
+    padd%1  m%2, m%2
+    padd%1  m%2, %3
+    psub%1  m%4, %3
+    psub%1  m%4, %3
+%endif
+%endmacro
+
+%macro SUMSUB2_BA 4
+%if avx_enabled == 0
+    mova    m%4, m%2
+    padd%1  m%2, m%3
+    padd%1  m%2, m%3
+    psub%1  m%3, m%4
+    psub%1  m%3, m%4
+%else
+    padd%1  m%4, m%2, m%3
+    padd%1  m%4, m%3
+    psub%1  m%3, m%2
+    psub%1  m%3, m%2
+    SWAP     %2,  %4
+%endif
+%endmacro
+
+%macro SUMSUBD2_AB 5
+%ifnum %4
+    psra%1  m%5, m%2, 1  ; %3: %3>>1
+    psra%1  m%4, m%3, 1  ; %2: %2>>1
+    padd%1  m%4, m%2     ; %3: %3>>1+%2
+    psub%1  m%5, m%3     ; %2: %2>>1-%3
+    SWAP     %2, %5
+    SWAP     %3, %4
+%else
+    mova    %5, m%2
+    mova    %4, m%3
+    psra%1  m%3, 1  ; %3: %3>>1
+    psra%1  m%2, 1  ; %2: %2>>1
+    padd%1  m%3, %5 ; %3: %3>>1+%2
+    psub%1  m%2, %4 ; %2: %2>>1-%3
+%endif
+%endmacro
+
+%macro DCT4_1D 5
+%ifnum %5
+    SUMSUB_BADC w, %4, %1, %3, %2, %5
+    SUMSUB_BA   w, %3, %4, %5
+    SUMSUB2_AB  w, %1, %2, %5
+    SWAP %1, %3, %4, %5, %2
+%else
+    SUMSUB_BADC w, %4, %1, %3, %2
+    SUMSUB_BA   w, %3, %4
+    mova     [%5], m%2
+    SUMSUB2_AB  w, %1, [%5], %2
+    SWAP %1, %3, %4, %2
+%endif
+%endmacro
+
+%macro IDCT4_1D 6-7
+%ifnum %6
+    SUMSUBD2_AB %1, %3, %5, %7, %6
+    ; %3: %3>>1-%5 %5: %3+%5>>1
+    SUMSUB_BA   %1, %4, %2, %7
+    ; %4: %2+%4 %2: %2-%4
+    SUMSUB_BADC %1, %5, %4, %3, %2, %7
+    ; %5: %2+%4 + (%3+%5>>1)
+    ; %4: %2+%4 - (%3+%5>>1)
+    ; %3: %2-%4 + (%3>>1-%5)
+    ; %2: %2-%4 - (%3>>1-%5)
+%else
+%ifidn %1, w
+    SUMSUBD2_AB %1, %3, %5, [%6], [%6+16]
+%else
+    SUMSUBD2_AB %1, %3, %5, [%6], [%6+32]
+%endif
+    SUMSUB_BA   %1, %4, %2
+    SUMSUB_BADC %1, %5, %4, %3, %2
+%endif
+    SWAP %2, %5, %4
+    ; %2: %2+%4 + (%3+%5>>1) row0
+    ; %3: %2-%4 + (%3>>1-%5) row1
+    ; %4: %2-%4 - (%3>>1-%5) row2
+    ; %5: %2+%4 - (%3+%5>>1) row3
+%endmacro
+
+
+%macro LOAD_DIFF 5
+%ifidn %3, none
+    movh       %1, %4
+    movh       %2, %5
+    punpcklbw  %1, %2
+    punpcklbw  %2, %2
+    psubw      %1, %2
+%else
+    movh       %1, %4
+    punpcklbw  %1, %3
+    movh       %2, %5
+    punpcklbw  %2, %3
+    psubw      %1, %2
+%endif
+%endmacro
+
+%macro STORE_DCT 6
+    movq   [%5+%6+ 0], m%1
+    movq   [%5+%6+ 8], m%2
+    movq   [%5+%6+16], m%3
+    movq   [%5+%6+24], m%4
+    movhps [%5+%6+32], m%1
+    movhps [%5+%6+40], m%2
+    movhps [%5+%6+48], m%3
+    movhps [%5+%6+56], m%4
+%endmacro
+
+%macro LOAD_DIFF_8x4P 7-10 r0,r2,0 ; 4x dest, 2x temp, 2x pointer, increment?
+    LOAD_DIFF m%1, m%5, m%7, [%8],      [%9]
+    LOAD_DIFF m%2, m%6, m%7, [%8+r1],   [%9+r3]
+    LOAD_DIFF m%3, m%5, m%7, [%8+2*r1], [%9+2*r3]
+    LOAD_DIFF m%4, m%6, m%7, [%8+r4],   [%9+r5]
+%if %10
+    lea %8, [%8+4*r1]
+    lea %9, [%9+4*r3]
+%endif
+%endmacro
+
+%macro DIFFx2 6-7
+    movh       %3, %5
+    punpcklbw  %3, %4
+    psraw      %1, 6
+    paddsw     %1, %3
+    movh       %3, %6
+    punpcklbw  %3, %4
+    psraw      %2, 6
+    paddsw     %2, %3
+    packuswb   %2, %1
+%endmacro
+
+%macro STORE_DIFF 4
+    movh       %2, %4
+    punpcklbw  %2, %3
+    psraw      %1, 6
+    paddsw     %1, %2
+    packuswb   %1, %1
+    movh       %4, %1
+%endmacro
+
+%macro STORE_DIFFx2 8 ; add1, add2, reg1, reg2, zero, shift, source, stride
+    movh       %3, [%7]
+    movh       %4, [%7+%8]
+    psraw      %1, %6
+    psraw      %2, %6
+    punpcklbw  %3, %5
+    punpcklbw  %4, %5
+    paddw      %3, %1
+    paddw      %4, %2
+    packuswb   %3, %5
+    packuswb   %4, %5
+    movh     [%7], %3
+    movh  [%7+%8], %4
+%endmacro
+
+%macro PMINUB 3 ; dst, src, ignored
+%if cpuflag(mmxext)
+    pminub   %1, %2
+%else ; dst, src, tmp
+    mova     %3, %1
+    psubusb  %3, %2
+    psubb    %1, %3
+%endif
+%endmacro
+
+%macro SPLATW 2-3 0
+%if cpuflag(avx2) && %3 == 0
+    vpbroadcastw %1, %2
+%elif mmsize == 16
+    pshuflw    %1, %2, (%3)*0x55
+    punpcklqdq %1, %1
+%elif cpuflag(mmxext)
+    pshufw     %1, %2, (%3)*0x55
+%else
+    %ifnidn %1, %2
+        mova       %1, %2
+    %endif
+    %if %3 & 2
+        punpckhwd  %1, %1
+    %else
+        punpcklwd  %1, %1
+    %endif
+    %if %3 & 1
+        punpckhwd  %1, %1
+    %else
+        punpcklwd  %1, %1
+    %endif
+%endif
+%endmacro
+
+%macro SPLATD 1
+%if mmsize == 8
+    punpckldq  %1, %1
+%elif cpuflag(sse2)
+    pshufd  %1, %1, 0
+%elif cpuflag(sse)
+    shufps  %1, %1, 0
+%endif
+%endmacro
+
+%macro CLIPUB 3 ;(dst, min, max)
+    pmaxub %1, %2
+    pminub %1, %3
+%endmacro
+
+%macro CLIPW 3 ;(dst, min, max)
+    pmaxsw %1, %2
+    pminsw %1, %3
+%endmacro
+
+%macro PMINSD_MMX 3 ; dst, src, tmp
+    mova      %3, %2
+    pcmpgtd   %3, %1
+    pxor      %1, %2
+    pand      %1, %3
+    pxor      %1, %2
+%endmacro
+
+%macro PMAXSD_MMX 3 ; dst, src, tmp
+    mova      %3, %1
+    pcmpgtd   %3, %2
+    pand      %1, %3
+    pandn     %3, %2
+    por       %1, %3
+%endmacro
+
+%macro CLIPD_MMX 3-4 ; src/dst, min, max, tmp
+    PMINSD_MMX %1, %3, %4
+    PMAXSD_MMX %1, %2, %4
+%endmacro
+
+%macro CLIPD_SSE2 3-4 ; src/dst, min (float), max (float), unused
+    cvtdq2ps  %1, %1
+    minps     %1, %3
+    maxps     %1, %2
+    cvtps2dq  %1, %1
+%endmacro
+
+%macro CLIPD_SSE41 3-4 ;  src/dst, min, max, unused
+    pminsd  %1, %3
+    pmaxsd  %1, %2
+%endmacro
+
+%macro VBROADCASTSS 2 ; dst xmm/ymm, src m32
+%if cpuflag(avx)
+    vbroadcastss %1, %2
+%else ; sse
+    movss        %1, %2
+    shufps       %1, %1, 0
+%endif
+%endmacro
+
+%macro VBROADCASTSD 2 ; dst xmm/ymm, src m64
+%if cpuflag(avx) && mmsize == 32
+    vbroadcastsd %1, %2
+%elif cpuflag(sse3)
+    movddup      %1, %2
+%else ; sse2
+    movsd        %1, %2
+    movlhps      %1, %1
+%endif
+%endmacro
+
+%macro SHUFFLE_MASK_W 8
+    %rep 8
+        %if %1>=0x80
+            db %1, %1
+        %else
+            db %1*2
+            db %1*2+1
+        %endif
+        %rotate 1
+    %endrep
+%endmacro
+
+%macro PMOVSXWD 2; dst, src
+%if cpuflag(sse4)
+    pmovsxwd     %1, %2
+%else
+    %ifnidn %1, %2
+    mova         %1, %2
+    %endif
+    punpcklwd    %1, %1
+    psrad        %1, 16
+%endif
+%endmacro
+
+; Wrapper for non-FMA version of fmaddps
+%macro FMULADD_PS 5
+    %if cpuflag(fma3) || cpuflag(fma4)
+        fmaddps %1, %2, %3, %4
+    %elifidn %1, %4
+        mulps   %5, %2, %3
+        addps   %1, %4, %5
+    %else
+        mulps   %1, %2, %3
+        addps   %1, %4
+    %endif
+%endmacro
+
+%macro LSHIFT 2
+%if mmsize > 8
+    pslldq  %1, %2
+%else
+    psllq   %1, 8*(%2)
+%endif
+%endmacro
+
+%macro RSHIFT 2
+%if mmsize > 8
+    psrldq  %1, %2
+%else
+    psrlq   %1, 8*(%2)
+%endif
+%endmacro

avidemux_2.6.20.tar.gz/avidemux_core/ADM_core/src/ADM_cpuCap.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/src/ADM_cpuCap.cpp Changed

@@ -1,7 +1,7 @@
 //
 // C++ Implementation: ADM_cpuCap
 //
-// Description: 
+// Description:
 //
 //
 // Author: mean <fixounet@free.fr>, (C) 2004
@@ -30,17 +30,15 @@
 #include "libavutil/cpu.h"
 }
 
+#ifdef ADM_CPU_X86
+  extern "C"
+  {
+  extern void adm_cpu_cpuid(int index, int *eax, int *ebx, int *ecx, int *edx);
+  extern int  adm_cpu_cpuid_test(void);
+  }
+#endif
 
 
-#define cpuid(index,eax,ebx,ecx,edx)\
-    __asm __volatile\
-        ("mov %%" REG_b", %%" REG_S"\n\t"\
-         "cpuid\n\t"\
-         "xchg %%" REG_b", %%" REG_S\
-         : "=a" (eax), "=S" (ebx),\
-           "=c" (ecx), "=d" (edx)\
-         : "0" (index));
-
 
 /**
  * 		\fn CpuCaps::init
@@ -51,87 +49,71 @@
     printf("[CpuCaps] Checking CPU capabilities\n");
     myCpuCaps=0;
     myCpuMask=0xffffffff;
-   
-#ifdef ADM_CPU_X86
-    int eax, ebx, ecx, edx;
-    int max_std_level, max_ext_level;
-
-#if !defined(ADM_CPU_64BIT) // 64 bits CPU have all cpuid
-    long a, c;
-
-    __asm__ __volatile__ (
-                       /* See if CPUID instruction is supported ... */
-                       /* ... Get copies of EFLAGS into eax and ecx */
-                       "pushf\n\t"
-                       "pop %0\n\t"
-                       "mov %0, %1\n\t"
-
-                       /* ... Toggle the ID bit in one copy and store */
-                       /*     to the EFLAGS reg */
-                       "xor $0x200000, %0\n\t"
-                       "push %0\n\t"
-                       "popf\n\t"
-
-                       /* ... Get the (hopefully modified) EFLAGS */
-                       "pushf\n\t"
-                       "pop %0\n\t"
-                       : "=a" (a), "=c" (c)
-                       :
-                       : "cc"
-                       );
-
- if (a == c)
-     return ; /* CPUID not supported */
-#endif
+    bool available=true;
 
- cpuid(0, max_std_level, ebx, ecx, edx);
- if(max_std_level >= 1)
- {
-	 int std_caps = 0;
-
-     cpuid(1, eax, ebx, ecx, std_caps);
-     if (std_caps & (1<<23))
-    	 myCpuCaps |= ADM_CPUCAP_MMX;
-     if (std_caps & (1<<25))
-    	 myCpuCaps |= ADM_CPUCAP_MMXEXT | ADM_CPUCAP_SSE;
-     if (std_caps & (1<<26))
-    	 myCpuCaps |= ADM_CPUCAP_SSE2;
-     if (ecx & 1)
-    	 myCpuCaps |= ADM_CPUCAP_SSE3;
-     if (ecx & 0x00000200 )
-    	 myCpuCaps |= ADM_CPUCAP_SSSE3;
- }
-
- cpuid(0x80000000, max_ext_level, ebx, ecx, edx);
- if(max_ext_level >= 0x80000001)
- {
-	 int ext_caps = 0;
-
-     cpuid(0x80000001, eax, ebx, ecx, ext_caps);
-     if (ext_caps & (1<<31))
-    	 myCpuCaps |= ADM_CPUCAP_3DNOW;
-     if (ext_caps & (1<<30))
-    	 myCpuCaps |= ADM_CPUCAP_3DNOWEXT;
-     if (ext_caps & (1<<23))
-    	 myCpuCaps |= ADM_CPUCAP_MMX;
-     if (ext_caps & (1<<22))
-    	 myCpuCaps |= ADM_CPUCAP_MMXEXT;
- }
-
-#define CHECK(x) if (myCpuCaps & ADM_CPUCAP_##x) { printf("\t\t"#x" detected"); \
-                     if (!(myCpuMask & ADM_CPUCAP_##x)) printf(", but disabled"); \
-                     printf("\n"); }
-    CHECK(MMX);
-    CHECK(3DNOW);
-    CHECK(3DNOWEXT);
-    CHECK(MMXEXT);
-    CHECK(SSE);
-    CHECK(SSE2);
-    CHECK(SSE3);
-    CHECK(SSSE3);
+#ifdef ADM_CPU_X86
+      int eax, ebx, ecx, edx;
+      int max_std_level, max_ext_level;
+
+  #ifdef ADM_CPU_X86_32
+      available=adm_cpu_cpuid_test();
+  #endif
+
+      if(!available)
+      {
+        ADM_warning("CPUID not available\n");
+        goto skipIt;
+      }
+
+
+
+   adm_cpu_cpuid(0, &max_std_level, &ebx, &ecx, &edx);
+   if(max_std_level >= 1)
+   {
+  	 int std_caps = 0;
+
+       adm_cpu_cpuid(1, &eax, &ebx, &ecx, &std_caps);
+       if (std_caps & (1<<23))
+      	 myCpuCaps |= ADM_CPUCAP_MMX;
+       if (std_caps & (1<<25))
+      	 myCpuCaps |= ADM_CPUCAP_MMXEXT | ADM_CPUCAP_SSE;
+       if (std_caps & (1<<26))
+      	 myCpuCaps |= ADM_CPUCAP_SSE2;
+       if (ecx & 1)
+      	 myCpuCaps |= ADM_CPUCAP_SSE3;
+       if (ecx & 0x00000200 )
+      	 myCpuCaps |= ADM_CPUCAP_SSSE3;
+   }
+
+   adm_cpu_cpuid(0x80000000,& max_ext_level,& ebx, &ecx,& edx);
+   if(max_ext_level >= 0x80000001)
+   {
+  	 int ext_caps = 0;
+
+       adm_cpu_cpuid(0x80000001, &eax,& ebx,& ecx,& ext_caps);
+       if (ext_caps & (1<<31))
+      	 myCpuCaps |= ADM_CPUCAP_3DNOW;
+       if (ext_caps & (1<<30))
+      	 myCpuCaps |= ADM_CPUCAP_3DNOWEXT;
+       if (ext_caps & (1<<23))
+      	 myCpuCaps |= ADM_CPUCAP_MMX;
+       if (ext_caps & (1<<22))
+      	 myCpuCaps |= ADM_CPUCAP_MMXEXT;
+   }
+skipIt:
+  #define CHECK(x) if (myCpuCaps & ADM_CPUCAP_##x) { printf("\t\t"#x" detected"); \
+                       if (!(myCpuMask & ADM_CPUCAP_##x)) printf(", but disabled"); \
+                       printf("\n"); }
+      CHECK(MMX);
+      CHECK(3DNOW);
+      CHECK(3DNOWEXT);
+      CHECK(MMXEXT);
+      CHECK(SSE);
+      CHECK(SSE2);
+      CHECK(SSE3);
+      CHECK(SSSE3);
 #endif // X86
-
-    printf("[CpuCaps] End of CPU capabilities check (cpuCaps: 0x%08x, cpuMask: 0x%08x)\n",myCpuCaps,myCpuMask);
+    ADM_info("[CpuCaps] End of CPU capabilities check (cpuCaps: 0x%08x, cpuMask: 0x%08x)\n",myCpuCaps,myCpuMask);
     return ;
 }
 
@@ -172,17 +154,17 @@
 #endif
 }
 /**
- * 
+ *
  * @param admMask
- * @return 
+ * @return
  */
 static int Cpu2Lav(uint32_t admMask)
 {
-   if(admMask==ADM_CPUCAP_ALL) 
+   if(admMask==ADM_CPUCAP_ALL)
        return -1; // allow all
    int out=0;
  #define LAV_CPU_CAPS(x)    	if(admMask & ADM_CPUCAP_##x) out|=AV_CPU_FLAG_##x;
-    
+
     	LAV_CPU_CAPS(MMX);
     	LAV_CPU_CAPS(MMXEXT);
     	LAV_CPU_CAPS(3DNOW);
@@ -195,27 +177,39 @@
 }
 
 /**
- * 
+ *
  * @param mask
- * @return 
+ * @return
  */
 bool     CpuCaps::setMask(uint32_t mask)
 {
     ADM_info("[CpuCaps] Setting mask to 0x%08x\n",mask);
     myCpuMask=mask;
-    
+
     int lavCpuMask=Cpu2Lav(myCpuMask);
     av_set_cpu_flags_mask(lavCpuMask);
-    
+
     return true;
 }
 /**
- * 
+ *
  * @param mask
- * @return 
+ * @return
  */
 uint32_t     CpuCaps::getMask( )
 {
     return myCpuMask;
 }
+extern "C"
+{
+extern void adm2_emms_yasm(void);
+}
+/**
+ *
+ *
+ */
+void ADM_emms()
+{
+    adm2_emms_yasm();
+}

avidemux_2.6.20.tar.gz/avidemux_core/ADM_core/src/ADM_fileio.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/src/ADM_fileio.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_core/src/ADM_folder_linux.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/src/ADM_folder_linux.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_core/src/ADM_folder_mac.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/src/ADM_folder_mac.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_core/src/ADM_folder_win32.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/src/ADM_folder_win32.cpp Changed

@@ -26,6 +26,7 @@
 extern void simplify_path(char **buf);
 char *ADM_getRelativePath(const char *base0, const char *base1, const char *base2, const char *base3);
 static char ADM_basedir[1024] = {0};
+static char ADM_logdir[1024] = {0};
 static char *ADM_autodir = NULL;
 static char *ADM_systemPluginSettings=NULL;
 
@@ -84,6 +85,14 @@
 	return ADM_basedir;
 }
 
+/*
+      Get the root directory for .avidemux stuff
+******************************************************/
+const char *ADM_getLogDir(void)
+{
+	return ADM_logdir;
+}
+
 /**
  * \fn ADM_initBaseDir
  * \brief ADM_initBaseDir
@@ -91,6 +100,7 @@
 void ADM_initBaseDir(int argc, char *argv[])
 {
 	char *home = NULL;
+	char *log = NULL;
 
     bool portableMode=isPortableMode(argc,argv);
 	// Get the base directory
@@ -99,10 +109,12 @@
     {
         // Portable mode...
         home = ADM_getInstallRelativePath(NULL, NULL, NULL);
+        log = ADM_getInstallRelativePath(NULL, NULL, NULL);
     }
 	else
     {
         wchar_t wcHome[MAX_PATH];
+        wchar_t wcLog[MAX_PATH];
 
         if (SHGetFolderPathW(NULL, CSIDL_APPDATA, NULL, 0, wcHome) == S_OK)
         {
@@ -117,6 +129,20 @@
             home=new char[10];
             strcpy(home,"c:\\");
         }
+        
+        if (SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, wcLog) == S_OK)
+        {
+            int len = wideCharStringToUtf8(wcLog, -1, NULL);
+            log = new char[len];
+
+            wideCharStringToUtf8(wcLog, -1, log);
+        }
+        else
+        {
+            printf("Oops: can't determine the Local Application Data folder.");
+            log=new char[10];
+            strcpy(log,"c:\\");
+        }        
     }
 
 
@@ -149,6 +175,34 @@
 			ADM_error("Oops: cannot create the .avidemux directoryi (%s)\n", ADM_basedir);
 		}
 	}
+	
+	if (log)
+	{
+		strcpy(ADM_logdir, log);
+		AddSeparator(ADM_logdir);
+
+
+		const char *ADM_DIR_NAME;
+
+		if (portableMode)
+			ADM_DIR_NAME = "settings";
+		else
+			ADM_DIR_NAME = "avidemux";
+
+		strcat(ADM_logdir, ADM_DIR_NAME);
+		strcat(ADM_logdir, ADM_SEPARATOR);
+
+		delete [] log;
+
+		if (ADM_mkdir(ADM_logdir))
+		{
+			printf("Using %s as log directory.\n", ADM_logdir);
+		}
+		else
+		{
+			ADM_error("Oops: cannot create the log directory (%s)\n", ADM_logdir);
+		}
+	}
 }
 /**
  * \fn ADM_getI8NDir

avidemux_2.6.20.tar.gz/avidemux_core/ADM_core/src/ADM_memcpy.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/src/ADM_memcpy.cpp Changed

@@ -1,33 +1,4 @@
-/* Adapted from Xine /Mplayer to avidemx2 */
 /*
- * Copyright (C) 2001-2004 the xine project
- *
- * This file is part of xine, a free video player.
- *
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * xine 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
- *
- * These are the MMX/MMX2/SSE optimized versions of memcpy
- *
- * This code was adapted from Linux Kernel sources by Nick Kurshev to
- * the mplayer program. (http://mplayer.sourceforge.net)
- *
- * Miguel Freitas split the #ifdefs into several specialized functions that
- * are benchmarked at runtime by xine. Some original comments from Nick
- * have been preserved documenting some MMX/SSE oddities.
- * Also added kernel memcpy function that seems faster than libc one.
- *
  */
 
 #include <stdio.h>
@@ -37,381 +8,8 @@
 #include "ADM_default.h"
 #include "ADM_memsupport.h"
 
-extern "C" {
-#include "libavcodec/avcodec.h"
-}
 
 adm_fast_memcpy myAdmMemcpy=NULL;
-/* Original comments from mplayer (file: aclib.c)
- This part of code was taken by me from Linux-2.4.3 and slightly modified
-for MMX, MMX2, SSE instruction set. I have done it since linux uses page aligned
-blocks but mplayer uses weakly ordered data and original sources can not
-speedup them. Only using PREFETCHNTA and MOVNTQ together have effect!
-
->From IA-32 Intel Architecture Software Developer's Manual Volume 1,
-
-Order Number 245470:
-"10.4.6. Cacheability Control, Prefetch, and Memory Ordering Instructions"
-
-Data referenced by a program can be temporal (data will be used again) or
-non-temporal (data will be referenced once and not reused in the immediate
-future). To make efficient use of the processor's caches, it is generally
-desirable to cache temporal data and not cache non-temporal data. Overloading
-the processor's caches with non-temporal data is sometimes referred to as
-"polluting the caches".
-The non-temporal data is written to memory with Write-Combining semantics.
-
-The PREFETCHh instructions permits a program to load data into the processor
-at a suggested cache level, so that it is closer to the processors load and
-store unit when it is needed. If the data is already present in a level of
-the cache hierarchy that is closer to the processor, the PREFETCHh instruction
-will not result in any data movement.
-But we should you PREFETCHNTA: Non-temporal data fetch data into location
-close to the processor, minimizing cache pollution.
-
-The MOVNTQ (store quadword using non-temporal hint) instruction stores
-packed integer data from an MMX register to memory, using a non-temporal hint.
-The MOVNTPS (store packed single-precision floating-point values using
-non-temporal hint) instruction stores packed floating-point data from an
-XMM register to memory, using a non-temporal hint.
-
-The SFENCE (Store Fence) instruction controls write ordering by creating a
-fence for memory store operations. This instruction guarantees that the results
-of every store instruction that precedes the store fence in program order is
-globally visible before any store instruction that follows the fence. The
-SFENCE instruction provides an efficient way of ensuring ordering between
-procedures that produce weakly-ordered data and procedures that consume that
-data.
-
-If you have questions please contact with me: Nick Kurshev: nickols_k@mail.ru.
-*/
-
-/*  mmx v.1 Note: Since we added alignment of destinition it speedups
-    of memory copying on PentMMX, Celeron-1 and P2 upto 12% versus
-    standard (non MMX-optimized) version.
-    Note: on K6-2+ it speedups memory copying upto 25% and
-          on K7 and P3 about 500% (5 times).
-*/
-
-/* Additional notes on gcc assembly and processors: [MF]
-prefetch is specific for AMD processors, the intel ones should be
-prefetch0, prefetch1, prefetch2 which are not recognized by my gcc.
-prefetchnta is supported both on athlon and pentium 3.
-
-therefore i will take off prefetchnta instructions from the mmx1 version
-to avoid problems on pentium mmx and k6-2.
-
-quote of the day:
-"Using prefetches efficiently is more of an art than a science"
-*/
-
-
-#ifdef ADM_CPU_X86
-
-/* for small memory blocks (<256 bytes) this version is faster */
-#define small_memcpy(to,from,n)\
-{\
-register unsigned long int dummy;\
-__asm__ __volatile__(\
-  "rep; movsb"\
-  :"=&D"(to), "=&S"(from), "=&c"(dummy)\
-  :"0" (to), "1" (from),"2" (n)\
-  : "memory");\
-}
-
-/* linux kernel __memcpy (from: /include/asm/string.h) */
-static __inline__ void * linux_kernel_memcpy_impl (
-			       void * to,
-			       const void * from,
-			       size_t n)
-{
-int d0, d1, d2;
-
-  if( n < 4 ) {
-    small_memcpy(to,from,n);
-  }
-  else
-    __asm__ __volatile__(
-    "rep ; movsl\n\t"
-    "testb $2,%b4\n\t"
-    "je 1f\n\t"
-    "movsw\n"
-    "1:\ttestb $1,%b4\n\t"
-    "je 2f\n\t"
-    "movsb\n"
-    "2:"
-    : "=&c" (d0), "=&D" (d1), "=&S" (d2)
-    :"0" (n/4), "q" (n),"1" ((intptr_t) to),"2" ((intptr_t) from)
-    : "memory");
-
-  return (to);
-}
-
-#define SSE_MMREG_SIZE 16
-#define MMX_MMREG_SIZE 8
-
-#define MMX1_MIN_LEN 0x800  /* 2K blocks */
-#define MIN_LEN 0x40  /* 64-byte blocks */
-
-/* SSE note: i tried to move 128 bytes a time instead of 64 but it
-didn't make any measureable difference. i'm using 64 for the sake of
-simplicity. [MF] */
-static void * sse_memcpy(void * to, const void * from, size_t len)
-{
-  void *retval;
-  uint8_t *ufrom=(uint8_t *)from;
-  uint8_t *uto=(uint8_t *)to;
-  retval = to;
-
-  /* PREFETCH has effect even for MOVSB instruction ;) */
-  __asm__ __volatile__ (
-    "   prefetchnta (%0)\n"
-    "   prefetchnta 32(%0)\n"
-    "   prefetchnta 64(%0)\n"
-    "   prefetchnta 96(%0)\n"
-    "   prefetchnta 128(%0)\n"
-    "   prefetchnta 160(%0)\n"
-    "   prefetchnta 192(%0)\n"
-    "   prefetchnta 224(%0)\n"
-    "   prefetchnta 256(%0)\n"
-    "   prefetchnta 288(%0)\n"
-    : : "r" (ufrom) );
-
-  if(len >= MIN_LEN)
-  {
-    register unsigned long int delta;
-    /* Align destinition to MMREG_SIZE -boundary */
-    delta = ((intptr_t)uto)&(SSE_MMREG_SIZE-1);
-    if(delta)
-    {
-      delta=SSE_MMREG_SIZE-delta;
-      len -= delta;
-      small_memcpy(uto, ufrom, delta);
-    }
-    size_t i = len >> 6; /* len/64 */
-    len&=63;
-    if(((intptr_t)ufrom) & 15)
-      /* if SRC is misaligned */
-      for(; i>0; i--)
-      {
-        __asm__ __volatile__ (
-        "prefetchnta 320(%0)\n"
-       "prefetchnta 352(%0)\n"
-        "movups (%0), %%xmm0\n"
-        "movups 16(%0), %%xmm1\n"
-        "movups 32(%0), %%xmm2\n"
-        "movups 48(%0), %%xmm3\n"
-        "movntps %%xmm0, (%1)\n"
-        "movntps %%xmm1, 16(%1)\n"
-        "movntps %%xmm2, 32(%1)\n"
-        "movntps %%xmm3, 48(%1)\n"
-        :: "r" (ufrom), "r" (uto) : "memory");
-         ufrom+=64;
-         uto+=64;
-      }
-    else
-      /*
-         Only if SRC is aligned on 16-byte boundary.
-         It allows to use movaps instead of movups, which required data
-         to be aligned or a general-protection exception (#GP) is generated.
-      */
-      for(; i>0; i--)
-      {
-        __asm__ __volatile__ (
-        "prefetchnta 320(%0)\n"
-       "prefetchnta 352(%0)\n"
-        "movaps (%0), %%xmm0\n"
-        "movaps 16(%0), %%xmm1\n"
-        "movaps 32(%0), %%xmm2\n"
-        "movaps 48(%0), %%xmm3\n"
-        "movntps %%xmm0, (%1)\n"
-        "movntps %%xmm1, 16(%1)\n"
-        "movntps %%xmm2, 32(%1)\n"
-        "movntps %%xmm3, 48(%1)\n"
-        :: "r" (ufrom), "r" (uto) : "memory");
-        ufrom+=64;
-        uto+=64;
-      }
-    /* since movntq is weakly-ordered, a "sfence"
-     * is needed to become ordered again. */
-    __asm__ __volatile__ ("sfence":::"memory");
-    /* enables to use FPU */
-    __asm__ __volatile__ ("emms":::"memory");
-  }
-  /*
-   *	Now do the tail of the block
-   */
-  if(len) linux_kernel_memcpy_impl(uto, ufrom, len);
-  return retval;
-}
-
-static void * mmx_memcpy(void * to, const void * from, size_t len)
-{
-  void *retval;
-  uint8_t *ufrom=(uint8_t *)from;
-  uint8_t *uto=(uint8_t *)to;
-  retval = uto;
-
-  if(len >= MMX1_MIN_LEN)
-  {
-    register unsigned long int delta;
-    /* Align destinition to MMREG_SIZE -boundary */
-    delta = ((intptr_t)uto)&(MMX_MMREG_SIZE-1);
-    if(delta)
-    {
-      delta=MMX_MMREG_SIZE-delta;
-      len -= delta;
-      small_memcpy(uto, ufrom, delta);
-    }
-    size_t i = len >> 6; /* len/64 */
-    len&=63;
-    for(; i>0; i--)
-    {
-      __asm__ __volatile__ (
-      "movq (%0), %%mm0\n"
-      "movq 8(%0), %%mm1\n"
-      "movq 16(%0), %%mm2\n"
-      "movq 24(%0), %%mm3\n"
-      "movq 32(%0), %%mm4\n"
-      "movq 40(%0), %%mm5\n"
-      "movq 48(%0), %%mm6\n"
-      "movq 56(%0), %%mm7\n"
-      "movq %%mm0, (%1)\n"
-      "movq %%mm1, 8(%1)\n"
-      "movq %%mm2, 16(%1)\n"
-      "movq %%mm3, 24(%1)\n"
-      "movq %%mm4, 32(%1)\n"
-      "movq %%mm5, 40(%1)\n"
-      "movq %%mm6, 48(%1)\n"
-      "movq %%mm7, 56(%1)\n"
-      :: "r" (ufrom), "r" (uto) : "memory");
-      ufrom+=64;
-      uto+=64;
-    }
-    __asm__ __volatile__ ("emms":::"memory");
-  }
-  /*
-   *	Now do the tail of the block
-   */
-  if(len) linux_kernel_memcpy_impl(uto, ufrom, len);
-  return retval;
-}
-
-static void * mmx2_memcpy(void * to, const void * from, size_t len)
-{
-  void *retval;
-  uint8_t *ufrom=(uint8_t *)from;
-  uint8_t *uto=(uint8_t *)to;
-  retval = to;
-
-  /* PREFETCH has effect even for MOVSB instruction ;) */
-  __asm__ __volatile__ (
-    "   prefetchnta (%0)\n"
-    "   prefetchnta 32(%0)\n"
-    "   prefetchnta 64(%0)\n"
-    "   prefetchnta 96(%0)\n"
-    "   prefetchnta 128(%0)\n"
-    "   prefetchnta 160(%0)\n"
-    "   prefetchnta 192(%0)\n"
-    "   prefetchnta 224(%0)\n"
-    "   prefetchnta 256(%0)\n"
-    "   prefetchnta 288(%0)\n"
-    : : "r" (ufrom) );
-
-  if(len >= MIN_LEN)
-  {
-    register unsigned long int delta;
-    /* Align destinition to MMREG_SIZE -boundary */
-    delta = ((intptr_t)uto)&(MMX_MMREG_SIZE-1);
-    if(delta)
-    {
-      delta=MMX_MMREG_SIZE-delta;
-      len -= delta;
-      small_memcpy(uto, ufrom, delta);
-    }
-    size_t i = len >> 6; /* len/64 */
-    len&=63;
-    for(; i>0; i--)
-    {
-      __asm__ __volatile__ (
-      "prefetchnta 320(%0)\n"
-      "prefetchnta 352(%0)\n"
-      "movq (%0), %%mm0\n"
-      "movq 8(%0), %%mm1\n"
-      "movq 16(%0), %%mm2\n"
-      "movq 24(%0), %%mm3\n"
-      "movq 32(%0), %%mm4\n"
-      "movq 40(%0), %%mm5\n"
-      "movq 48(%0), %%mm6\n"
-      "movq 56(%0), %%mm7\n"
-      "movntq %%mm0, (%1)\n"
-      "movntq %%mm1, 8(%1)\n"
-      "movntq %%mm2, 16(%1)\n"
-      "movntq %%mm3, 24(%1)\n"
-      "movntq %%mm4, 32(%1)\n"
-      "movntq %%mm5, 40(%1)\n"
-      "movntq %%mm6, 48(%1)\n"
-      "movntq %%mm7, 56(%1)\n"
-      :: "r" (ufrom), "r" (uto) : "memory");
-      ufrom+=64;
-      uto+=64;
-    }
-     /* since movntq is weakly-ordered, a "sfence"
-     * is needed to become ordered again. */
-    __asm__ __volatile__ ("sfence":::"memory");
-    __asm__ __volatile__ ("emms":::"memory");
-  }
-  /*
-   *	Now do the tail of the block
-   */
-  if(len) linux_kernel_memcpy_impl(uto, ufrom, len);
-  return retval;
-}
-
-static void *linux_kernel_memcpy(void *to, const void *from, size_t len) {
-  return linux_kernel_memcpy_impl(to,from,len);
-}
-#endif /* ARCH_X86 */
-
-#if defined(ADM_CPU_X86)
-static unsigned long long int rdtsc(void)
-{
-  unsigned long long int x=0;
-
-  /* that should prevent us from trying cpuid with old cpus */
-
-    __asm__ volatile (".byte 0x0f, 0x31" : "=A" (x));
-    return x;
- }
-#else
-static unsigned long long int rdtsc(void)
-{
-	return 0;
- }
-
-#endif
-
-
-
-#define BUFSIZE 1024*1024
-/*******************************************
-*/
-uint8_t probe(adm_fast_memcpy func,char *name)
-{
-	void *src,*dst;
-	uint64_t start,stop;
-
-	src=ADM_alloc(BUFSIZE);
-	dst=ADM_alloc(BUFSIZE);
-	start=rdtsc();
-	func(dst,src,BUFSIZE);
-	stop=rdtsc();
-	ADM_dealloc(src);
-	ADM_dealloc(dst);
-	printf("Method :%s \tTime:%lu\n",name,stop-start);
-	return 1;
-
-}
 /*
 
 	It seems MMX gives the best result most of the times
@@ -423,18 +21,5 @@
 
 #undef memcpy
         myAdmMemcpy=memcpy;
-#if defined(ADM_CPU_X86)
-        if(CpuCaps::hasMMX())
-                myAdmMemcpy=mmx_memcpy;
-#endif
-#if 0
-	probe(memcpy,"libc");
-	probe(linux_kernel_memcpy,"kernel");
-#if defined(ADM_CPU_X86)
-	if(CpuCaps::hasMMX()) probe(mmx_memcpy,"mmx");
-	if(CpuCaps::hasMMXEXT()) probe(mmx_memcpy,"mmxext");
-	if(CpuCaps::hasSSE()) probe(sse_memcpy,"sse");
-#endif
-#endif
 	return 1;
 }

avidemux_2.6.20.tar.gz/avidemux_core/ADM_core/src/ADM_win32_mingw.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/src/ADM_win32_mingw.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_core/src/ADM_win32_vs.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/src/ADM_win32_vs.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_core/src/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/src/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/src/adm_emms.asm Added

@@ -0,0 +1,30 @@
+;*****************************************************************************
+;* Copyright (C) 2013 Martin Storsjo
+;*
+;* 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
+;******************************************************************************
+
+%include "admx86util.asm"
+
+SECTION .text
+
+;-----------------------------------------------------------------------------
+; void avpriv_emms_yasm(void)
+;-----------------------------------------------------------------------------
+cvisible emms_yasm, 0, 0
+    emms
+    RET

avidemux_2.7.0.tar.gz/avidemux_core/ADM_core/src/cpuid.asm Added

@@ -0,0 +1,91 @@
+;*****************************************************************************
+;* Copyright (C) 2005-2010 x264 project
+;*
+;* Authors: Loren Merritt <lorenm@u.washington.edu>
+;*          Fiona Glaser <fiona@x264.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
+;******************************************************************************
+
+%include "admx86util.asm"
+
+SECTION .text
+
+;-----------------------------------------------------------------------------
+; void ff_cpu_cpuid(int index, int *eax, int *ebx, int *ecx, int *edx)
+;-----------------------------------------------------------------------------
+cglobal cpu_cpuid, 5,7
+    push rbx
+    push  r4
+    push  r3
+    push  r2
+    push  r1
+    mov  eax, r0d
+    xor  ecx, ecx
+    cpuid
+    pop   r4
+    mov [r4], eax
+    pop   r4
+    mov [r4], ebx
+    pop   r4
+    mov [r4], ecx
+    pop   r4
+    mov [r4], edx
+    pop  rbx
+    RET
+
+;-----------------------------------------------------------------------------
+; void ff_cpu_xgetbv(int op, int *eax, int *edx)
+;-----------------------------------------------------------------------------
+cglobal cpu_xgetbv, 3,7
+    push  r2
+    push  r1
+    mov  ecx, r0d
+    xgetbv
+    pop   r4
+    mov [r4], eax
+    pop   r4
+    mov [r4], edx
+    RET
+
+%if ARCH_X86_64 == 0
+;-----------------------------------------------------------------------------
+; int ff_cpu_cpuid_test(void)
+; return 0 if unsupported
+;-----------------------------------------------------------------------------
+cglobal cpu_cpuid_test
+    pushfd
+    push    ebx
+    push    ebp
+    push    esi
+    push    edi
+    pushfd
+    pop     eax
+    mov     ebx, eax
+    xor     eax, 0x200000
+    push    eax
+    popfd
+    pushfd
+    pop     eax
+    xor     eax, ebx
+    pop     edi
+    pop     esi
+    pop     ebp
+    pop     ebx
+    popfd
+    ret
+%endif

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

@@ -194,21 +194,43 @@
     int size2=bufferSize-syncOffset;
     ADM_assert(size2>0);
     ADM_info("Maybe EAC3... \n");
-    // Try on 2nd packet...
-    if( ADM_EAC3GetInfo(second,size2, &syncOffset,&info2))
+    // Try with 6 packets
+    bool r=true;
+    for(int i=0;i<2;i++)
     {
-        if((info.frequency==info2.frequency) && (info.channels==info2.channels) && (info.byterate==info2.byterate) && !syncOffset)
+        ADM_info("\t pass %d\n",i);
+        if( !ADM_EAC3GetInfo(second,size2, &syncOffset,&info2))
         {
-            ADM_warning("\tProbably EAC3 : Fq=%d br=%d chan=%d, offset=%d\n",(int)info.frequency,(int)info.byterate,(int)info.channels,syncOffset);
-            oinfo.encoding=WAV_EAC3;
-            oinfo.channels=info.channels;
-            oinfo.byterate=info.byterate; // already in bytes/sec
-            oinfo.frequency=info.frequency;
-            return true;
+            ADM_info("Cannot sync (pass %d)\n",i);
+            r=false;
+            break;
+        }
+        if((info.frequency!=info2.frequency) || (info.channels!=info2.channels) || (info.byterate!=info2.byterate))
+        {
+            ADM_info("Not same infos (pass %d)\n",i);
+            r=false;
+            break;
+        }
+        if(syncOffset)
+        {
+            ADM_info("Offset between packets (pass %d)\n",i);
+            r=false;
+            break;
         }
     }
-    ADM_info("Cannot confirm EAC3\n");
-    return false; 
+    if(r)                                                                            
+    {
+        ADM_warning("\tProbably EAC3 : Fq=%d br=%d chan=%d, offset=%d\n",(int)info.frequency,(int)info.byterate,(int)info.channels,syncOffset);
+        oinfo.encoding=WAV_EAC3;
+        oinfo.channels=info.channels;
+        oinfo.byterate=info.byterate; // already in bytes/sec
+        oinfo.frequency=info.frequency;
+        return true;
+    }else
+    {
+        ADM_info("Cannot confirm EAC3\n");
+    }
+    return r; 
 }
 
 /**
@@ -307,6 +329,7 @@
     if(idWAV(bufferSize,buffer,info,offset)) return true;
     if(idMP2(bufferSize,buffer,info,offset)) return true;
     if(idEAC3(bufferSize,buffer,info,offset)) return true;
+    if(idAC3(bufferSize,buffer,info,offset)) return true;
     if(idAAACADTS(bufferSize,buffer,info,offset)) return true;
     if(idAC3(bufferSize,buffer,info,offset)) return true;

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreAudioDevice/src/ADM_audioDeviceThreaded.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreAudioDevice/src/ADM_audioDeviceThreaded.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreAudioParser/include/ADM_aacinfo.h -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreAudioParser/include/ADM_aacinfo.h Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_eac3info.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_eac3info.cpp Changed

@@ -25,46 +25,49 @@
 uint32_t l;
 uint32_t of=0;
 
-	*syncoff=of=0;
- //    	printf("\n Syncing on %d \n",len);
-	// Search for startcode
-	// 0x0b 0x77
-	while(1)
-	{
-		 if(len<7)
-		 {
-		 	printf("Not enough info to find a52 syncword\n");
-		 	return 0;
-		 }
-		 if( *buf!=0x0b || *(buf+1)!=0x77)
-		 {
-		 	len--;
-			buf++;
-			of++;
-			continue;
-		 }
-            AC3HeaderInfo *hdr=NULL;
-            GetBitContext gb;
-            init_get_bits(&gb,buf,len*8);
-            if(avpriv_ac3_parse_header(&gb, &hdr))
-            {
-                len--;
-                buf++;
-                of++;
-                printf("Sync failed..continuing\n");
-                continue;
-            }
+    *syncoff=of=0;
+    //	printf("\n Syncing on %d \n",len);
+    // Search for startcode
+    // 0x0b 0x77
+    while(1)
+    {
+        if(len<7)
+        {
+               printf("Not enough info to find a52 syncword\n");
+               return 0;
+        }
+        if( *buf!=0x0b || *(buf+1)!=0x77)
+        {
+               len--;
+               buf++;
+               of++;
+               continue;
+        }
+        AC3HeaderInfo *hdr=NULL;
+        GetBitContext gb;
+        init_get_bits(&gb,buf,len*8);
+        if(avpriv_ac3_parse_header(&gb, &hdr))
+        {
+            len--;
+            buf++;
+            of++;
+            printf("Sync failed..continuing\n");
+            continue;
+        }
+        if(hdr->bitstream_id<=10) // this is not EAC3 but plain ac3
+            return false;
+        
+        
 //            printf("Sync found at offset %"PRIu32"\n",of);
-            *syncoff=of;
-            info->frequency=(uint32_t)hdr->sample_rate;
-            info->byterate=(uint32_t)hdr->bit_rate>>3;
-            info->channels=hdr->channels;
-            info->frameSizeInBytes=hdr->frame_size;
-            info->samples=265*6; // ??
-            av_free(hdr);
-            hdr=NULL;
-            return 1;
-		}
-		return 1;
-	
+        *syncoff=of;
+        info->frequency=(uint32_t)hdr->sample_rate;
+        info->byterate=(uint32_t)hdr->bit_rate>>3;
+        info->channels=hdr->channels;
+        info->frameSizeInBytes=hdr->frame_size;
+        info->samples=265*6; // ??
+        av_free(hdr);
+        hdr=NULL;
+        return 1;
+    }
+    return 1;	
 }

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreImage/include/ADM_colorspace.h -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/include/ADM_colorspace.h Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreImage/include/ADM_image.h -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/include/ADM_image.h Changed

@@ -1,7 +1,7 @@
 //
 // C++ Interface: %{MODULE}
 //
-// Description: 
+// Description:
 //
 //
 // Author: %{AUTHOR} <%{EMAIL}>, (C) %{YEAR}
@@ -30,7 +30,7 @@
 #include "ADM_assert.h"
 #include "ADM_byteBuffer.h"
 
-typedef enum 
+typedef enum
 {
 	ADM_ASPECT_4_3=1,
 	ADM_ASPECT_16_9,
@@ -42,20 +42,20 @@
 //#define vi.IsYV12()   1
 #define GetRowSize GetPitch
 
-typedef enum 
+typedef enum
 {
         PLANAR_Y=0,
         PLANAR_U=1,
         PLANAR_V=2,
         PLANAR_ALPHA=3,
         PLANAR_LAST=3 // Alpha is not a real channel
-        
+
 } ADM_PLANE;
 
 typedef enum
 {
     ADM_IMAGE_DEFAULT,
-    ADM_IMAGE_REF    
+    ADM_IMAGE_REF
 }ADM_IMAGE_TYPE;
 
 typedef enum
@@ -98,8 +98,8 @@
 public: // half public/protected, only in  ADMImageRef case it is really public
         uint8_t         *_planes[3];     /// In case of linked data store y/u/v pointers
         int             _planeStride[3]; /// Same story
-        uint8_t         *_alpha;         /// Null in most case, else alha channel 
-        int             _alphaStride; 
+        uint8_t         *_alpha;         /// Null in most case, else alha channel
+        int             _alphaStride;
 public:
         uint32_t	    _width;		/// Width of image
         uint32_t	    _height;	/// Height of image
@@ -117,16 +117,16 @@
         uint8_t         *quant;
         int             _qStride;
         int             _qSize;
-        
-        
+
+
         int             GetHeight(ADM_PLANE plane) ;
         int             GetWidth(ADM_PLANE plane) ;
         bool            GetPitches(int *pitches);
         bool            GetWritePlanes(uint8_t **planes);
         bool            GetReadPlanes(uint8_t **planes);
 
-virtual                 ~ADMImage();        
-        
+virtual                 ~ADMImage();
+
 
 protected:
                                     ADMImage(uint32_t width, uint32_t height,ADM_IMAGE_TYPE type);
@@ -142,8 +142,8 @@
         virtual      uint8_t        *GetReadPtr(ADM_PLANE plane)=0;
         virtual      bool           isWrittable(void)=0;
         virtual      ADMImageRef    *castToRef(void) {return NULL;};
-        
-        virtual      bool           duplicateMacro(ADMImage *src,bool swap);       /// copy an image to ourself, including info 
+
+        virtual      bool           duplicateMacro(ADMImage *src,bool swap);       /// copy an image to ourself, including info
 
                      uint8_t        getWidthHeight(uint32_t *w,uint32_t *h)
                                     {
@@ -156,10 +156,6 @@
         bool    copyInfo(ADMImage *src);	/// copy all the flags, not the data themselves
         bool    copyQuantInfo(ADMImage *src);	/// copy quant table if any
         bool    isRef(void) { if(_imageType==ADM_IMAGE_REF) return true;return false;};
-        // 
-        bool    merge(ADMImage *src1,ADMImage *src2);
-        bool    blend(ADMImage *src1,ADMImage *src2);
-        bool    substract(ADMImage *src1,ADMImage *src2);
         bool    blacken(void);
         bool    copyTo(ADMImage *target, uint32_t x, uint32_t y);
         bool    copyToAlpha(ADMImage *target, uint32_t x, uint32_t y,uint32_t alpha);
@@ -167,15 +163,15 @@
         bool    copyLeftSideTo(ADMImage *dest);
         /* Some utilitarian functions */
         bool    saveAsBmp(const char *filename);
-        
+
         bool    saveAsJpg(const char *filename);
         bool    printString(uint32_t x,uint32_t y, const char *strng);
 static  bool    copyPlane(ADMImage *s, ADMImage *d, ADM_PLANE plane);
-static  uint32_t lumaDiff(ADMImage *src1,ADMImage *src2,uint32_t noise);
+
         bool    convertFromYUV444(uint8_t *from);
         bool    convertFromNV12(uint8_t *yData, uint8_t *uvData, int strideY, int strideUV);
         bool    convertToNV12(uint8_t *yData, uint8_t *uvData, int strideY, int strideUV);
-        bool    interleaveUV(uint8_t *target, int stride);
+        bool    interleaveUVtoNV12(uint8_t *target, int targetStride);
 };
 
 /**

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreImage/src/ADM_image.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/src/ADM_image.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp Changed

@@ -17,533 +17,18 @@
 #include "ADM_bitmap.h"
 #include "ADM_bitstream.h"
 #include "DIA_coreToolkit.h"
+#include "ADM_coreUtils.h"
+#include "ADM_cpuCap.h"
+void testYUV444();
 
-
-#define ADM_CLEAR_MM7()         __asm__ volatile( "pxor %%mm7,%%mm7"      ::    )
-#define ADM_EMMS()              __asm__ volatile( "emms\n"                ::    )
-
-//#undef ADM_CPU_X86
-
-static uint8_t tinyAverage(uint8_t *dst, uint8_t *src1, uint8_t *src2,uint32_t l)
-{
-
-uint8_t *s1,*s2,*d1;
-int a1,a2;
-        s1=src1;
-        s2=src2;
-        
-        d1=dst;
-          for(int y=0;y<l;y++)
-                {
-                        a1=*s1;
-                        a2=*s2;
-                        a1=a1+a2;
-                        a1>>=1;
-                        if(a1<0) a1=0;
-                        if(a1>255) a1=255;
-                        *d1=a1;                         
-
-                        s1++;
-                        s2++;
-                        d1++;
-                }
-        
-        return 1;
-}
-#ifdef ADM_CPU_X86
-static uint8_t tinyAverageMMX(uint8_t *dst, uint8_t *src1, uint8_t *src2,uint32_t l)
-{
-int delta;
-uint32_t ww,rr;
-uint8_t *s1,*s2,*d1;
-int a1,a2;
-        s1=src1;
-        s2=src2;
-        
-        d1=dst;
-        ww=l>>2;
-        rr=l&3;
-
-        ADM_CLEAR_MM7();
-          for(int y=0;y<ww;y++)
-          {
-                __asm__ volatile(
-                        "movd           (%0),%%mm0 \n"
-                        "movd           (%1),%%mm1 \n"
-                        "punpcklbw      %%mm7,%%mm0 \n"
-                        "punpcklbw      %%mm7,%%mm1 \n"
-                        "paddw           %%mm1,%%mm0 \n"
-                        "psrlw          $1,%%mm0 \n"
-                        "packuswb       %%mm0,  %%mm0\n"
-                        "movd           %%mm0,(%2) \n"
-
-                : : "r" (s1),"r" (s2),"r"(d1)
-                :"memory"
-                );
-                        s1+=4;
-                        s2+=4;
-                        d1+=4;
-                }
-       ADM_EMMS();
-        if(rr) tinyAverage(d1, s1, s2,rr);
-        return 1;
-}
-
-
-#endif
-/**
-
-*/
-bool ADMImage::merge(ADMImage *src1,ADMImage *src2)
-{
 #ifdef ADM_CPU_X86
-        if(CpuCaps::hasMMX())
-        {
-                tinyAverageMMX(YPLANE(this),YPLANE(src1),YPLANE(src2),(_width*_height*3)>>1);
-                return 1;
-        }
+  #define ADM_EMMS()             ADM_emms()
 #endif
-        tinyAverage(YPLANE(this),YPLANE(src1),YPLANE(src2),(_width*_height*3)>>1);
-        return 1;
-
-
-}
-/**
-    \fn blendC
-    \brief Blend src1 and src2 into target (one plane)
-*/
-typedef bool blendFunction(int width, int height, uint8_t *target,uint32_t stride,    uint8_t *src1,uint32_t stride1,               uint8_t *src2,uint32_t stride2);
 
-static bool blendC(int width, int height,
-                    uint8_t *target,uint32_t stride,
-                    uint8_t *src1,  uint32_t stride1,
-                    uint8_t *src2,  uint32_t stride2)
-{
-          for(int y=0;y<height;y++)
-                {
-                    uint8_t *s1=src1,*s2=src2,*d=target;
-                    unsigned int a;
-                    for(int x=0;x<width;x++)
-                    {
-                        a=((unsigned int)*s1)+((unsigned int)*s2);
-                        a>>=1;
-                        *d=(uint8_t)a;
-                        s1++;
-                        s2++;
-                        d++;
-                    }
-                    src1+=stride1;src2+=stride2;target+=stride;
-                }
-        return true;
-}
-#ifdef ADM_CPU_X86
-static bool blendMMX(int width, int height,
-                    uint8_t *target,uint32_t stride,
-                    uint8_t *src1,  uint32_t stride1,
-                    uint8_t *src2,  uint32_t stride2)
-{
-uint32_t ww,rr;
-uint8_t *s1,*s2,*d1;
-        int a1,a2;
-      
-        ww=width>>2;
-        rr=width&3;
-
-
-         ADM_CLEAR_MM7();
-
-          for(int y=0;y<height;y++)
-          {
-                s1=src1;
-                s2=src2;
-                d1=target;
-                if(rr)
-                {
-                    blendC(rr,height,d1+(ww<<2), stride,s1+(ww<<2),stride1,s2+(ww<<2),stride2);
-                }
-
-                for(int x=0;x<ww;x++)
-                {
-                    __asm__ volatile(
-                            "movd           (%0),%%mm0 \n"
-                            "movd           (%1),%%mm1 \n"
-                            "punpcklbw      %%mm7,%%mm0 \n"
-                            "punpcklbw      %%mm7,%%mm1 \n"
-                            "paddw           %%mm1,%%mm0 \n"
-                            "psrlw          $1,%%mm0 \n"
-                            "packuswb       %%mm0,  %%mm0\n"
-                            "movd           %%mm0,(%2) \n"
-
-                    : : "r" (s1),"r" (s2),"r"(d1)
-                    :"memory"
-                    );
-                    s1+=4;
-                    s2+=4;
-                    d1+=4;
-                }
-                src1+=stride1;
-                src2+=stride2;
-                target+=stride;
-           }
-        ADM_EMMS();
-        return true;
-}
-/**
-    \fn blendSSE
-*/
-static bool blendSSE(int width, int height,
-                    uint8_t *target,uint32_t stride,
-                    uint8_t *src1,  uint32_t stride1,
-                    uint8_t *src2,  uint32_t stride2)
-{
-uint32_t ww,rr;
-uint8_t *s1,*s2,*d1;
-        int a1,a2;
-
-        ww=width>>3;
-        rr=width&7;
-
-          for(int y=0;y<height;y++)
-          {
-                int count=ww;
-                s1=src1;
-                s2=src2;
-                d1=target;
-                if(rr)
-                {
-                    blendC(rr,height,d1+(ww<<3), stride,s1+(ww<<3),stride1,s2+(ww<<3),stride2);
-                }
-
-                    
-                __asm__ volatile(
-                        
-                        "1: \n"
-                        "movq           (%0),%%mm0  \n"
-                        "movq           (%1),%%mm1  \n"
-                        "pavgb          %%mm1,%%mm0 \n"
-                        "movq           %%mm0,(%2)  \n"
-                        "add           $8,%0      \n"
-                        "add           $8,%1      \n"
-                        "add           $8,%2      \n"
-                        "sub           $1,%3      \n"
-                        "jnz           1b        \n"
-                        
-
-                : : "r" (s1),"r" (s2),"r"(d1),"r"(count)
-                :"memory"
-                );
-                src1+=stride1;
-                src2+=stride2;
-                target+=stride;
-           }
-        ADM_EMMS();
-        return true;
-}
-
-#endif
-/**
-    \fn blend
-    \brief Blend src1 and src2 into our image
-*/
-bool ADMImage::blend(ADMImage *src1,ADMImage *src2)
-{
-    blendFunction *myBlend=blendC;
-#ifdef ADM_CPU_X86
-    if(CpuCaps::hasMMX())
-            myBlend=blendMMX;
-    if(CpuCaps::hasSSE())
-            myBlend=blendSSE;
-#endif
-    ADM_assert(src1->_width==src2->_width);
-    ADM_assert(_width==src2->_width);
-    ADM_assert(src1->_height==src2->_height);
-    for(int x=0;x<3;x++)
-    {
-        ADM_PLANE plane=(ADM_PLANE)x;
-        myBlend(GetWidth(plane),GetHeight(plane),
-                                    GetWritePtr(plane),GetPitch(plane),
-                                    src1->GetReadPtr(plane),src1->GetPitch(plane),
-                                    src2->GetReadPtr(plane),src2->GetPitch(plane)
-                                );
-    }
-    return true;
-}
-/**
-
-*/
-/* 3000 * 3000 max size, using uint32_t is safe... */
-static uint32_t computeDiff(uint8_t  *s1,uint8_t *s2,uint32_t noise,int w,int h, int stride1, int stride2)
-{
-uint32_t df=0;
-uint32_t delta;
-
-    for(int y=0;y<h;y++)
-    {
-        for(int x=0;x<w;x++)
-        {
-                delta=abs((int)(s1[x])-(int)(s2[x]));
-                if(delta>noise)
-                        df+=delta;
-        }
-        s1+=stride1;
-        s2+=stride2;
-    }
-    return df;
-}
-/**
- * 
- * @param s1
- * @param s2
- * @param noise
- * @param w
- * @param h
- * @param stride1
- * @param stride2
- * @return 
- */
-static uint32_t smallDiff(uint8_t  *s1,uint8_t *s2,uint32_t noise, int count)
-{
-uint32_t df=0;
-uint32_t delta;
-    for(int x=0;x<count;x++)
-    {
-            delta=abs((int)(s1[x])-(int)(s2[x]));
-            if(delta>noise)
-                    df+=delta;
-    }
-    return df;
-}
-#ifdef ADM_CPU_X86
-static uint64_t __attribute__((used)) FUNNY_MANGLE(noise64);
-/**
- * \fn computeDiffMMX
- * @param s1
- * @param s2
- * @param noise
- * @param w
- * @param l
- * @param pitch1
- * @param pitch2
- * @return 
- */
-static uint32_t computeDiffMMX(uint8_t  *s1,uint8_t *s2,uint32_t noise,uint32_t w,uint32_t l, uint32_t pitch1, uint32_t pitch2)
-{
-uint32_t mod4,leftOver;
-uint64_t noise2=(uint64_t )noise;
-
-uint32_t result=0,tmpResult;
-        noise64=noise2+(noise2<<16)+(noise2<<32)+(noise2<<48);
-        
-        leftOver=w&7;
-
-         __asm__ volatile(
-                         "pxor %%mm7,%%mm7\n"                       
-                         "movq " Mangle(noise64)", %%mm6\n"
-                :::  "memory"
-                 );
-
-          for(int y=0;y<l;y++)
-          {
-                mod4=w>>3;
-                if(leftOver)
-                    result+=smallDiff(s1+mod4*8,s2+mod4*8,noise,leftOver);
-                uint8_t *tmpS1=s1;
-                uint8_t *tmpS2=s2;
-                
-                __asm__ volatile(
-                        "pxor           %%mm3,%%mm3\n"
-                        "1:"
-                // LEFT
-                        "movd           (%0),  %%mm0 \n"
-                        "movd           (%1),  %%mm1 \n"
-                        "punpcklbw      %%mm7, %%mm0 \n"
-                        "punpcklbw      %%mm7, %%mm1 \n"
-                        
-                        "movq           %%mm0, %%mm2 \n"
-                        "psubusw        %%mm1, %%mm2 \n"
-                        "psubusw        %%mm0, %%mm1 \n"
-                        "por            %%mm1, %%mm2 \n" // SAD  
-                                           
-                        "movq           %%mm2, %%mm0 \n"
-                        "pcmpgtw        %%mm6, %%mm2 \n" // Threshold against noise
-                        "pand           %%mm2, %%mm0 \n" //
-                        "movq           %%mm0, %%mm5 \n" //  %mm5 is the  A1 A2 A3 A4, we want the sum later
-                // RIGHT
-                        "movd           4(%0),  %%mm0 \n"
-                        "movd           4(%1),  %%mm1 \n"
-                        "punpcklbw      %%mm7, %%mm0 \n"
-                        "punpcklbw      %%mm7, %%mm1 \n"
-                        
-                        "movq           %%mm0, %%mm2 \n"
-                        "psubusw        %%mm1, %%mm2 \n"
-                        "psubusw        %%mm0, %%mm1 \n"
-                        "por            %%mm1, %%mm2 \n" // SAD  
-                                           
-                        "movq           %%mm2, %%mm0 \n"
-                        "pcmpgtw        %%mm6, %%mm2 \n" // Threshold against noise
-                        "pand           %%mm2, %%mm0 \n" // mm0 is B1 B2 B3 B4
-                
-                        "paddW          %%mm5, %%mm0 \n"
-                
-                // PACK
-                        "movq           %%mm0, %%mm1 \n" // MM0 is a b c d and we want
-                        "psrlq          $16,  %%mm1 \n"  // mm3+=a+b+c+d
-
-                        "movq           %%mm0, %%mm2 \n"
-                        "psrlq          $32,  %%mm2 \n"
-
-                        "movq           %%mm0, %%mm4 \n"
-                        "psrlq          $48,  %%mm4 \n"
-
-                        "paddw          %%mm1, %%mm0 \n"
-                        "paddw          %%mm2, %%mm4 \n"
-                        "paddw          %%mm4, %%mm0 \n" // MM0 is the sum
-
-                        "psllq          $48,  %%mm0 \n"
-                        "psrlq          $48,  %%mm0 \n" // Only keep 16 bits
-
-                        "paddw          %%mm0, %%mm3 \n" /* PADDQ is SSE2 */                        
-                        "add            $8,%0      \n"
-                        "add            $8,%1      \n"
-                        "sub            $1,%2      \n"
-                        "jnz            1b         \n"
-
-                : "=r" (tmpS1),"=r" (tmpS2),"=r"(mod4)
-                : "0"(tmpS1),"1"(tmpS2),"2"(mod4)
-                : "memory","0","1","2"
-                );
-                __asm__ volatile(
-                       
-                        "movd           %%mm3,(%0)\n"
-                        "emms\n"
-                :: "r"(&tmpResult)
-                );
-                result+=tmpResult;
-                s1+=pitch1;
-                s2+=pitch2;
-         }
-        // Pack result
-        return result;
-}
-
-
-#endif
-
-uint32_t ADMImage::lumaDiff(ADMImage *src1,ADMImage *src2,uint32_t noise)
-{
-
-#ifdef ADM_CPU_X86
-uint32_t r1,r2;
-        if(CpuCaps::hasMMX())
-        {
-                uint32_t a= computeDiffMMX(YPLANE(src1),YPLANE(src2),noise,  
-                    src1->GetWidth(PLANAR_Y),src1->GetHeight(PLANAR_Y),
-                    src1->GetPitch(PLANAR_Y),src2->GetPitch(PLANAR_Y));                
-#if 0
-                uint32_t b= computeDiff(YPLANE(src1),YPLANE(src2),noise,
-                    src1->GetWidth(PLANAR_Y),src1->GetHeight(PLANAR_Y),
-                    src1->GetPitch(PLANAR_Y),src2->GetPitch(PLANAR_Y));
-                printf("MMX = %u, native =%u\n",a,b);
-#endif
-                return a;
-                
-        }
-#endif
-        return computeDiff(YPLANE(src1),YPLANE(src2),noise,
-                src1->GetWidth(PLANAR_Y),src1->GetHeight(PLANAR_Y),
-                src1->GetPitch(PLANAR_Y),src2->GetPitch(PLANAR_Y));
-}
-
-//******************************************************************************
-// so srcR=2*src-srcP
-static uint8_t tinySubstract(uint8_t *dst, uint8_t *src1, uint8_t *src2,uint32_t l)
-{
-uint32_t ww,hh;
-uint8_t *s1,*s2,*d1;
-int a1,a2;
-        s1=src1;
-        s2=src2;
-        
-        d1=dst;
-       
-
-          for(int y=0;y<l;y++)
-               
-                {
-                        a1=*s1;
-                        a2=*s2;
-                        a1=2*a1-a2;
-                        if(a1<0) a1=0;
-                        if(a1>255) a1=255;
-                        *d1=a1;                         
-
-                        s1++;
-                        s2++;
-                        d1++;
-                }
-        return 1;
-}
-#ifdef ADM_CPU_X86
-static uint8_t tinySubstractMMX(uint8_t *dst, uint8_t *src1, uint8_t *src2,uint32_t l)
-{
-int delta;
-uint32_t ww,hh;
-uint8_t *s1,*s2,*d1;
-int ll,rr;
-        ll=l>>2;
-        rr=l&3;
-        s1=src1;
-        s2=src2;
-        
-        d1=dst;
-      
-        ADM_CLEAR_MM7();
-        for(int x=0;x<ll;x++)
-        {
-                        __asm__ volatile(
-                        "movd           (%0),%%mm0 \n"
-                        "movd           (%1),%%mm1 \n"
-                       
-                        "punpcklbw      %%mm7,%%mm0 \n"
-                        "punpcklbw      %%mm7,%%mm1 \n"
-                      
-                        
-                        "paddw          %%mm0,%%mm0 \n"
-                       
-                        
-                        "psubusw        %%mm1,%%mm0 \n" // mm1=sum                       
-                        "packuswb       %%mm0,  %%mm0\n"
-                        "movd           %%mm0,(%2) \n"                       
-                        :: "r"(s1),"r"(s2),"r"(d1)
-                        :"memory"
-                        );
-                        s1+=4;
-                        s2+=4;
-                        d1+=4;
-        }
-        ADM_EMMS();
-        if(rr) tinySubstractMMX(d1, s1, s2,rr);
-        return 1;
-}
-#endif
-
-bool ADMImage::substract(ADMImage *src1,ADMImage *src2)
-{
-
-#ifdef ADM_CPU_X86
-uint32_t r1,r2;
-        if(CpuCaps::hasMMX())
-        {
-                 return tinySubstractMMX(YPLANE(this),YPLANE(src1),YPLANE(src2),src1->_width*src1->_height);                
-        }
-#endif
-        return tinySubstract(YPLANE(this),YPLANE(src1),YPLANE(src2),src1->_width*src1->_height);
-}
-  
  /**
   *		\fn  copyLeftSideTo
   * 	\brief Copy half the image (left part) to dest
-  * 	@param dest : Image to copy to 
+  * 	@param dest : Image to copy to
   */
  bool ADMImage::copyLeftSideTo(ADMImage *dest)
  {
@@ -602,9 +87,9 @@
         uint8_t *dst=d->GetWritePtr(plane);
         uint32_t sPitch=s->GetPitch(plane);
         uint32_t dPitch=d->GetPitch(plane);
-        uint32_t w=s->_width;  
+        uint32_t w=s->_width;
         uint32_t h=s->_height;
-        if(plane!=PLANAR_Y) 
+        if(plane!=PLANAR_Y)
         {
             w>>=1;
             h>>=1;
@@ -615,72 +100,53 @@
 /**
     \fn convertFromYUV444
 */
-static inline void yuv444_C(uint8_t *src,uint8_t *dst,int w,int h,int s)
+static inline void yuv444_C(uint8_t *src,uint8_t *dst,int w,int h,int dstStride,int srcStride)
 {
     src+=2;
     for(int y=0;y<h;y++)
     {
         for(int x=0;x<w;x++)
                 dst[x]=src[4*x];
-        dst+=s;
-        src+=4*w;
+        dst+=dstStride;
+        src+=srcStride;
     }
 }
 #ifdef ADM_CPU_X86
-static inline void yuv444_MMX(uint8_t *src,uint8_t *dst,int w,int h,int s)
+extern "C"
 {
-static uint64_t __attribute__((used)) FUNNY_MANGLE(mask) = 0x00ff000000ff0000LL;
+void adm_YUV444Luma_mmx(int w8,uint8_t *dst,uint8_t *src, const uint64_t *mangle);
+}
+
+static inline void yuv444_MMX(uint8_t *src,uint8_t *dst,int w,int h,int destStride, int sourceStride)
+{
+static const uint64_t attribute_used FUNNY_MANGLE(mask) = 0x00ff000000ff0000LL;
 
-    __asm__ volatile(" movq " Mangle(mask)", %%mm7\n" ::);
-    __asm__ volatile(" pxor %%mm6,%%mm6\n" ::);
-    
-    int step=w/8;
-    int left=w-8*step;
-    uint8_t *xsrc=src;
-    uint8_t *xdst=dst;
+
+    int step=w>>3;
+    int left=w&7;
+    int targetOffset=(step<<3);
+    int sourceOffset=(step<<5)+2;
 
     for(int y=0;y<h;y++)
     {
-        xsrc=src;
-        xdst=dst;
-        for(int x=0;x<step;x++)
-        {
-                        __asm__ volatile(
-                        "movq           (%0),%%mm0 \n"
-                        "pand           %%mm7,%%mm0\n"
-                        "movq           8(%0),%%mm1 \n"
-                        "pand           %%mm7,%%mm1\n"
-
-                        "movq           16(%0),%%mm2 \n"
-                        "pand           %%mm7,%%mm2\n"
-                        "movq           24(%0),%%mm3 \n"
-                        "pand           %%mm7,%%mm3\n"
-
-                        "packuswb       %%mm1,%%mm0\n"
-                        "packuswb       %%mm3,%%mm2\n"
-                        "psrlw          $8,%%mm0\n"
-                        "psrlw          $8,%%mm2\n"
-                        "packuswb       %%mm2,%%mm0\n"
-
-                        "movq           %%mm0,(%1) \n"                       
-                        
-                        
-                        :: "r"(xsrc),"r"(xdst)
-                        :"memory"
-                        );
-                        xsrc+=32;
-                        xdst+=8;
-            }
+
+        adm_YUV444Luma_mmx(step,dst,src,&mask);
         for(int i=0;i<left;i++)
-             xdst[i]=xsrc[4*i];
-        dst+=s;
-        src+=4*w;
+             dst[targetOffset+i]=src[sourceOffset+4*i];
+        dst+=destStride;
+        src+=sourceStride;
     }
      ADM_EMMS();
 
 }
 #endif
 #ifdef ADM_CPU_X86
+extern "C"
+{
+extern void adm_YUV444_chroma_mmx(uint8_t *src, uint8_t *dst, uint8_t *dst2, int w4);
+}
+
+
 static inline void YUV444_chroma_MMX(uint8_t *src,uint8_t *dst,uint8_t *dst2,int w,int h,int s,int s2)
 {
     int step=w/4;
@@ -688,62 +154,23 @@
     uint8_t *xsrc=src;
     uint8_t *xdst=dst;
     uint8_t *xdst2=dst2;
-    
+
 
     for(int y=0;y<h;y++)
     {
-        xsrc=src;
-        xdst=dst;
-        xdst2=dst2;
-        for(int x=0;x<step;x++)
-        {
-                        __asm__ volatile(
-                        "movq           (%0),%%mm0 \n"
-                        "movq           8(%0),%%mm1 \n"
-                        "movq           16(%0),%%mm2 \n"
-                        "movq           24(%0),%%mm3 \n"
-        
-                        "movq           %%mm0,%%mm4\n"
-                        "movq           %%mm1,%%mm5\n"
-                        "movq           %%mm2,%%mm6\n"
-                        "movq           %%mm3,%%mm7\n"
-
-                        "punpcklbw       %%mm2,%%mm0\n"
-                        "punpcklbw       %%mm3,%%mm1\n"
-                        "punpcklbw       %%mm1,%%mm0\n"
-                        
-                        "movd           %%mm0,(%1) \n"                       
-
-                        "psrlw          $8,%%mm4\n"
-                        "psrlw          $8,%%mm5\n"
-                        "psrlw          $8,%%mm6\n"
-                        "psrlw          $8,%%mm7\n"
-
-                        "punpcklbw       %%mm6,%%mm4\n"
-                        "punpcklbw       %%mm7,%%mm5\n"
-                        "punpcklbw       %%mm5,%%mm4\n"
-
-
-                        "movd           %%mm4,(%2) \n"                       
-                        :: "r"(xsrc),"r"(xdst),"r"(xdst2)
-                        :"memory"
-                        );
-                        xsrc+=32;
-                        xdst+=4;
-                        xdst2+=4;
-            }
+        adm_YUV444_chroma_mmx(src,dst,dst2,step);
         for(int i=0;i<left;i++)
         {
-             xdst[i]=xsrc[8*i];
-             xdst2[i]=xsrc[8*i+1];
+             dst[step*4+i]=src[step*32+8*i];
+             dst2[step*4+i]=src[step*32+8*i+1];
         }
         dst+=s;
         dst2+=s2;
         src+=4*w*4;
     }
      ADM_EMMS();
-
 }
+
 #endif
 /**
     \fn YUV444_chroma_C
@@ -773,6 +200,10 @@
  * @param srcPitch
  * @param src
  */
+extern "C"
+{
+  void adm_uv_to_nv12_mmx(uint8_t *u, uint8_t *v, uint8_t *dst, int len);
+}
 static void uv_to_nv12_mmx(int w, int h,int upitch, int vpitch, uint8_t *srcv, uint8_t *srcu,int strideUV, uint8_t *dst)
 {
         int mod8=w>>3;
@@ -780,48 +211,24 @@
         int x;
         for(int y=0;y<h;y++)
         {
-                uint8_t *ddst=dst;                
-                uint8_t *u=srcu;
-                uint8_t *v=srcv;
-                dst+=strideUV;
-                srcu+=upitch;
-                srcv+=vpitch;   
-                      __asm__ volatile(
-                        "mov            %4,%3      \n" // local copy
-                        "1:\n"
-                        "movq           (%1),%%mm0   \n" // U
-                        "movq           (%2),%%mm1   \n" // V
-                        "movq           %%mm0,%%mm2  \n"                       
-                        "movq           %%mm1,%%mm3  \n"   
-
-                        "punpcklbw      %%mm1,%%mm0  \n"
-                        "punpckhbw      %%mm3,%%mm2  \n"
-                        "movq           %%mm0,(%0)   \n"                       
-                        "movq           %%mm2,8(%0)  \n"     
-                        
-                        "add            $16,%0       \n"
-                        "add            $8,%1        \n"
-                        "add            $8,%2        \n"
-                        "sub            $1,%3        \n"
-                        "jnz            1b           \n"
-                        
-                        :
-                        : "r"(ddst),"r"(u),"r"(v),"r"(x),"r"(mod8)
-                        : "memory"
-                        );
+                adm_uv_to_nv12_mmx(srcu,srcv,dst,mod8);
+
                 if(leftOver)
                 {
-                    x=mod8*8;
-                    ddst+=x*2;
-                    v+=x;
-                    u+=x;
-                    for(;x<w;x++)
+                  uint8_t *u=srcu+mod8*8;
+                  uint8_t *v=srcv+mod8*8;
+                  uint8_t *ddst=dst+mod8*16;
+
+                    for(int x=0;x<leftOver;x++)
                     {
                         ddst[0]=*(u++);
                         ddst[1]=*(v++);
                         ddst+=2;
                     }
                 }
+                dst+=strideUV;
+                srcu+=upitch;
+                srcv+=vpitch;
         }
         ADM_EMMS();
         return ;
@@ -838,47 +245,11 @@
  * @param srcPitch
  * @param src
  */
-
-static void nv12_to_u_v_mmx_one_line(int w8, uint8_t *dstu, uint8_t *dstv, uint8_t *src)
+extern "C"
 {
-      __asm__ volatile(
-
+void adm_nv12_to_u_v_one_line_mmx(int w8, uint8_t *dstu, uint8_t *dstv, uint8_t *src);
 
-                  "1:\n"                  
-                  "movq           (%4),%%mm0   \n"
-                  "movq           8(%4),%%mm1  \n"                              
-                  "movq           %%mm0,%%mm2  \n"                       
-                  "movq           %%mm1,%%mm3  \n"   
-
-                  "psllw          $8,%%mm0    \n"                              
-                  "psrlw          $8,%%mm0    \n"    
-
-                  "psllw          $8,%%mm1    \n"                              
-                  "psrlw          $8,%%mm1    \n"    
-
-
-                  "packuswb       %%mm1,%%mm0 \n"
-
-                  "psrlw          $8,%%mm2    \n"                              
-                  "psrlw          $8,%%mm3    \n"    
-
-                  "packuswb       %%mm3,%%mm2 \n"
-
-                  "movq           %%mm0,(%6)  \n"                       
-                  "movq           %%mm2,(%5)  \n"     
-
-                  "add            $16,%4\n"
-                  "add            $8,%5\n"
-                  "add            $8,%6\n"
-                  "sub            $1,%7\n"
-                  "jnz            1b\n"
-
-                  : "=r"(src),"=r"(dstu),"=r"(dstv),"=r"(w8) //00..3
-                  : "0"(src),"1"(dstu),"2"(dstv),"3"(w8)     //4..7
-                  : "memory"
-                  );
 }
-
 static void nv12_to_uv_mmx(int w, int h,int upitch, int vpitch, uint8_t *dstu, uint8_t *dstv,int srcPitch, uint8_t *src)
 {
         int mod8=w>>3;
@@ -886,14 +257,14 @@
         int x;
         for(int y=0;y<h;y++)
         {
-                uint8_t *ssrc=src;                
+                uint8_t *ssrc=src;
                 uint8_t *u=dstu;
                 uint8_t *v=dstv;
                 src+=srcPitch;
                 dstu+=upitch;
-                dstv+=vpitch;                        
+                dstv+=vpitch;
 
-                nv12_to_u_v_mmx_one_line(mod8,u,v,ssrc);
+                adm_nv12_to_u_v_one_line_mmx(mod8,u,v,ssrc);
                 if(leftOver)
                 {
                     int c=mod8*8;
@@ -914,10 +285,10 @@
 #endif
 static void nv12_to_uv_c(int w, int h,int upitch, int vpitch, uint8_t *dstu, uint8_t *dstv,int srcPitch, uint8_t *src)
 {
-        
+
         for(int y=0;y<h;y++)
         {
-                uint8_t *ssrc=src;                
+                uint8_t *ssrc=src;
                 uint8_t *u=dstu;
                 uint8_t *v=dstv;
                 src+=srcPitch;
@@ -939,7 +310,7 @@
  * @param uvData
  * @param strideY
  * @param strideUV
- * @return 
+ * @return
  */
 bool    ADMImage::convertFromNV12(uint8_t *yData, uint8_t *uvData, int strideY, int strideUV)
 {
@@ -956,22 +327,22 @@
             src+=sstride;
             dst+=dstride;
         }
-        
+
         //U & V
         sstride=strideUV;
         src=uvData;
         h/=2;
         w/=2;
-        
+
         #if defined(ADM_CPU_X86) && 1
                 if(CpuCaps::hasMMX())
                     nv12_to_uv_mmx(w,h,GetPitch(PLANAR_U),GetPitch(PLANAR_V),GetWritePtr(PLANAR_U),GetWritePtr(PLANAR_V),strideUV,uvData);
                 else
-        #endif   
+        #endif
                     nv12_to_uv_c(w,h,GetPitch(PLANAR_U),GetPitch(PLANAR_V),GetWritePtr(PLANAR_U),GetWritePtr(PLANAR_V),strideUV,uvData);
 
-       
-        
+
+
         return true;
 }
 /**
@@ -980,7 +351,7 @@
  * @param uvData
  * @param strideY
  * @param strideUV
- * @return 
+ * @return
  */
 bool    ADMImage::convertToNV12(uint8_t *yData, uint8_t *uvData, int strideY, int strideUV)
 {
@@ -997,16 +368,16 @@
             src+=sstride;
             dst+=dstride;
         }
-        interleaveUV(uvData,strideUV);
+        interleaveUVtoNV12(uvData,strideUV);
         return true;
 }
 /**
         \fn nv12_to_uv_c
 */
 static void uv_to_nv12_c(int w, int h,int upitch, int vpitch, uint8_t *srcu, uint8_t *srcv,int dstride, uint8_t *dst)
-{ 
+{
         for(int y=0;y<h;y++)
-        {                
+        {
                 uint8_t *u=srcu;
                 uint8_t *v=srcv;
                 uint8_t *d=dst;
@@ -1021,29 +392,29 @@
                     d+=2;
                 }
         }
- } 
+ }
 /**
- * 
+ *
  * @param target
  * @param stride
- * @return 
+ * @return
  */
-bool    ADMImage::interleaveUV(uint8_t *target, int stride)
-{    
+bool    ADMImage::interleaveUVtoNV12(uint8_t *target, int targetStride)
+{
         int w=_width/2;
-        int h=_height/2;    
+        int h=_height/2;
 #if defined(ADM_CPU_X86) && 1
         if(CpuCaps::hasMMX())
-            uv_to_nv12_mmx(w,h,GetPitch(PLANAR_U),GetPitch(PLANAR_V),GetWritePtr(PLANAR_U),GetWritePtr(PLANAR_V),stride,target);
+            uv_to_nv12_mmx(w,h,GetPitch(PLANAR_U),GetPitch(PLANAR_V),GetWritePtr(PLANAR_U),GetWritePtr(PLANAR_V),targetStride,target);
         else
-#endif   
-            uv_to_nv12_c(w,h,GetPitch(PLANAR_U),GetPitch(PLANAR_V),GetReadPtr(PLANAR_U),GetReadPtr(PLANAR_V),stride,target);
+#endif
+            uv_to_nv12_c(w,h,GetPitch(PLANAR_U),GetPitch(PLANAR_V),GetReadPtr(PLANAR_U),GetReadPtr(PLANAR_V),targetStride,target);
         return true;
 }
 /**
  * \fn convertFromYUV444
  * @param from
- * @return 
+ * @return
  */
 bool ADMImage::convertFromYUV444(uint8_t *from)
 {
@@ -1055,11 +426,11 @@
 
     #if defined(ADM_CPU_X86) && 1
         if(CpuCaps::hasMMX())
-            yuv444_MMX(src,dst,width,height,stride);            
+            yuv444_MMX(src,dst,width,height,stride,4*width);
         else
     #endif
-            yuv444_C(src,dst,width,height,stride);
-    
+            yuv444_C(src,dst,width,height,stride,4*width);
+
 
     //
     stride=this->GetPitch(PLANAR_U);
@@ -1072,7 +443,7 @@
     #ifdef ADM_CPU_X86
         if(  CpuCaps::hasMMX())
         {
-            YUV444_chroma_MMX(src,dst,dst2,width,height,stride,stride2); 
+            YUV444_chroma_MMX(src,dst,dst2,width,height,stride,stride2);
         }
         else
     #endif
@@ -1083,4 +454,146 @@
 
     return true;
 }
+#if defined(ADM_CPU_X86) && 1
+
+#define START(x) ADM_info(#x)
+#define CHECKOK(x) if(!(x)) {ADM_warning(#x " failed at line %d , file %s\n",__LINE__,__FILE__);exit(-1);}
+#define PASS() ADM_info("   OK\n")
+void testYUV444Chroma(void)
+{
+    uint8_t src[50];
+    uint8_t dst[50],dstb[50];
+    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);
+
+
+#define ROW_SIZE 23
+
+    YUV444_chroma_C(src,dst,ROW_SIZE,1,ROW_SIZE);
+    YUV444_chroma_C(src+1,dst2,ROW_SIZE,1,ROW_SIZE);
+
+
+    YUV444_chroma_MMX(src,dstb,dst2b,ROW_SIZE,1,ROW_SIZE,ROW_SIZE);
+
+    START(YUV444_chroma_C);
+    CHECKOK(!memcmp(dst,dstb,ROW_SIZE));
+    CHECKOK(!memcmp(dst2,dst2b,ROW_SIZE));
+    PASS();
+
+}
+
+void testUV(void)
+{
+
+    uint8_t src[50];
+    uint8_t dst[50],dstb[50];
+    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);
+
+
+
+    nv12_to_uv_c(ROW_SIZE,1,ROW_SIZE,ROW_SIZE,dst,dstb,0,src);
+    nv12_to_uv_mmx(ROW_SIZE,1,ROW_SIZE,ROW_SIZE,dst2,dst2b,0,src);
+
+    printf("U:\n");
+    mixDump(dst,ROW_SIZE);
+    mixDump(dstb,ROW_SIZE);
+    printf("V:\n");
+    mixDump(dst2,ROW_SIZE);
+    mixDump(dst2b,ROW_SIZE);
+
+
+    START(testUV);
+    CHECKOK(!memcmp(dst,dst2,ROW_SIZE));
+    CHECKOK(!memcmp(dstb,dst2b,ROW_SIZE));
+    PASS();
+
+}
+void testYUV444Luma()
+{
+#define SRC_SIZE 600
+    uint8_t src[SRC_SIZE];
+    uint8_t dst[SRC_SIZE];
+    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);
+
+
+    yuv444_MMX(src,dst,ROW_SIZE,1,ROW_SIZE,4*ROW_SIZE);
+    yuv444_C(src,dst2,ROW_SIZE,1,ROW_SIZE,4*ROW_SIZE);
+
+    printf("SRC\n");
+    mixDump(src,ROW_SIZE*4);
+
+
+    printf("MMX\n");
+    mixDump(dst,ROW_SIZE);
+    printf("C\n");
+    mixDump(dst2,ROW_SIZE);
+
+    START(testYUV444);
+    CHECKOK(!memcmp(dst,dst2,ROW_SIZE));
+    PASS();
+
+
+}
+
+void testInterleaveUv()
+{
+  #define SRC_SIZE 600
+      uint8_t srcu[SRC_SIZE];
+      uint8_t srcv[SRC_SIZE];
+      uint8_t dst[SRC_SIZE];
+      uint8_t dst2[SRC_SIZE];
+
+      for(int i=0;i<SRC_SIZE;i++)
+      {
+          srcu[i]=i;
+          srcv[i]=0x80^i;
+      }
+      memset(dst,SRC_SIZE,0);
+      memset(dst2,SRC_SIZE,0);
+
+
+      uv_to_nv12_mmx(ROW_SIZE,1,ROW_SIZE>>1,ROW_SIZE>>1,srcu,srcv,ROW_SIZE,dst2);
+      uv_to_nv12_c(ROW_SIZE,1,ROW_SIZE>>1,ROW_SIZE>>1,srcu,srcv,ROW_SIZE,dst);
+
+
+      printf("SRCU\n");
+      mixDump(srcu,ROW_SIZE);
+      printf("SRCV\n");
+      mixDump(srcv,ROW_SIZE);
+
+
+      printf("MMX\n");
+      mixDump(dst,ROW_SIZE*2);
+      printf("C\n");
+      mixDump(dst2,ROW_SIZE*2);
+
+      START(testInterleaveUV);
+      CHECKOK(!memcmp(dst,dst2,ROW_SIZE*2));
+      PASS();
+
+}
+
+void allTestImageUtil()
+{
+    testYUV444Chroma();
+    testYUV444Luma();
+    testUV();
+    testInterleaveUv();
+}
+#endif
 //EOF

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageUtils_asm.asm Added

@@ -0,0 +1,237 @@
+;
+;
+%define private_prefix adm
+%define public_prefix  adm
+
+%include "admx86util.asm"
+;
+;
+;
+;static inline void YUV444_chroma_MMX(uint8_t *src,uint8_t *dst,uint8_t *dst2,int w,int h,int s,int s2)
+;{
+;    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++)
+;    {
+;        xsrc=src;
+;        xdst=dst;
+;        xdst2=dst2;
+;        for(int x=0;x<step;x++)
+;        {
+;                        __asm__ volatile(
+;                        "movq           (%0),%%mm0 \n"
+;                        "movq           8(%0),%%mm1 \n"
+;                        "movq           16(%0),%%mm2 \n"
+;                        "movq           24(%0),%%mm3 \n"
+;
+;                        "movq           %%mm0,%%mm4\n"
+;                        "movq           %%mm1,%%mm5\n"
+;                        "movq           %%mm2,%%mm6\n"
+;                        "movq           %%mm3,%%mm7\n"
+;
+;                        "punpcklbw       %%mm2,%%mm0\n"
+;                        "punpcklbw       %%mm3,%%mm1\n"
+;                        "punpcklbw       %%mm1,%%mm0\n"
+;
+;                        "movd           %%mm0,(%1) \n"
+;
+;                        "psrlw          $8,%%mm4\n"
+;                        "psrlw          $8,%%mm5\n"
+;                        "psrlw          $8,%%mm6\n"
+;                        "psrlw          $8,%%mm7\n"
+;
+;                        "punpcklbw       %%mm6,%%mm4\n"
+;                        "punpcklbw       %%mm7,%%mm5\n"
+;                        "punpcklbw       %%mm5,%%mm4\n"
+;
+;
+;                        "movd           %%mm4,(%2) \n"
+;                        :: "r"(xsrc),"r"(xdst),"r"(xdst2)
+;                        :"memory"
+;                        );
+;                        xsrc+=32;
+;                        xdst+=4;
+;                        xdst2+=4;
+;            }
+;        for(int i=0;i<left;i++)
+;        {
+;             xdst[i]=xsrc[8*i];
+;             xdst2[i]=xsrc[8*i+1];
+;        }
+;        dst+=s;
+;        dst2+=s2;
+;        src+=4*w*4;
+;    }
+section .text
+INIT_MMX mmx
+cglobal YUV444_chroma, 4,4,8, src, dst, dst2, w4
+.again
+        movq           m0,[srcq]
+        movq           m1,8[srcq]
+        movq           m2,16[srcq]
+        movq           m3,24[srcq]
+
+        movq           m4,m0
+        movq           m5,m1
+        movq           m6,m2
+        movq           m7,m3
+
+        punpcklbw      m0,m2
+        punpcklbw      m1,m3
+        punpcklbw      m0,m1
+        movd           [dstq],m0
+        psrlw          m4,8
+        psrlw          m5,8
+        psrlw          m6,8
+        psrlw          m7,8
+
+        punpcklbw      m4, m6
+        punpcklbw      m5, m7
+        punpcklbw      m4, m5
+
+        movd           [dst2q],m4
+
+        add            srcq,32
+        add            dstq,4
+        add            dst2q,4
+        sub            w4d,1
+        jnz             .again
+        ret
+;
+;
+;
+INIT_MMX mmx
+cglobal nv12_to_u_v_one_line,4,4,4, w8, dstu, dstv, src
+
+.nv12_again
+       movq           m0 , [srcq]
+       movq           m1 , 8[srcq]
+       movq           m2, m0
+       movq           m3, m1
+
+       psllw          m0,8
+       psrlw          m0,8
+
+       psllw          m1,8
+       psrlw          m1,8
+
+
+       packuswb       m0,m1
+
+       psrlw          m2,8
+       psrlw          m3,8
+
+       packuswb       m2,m3
+
+       movq           [dstvq],m0
+       movq           [dstuq],m2
+
+       add            srcq,16
+       add            dstuq,8
+       add            dstvq,8
+       sub            w8q,1
+       jnz            .nv12_again
+       ret
+
+;yuv444_MMX
+;  xdst=dst;
+;        for(int x=0;x<step;x++)
+;        {
+;                        __asm__ volatile(
+;                        "movq           (%0),%%mm0 \n"
+;                        "pand           %%mm7,%%mm0\n"
+;                        "movq           8(%0),%%mm1 \n"
+;
+;                        "movq           16(%0),%%mm2 \n"
+;                        "pand           %%mm7,%%mm1\n"
+;                        "pand           %%mm7,%%mm2\n"
+;                        "movq           24(%0),%%mm3 \n"
+;                        "pand           %%mm7,%%mm3\n"
+;
+;                        "packuswb       %%mm1,%%mm0\n"
+;                        "packuswb       %%mm3,%%mm2\n"
+;                        "psrlw          $8,%%mm0\n"
+;                        "psrlw          $8,%%mm2\n"
+;                        "packuswb       %%mm2,%%mm0\n"
+;
+;                        "movq           %%mm0,(%1) \n"
+;
+;
+;                        :: "r"(xsrc),"r"(xdst)
+;                        :"memory"
+;                        );
+;                        xsrc+=32;
+;                        xdst+=8;
+;            }
+
+INIT_MMX mmx
+cglobal YUV444Luma,4,4,5, w8, dst, src,mangle
+           movq            m4,[mangleq]
+.again3
+            movq           m0,[srcq]
+            pand           m0,m4
+            movq           m1,8[srcq]
+            movq           m2,16[srcq]
+            pand           m1,m4
+            pand           m2,m4
+            movq           m3,24[srcq]
+            pand           m3,m4
+            packuswb       m0,m1
+            packuswb       m2,m3
+            psrlw          m0,8
+            psrlw          m2,8
+            packuswb       m0,m2
+            movq           [dstq],m0
+            add            srcq,32
+            add            dstq,8
+            sub            w8q,1
+            jnz            .again3
+            ret
+
+
+;eof
+;__asm__ volatile(
+; "mov            %4,%3      \n" // local copy
+;  "1:\n"
+;  "movq           (%1),%%mm0   \n" // U
+;  "movq           (%2),%%mm1   \n" // V
+;  "movq           %%mm0,%%mm2  \n"
+;  "movq           %%mm1,%%mm3  \n"
+;
+;  "punpcklbw      %%mm1,%%mm0  \n"
+;  "punpckhbw      %%mm3,%%mm2  \n"
+;  "movq           %%mm0,(%0)   \n"
+;  "movq           %%mm2,8(%0)  \n"
+;
+;  "add            $16,%0       \n"
+;  "add            $8,%1        \n"
+;  "add            $8,%2        \n"
+;  "sub            $1,%3        \n"
+;  "jnz            1b           \n"
+;
+;  :
+;  : "r"(ddst),"r"(u),"r"(v),"r"(x),"r"(mod8)
+;  : "memory"
+;  );
+cglobal uv_to_nv12,4,4,4, u, v, dst,w8
+
+.nv12
+  movq           m0,[uq]
+  movq           m1,[vq]
+  movq           m2,m0
+  movq           m3,m1
+
+  punpcklbw      m0,m1
+  punpckhbw      m2,m3
+  movq           [dstq],m0
+  movq           8[dstq],m2
+
+  add            dstq,16
+  add            uq,8
+  add            vq,8
+  sub            w8q,1
+  jnz            .nv12
+  ret

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreImage/src/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/src/CMakeLists.txt Changed

@@ -1,36 +1,30 @@
 SET(ADM_coreImage_SRCS 
-#        ADM_videoFilter.cpp  
         ADM_image.cpp  
         ADM_imageUtils.cpp
         ADM_imageResizer.cpp
-#        yuv.cpp
-#        rgb2yuv.cpp
         ADM_colorspace.cpp
-#        ADM_rgb.cpp
         ADM_pp.cpp
         ADM_print.cpp
-        #ADM_vidFieldUtil.cpp
-        #ADM_vidFields.cpp
-        #ADM_vidFieldASM.cpp
-        #ADM_vidFieldBlend.cpp
-#        ADM_interlaceUtil.cpp
-#        DIA_flyDialog.cpp
         ADM_imageSave.cpp
         ADM_imageOperation.cpp
+# ASM
+        ADM_imageUtils_asm.asm
 )
 
+YASMIFY(bins ADM_imageUtils_asm)
 add_compiler_export_flags()
-ADM_ADD_SHARED_LIBRARY(ADM_coreImage6 ${ADM_coreImage_SRCS})
+ADM_ADD_SHARED_LIBRARY(ADM_coreImage6 ${ADM_coreImage_SRCS} ${bins})
 ADD_SOURCE_CFLAGS(DIA_flyDialog.cpp " -DADM_UI_TYPE_BUILD=99")
 
+
 IF (APPLE)
     IF (NOT ADM_CPU_X86_64)
         TARGET_LINK_LIBRARIES(ADM_coreImage6 -Wl,-read_only_relocs,suppress)
     ENDIF (NOT ADM_CPU_X86_64)
 ENDIF (APPLE)
 
-TARGET_LINK_LIBRARIES(ADM_coreImage6 ADM_core6 ADM_coreUI6 ADM_libswscale ADM_libpostproc ADM_coreUtils6)
-TARGET_LINK_LIBRARIES(ADM_coreImage6 ADM_libavcodec ADM_libavutil)
+TARGET_LINK_LIBRARIES(ADM_coreImage6 ADM_coreUI6 ADM_libswscale ADM_libpostproc ADM_coreUtils6)
+TARGET_LINK_LIBRARIES(ADM_coreImage6 ADM_core6 ADM_libavcodec ADM_libavutil)
 
 if (NOT ${CMAKE_VERSION} VERSION_GREATER 2.8.3)
 	add_dependencies(ADM_coreImage6 libavcodec libavutil libpostproc libswscale)

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/src/attic Added

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/src/attic/ADM_interlaceUtil.cpp Added

@@ -0,0 +1,224 @@
+/***************************************************************************
+                          ADM_interlaced.cpp  -  description
+                             -------------------
+
+	This piece of code count how many interlaced part we detected in the frame
+	The method is from smartdeinterlacer
+	Works only on luma (as chroma is 2:2 downsampled)
+
+    begin                : Wed Dec 18 2002
+    copyright            : (C) 2002 by mean
+    email                : fixounet@free.fr
+
+Benchmark:
+		ASM 3-version 	: 20 ms
+		C Version 		: 25 ms
+Skip factor=2
+
+		ASM 3-version 	: 7 ms
+		C Version 		: 8 ms
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+
+//#include "ADM_editor/ADM_edit.hxx"
+#include "ADM_videoFilter.h"
+
+//#define MMX_TRACE
+#warning remove mmxmacro and debug asm
+//#define ASM_ILACING
+
+
+
+
+
+
+#define SKIP_FACTOR 2   // 2^SKIPFACTOR=SKIP_LINEAR+1
+#define SKIP_LINEAR   3
+
+ #define MATCH_THRESH (60*60)
+ #define QMATCH_THRESH ((uint64_t)(MATCH_THRESH>>2))
+
+
+/*
+	This macro compute the number of pixel where c-p * c-n > threshold and add the result to mm7
+	There will be an overflow if more than 50 % of the video is like that but we can safely assume
+		that would be rare
+
+		mm0 contains 4 bytes of c
+		mm1 contains 4 bytes of p
+		mm2 contains 4 bytes of n
+*/
+
+#if defined(ADM_CPU_X86) && defined(ASM_ILACING)
+
+static uint32_t      ADMVideo_interlaceCount_MMX( uint8_t *src ,uint32_t w, uint32_t h);
+static uint8_t * FUNNY_MANGLE(_l_p)  =NULL;
+static uint8_t * FUNNY_MANGLE(_l_c) =NULL;
+static uint8_t * FUNNY_MANGLE(_l_n) =NULL;
+
+static int64_t FUNNY_MANGLE(_l_h)
+
+static mmx_t _lthresh,_added,_lwrd;
+static mmx_t  FUNNY_MANGLE(_total) ;
+static mmx_t _l255;
+static mmx_t _l0;
+
+#define COMPUTE \
+punpcklbw_r2r(mm5,mm0);  /*c  expand 4 bytes -> 4 word */ \
+punpcklbw_r2r(mm5,mm1);  /*p*/ \
+punpcklbw_r2r(mm5,mm2); /* n*/ \
+movq_r2r(mm0,mm3);		/* mm3 also c*/ \
+psubw_r2r(mm1,mm0) ; /* mm0=mm0-mm1 =  c-p*/ \
+psubw_r2r(mm2,mm3) ; /* mm3=mm3-mm2 =  c-n*/ \
+psraw_i2r(1,mm0); /* to protect from overflow*/ \
+psraw_i2r(1,mm3);\
+pmullw_r2r(mm0,mm3); /* mm3=(c-p)*(c-n) / 4;*/ \
+pcmpgtw_r2r(mm4,mm3); /* keep only > size*/ \
+psrlw_i2r(15,mm3); 	/* keep only one bit*/ \
+pmaddwd_r2r(mm3,mm3);\
+movq_r2r(mm3,mm0);\
+psrlq_i2r(32,mm0);\
+paddw_r2r(mm3,mm0); /* we got the total of match in mm0*/ \
+pand_r2r(mm6,mm0); /* and we keep the last word*/ \
+paddd_r2r(mm0,mm7);
+
+
+#endif
+static uint32_t      ADMVideo_interlaceCount_C( uint8_t *src ,uint32_t w, uint32_t h);
+/*
+	Returns the # of interlacing effects on 1/4 of the image
+*/
+
+uint32_t      ADMVideo_interlaceCount( uint8_t *src ,uint32_t w, uint32_t h)
+{
+#if defined(ADM_CPU_X86) && defined(ASM_ILACING)  
+        if(CpuCaps::hasMMX())
+                return ADMVideo_interlaceCount_MMX(src,w,h);
+        else
+#endif
+        return ADMVideo_interlaceCount_C(src,w,h);
+
+}
+
+#if defined(ADM_CPU_X86) && defined(ASM_ILACING)  
+uint32_t      ADMVideo_interlaceCount_MMX( uint8_t *src ,uint32_t w, uint32_t h)
+{
+uint32_t m=0,y,x;
+
+_total.uq=0LL;
+//_l255.uq=0xffffffffffffffffLL;
+//_l0.uq=0LL;
+_lwrd.uq=0xffffLL;
+uint32_t stride=w*SKIP_LINEAR;
+	_l_p=src;
+	_l_c=src+w;
+	_l_n=src+w+w;
+	_l_h=w;
+	_lthresh.uq=QMATCH_THRESH+(QMATCH_THRESH<<16)+
+				(QMATCH_THRESH<<32)+(QMATCH_THRESH<<48);
+
+movq_m2r(_lwrd,mm6);
+movq_m2r(_lthresh,mm4);
+pxor_r2r(mm5,mm5);
+pxor_r2r(mm7,mm7);
+
+	for(y=h>>SKIP_FACTOR;  y >2 ; y--)
+		{
+			__asm__ __volatile__(
+                                "push "REG_bx"\n\t"
+				"mov "Mangle(_l_c)",	"REG_ax"\n\t"
+				"mov "Mangle(_l_p)",	"REG_bx"\n\t"
+				"mov "Mangle(_l_n)",	"REG_cx"\n\t"
+				"mov "Mangle(_l_h)",	"REG_dx"\n\t"
+				"8: \n\t"
+				"movd ("REG_ax"),	%%mm0\n\t"
+				"movd ("REG_bx"),	%%mm1\n\t"
+				"movd ("REG_cx"),	%%mm2\n\t"
+				:
+				:
+				: "eax",  "ecx", "edx"
+				);
+				COMPUTE
+
+			__asm__ __volatile__(
+				"add $4,		"REG_ax"\n\t"
+				"add $4	,	"REG_bx"\n\t"
+				"add $4,		"REG_cx"\n\t"
+				"sub $1,		"REG_dx"\n\t"
+				"jnz 		8b\n\t"
+                                "pop "REG_bx"\n\t"
+				:
+				:
+				: "eax", "ecx", "edx"
+				);
+
+
+				_l_p+=(1+SKIP_LINEAR)*w;
+				_l_c+=(1+SKIP_LINEAR)*w;
+				_l_n+=(1+SKIP_LINEAR)*w;
+
+
+		}
+		// retrieve mm7 containg the total
+
+		__asm__ __volatile__(
+		"mov 	$"Mangle(_total)",		"REG_ax"\n\t"
+		"movd 	%%mm7,	("REG_ax")\n\t"
+		"emms\n\t"
+		:
+		:
+		: "eax"
+		);
+		m=(uint32_t)_total.uw[0];
+
+                 return m;
+}
+#endif
+// C version
+uint32_t      ADMVideo_interlaceCount_C( uint8_t *src ,uint32_t w, uint32_t h)
+{
+uint32_t m=0,y,x;
+
+			uint8_t *p,*n,*c;
+			int j;
+			c=src + w;
+			n=src + w+w;
+			p=src ;
+
+
+			for(y=h>>SKIP_FACTOR;  y >2 ; y--)
+					{
+           				for(x=w;x>0;x--)
+								{
+								j=(int)*p-(int)*c;
+								j*=(int)*n-(int)*c;
+							//	printf("p %d c %d  n %d j %d\n",*p,*c,*n , j);
+                             					if(  j >MATCH_THRESH)
+								{
+								m++;
+							//	*c=*p=*n=0xff;
+								}
+
+										p++;c++;n++;
+								}
+								p+=(SKIP_LINEAR)*w;
+								c+=(SKIP_LINEAR)*w;
+								n+=(SKIP_LINEAR)*w;
+
+					}
+
+                 return m;
+}
+
+

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/src/attic/ADM_vidFieldASM.cpp Added

@@ -0,0 +1,218 @@
+/***************************************************************************
+                          ADM_vidDeintASM.cpp  -  description
+                             -------------------
+    begin                : Tue Jan 7 2003
+    copyright            : (C) 2003 by mean
+    email                : fixounet@free.fr
+
+    Slighlty faster ASM deinterlace
+    Blend later	
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+
+#include "ADM_videoFilter.h"
+
+#include"ADM_vidField.h"
+
+#ifdef ADM_CPU_X86
+//	#define DEBUG_DEINT 1
+//	#define MMX_TRACE 1
+
+ void myDeintASM(void);
+
+ static int32_t _l_w,_l_h,FUNNY_MANGLE(_l_all);
+ static uint8_t * FUNNY_MANGLE(_l_p) , * FUNNY_MANGLE(_l_c) ,* FUNNY_MANGLE(_l_n);
+ static uint8_t * FUNNY_MANGLE(_l_e) , * FUNNY_MANGLE(_l_e2);
+#define EXPAND(x) (x)+((x)<<16)+((x)<<32) +((x)<<48)
+static mmx_t _mmTHRESH1;
+static mmx_t _mmTHRESH2;
+
+#define COMPUTE_MMX \
+punpcklbw_r2r(mm5,mm0);  /*c  expand 4 bytes -> 4 word */ \
+punpcklbw_r2r(mm5,mm1);  /*p*/ \
+punpcklbw_r2r(mm5,mm2); /* n*/ \
+movq_r2r(mm0,mm3);		/* mm3 also c*/ \
+psubw_r2r(mm1,mm0) ; /* mm0=mm0-mm1 =  c-p*/ \
+psubw_r2r(mm2,mm3) ; /* mm3=mm3-mm2 =  c-n*/ \
+psraw_i2r(1,mm0); /* to protect from overflow*/ \
+psraw_i2r(1,mm3);\
+pmullw_r2r(mm0,mm3); /* mm3=(c-p)*(c-n) / 4;*/ \
+movq_r2r(mm3,mm0) ; /* mm0 also c-p*c-n */ \
+pcmpgtw_r2r(mm4,mm3); /* keep only > size*/ \
+pcmpgtw_r2r(mm6,mm0); /* keep only > size*/ \
+packsswb_r2r(mm5,mm0); \
+packsswb_r2r(mm5,mm3);
+
+#endif
+
+void ADMVideoFields::hasMotion_C(uint8_t *p,uint8_t *c,
+								uint8_t *n,
+								uint8_t *e,
+								uint8_t *e2
+								)
+{
+int32_t val,x,y;
+//printf("\nC \n");
+// other line
+       	for(y=_info.height-2;y>0;y--)
+        	{
+               for(x=_info.width;x>0;x--)
+               		{
+                   		val= (*p-*c)*(*n-*c);
+                        if(val>(int32_t)(_param->motion_trigger*_param->motion_trigger))
+                        	{
+                          	*e=0xff;
+                         }
+                         if(val>(int32_t)(_param->blend_trigger*_param->blend_trigger))
+                         	*e2=0xff;
+                         p++;c++;n++;e++;e2++;
+                      }
+           }
+}
+#ifdef ADM_CPU_X86
+void ADMVideoFields::hasMotion_MMX(uint8_t *p,uint8_t *c,
+									uint8_t *n,
+									uint8_t *e,
+									uint8_t *e2
+									)
+{
+
+
+			 	_mmTHRESH1.uq=EXPAND((uint64_t ) ((_param->motion_trigger*_param->motion_trigger)>>2) );
+				_mmTHRESH2.uq=EXPAND((uint64_t ) ((_param->blend_trigger*_param->blend_trigger)>>2) );
+
+			_l_h=_info.height-2;
+			_l_w=_info.width>>2;
+			_l_all=_l_h*_l_w;
+			_l_p=p;
+			_l_c=c;
+			_l_n=n;
+			_l_e=e;
+			_l_e2=e2;
+//			printf("\n MMX \n");
+
+			pxor_r2r(mm5,mm5);
+			movq_m2r(_mmTHRESH1,mm4);
+			movq_m2r(_mmTHRESH2,mm6);
+			myDeintASM();
+}
+#if !defined(DEBUG_DEINT)
+void myDeintASM(void)
+{
+                    __asm__ __volatile__ (
+                            "push "REG_bx"\n\t" // Dont clobber ebx for macOsX
+                            "mov "Mangle(_l_c)",	"REG_ax"\n\t"
+                            "mov "Mangle(_l_p)",	"REG_bx"\n\t"
+                            "mov "Mangle(_l_n)",	"REG_cx"\n\t"
+                            "mov "Mangle(_l_all)",	"REG_si"\n\t"
+                            "7:"
+                            "movd ("REG_ax"),	%%mm0\n\t"
+                            "movd ("REG_bx"),	%%mm1\n\t"
+                            "movd ("REG_cx"),	%%mm2\n\t"
+                            :
+                            :
+                            : "eax","ecx","edx","esi" 
+                            );
+
+                            COMPUTE_MMX; // Doint it like that should be safe as there should be no extra code inserted (...)
+
+                            /* store result in e, e2 */
+
+                    __asm__ __volatile__(
+                            "mov 	"Mangle(_l_e)",	"REG_dx"\n\t"
+                            "movd	%%mm3,("REG_dx")\n\t"
+
+                            "mov 	"Mangle(_l_e2)",	"REG_dx"\n\t"
+                            "movd	%%mm0,("REG_dx")\n\t"
+
+                            "add 	$4,	"REG_ax"\n\t"
+                            "add 	$4,	"REG_bx"\n\t"
+                            "add 	$4,	"REG_cx"\n\t"
+                            "add 	$4,	"Mangle(_l_e)"\n\t"
+                            "add 	$4,	"Mangle(_l_e2)"\n\t"
+                            "sub 	$1,	"REG_si"\n\t"
+                            "jnz 7b\n\t"
+                            "pop "REG_bx"\n\t" // Dont clobber ebx for macOsX
+                            :
+                            :
+                            : "eax", "ecx","edx","esi"
+                            );
+	   emms();
+
+}
+#else
+/*************************************************
+***************DEBUG*************************
+**************************************************
+**************************************************/
+
+
+void myDeintASM(void)
+{
+
+int32_t x,y;
+	printf("\n using  MMX debug\n");
+
+       	for(y=_l_h;y>0;y--)
+        	{
+		for(x=_l_w;x>0;x--)
+               		{
+
+			__asm__ __volatile__ (
+				"mov _l_c,	"REG_ax"\n\t"
+				"mov _l_p,	"REG_bx"\n\t"
+				"mov _l_n,	"REG_cx"\n\t"
+				"mov _l_w,	"REG_si"\n\t"
+				"movd ("REG_ax"),	%%mm0\n\t"
+				"movd ("REG_bx"),	%%mm1\n\t"
+				"movd ("REG_cx"),	%%mm2\n\t"
+				:
+				:
+				: "eax", "ebx", "ecx", "edx","esi"
+				);
+			emms();
+				COMPUTE_MMX;
+			emms();
+				/* store result in e, e2 */
+
+			__asm__ __volatile__(
+				"mov 	_l_e,	"REG_dx"\n\t"
+				"movd	%%mm3,("REG_dx")\n\t"
+				//"movd	%%mm3,(%%eax)\n\t"
+
+				"mov 	_l_e2,	"REG_dx"\n\t"
+				"movd	%%mm0,("REG_dx")\n\t"
+
+				:
+				:
+				: "eax","edx","esi"
+				);
+
+			emms();
+
+
+			 _l_e+=4;
+			 _l_e2+=4;
+			 _l_c+=4;
+			 _l_p+=4;
+			 _l_n+=4;
+
+           } // end for x
+	  }
+	   emms();
+}
+
+
+#endif
+#endif

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/src/attic/ADM_vidFieldBlend.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/src/attic/ADM_vidFieldUtil.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/src/attic/ADM_vidFields.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreImage/src/attic/ADM_videoFilter.cpp Changed

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

@@ -37,18 +37,18 @@
     \fn ffmpuxerSetExtradata
     \brief dupe the extradata if needed
 */
-bool ffmpuxerSetExtradata(AVCodecContext *context, int size, const uint8_t *data)
+bool ffmpuxerSetExtradata(AVCodecParameters *params, int size, const uint8_t *data)
 {
     if(!size)
     {
-        context->extradata=NULL;
-        context->extradata_size=0;
+        params->extradata=NULL;
+        params->extradata_size=0;
         return true;
     }
     uint8_t *copy=(uint8_t *)av_malloc( (1+(size>>4))<<4);;
     memcpy(copy,data,size);
-    context->extradata=copy;
-    context->extradata_size=size;
+    params->extradata=copy;
+    params->extradata_size=size;
     return true;
 }
 
@@ -160,31 +160,34 @@
 		printf("[FF] new stream failed\n");
 		return false;
 	}
-    AVCodecContext *c;
-        c = video_st->codec;
-        c->sample_aspect_ratio.num=1;
-        c->sample_aspect_ratio.den=1;
-        video_st->sample_aspect_ratio=c->sample_aspect_ratio;
+    AVCodecParameters *par;
+        par = video_st->codecpar;
+        par->sample_aspect_ratio.num=1;
+        par->sample_aspect_ratio.den=1;
+        video_st->sample_aspect_ratio=par->sample_aspect_ratio;
+        par->bit_rate=9000*1000;
+        par->codec_type = AVMEDIA_TYPE_VIDEO;
+        par->width = stream->getWidth();
+        par->height =stream->getHeight();
 
         uint32_t videoExtraDataSize=0;
         uint8_t  *videoExtraData;
         stream->getExtraData(&videoExtraDataSize,&videoExtraData);
         printf("[FF] Using %d bytes for video extradata\n",(int)videoExtraDataSize);
-        ffmpuxerSetExtradata(c,videoExtraDataSize,videoExtraData);
+        ffmpuxerSetExtradata(par,videoExtraDataSize,videoExtraData);
 
+    AVCodecContext *c;
+        c = video_st->codec;
         c->rc_buffer_size=8*1024*224;
         c->rc_max_rate=9500*1000;
         c->rc_min_rate=0;
-        c->bit_rate=9000*1000;
-        c->codec_type = AVMEDIA_TYPE_VIDEO;
         c->flags=CODEC_FLAG_QSCALE;
-        c->width = stream->getWidth();
-        c->height =stream->getHeight();
+
         uint32_t fcc=stream->getFCC();
 
         if(isMpeg4Compatible(fcc))
         {
-                c->codec_id = AV_CODEC_ID_MPEG4;
+                par->codec_id = AV_CODEC_ID_MPEG4;
                 if(stream->providePts()==true)
                 {
                     c->has_b_frames=1; // in doubt...
@@ -211,10 +214,10 @@
                         }
                         
                         if(isH265Compatible(fcc)) {
-                            c->codec_id = AV_CODEC_ID_HEVC;
+                            par->codec_id = AV_CODEC_ID_HEVC;
                              setAvCodec(c,AV_CODEC_ID_HEVC);
                         } else {
-                            c->codec_id = AV_CODEC_ID_H264;
+                            par->codec_id = AV_CODEC_ID_H264;
                              setAvCodec(c,AV_CODEC_ID_H264);
                         }
                 }
@@ -222,17 +225,17 @@
                 {
                         if(isDVCompatible(fcc))
                         {
-                          c->codec_id = AV_CODEC_ID_DVVIDEO;
+                          par->codec_id = AV_CODEC_ID_DVVIDEO;
                         }else
                         {
                           if(fourCC::check(fcc,(uint8_t *)"H263"))
                           {
-                                    c->codec_id= AV_CODEC_ID_H263;
+                                    par->codec_id= AV_CODEC_ID_H263;
                             }else
 
                            if(isVP6Compatible(stream->getFCC()))
                                 {
-                                         c->codec_id= AV_CODEC_ID_VP6F;
+                                         par->codec_id= AV_CODEC_ID_VP6F;
                                          setAvCodec(c,AV_CODEC_ID_VP6F);
                                          c->has_b_frames=0; // No PTS=cannot handle CTS...
                                          c->max_b_frames=0;
@@ -241,7 +244,7 @@
                                         {
                                                 c->has_b_frames=0; // No PTS=cannot handle CTS...
                                                 c->max_b_frames=0;
-                                                c->codec_id= AV_CODEC_ID_FLV1;
+                                                par->codec_id= AV_CODEC_ID_FLV1;
                                                 setAvCodec(c,AV_CODEC_ID_FLV1);
 
                                         }else
@@ -250,13 +253,13 @@
                                             {
                                                 c->has_b_frames=1; // No PTS=cannot handle CTS...
                                                 c->max_b_frames=2;
-                                                c->codec_id= AV_CODEC_ID_MPEG1VIDEO;
+                                                par->codec_id= AV_CODEC_ID_MPEG1VIDEO;
                                             }
                                             else if(fourCC::check(stream->getFCC(),(uint8_t *)"MPEG"))
                                             {
                                                 c->has_b_frames=1; // No PTS=cannot handle CTS...
                                                 c->max_b_frames=2;
-                                                c->codec_id= AV_CODEC_ID_MPEG2VIDEO;
+                                                par->codec_id= AV_CODEC_ID_MPEG2VIDEO;
                                             }else
                                             {
                                                 uint32_t id=stream->getFCC();
@@ -267,7 +270,7 @@
                                                     printf("[FF] Unknown video codec\n");
                                                     return false;
                                                 }
-                                                c->codec_id=cid;
+                                                par->codec_id=cid;
                                             }
                                         }
                         }
@@ -316,56 +319,58 @@
           }
           WAVHeader *audioheader=audio[i]->getInfo();;
           AVCodecContext *c;
+          AVCodecParameters *par;
           c = audio_st[i]->codec;
-          c->frame_size=1024; //For AAC mainly, sample per frame
+          par = audio_st[i]->codecpar;
+          par->frame_size=1024; //For AAC mainly, sample per frame
           printf("[FF] Bitrate %u\n",(audioheader->byterate*8)/1000);
-          c->sample_rate = audioheader->frequency;
+          par->sample_rate = audioheader->frequency;
           switch(audioheader->encoding)
           {
                   case WAV_OGG_VORBIS:
-                                c->codec_id = AV_CODEC_ID_VORBIS;c->frame_size=6*256;
-                                ffmpuxerSetExtradata(c,audioextraSize,audioextraData);
+                                par->codec_id = AV_CODEC_ID_VORBIS;par->frame_size=6*256;
+                                ffmpuxerSetExtradata(par,audioextraSize,audioextraData);
                                 break;
                   case WAV_FLAC:
-                                c->codec_id = AV_CODEC_ID_FLAC;
+                                par->codec_id = AV_CODEC_ID_FLAC;
                                 // Do we already have the flac header ? FFmpeg will add it..
                                 // If we have it, skip it
                                 if(audioextraSize>=8 && audioextraData[0]==0x66 && audioextraData[1]==0x4c &&audioextraData[2]==0x61 && audioextraData[3]==0x43 )
-                                    ffmpuxerSetExtradata(c,audioextraSize-8,audioextraData+8);
+                                    ffmpuxerSetExtradata(par,audioextraSize-8,audioextraData+8);
                                 else
-                                    ffmpuxerSetExtradata(c,audioextraSize,audioextraData);
+                                    ffmpuxerSetExtradata(par,audioextraSize,audioextraData);
                                 break;                                
-                  case WAV_DTS: c->codec_id = AV_CODEC_ID_DTS;c->frame_size=1024;break;
-                  case WAV_OPUS:    c->codec_id = AV_CODEC_ID_OPUS;
-                                    c->frame_size=1024;
-                                    ffmpuxerSetExtradata(c,audioextraSize,audioextraData);
+                  case WAV_DTS: par->codec_id = AV_CODEC_ID_DTS;par->frame_size=1024;break;
+                  case WAV_OPUS:    par->codec_id = AV_CODEC_ID_OPUS;
+                                    par->frame_size=1024;
+                                    ffmpuxerSetExtradata(par,audioextraSize,audioextraData);
                                     break;
-                  case WAV_EAC3: c->codec_id = AV_CODEC_ID_EAC3;c->frame_size=6*256;break;
-                  case WAV_AC3: c->codec_id = AV_CODEC_ID_AC3;c->frame_size=6*256;break;
-                  case WAV_MP2: c->codec_id = AV_CODEC_ID_MP2;c->frame_size=1152;break;
+                  case WAV_EAC3: par->codec_id = AV_CODEC_ID_EAC3;par->frame_size=6*256;break;
+                  case WAV_AC3: par->codec_id = AV_CODEC_ID_AC3;par->frame_size=6*256;break;
+                  case WAV_MP2: par->codec_id = AV_CODEC_ID_MP2;par->frame_size=1152;break;
                   case WAV_MP3:
 //  #warning FIXME : Probe deeper
-                              c->frame_size=1152;
-                              c->codec_id = AV_CODEC_ID_MP3;
+                              par->frame_size=1152;
+                              par->codec_id = AV_CODEC_ID_MP3;
                               break;
                   case WAV_PCM:
                                   // One chunk is 10 ms (1/100 of fq)
-                                  c->frame_size=4;
-                                  c->codec_id = AV_CODEC_ID_PCM_S16LE;break;
+                                  par->frame_size=4;
+                                  par->codec_id = AV_CODEC_ID_PCM_S16LE;break;
                   case WAV_AAC:
-                                  ffmpuxerSetExtradata(c,audioextraSize,audioextraData);
-                                  c->codec_id = AV_CODEC_ID_AAC;
-                                  c->frame_size=1024;
+                                  ffmpuxerSetExtradata(par,audioextraSize,audioextraData);
+                                  par->codec_id = AV_CODEC_ID_AAC;
+                                  par->frame_size=1024;
                                   break;
                   default:
                                  printf("[FF]: Unsupported audio\n");
                                  return false;
                           break;
           }
-          c->codec_type = AVMEDIA_TYPE_AUDIO;
-          c->bit_rate = audioheader->byterate*8;
-          c->rc_buffer_size=(c->bit_rate/(2*8)); // 500 ms worth
-          c->channels = audioheader->channels;
+          par->codec_type = AVMEDIA_TYPE_AUDIO;
+          par->bit_rate = audioheader->byterate*8;
+          c->rc_buffer_size=(par->bit_rate/(2*8)); // 500 ms worth
+          par->channels = audioheader->channels;
           if(useGlobalHeader()==true)
           {
             if(audioextraSize)
@@ -519,7 +524,10 @@
             {
                 MuxAudioPacket *audioTrack=&(audioPackets[audio]);
                 ADM_audioStream*a=aStreams[audio];
-                uint32_t fq=a->getInfo()->frequency;
+                WAVHeader *info=a->getInfo();
+                if(!info) // no more track
+                    continue;
+                uint32_t fq=info->frequency;
 
                 while(1)
                 {

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_dynaMuxer.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_dynaMuxer.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreScript/src/ADM_scriptDFMenu.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreScript/src/ADM_scriptDFMenu.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreSocket/src/ADM_coreCommandSocket.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreSocket/src/ADM_coreCommandSocket.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_codecType.h -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_codecType.h Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_last.h -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_last.h Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_videoInfoExtractor.h -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_videoInfoExtractor.h Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreUtils/include/prefs.h -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreUtils/include/prefs.h Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_codecType.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_codecType.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_coreCodecMapping.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_coreCodecMapping.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH264.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH264.cpp Changed

@@ -57,6 +57,7 @@
 bool ADM_SPSannexBToMP4(uint32_t dataLen,uint8_t *incoming,
                                     uint32_t *outLen, uint8_t *outData)
 {
+    int p;
     if(dataLen>200)
     {
         ADM_warning("SPS TOO LONG\n");
@@ -79,11 +80,12 @@
     outData[8]=0x67; // Len LSB, should fit in 1 byte...
 #if 1
     memcpy(outData+9,incoming,dataLen);
-    int p=dataLen+9;
+    p=dataLen;
 #else
-    int p=ADM_unescapeH264(dataLen,incoming,outData+9) ;
+    p=ADM_unescapeH264(dataLen,incoming,outData+9) ;
 #endif
-    outData[7]=p; // Len LSB, should fit in 1 byte...
+    outData[7]=(p+1); // Len LSB, should fit in 1 byte...
+    outData[6]=(p+1)>>8; // MSB : And no, does not always fit
     *outLen= p+9;
     return true;
 }
@@ -571,7 +573,7 @@
                     but 4 bytes NALU
 
 */
-uint8_t extractH264FrameType (uint32_t nalSize, uint8_t * buffer, uint32_t len,  uint32_t * flags)
+uint8_t extractH264FrameType (uint32_t nalSize, uint8_t * buffer, uint32_t len,  uint32_t * flags,uint32_t *extRecovery)
 {
   uint8_t *head = buffer, *tail = buffer + len;
   uint8_t stream;
@@ -584,6 +586,8 @@
       if(length>len) nalSize=3;
   }
   uint32_t recovery=0xff;
+  
+  
   *flags=0;
   while (head + nalSize < tail)
     {
@@ -604,7 +608,17 @@
       switch (stream)
         {
             case NAL_SEI:
-                getRecoveryFromSei(length-1, head+1,&recovery);
+            {
+
+                bool sei=getRecoveryFromSei(length-1, head+1,&recovery);
+                if(extRecovery)
+                {
+                    if(sei)
+                        *extRecovery=recovery;
+                    else
+                        recovery=*extRecovery;
+                }
+            }
                 break;
             case NAL_SPS:
             case NAL_PPS:

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH265.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH265.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_last.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_last.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreUtils/src/prefs.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreUtils/src/prefs.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA.h -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA.h Changed

@@ -32,6 +32,8 @@
 class ADM_vaSurface;
 
 
+#define VA_10BITS_IS_ACTUALL_8BITS 1 // ???
+
 /**
     \class admLibVA
 */
@@ -52,7 +54,7 @@
     static bool         init(GUI_WindowInfo *x);
     static bool         isOperationnal(void);
     static bool         cleanup(void);
-    
+    static VADisplay    getVADisplay();
     /* Setup   */
     static bool         setupConfig(void);
     static bool         setupImageFormat(void);
@@ -63,7 +65,7 @@
 static  VAContextID createDecoder(VAProfile profile,int width, int height, int nbSurface, VASurfaceID *surfaces);
 static  bool        destroyDecoder(VAContextID decoder);
 
-static  VASurfaceID allocateSurface( int w, int h);
+static  VASurfaceID allocateSurface( int w, int h, int fmt=VA_RT_FORMAT_YUV420);
 static  void        destroySurface(  VASurfaceID surface);
 
 static  VAImage    *allocateNV12Image( int w, int h);
@@ -77,7 +79,7 @@
 
 // Indirect access through image
 static bool        uploadToImage(ADMImage *src,VAImage *dest );
-static bool        downloadFromImage(ADMImage *src,VAImage *dest );
+static bool        downloadFromImage(ADMImage *src,VAImage *dest ,ADMColorScalerSimple *color=NULL);
 static bool        imageToSurface(VAImage *src,ADM_vaSurface *dest);
 static bool        surfaceToImage(ADM_vaSurface *dst,VAImage *src );
 
@@ -88,7 +90,7 @@
 // Direct access
 
 static bool        admImageToSurface( ADMImage *src,ADM_vaSurface *dest);
-static bool        surfaceToAdmImage(ADMImage *dest,ADM_vaSurface *src);
+static bool        surfaceToAdmImage(ADMImage *dest,ADM_vaSurface *src,ADMColorScalerSimple *color=NULL);
 
 //
 static bool        supported(VAProfile profile);
@@ -139,32 +141,15 @@
     int                 refCount;
     VAImage             *image;
     int                 w,h;
-    ADM_vaSurface(int w, int h)
-    {
-        surface=VA_INVALID;
-        refCount=0;
-        this->w=w;
-        this->h=h;
-        image=admLibVA::allocateImage(w,h);
-    }
-    ~ADM_vaSurface()
-    {
-        if(surface!=VA_INVALID)
-        {
-           admLibVA::destroySurface(surface);
-           surface=VA_INVALID;
-        }
-        if(image)
-        {
-            admLibVA::destroyImage(image);
-            image=NULL;
-        }
-    }
+    ADMColorScalerSimple *color10bits;
+    ADM_vaSurface(int w, int h);    
+    ~ADM_vaSurface();
+
     bool hasValidSurface() {return !(surface==VA_INVALID);}
     bool toAdmImage(ADMImage *image);
     bool fromAdmImage(ADMImage *image);
     
-    static ADM_vaSurface *allocateWithSurface(int w,int h);
+    static ADM_vaSurface *allocateWithSurface(int w,int h,int fmt=VA_RT_FORMAT_YUV420);
     
 };
 /**

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp Changed

@@ -102,7 +102,7 @@
 static bool                  coreLibVAWorking=false;
 
 #define CLEAR(x) memset(&x,0,sizeof(x))
-#define CHECK_ERROR(x) {xError=x;displayXError(#x,ADM_coreLibVA::display,xError);}
+#define CHECK_ERROR(x) {xError=x;displayXError(#x,ADM_coreLibVA::display,xError);if(xError) printf("%d =<%s>\n",xError,vaErrorStr(xError));}
 
 #include "ADM_coreLibVA_test.cpp"
 #include "ADM_bitstream.h"
@@ -171,6 +171,15 @@
 
 }
 /**
+ * 
+ * @return 
+ */
+VADisplay admLibVA::getVADisplay()
+{
+    return ADM_coreLibVA::display;
+}
+
+/**
  * \fn setupEncodingConfig
  * @return
  */
@@ -693,16 +702,16 @@
  * @param h
  * @return
  */
-VASurfaceID        admLibVA::allocateSurface(int w, int h)
+VASurfaceID        admLibVA::allocateSurface(int w, int h, int fmt)
 {
        int xError;
        CHECK_WORKING(VA_INVALID);
 
-       aprintf("Creating surface %d x %d\n",w,h);
+       aprintf("Creating surface %d x %d (fmt=%d)\n",w,h,fmt);
        VASurfaceID s;
 
         CHECK_ERROR(vaCreateSurfaces(ADM_coreLibVA::display,
-                        VA_RT_FORMAT_YUV420,
+                        fmt,
                         w,h,
                         &s,1,
                         NULL,0));
@@ -755,7 +764,7 @@
  * @param img
  * @return
  */
-bool        admLibVA::surfaceToAdmImage(ADMImage *dest,ADM_vaSurface *src)
+bool        admLibVA::surfaceToAdmImage(ADMImage *dest,ADM_vaSurface *src,ADMColorScalerSimple *color)
 {
     int xError;
     bool r=false;
@@ -818,6 +827,7 @@
     {
         case VA_FOURCC_YV12:break;
         case VA_FOURCC_NV12:break;
+        case VA_FOURCC_P010:break;
         default:
             ADM_warning("Unknown format %s\n",fourCC_tostring(vaImage.format.fourcc));
             goto dropIt;
@@ -841,10 +851,29 @@
                     break;
                 }
                 case VA_FOURCC_NV12:
+#ifdef VA_10BITS_IS_ACTUALL_8BITS                    
+                case VA_FOURCC_P010:
+#endif                    
                 {
                     dest->convertFromNV12(ptr+vaImage.offsets[0],ptr+vaImage.offsets[1], vaImage.pitches[0], vaImage.pitches[1]);
                     break;
                 }
+#ifndef VA_10BITS_IS_ACTUALL_8BITS                
+                case VA_FOURCC_P010: // It is actually NV12 style All Y, then U/V interleaved
+                {
+                    ADM_assert(color);
+                    ADMImageRef ref(dest->_width,dest->_height);
+                    for(int i=0;i<2;i++)
+                    {
+                            ref._planes[i]= ptr+vaImage.offsets[i];
+                            ref._planeStride[i]=vaImage.pitches[i];
+                    }
+                    ref._planes[2]=NULL;
+                    ref._planeStride[2]=0;
+                    color->convertImage(&ref,dest);                    
+                    break;
+                }
+#endif                
                 default:
                     goto dropIt;
                     break;
@@ -854,8 +883,6 @@
     }
 dropIt:
     CHECK_ERROR(vaDestroyImage (ADM_coreLibVA::display,vaImage.image_id));
-
-
     return r;
 }
 /**
@@ -968,12 +995,12 @@
 }
 
 /**
- * \fn uploadToImage
+ * \fn downloadFromImage
  * @param dest
  * @param src
  * @return
  */
-bool   admLibVA::downloadFromImage( ADMImage *src,VAImage *dest)
+bool   admLibVA::downloadFromImage( ADMImage *src,VAImage *dest,ADMColorScalerSimple *color)
 {
     int xError;
     VASurfaceStatus status;
@@ -999,6 +1026,20 @@
                         src->duplicate(&ref);
                 }
                 break;
+        case VA_FOURCC_P010: // It is actually NV12 style All Y, then U/V interleaved
+                {
+                    ADM_assert(color);
+                    ADMImageRef ref(src->_width,src->_height);
+                    for(int i=0;i<2;i++)
+                    {
+                            ref._planes[i]= ptr+dest->offsets[i];
+                            ref._planeStride[i]=dest->pitches[i];
+                    }
+                    ref._planes[2]=NULL;
+                    ref._planeStride[2]=0;
+                    color->convertImage(&ref,src);                    
+                    break;
+                }                
         case VA_FOURCC_NV12:
                         src->convertFromNV12(  ptr+dest->offsets[0], ptr+dest->offsets[1],dest->pitches[0],dest->pitches[1]);
                         break;
@@ -1151,10 +1192,10 @@
  * @param h
  * @return
  */
-ADM_vaSurface *ADM_vaSurface::allocateWithSurface(int w,int h)
+ADM_vaSurface *ADM_vaSurface::allocateWithSurface(int w,int h,int fmt)
 {
     ADM_vaSurface *s=new ADM_vaSurface(w,h);
-    s->surface=admLibVA::allocateSurface(w,h);
+    s->surface=admLibVA::allocateSurface(w,h,fmt);
     if(!s->hasValidSurface())
     {
         delete s;
@@ -1192,6 +1233,42 @@
 
 }
 /**
+ * 
+ * @param w
+ * @param h
+ */
+ ADM_vaSurface::ADM_vaSurface(int w, int h)
+{
+    surface=VA_INVALID;
+    refCount=0;
+    this->w=w;
+    this->h=h;
+    image=admLibVA::allocateImage(w,h);
+    color10bits=new ADMColorScalerSimple(w,h,ADM_COLOR_NV12_10BITS,ADM_COLOR_YV12);
+}
+/**
+ * 
+ */ 
+ADM_vaSurface:: ~ADM_vaSurface()
+ {
+     if(surface!=VA_INVALID)
+     {
+        admLibVA::destroySurface(surface);
+        surface=VA_INVALID;
+     }
+     if(image)
+     {
+         admLibVA::destroyImage(image);
+         image=NULL;
+     }
+     if(color10bits)
+     {
+         delete color10bits;
+         color10bits=NULL;
+     }
+ }
+
+/**
  * \fn admLibVa_exitCleanup
  */
 bool admLibVa_exitCleanup()
@@ -1216,13 +1293,13 @@
     case   admLibVA::ADM_LIBVA_NONE: ADM_warning("No transfer supported\n");return false;break;
     case   admLibVA::ADM_LIBVA_DIRECT:
                 //printf("Direct\n");
-                return admLibVA::surfaceToAdmImage(dest,this);
+                return admLibVA::surfaceToAdmImage(dest,this,color10bits);
     case   admLibVA::ADM_LIBVA_INDIRECT_NV12:
     case   admLibVA::ADM_LIBVA_INDIRECT_YV12:
                 //printf("InDirect\n");
                 ADM_assert(this->image);
                 if(admLibVA::surfaceToImage(this,this->image))
-                        return  admLibVA::downloadFromImage(dest,this->image);
+                        return  admLibVA::downloadFromImage(dest,this->image,color10bits);
                 return false;
                 break;
     default:ADM_assert(0);

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_codecFFVP9.h Added

@@ -0,0 +1,45 @@
+/***************************************************************************
+    \file ADM_codecFFVP9
+    \brief Simple wrapper around vp9, including parser
+    \author mean fixounet@free.fr (c) 2017
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+#include "ADM_codecFFsimple.h"
+/**
+    \class decoderFF
+    \brief Base class for lavcodec based decoder
+*/
+
+
+
+class ADM_COREVIDEOCODEC6_EXPORT decoderFFVP9:public decoderFFSimple
+{
+protected:
+
+protected:
+
+public:
+                        decoderFFVP9 (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp);
+        virtual         ~ decoderFFVP9 ();
+        virtual bool    uncompress (ADMCompressedImage * in, ADMImage * out);
+        virtual const char *getDecoderName(void) 
+                          {
+                              if(hwDecoder)
+                                  return hwDecoder->getName();
+                              return "Lavcodec VP9";
+                          }
+                            
+protected:
+                AVCodecParserContext *_parserContext;
+};
\ No newline at end of file

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_codecSearch.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_codecSearch.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffVp9.cpp Added

@@ -0,0 +1,77 @@
+/***************************************************************************
+    \file  ADM_ffVp9
+    \brief Decoders using lavcodec
+    \author mean & all (c) 2017
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include <stddef.h>
+
+#include "ADM_default.h"
+#include "ADM_ffmp43.h"
+#include "DIA_coreToolkit.h"
+#include "ADM_hwAccel.h"
+#include "ADM_codecFFVP9.h"
+
+#define xlog(...) {}
+
+/**
+ * \fn ctor
+ */
+decoderFFVP9::decoderFFVP9 (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp)
+    : decoderFFSimple(w,h,fcc,extraDataLen,extraData,bpp)
+{
+    _parserContext=av_parser_init(AV_CODEC_ID_VP9);
+    ADM_assert(_parserContext);
+}
+/**
+ * \fn dtor
+ */
+decoderFFVP9::~decoderFFVP9 ()
+{
+    if(_parserContext)
+    {   
+        av_parser_close(_parserContext);
+        _parserContext=NULL;
+    }
+}
+/**
+ * \fn uncompress
+ * \brief not sure this is correct, we run the parser and feed everything to libavcodec
+ */
+bool    decoderFFVP9::uncompress (ADMCompressedImage * in, ADMImage * out)
+{
+    uint8_t *parsedPointer=NULL;
+    int      parsedLen=0;
+    bool result;
+    // run parser on it..
+    int offset=0;
+    xlog("Parse %d\n",in->dataLength);
+    while(offset<in->dataLength)
+    {
+        int r=av_parser_parse2( _parserContext, _context,
+                                        &parsedPointer, &parsedLen, 
+                                        in->data+offset, in->dataLength-offset,
+                                        in->demuxerPts, in->demuxerDts, -1);
+        if(r<=0 || !parsedPointer)
+            break;
+        offset+=r;
+        xlog("Got pic\n");
+        ADMCompressedImage dummy;
+        dummy=*in;
+        dummy.data=parsedPointer;
+        dummy.dataLength=parsedLen;
+        result=decoderFFSimple::uncompress(&dummy,out);
+    }
+    xlog("/Parse\n");
+    return result;
+}
+// eof

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_core/ADM_coreVideoCodec/src/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_core/ADM_coreVideoCodec/src/CMakeLists.txt Changed

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

avidemux_2.6.20.tar.gz/avidemux_core/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_core/CMakeLists.txt Changed

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.0)
 
 MESSAGE("")
 MESSAGE("#########################################")
@@ -158,13 +158,18 @@
 ADM_INSTALL_CMAKE_HELPER_FOLDER("${CMAKE_SOURCE_DIR}/../cmake/cmake_compile_check/" cmake_compile_check)     
 # 
 
-INSTALL(FILES ${CMAKE_BINARY_DIR}/config/ADM_coreConfig.h DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6" COMPONENT dev)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/config/ADM_coreConfig.cmake DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/cmake/" COMPONENT dev)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/config/ADM_coreConfig.h DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}" COMPONENT dev)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/config/ADM_coreConfig.cmake DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/cmake/" COMPONENT dev)
 
 IF(MSVC)
-        INSTALL(FILES ${CMAKE_SOURCE_DIR}/../foreignBuilds/msvc/include/stdint.h DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6" COMPONENT dev)
-        INSTALL(FILES ${CMAKE_SOURCE_DIR}/../foreignBuilds/msvc/include/inttypes.h DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6" COMPONENT dev)
-        INSTALL(FILES ${CMAKE_SOURCE_DIR}/../foreignBuilds/msvc/include/GL/glext.h  DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/GL" COMPONENT dev)
+        INSTALL(FILES ${CMAKE_SOURCE_DIR}/../foreignBuilds/msvc/include/stdint.h DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}" COMPONENT dev)
+        INSTALL(FILES ${CMAKE_SOURCE_DIR}/../foreignBuilds/msvc/include/inttypes.h DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}" COMPONENT dev)
+        INSTALL(FILES ${CMAKE_SOURCE_DIR}/../foreignBuilds/msvc/include/GL/glext.h  DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/GL" COMPONENT dev)
+        # install runtimes also
+        SET(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ${AVIDEMUX_BIN_DIR})
+        include(InstallRequiredSystemLibraries)
+        FILE(GLOB dlls   ${VS_ROOT}/bin/*.dll )
+        INSTALL(FILES ${dlls} DESTINATION ${AVIDEMUX_BIN_DIR})
 ENDIF(MSVC)

avidemux_2.7.0.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-3.3.2.tar.bz2 Added

avidemux_2.6.20.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_h264_parser.c.patch -> avidemux_2.7.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_h264_parser.c.patch Changed

@@ -1,9 +1,7 @@
-diff --git libavcodec/h264_parser.c libavcodec/h264_parser.c
-index 19d1aa3..a10e636 100644
---- libavcodec/h264_parser.c
-+++ libavcodec/h264_parser.c
-@@ -40,6 +40,88 @@ typedef struct H264ParseContext {
-     int got_first;
+--- 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 @@
+     int last_frame_num, last_picture_structure;
  } H264ParseContext;
  
 +#include "ff_spsinfo.h" // MEANX
@@ -12,38 +10,52 @@
 +int ff_h264_info(AVCodecParserContext *parser,ffSpsInfo *info);
 +/**
 +    \fn AVCodecParserContext
++ *  \brief find a valid sps,take the 1st one that look sok
 +*/
-+/// find a valid sps
-+static SPS *findValidSPS(H264Context *ctx)
-+{
-+    if(ctx->sps.mb_width!=0) return &(ctx->sps);
-+    for(int i=0;i<MAX_SPS_COUNT;i++)
-+    {
-+        SPS *s=ctx->sps_buffers[i];
-+        if(!s) continue;
-+        if(!s->mb_width || !s->mb_height) continue;
-+        return s;
-+    }
++
++static SPS *findValidSPS(H264ParamSets *ps)
++{  
++   int i; 
++    
++   if(!ps) 
++   { 
++       av_log(NULL, AV_LOG_ERROR, "findValidSPS called with invalid data\n");
++       return NULL;
++   }
++   
++   for (i = 0; i<MAX_SPS_COUNT; i++)
++   {
++        AVBufferRef *ref=ps->sps_list[i];
++        if (ref)
++        {
++           SPS   *sps = ( SPS *)ref->data; // actually it's a const
++           if(sps->mb_width)
++               return sps;
++        }
++   }
++    av_log(NULL, AV_LOG_ERROR, "findValidSPS no valid SPS found\n");
 +    return NULL;
 +}
++/**
++ * 
++ * @param parser
++ * @param info
++ * @return 
++ */
 +int ff_h264_info(AVCodecParserContext *parser,ffSpsInfo *info)
 +{
-+    H264Context *ctx = parser->priv_data;
++    H264ParseContext *ctx = parser->priv_data;    
 +    int f;   
 +    SPS *sps;
-+    
-+    
-+    
 +    memset(info,0,sizeof(*info));
-+    sps=findValidSPS(ctx);
-+    
-+    
++    sps=findValidSPS(&(ctx->ps));
++        
 +    if(!sps)
 +    {
 +        return 0;
 +    }
 +    info->width=sps->mb_width  * 16;
-+    info->height=(2-sps->frame_mbs_only_flag)*sps->mb_height * 16;
++    info->height=sps->mb_height * 16;
 +    if(sps->timing_info_present_flag)
 +    {
 +            float scale=sps->time_scale ;
@@ -90,4 +102,4 @@
 +
  
  static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf,
-                                int buf_size)
+                                int buf_size, void *logctx)

avidemux_2.6.20.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_hevc_parser.c.patch -> avidemux_2.7.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_hevc_parser.c.patch Changed

@@ -1,43 +1,20 @@
---- libavcodec/hevc_parser.c.org	2017-01-30 07:50:12.779173809 +0100
-+++ libavcodec/hevc_parser.c	2017-01-30 07:43:40.491714104 +0100
-@@ -25,6 +25,11 @@
- #include "golomb.h"
- #include "hevc.h"
+--- libavcodec/hevc_parser.c.old	2017-02-08 07:28:24.025576908 +0100
++++ libavcodec/hevc_parser.c	2017-02-08 07:35:03.939231159 +0100
+@@ -27,6 +27,13 @@
+ #include "h2645_parse.h"
  #include "parser.h"
+ 
 +/* MEANX */
 +HEVCSPS *ff_hevc_parser_get_sps(AVCodecParserContext *s);
 +HEVCPPS *ff_hevc_parser_get_pps(AVCodecParserContext *s);
 +HEVCVPS *ff_hevc_parser_get_vps(AVCodecParserContext *s);
 +/* /MEANX */
- 
++
++
  #define START_CODE 0x000001 ///< start_code_prefix_one_3bytes
  
-@@ -46,7 +51,7 @@
- } HEVCParserContext;
- 
- #if !ADVANCED_PARSER
--static int hevc_parse_slice_header(AVCodecParserContext *s, HEVCNAL *nal,
-+int hevc_parse_slice_header(AVCodecParserContext *s, HEVCNAL *nal,
-                                    AVCodecContext *avctx)
- {
-     HEVCParserContext *ctx = s->priv_data;
-@@ -81,7 +86,6 @@
- 
-     return 0;
- }
--
- static int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf,
-                            int buf_size, AVCodecContext *avctx)
- {
-@@ -128,7 +132,6 @@
-     return 0;
- }
- #endif
--
- /**
-  * Find the end of the current frame in the bitstream.
-  * @return the position of the first byte of the next frame, or END_NOT_FOUND
-@@ -174,6 +177,59 @@
+ #define IS_IRAP_NAL(nal) (nal->type >= 16 && nal->type <= 23)
+@@ -176,6 +183,62 @@
  
  #if ADVANCED_PARSER
  /**
@@ -94,6 +71,9 @@
 +// /MEANX
 +
 +/**
++
++
++/**
   * Parse NAL units of found picture and decode some basic information.
   *
   * @param s parser context.

avidemux_2.7.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_internal_h_msvc.patch Added

avidemux_2.6.20.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_libavcodec.v.patch -> avidemux_2.7.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_libavcodec.v.patch Changed

avidemux_2.6.20.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h.patch -> avidemux_2.7.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h.patch Changed

avidemux_2.6.20.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_nvenc.patch -> avidemux_2.7.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_nvenc.patch Changed

@@ -1,34 +1,47 @@
---- libavcodec/nvenc.c.org	2016-03-29 04:25:20.000000000 +0200
-+++ libavcodec/nvenc.c	2016-09-19 07:36:39.524237421 +0200
-@@ -1015,19 +1015,19 @@
+--- libavcodec/nvenc.c.org	2017-04-17 08:23:35.667815437 +0200
++++ libavcodec/nvenc.c	2017-04-17 08:28:14.842850247 +0200
+@@ -40,11 +40,11 @@
+     AV_PIX_FMT_YUV420P,
+     AV_PIX_FMT_NV12,
+     AV_PIX_FMT_P010,
+-    AV_PIX_FMT_YUV444P,
+-    AV_PIX_FMT_YUV444P16,
+-    AV_PIX_FMT_0RGB32,
+-    AV_PIX_FMT_0BGR32,
+-    AV_PIX_FMT_CUDA,
++    // MEANX AV_PIX_FMT_YUV444P,
++    // MEANX AV_PIX_FMT_YUV444P16,
++    // MEANX AV_PIX_FMT_0RGB32,
++    // MEANX AV_PIX_FMT_0BGR32,
++    // MEANX AV_PIX_FMT_CUDA,
+     AV_PIX_FMT_NONE
+ };
  
-         switch (avctx->pix_fmt) {
-         case AV_PIX_FMT_YUV420P:
--            allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YV12_PL;
--            break;
-+            // MEANX allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YV12_PL;
-+            // MEANX break;
+@@ -1063,11 +1063,12 @@
+ {
+     switch (pix_fmt) {
+     case AV_PIX_FMT_YUV420P:
+-        return NV_ENC_BUFFER_FORMAT_YV12_PL;
++        // MEANX return NV_ENC_BUFFER_FORMAT_YV12_PL;
+     case AV_PIX_FMT_NV12:
+         return NV_ENC_BUFFER_FORMAT_NV12_PL;
+     case AV_PIX_FMT_P010:
+         return NV_ENC_BUFFER_FORMAT_YUV420_10BIT;
++#if 0 // MEANX
+     case AV_PIX_FMT_YUV444P:
+         return NV_ENC_BUFFER_FORMAT_YUV444_PL;
+     case AV_PIX_FMT_YUV444P16:
+@@ -1076,6 +1077,7 @@
+         return NV_ENC_BUFFER_FORMAT_ARGB;
+     case AV_PIX_FMT_0BGR32:
+         return NV_ENC_BUFFER_FORMAT_ABGR;
++#endif // MEANX
+     default:
+         return NV_ENC_BUFFER_FORMAT_UNDEFINED;
+     }
+@@ -1316,10 +1318,33 @@
  
-         case AV_PIX_FMT_NV12:
-             allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_NV12_PL;
-             break;
- 
--        case AV_PIX_FMT_YUV444P:
--            allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YUV444_PL;
--            break;
-+        // MEANX case AV_PIX_FMT_YUV444P:
-+            // MEANX allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YUV444_PL;
-+            // MEANX break;
- 
-         default:
--            av_log(avctx, AV_LOG_FATAL, "Invalid input pixel format\n");
-+            av_log(avctx, AV_LOG_FATAL, "NVENC  : Invalid input pixel format\n");
-             res = AVERROR(EINVAL);
-             goto error;
-         }
-@@ -1260,6 +1260,29 @@
- 
-     return res;
+     return NULL;
  }
 +/**
 +        MEANX
@@ -52,84 +65,35 @@
 +
 +        }
 +} 
-+ 
  
- static int nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
-     const AVFrame *frame, int *got_packet)
-@@ -1298,59 +1321,32 @@
-             av_log(avctx, AV_LOG_ERROR, "Failed locking nvenc input buffer\n");
-             return 0;
-         }
--
--        if (avctx->pix_fmt == AV_PIX_FMT_YUV420P) {
--            uint8_t *buf = lockBufferParams.bufferDataPtr;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch,
--                frame->data[0], frame->linesize[0],
--                avctx->width, avctx->height);
--
--            buf += inSurf->height * lockBufferParams.pitch;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch >> 1,
--                frame->data[2], frame->linesize[2],
--                avctx->width >> 1, avctx->height >> 1);
--
--            buf += (inSurf->height * lockBufferParams.pitch) >> 2;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch >> 1,
--                frame->data[1], frame->linesize[1],
--                avctx->width >> 1, avctx->height >> 1);
--        } else if (avctx->pix_fmt == AV_PIX_FMT_NV12) {
--            uint8_t *buf = lockBufferParams.bufferDataPtr;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch,
--                frame->data[0], frame->linesize[0],
--                avctx->width, avctx->height);
--
--            buf += inSurf->height * lockBufferParams.pitch;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch,
--                frame->data[1], frame->linesize[1],
--                avctx->width, avctx->height >> 1);
--        } else if (avctx->pix_fmt == AV_PIX_FMT_YUV444P) {
--            uint8_t *buf = lockBufferParams.bufferDataPtr;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch,
--                frame->data[0], frame->linesize[0],
--                avctx->width, avctx->height);
--
--            buf += inSurf->height * lockBufferParams.pitch;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch,
--                frame->data[1], frame->linesize[1],
--                avctx->width, avctx->height);
--
--            buf += inSurf->height * lockBufferParams.pitch;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch,
--                frame->data[2], frame->linesize[2],
--                avctx->width, avctx->height);
--        } else {
--            av_log(avctx, AV_LOG_FATAL, "Invalid pixel format!\n");
--            return AVERROR(EINVAL);
--        }
-+// MEANX
-+        { 
-+        uint8_t *buf = lockBufferParams.bufferDataPtr;
-+          av_image_copy_plane(buf, lockBufferParams.pitch,
+ static int nvenc_copy_frame(AVCodecContext *avctx, NvencSurface *nv_surface,
+             NV_ENC_LOCK_INPUT_BUFFER *lock_buffer_params, const AVFrame *frame)
+ {
++#if 0 // MEANX
+     int dst_linesize[4] = {
+         lock_buffer_params->pitch,
+         lock_buffer_params->pitch,
+@@ -1345,6 +1370,34 @@
+                   avctx->width, avctx->height);
+ 
+     return 0;
++#else // MEANX
++  // MEANX
++        uint8_t *buf = lock_buffer_params->bufferDataPtr;
++          av_image_copy_plane(buf, lock_buffer_params->pitch,
 +                 frame->data[0], frame->linesize[0],
 +                 avctx->width, avctx->height);
 +// MEANX : We accept YV12 and interleave while copying, it saves us one intermediate image buffer
-+        buf += inSurf->height * lockBufferParams.pitch;
++        buf += nv_surface->height * lock_buffer_params->pitch;
 +        switch(avctx->pix_fmt)
 +        {
 +                case AV_PIX_FMT_YUV420P:
 +                        // Interleave U & V to NV12
-+                        interleave_nv12(buf, lockBufferParams.pitch,frame->data[1],frame->linesize[1],frame->data[2],frame->linesize[2],avctx->width>>1, avctx->height>>1); 
++                        interleave_nv12(buf, lock_buffer_params->pitch,frame->data[1],frame->linesize[1],frame->data[2],frame->linesize[2],avctx->width>>1, avctx->height>>1); 
 +                        break;
 +
 +                case AV_PIX_FMT_NV12:
-+                        av_image_copy_plane(buf, lockBufferParams.pitch,
++                        av_image_copy_plane(buf, lock_buffer_params->pitch,
 +                                frame->data[1], frame->linesize[1],
 +                                avctx->width, avctx->height >> 1);
 +                        break;
@@ -137,8 +101,10 @@
 +                        av_log(avctx, AV_LOG_FATAL, "NVENC: Invalid pixel format!\n");
 +                        return AVERROR(EINVAL);
 +        } 
-+       }
-+// /MEANX
++
++#endif // MEANX
++        
++ return 0;
+ }
  
-         nv_status = p_nvenc->nvEncUnlockInputBuffer(ctx->nvencoder, inSurf->input_surface);
-         if (nv_status != NV_ENC_SUCCESS) {
+ static int nvenc_find_free_reg_resource(AVCodecContext *avctx)

avidemux_2.6.20.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_libavformat.v.patch -> avidemux_2.7.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_libavformat.v.patch Changed

avidemux_2.6.20.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc.c.patch -> avidemux_2.7.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc.c.patch Changed

@@ -1,28 +1,28 @@
---- libavformat/matroskaenc.c.org	2016-03-29 04:25:28.000000000 +0200
-+++ libavformat/matroskaenc.c	2016-09-15 07:12:54.207029493 +0200
-@@ -522,6 +522,8 @@
+--- libavformat/matroskaenc.c.org	2016-10-01 10:42:43.598335852 +0200
++++ libavformat/matroskaenc.c	2016-10-01 10:53:08.199475444 +0200
+@@ -524,6 +524,8 @@
  
- static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, AVCodecContext *codec)
+ static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par)
  {
 +#if 0 // MEANX avidemux does thing differently
 +
      const uint8_t *header_start[3];
      int header_len[3];
      int first_header_size;
-@@ -546,6 +548,29 @@
+@@ -548,6 +550,29 @@
          avio_write(pb, header_start[j], header_len[j]);
  
      return 0;
 +#else
 +   // Not endian safe....
-+      uint32_t packetLen[3],*ptr=(uint32_t *)codec->extradata;
++      uint32_t packetLen[3],*ptr=(uint32_t *)par->extradata;
 +      uint8_t *data[3],i,j;
-+      if( 3*4+ptr[0]+ptr[1]+ptr[2]!=codec->extradata_size)
++      if( 3*4+ptr[0]+ptr[1]+ptr[2]!=par->extradata_size)
 +      {
 +        av_log(s, AV_LOG_ERROR, "Broken avidemux xiph header.\n");
 +        return -1;
 +      }
-+      data[0]=codec->extradata+3*4;
++      data[0]=par->extradata+3*4;
 +      data[1]=data[0]+ptr[0];
 +      data[2]=data[1]+ptr[1];
 +      avio_w8(pb, 2);                    // number packets - 1
@@ -38,18 +38,20 @@
 +
  }
  
- static int put_wv_codecpriv(AVIOContext *pb, AVCodecContext *codec)
-@@ -867,6 +892,23 @@
+ static int put_wv_codecpriv(AVIOContext *pb, AVCodecParameters *par)
+@@ -971,7 +996,25 @@
      put_ebml_uint (pb, MATROSKA_ID_TRACKUID,
                     mkv->is_dash ? mkv->dash_track_number : i + 1);
      put_ebml_uint (pb, MATROSKA_ID_TRACKFLAGLACING , 0);    // no lacing (yet)
+-
++#if  0 // TODO FIXME
 +	/**  MEANX : Add a default duration for video **/
-+	if(codec->codec_type==AVMEDIA_TYPE_VIDEO)
++	if(par->codec_type==AVMEDIA_TYPE_VIDEO)
 +	{
-+		if(codec->time_base.den && codec->time_base.num)
++		if(par->time_base.den && par->time_base.num)
 +		{
-+			int num = codec->time_base.num;
-+			int den = codec->time_base.den;
++			int num = par->time_base.num;
++			int den = par->time_base.den;
 +			unsigned int default_duration;
 +			float period = num;
 +
@@ -60,6 +62,7 @@
 +		}
 +	}
 +	/**  MEANX : Add a default duration for video **/
- 
++#endif
      if ((tag = av_dict_get(st->metadata, "title", NULL, 0)))
          put_ebml_string(pb, MATROSKA_ID_TRACKNAME, tag->value);
+     tag = av_dict_get(st->metadata, "language", NULL, 0);

avidemux_2.7.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc_vp9.c.patch Added

avidemux_2.6.20.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_movenc.c.patch -> avidemux_2.7.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_movenc.c.patch Changed

@@ -1,13 +1,11 @@
-diff --git libavformat/movenc.c libavformat/movenc.c
-index 9b2c8da..34ac70a 100644
---- libavformat/movenc.c
-+++ libavformat/movenc.c
-@@ -1127,7 +1127,7 @@ static int mp4_get_codec_tag(AVFormatContext *s, MOVTrack *track)
+--- libavformat/movenc.c.org	2016-10-01 10:33:16.655727634 +0200
++++ libavformat/movenc.c	2016-10-01 10:34:01.546673803 +0200
+@@ -1155,7 +1155,7 @@
          return 0;
  
-     if      (track->enc->codec_id == AV_CODEC_ID_H264)      tag = MKTAG('a','v','c','1');
--    else if (track->enc->codec_id == AV_CODEC_ID_HEVC)      tag = MKTAG('h','e','v','1');
-+    else if (track->enc->codec_id == AV_CODEC_ID_HEVC)      tag = MKTAG('h','v','c','1');
-     else if (track->enc->codec_id == AV_CODEC_ID_AC3)       tag = MKTAG('a','c','-','3');
-     else if (track->enc->codec_id == AV_CODEC_ID_EAC3)      tag = MKTAG('e','c','-','3');
-     else if (track->enc->codec_id == AV_CODEC_ID_DIRAC)     tag = MKTAG('d','r','a','c');
+     if      (track->par->codec_id == AV_CODEC_ID_H264)      tag = MKTAG('a','v','c','1');
+-    else if (track->par->codec_id == AV_CODEC_ID_HEVC)      tag = MKTAG('h','e','v','1');
++    else if (track->par->codec_id == AV_CODEC_ID_HEVC)      tag = MKTAG('h','v','c','1');
+     else if (track->par->codec_id == AV_CODEC_ID_VP9)       tag = MKTAG('v','p','0','9');
+     else if (track->par->codec_id == AV_CODEC_ID_AC3)       tag = MKTAG('a','c','-','3');
+     else if (track->par->codec_id == AV_CODEC_ID_EAC3)      tag = MKTAG('e','c','-','3');

avidemux_2.7.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavutil_lfg2.c.patch Added

avidemux_2.7.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavutil_libavutil.v.patch Added

avidemux_2.6.20.tar.gz/avidemux_core/ffmpeg_package/patches/libavutil_log_c.patch -> avidemux_2.7.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavutil_log_c.patch Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.cpp Changed

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

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

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flvAudio.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flvAudio.cpp Changed

@@ -44,11 +44,14 @@
 */
 ADM_flvAccess::ADM_flvAccess(const char *name,flvTrak *track) : ADM_audioAccess()
 {
-        _fd=ADM_fopen(name,"rb");
-        ADM_assert(_fd);
-        _track=track;
-        goToBlock(0);
-        currentBlock=0;
+    _fd=ADM_fopen(name,"rb");
+    ADM_assert(_fd);
+    _track=track;
+    goToBlock(0);
+    currentBlock=0;
+    _msg_counter = 0;
+    _msg_ratelimit = new ADMCountdown(200);
+    _msg_ratelimit->reset();
 }
 /**
     \fn ADM_audioAccess
@@ -57,8 +60,11 @@
 */
 ADM_flvAccess::~ADM_flvAccess()
 {
-        if(_fd) fclose(_fd);
-        _fd=NULL;
+    if(_fd) fclose(_fd);
+    _fd=NULL;
+    if(_msg_ratelimit)
+        delete _msg_ratelimit;
+    _msg_ratelimit = NULL;
 }
 /**
     \fn getDurationInUs
@@ -111,8 +117,22 @@
     flvIndex *x;
     if(false==goToBlock(currentBlock))
     {
-      printf("[ADM_flvAccess] Get packet out of bound\n");
-      return false;
+        if(_msg_ratelimit->done())
+        {
+            if(_msg_counter)
+            {
+                printf("[ADM_flvAccess::getPacket] Packet out of bounds (message repeated %" PRIu32" times)\n",_msg_counter);
+                _msg_counter = 0;
+            }else
+            {
+                printf("[ADM_flvAccess::getPacket] Packet out of bounds\n");
+            }
+            _msg_ratelimit->reset();
+        }else
+        {
+            _msg_counter++;
+        }
+        return false;
     }
     x=&(_track->_index[currentBlock]);
     fread(buffer,x->size,1,_fd);
@@ -120,7 +140,7 @@
     *dts=((uint64_t)x->dtsUs);
     
     currentBlock++;
-    //
+    _msg_counter = 0;
     return 1;
 }
 /**
@@ -128,14 +148,20 @@
 */
 bool      ADM_flvAccess::goToBlock(uint32_t block)
 {
-  if(block>=_track->_nbIndex)
-  {
-    printf("[FLVAUDIO]Exceeding max cluster : asked: %u max :%u\n",block,_track->_nbIndex); 
-    return false;  // FIXME
-  }
-  currentBlock=block;
-  fseeko(_fd,_track->_index[currentBlock].pos,SEEK_SET);
-  return 1;
+    if(block>=_track->_nbIndex)
+    {
+        if(_msg_ratelimit->done())
+        {
+            if(_msg_counter)
+                printf("[ADM_flvAccess::goToBlock] Exceeding max cluster: asked: %u max: %u (message repeated %" PRIu32" times)\n",block,_track->_nbIndex,_msg_counter);
+            else
+                printf("[ADM_flvAccess::goToBlock] Exceeding max cluster: asked: %u max: %u\n",block,_track->_nbIndex);
+        }
+        return false;  // FIXME
+    }
+    currentBlock=block;
+    fseeko(_fd,_track->_index[currentBlock].pos,SEEK_SET);
+    return 1;
 }
 
 //EOF

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/Flv/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Flv/CMakeLists.txt Changed

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

@@ -13,7 +13,7 @@
  ***************************************************************************/
 #include "ADM_cpp.h"
 #include <math.h>
-
+#include <stdlib.h>
 #include "ADM_default.h"
 #include "ADM_Video.h"
 #include "ADM_mkv.h"
@@ -21,7 +21,7 @@
 #include "mkv_tags.h"
 #include "ADM_audioXiphUtils.h"
 #include "ADM_vidMisc.h"
-
+#include "ADM_mkvDeviation.h"
 typedef struct
 {
     int durationInUs;
@@ -32,10 +32,10 @@
 static const frameRateStruct candidateFrameRate[]=
 {
    {41708,1001,24000}, // 23.976 fps
-   {41667,1000,24000}, // 24 fps
+   //{41667,1000,24000}, // 24 fps
    {40000,1000,25000}, // 25 fps
    {33367,1001,30000}, // 30 NTSC
-   {20853,2000,24000}, // 24*2
+   //{20853,2000,24000}, // 24*2
    {20854,2002,24000}, // 23976*2
    {20000,1000,50000}, // 50
    {16683,1001,60000}, // 60 NTSCs
@@ -149,6 +149,11 @@
     }
   // update some infos
   _videostream.dwLength= _mainaviheader.dwTotalFrames=_tracks[0].index.size();;
+    if(! _videostream.dwLength)
+    {
+        ADM_warning("No image found in this video\n");
+        return 0;
+    }
 
     if(!isH264Compatible(_videostream.fccHandler) && !isMpeg4Compatible(_videostream.fccHandler) && !isMpeg12Compatible(_videostream.fccHandler))
     {
@@ -280,45 +285,6 @@
 }
 /**
     \fn checkDeviation
-    \brief returns the # of errors when forcing timestamp to be num/den (interval in us)
-      num=1000
-      den=24000 for a 24 fps
-
-
-*/
-int  mkvHeader::checkDeviation(int num, int den)
-{
-  mkvTrak *track=_tracks;
-  int nb=track->index.size();
-  int first=0;
-  double dHalf=(500000.*(double)num)/((double)den);
-  int half=dHalf-1; // half interval in us
-  int good=0,bad=0;
-  while(  track->index[first].Pts==ADM_NO_PTS && first<nb) first++; // we should have some at least
-  uint64_t zero= track->index[first].Pts;
-  ADM_info("Num=%d Den=%d half=%d zero=%d first=%d\n",num,den,half,(int)zero,first);
-  for(int i=first+1;i<nb;i++)
-  {
-    uint64_t pts=track->index[i].Pts;
-    if(pts<zero) continue;
-    pts-=zero;
-    double dmultiple=(pts+half);
-    dmultiple*=den;
-    dmultiple/=(1000000.*(double)num);
-    uint64_t multiple=(uint64_t)dmultiple;
-    int64_t reconstructed=(multiple*1000000*num)/den;
-    int64_t deviation=pts-reconstructed;
-    //printf("frame %d multiple = %d, deviation=%d\n",i,(int)multiple,(int)deviation);
-    if(deviation>2000)
-        bad++;
-    else
-        good++;
-  }
-  ADM_info("Den=%d Num=%d Good = %d, bad=%d\n",den,num,good,bad);
-  return bad  ;
-}
-/**
-    \fn checkDeviation
     \brief Bypass the 1ms accuracy by making sure all the frames are in the form PTS=offset + N*frameInterval
 */
 bool mkvHeader::enforceFixedFrameRate(int num, int den)
@@ -420,40 +386,86 @@
 
     int num= _videostream.dwScale;
     int den= _videostream.dwRate;
-    ADM_info("Checking deviation for native %d %d\n", _videostream.dwScale,   _videostream.dwRate);
-    int deviation=checkDeviation(  _videostream.dwScale,   _videostream.dwRate);
-    int deviationMinDelta=100000000;
-
-    if(minDelta)
-    {
-        ADM_info("Checking deviation for minDelata %d %d\n",minDelta,1000000);
-        deviationMinDelta =checkDeviation(  minDelta,1000000   );
-    }
-    ADM_info("Deviation        = %d\n",deviation);
-    ADM_info("DeviationMinDelta = %d\n",deviationMinDelta);
-    if(minDelta)
+    int skipped=0;
+    
+    int deviation=0;
     {
-        if(deviationMinDelta<deviation)
+        // Initialize deviation
+        // 
+        mkvDeviation devEngine(nb);      
+        int first=0;
+        while(  track->index[first].Pts==ADM_NO_PTS && first<nb) 
+              first++; // we should have some at least
+        uint64_t zero= track->index[first].Pts;
+        ADM_info("Num=%d Den=%d zero=%d first=%d\n",num,den,(int)zero,first);
+        for(int i=first;i<nb;i++)
         {
-            den=1000*1000;
-            num=minDelta;
-            deviation=deviationMinDelta;
-            ADM_info("Min delta is better\n");
+          uint64_t pts=track->index[i].Pts;
+          if(pts==ADM_NO_PTS) continue;
+          if(pts<zero) continue;
+            
+          devEngine.add(pts-zero);
         }
-    }
-    // Check std value too
-    if(stdFrameRate!=-1)
-    {
-        const frameRateStruct *fr=&(candidateFrameRate[stdFrameRate]);
-        ADM_info("Checking deviation for stdFrameRate=%d:%d\n",fr->num,fr->den);
-        int deviationStd=checkDeviation(fr->num,fr->den);
-        ADM_info("Deviation for stdFrameRate(%d) =%d\n",stdFrameRate,deviationStd);
-        if(deviationStd<deviation)
+        devEngine.sort();
+        ADM_info("Checking deviation for native %d %d\n", _videostream.dwScale,   _videostream.dwRate);
+        deviation=devEngine.computeDeviation(  _videostream.dwScale,   _videostream.dwRate,skipped);
+        
+        int deviationMinDelta=100000000;
+        int minDeltaSkip;
+        if(minDelta)
+        {
+            ADM_info("Checking deviation for minDelta %d %d\n",minDelta,1000000);
+            deviationMinDelta =devEngine.computeDeviation(  minDelta,1000000,minDeltaSkip   );
+        }
+        ADM_info("Deviation        = %d\n",deviation);
+        ADM_info("DeviationMinDelta = %d\n",deviationMinDelta);
+        ADM_info("Deviation skip    = %d\n",minDeltaSkip);
+    
+        if(minDeltaSkip>skipped*3) // we are skipping a lot more frame, fps too high
+        {
+            ADM_info("Too many skipped frames, dropping candidates\n");
+            deviationMinDelta=deviation*2;
+        }
+                
+        if(minDelta)
+        {
+            bool preferMinDelta=false;
+            // Hack to rescale double fps, ugly, might cause problem
+            if(deviationMinDelta==deviation)
+            {
+                // min num/den > std num/den
+                if(minDelta*_videostream.dwRate >  _videostream.dwScale*1000000*1.5)
+                {
+                    ADM_info("Both are equal but prefering minDelta\n");
+                    preferMinDelta=true;
+                }
+            }
+            //
+            if(deviationMinDelta<deviation || preferMinDelta)
+            {
+                den=1000*1000;
+                num=minDelta;
+                deviation=deviationMinDelta;
+                skipped=minDeltaSkip;
+                ADM_info("Min delta is better\n");
+            }
+        }
+
+        // Check std value too
+        if(stdFrameRate!=-1)
         {
-          num=fr->num;
-          den=fr->den;
-          deviation=deviationStd;
-          ADM_info("Std frame rate is better\n");
+            int stdSkip;
+            const frameRateStruct *fr=&(candidateFrameRate[stdFrameRate]);
+            ADM_info("Checking deviation for stdFrameRate=%d:%d\n",fr->num,fr->den);
+            int deviationStd=devEngine.computeDeviation(fr->num,fr->den,stdSkip);
+            ADM_info("Deviation for stdFrameRate(%d) =%d\n",stdFrameRate,deviationStd);
+            if(deviationStd<deviation && stdSkip<skipped*3)
+            {
+              num=fr->num;
+              den=fr->den;
+              deviation=deviationStd;
+              ADM_info("Std frame rate is better\n");
+            }
         }
     }
     ADM_info("Old default duration    %" PRId64" us\n",track->_defaultFrameDuration);
@@ -510,7 +522,7 @@
 
     if(nbValidDts<3)
     {
-            ADM_warning("Not enough valid DTS\n");
+            ADM_warning("Not enough valid DTS (%d)\n",(int)nbValidDts);
             *minDeltaX=minDelta;
             *maxDeltaX=0;
             return false;
@@ -815,6 +827,7 @@
   _cuePosition=0;
   _segmentPosition=0;
   _trackPosition=0;
+  _H264Recovery=16;
 }
 /**
     \fn ~mkvHeader

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

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvDeviation.cpp Added

@@ -0,0 +1,132 @@
+/***************************************************************************
+    copyright            : (C) 2017 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "ADM_cpp.h"
+#include <math.h>
+#include <stdlib.h>
+#include "ADM_default.h"
+
+#include "ADM_mkvDeviation.h"
+
+
+mkvDeviation::mkvDeviation(int n)
+{
+    total=n;
+    nbValid=0;
+    sorted=new uint64_t[n];
+}
+mkvDeviation::~mkvDeviation()
+{
+    delete [] sorted;
+    sorted=NULL;    
+}
+
+int comp64_t (const void * elem1, const void * elem2) 
+{
+    uint64_t left=*(uint64_t *)elem1;
+    uint64_t right=*(uint64_t *)elem2;
+    if(left==right) return 0;
+    if(left>right) return 1;
+    return -1;
+}
+void mkvDeviation::sort()
+{
+    qsort(sorted,nbValid,sizeof(uint64_t),comp64_t);
+}
+
+
+    
+/**
+    \fn computeDeviation
+    \brief returns the # of errors when forcing timestamp to be num/den (interval in us)
+      num=1000
+      den=24000 for a 24 fps
+
+
+*/
+int mkvDeviation::computeDeviation(int num, int den,int &nbSkipped)
+{
+  double dHalf=(500000.*(double)num)/((double)den);
+  int half=dHalf-1; // half interval in us
+  double sumOfError=0;
+  // Sorted contains the sorted list of valid PTS
+  double coeff=(double)num*1000000.;
+  coeff=coeff/(double)den;
+  int multipleError=0;
+  int lastValidFrame=1;
+  
+  int multipleCount=5;
+  int maxDelta=0;
+  int minDelta=8*1000 *1000;
+  nbSkipped=0;
+  
+  for(int i=1;i<nbValid;i++)
+  {
+      int delta=(int)(sorted[i]-sorted[i-1]);
+      if(delta>maxDelta) maxDelta=delta;
+      if(delta<minDelta) minDelta=delta;
+      if(sorted[i]<=sorted[i-1])
+          ADM_warning("Sorting error : [%d] %lld : %lld\n",i,sorted[i],sorted[i-1]);
+      
+  }
+      
+  
+  for(int i=2;i<nbValid;i++) // skip the 2 first frames, often wrong
+  {
+    uint64_t pts=sorted[i];
+    double dmultiple=(pts+half);
+    dmultiple/=coeff;
+    uint64_t multiple=(uint64_t)dmultiple;
+    double reconstructed=(double)multiple*coeff;
+    double deviation=(double)fabs((double)pts-reconstructed);
+    
+    if(multiple<=lastValidFrame )
+    {
+     //   printf("Warning : Multiple match for the same number (%d)\n",multiple);
+        sumOfError+=coeff*coeff; // full frame error
+        multipleError++;
+        if(multipleCount)
+        {
+            multipleCount--;
+            printf("Frame %d, multiple = %d\n",i,multiple);
+        }
+        continue;
+    }
+    int jump=(multiple-lastValidFrame)-1;
+    if(jump)
+    {
+        //printf("Skipped %d %d\n",i,jump);
+        nbSkipped+=jump;
+        sumOfError=sumOfError+(1+jump)*(1+jump)*coeff*coeff;
+        lastValidFrame=multiple;
+        continue;
+    }
+    lastValidFrame=multiple;
+    //printf("frame %d multiple = %d, deviation=%d\n",i,(int)multiple,(int)deviation);
+    
+    // We have an accuracy of 1ms, so if the error is less than 2 ms, we ignore it
+    if(deviation>1000.)
+    {
+        int dev=(int)deviation;
+        dev=dev-dev%1000;
+        deviation=dev;
+        sumOfError=sumOfError+(deviation*deviation);
+    }
+  }
+
+  double scale=nbValid;
+  sumOfError/=scale*scale;
+  ADM_info("Den=%d Num=%d  sum of error=%d, multiple=%d\n",den,num,(int)sumOfError,multipleError);
+  ADM_info("MinDelta=%d maxDelta=%d skipped=%d\n",minDelta,maxDelta,nbSkipped);
+  return (int)sumOfError  ;
+}

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvDeviation.h Added

@@ -0,0 +1,37 @@
+/***************************************************************************
+    copyright            : (C) 2017 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#pragma once
+
+/**
+ */
+class mkvDeviation
+{
+public:
+        mkvDeviation(int n);
+        ~mkvDeviation();
+        int computeDeviation(int num, int den,int &nbSkipped);
+        void sort(void);
+        void add(uint64_t p)
+        {
+            sorted[nbValid++]=p+500; // one ms error, take in the middle
+            ADM_assert(nbValid<=total);
+        }
+
+protected:
+        int  total;
+        int  nbValid;
+        uint64_t *sorted;
+  
+};
\ No newline at end of file

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

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/CMakeLists.txt Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp Changed

@@ -41,10 +41,10 @@
 // 14496-1 / 8.2.1
 typedef enum
 {
-	Tag_InitialObjDesc	=0x02,
-	Tag_ES_Desc		=0x03,
-	Tag_DecConfigDesc 	=0x04,
-	Tag_DecSpecificInfo 	=0x05
+    Tag_InitialObjDesc    =0x02,
+    Tag_ES_Desc           =0x03,
+    Tag_DecConfigDesc     =0x04,
+    Tag_DecSpecificInfo   =0x05
 }MP4_Tag;
 
 //extern char* ms2timedisplay(uint32_t ms);
@@ -165,34 +165,34 @@
 */
 void MP4Header::parseMvhd(void *ztom)
 {
-	adm_atom *tom = (adm_atom*)ztom;
-	int version = tom->read();
+    adm_atom *tom = (adm_atom*)ztom;
+    int version = tom->read();
 
-	tom->skipBytes(3);	// flags
+    tom->skipBytes(3);    // flags
 
-	if (version == 1)
-		tom->skipBytes(16);
-	else
-		tom->skipBytes(8);
+    if (version == 1)
+        tom->skipBytes(16);
+    else
+        tom->skipBytes(8);
 
-	int scale = tom->read32();
-	uint64_t duration = (version == 1) ? tom->read64() : tom->read32();
+    int scale = tom->read32();
+    uint64_t duration = (version == 1) ? tom->read64() : tom->read32();
 
-	_videoScale = scale;
+    _videoScale = scale;
 
-	printf("Warning: scale is not in ms %" PRIu32"!\n", _videoScale);
+    printf("Warning: scale is not in ms %" PRIu32"!\n", _videoScale);
 
-	if (_videoScale)
-	{
-		duration = 1000 * duration; // In ms
-		duration /= _videoScale;
-	}
-	else
-		_videoScale = 1000;
+    if (_videoScale)
+    {
+        duration = 1000 * duration; // In ms
+        duration /= _videoScale;
+    }
+    else
+        _videoScale = 1000;
 
-	//printf("Movie duration: %s\n", ms2timedisplay(duration));
+    //printf("Movie duration: %s\n", ms2timedisplay(duration));
 
-	_movieDuration = duration;
+    _movieDuration = duration;
 }
 
 /**
@@ -222,30 +222,30 @@
      {
        case ADM_MP4_TKHD:
               {
-				  int version = son.read();
+                  int version = son.read();
 
-				  son.skipBytes(3);
+                  son.skipBytes(3);
 
-				  if (version == 1)
-					  tom->skipBytes(16);
-				  else
-					  tom->skipBytes(8);
+                  if (version == 1)
+                      tom->skipBytes(16);
+                  else
+                      tom->skipBytes(8);
 
-				  aprintf("Track Id: %" PRIu32"\n", son.read32());
-				  son.skipBytes(4);
+                  aprintf("Track Id: %" PRIu32"\n", son.read32());
+                  son.skipBytes(4);
 
-				  uint64_t duration = (version == 1) ? son.read64() : son.read32();
+                  uint64_t duration = (version == 1) ? son.read64() : son.read32();
 
-				  aprintf( "Duration: %" PRIu32" (ms)\n", (duration * 1000) / _videoScale);
-				  son.skipBytes(8);
-				  son.skipBytes(8);
-				  son.skipBytes(36);
+                  aprintf( "Duration: %" PRIu32" (ms)\n", (duration * 1000) / _videoScale);
+                  son.skipBytes(8);
+                  son.skipBytes(8);
+                  son.skipBytes(36);
 
-				  w = son.read32() >> 16;
-				  h = son.read32() >> 16;
+                  w = son.read32() >> 16;
+                  h = son.read32() >> 16;
 
-				  aprintf("tkhd: %ld %ld\n", w, h);
-				  break;
+                  aprintf("tkhd: %ld %ld\n", w, h);
+                  break;
               }
         case ADM_MP4_MDIA:
         {
@@ -293,31 +293,31 @@
      {
        case ADM_MP4_MDHD:
        {
-		   int version = son.read();
+           int version = son.read();
 
-		   son.skipBytes(3); // flags
+           son.skipBytes(3); // flags
 
-		   if (version == 1)
-			   son.skipBytes(16);
-		   else
-			   son.skipBytes(8);
+           if (version == 1)
+               son.skipBytes(16);
+           else
+               son.skipBytes(8);
 
-		   trackScale = son.read32();
+           trackScale = son.read32();
 
-		   aprintf( "MDHD, Trackscale in mdhd: %u\n", trackScale);
+           aprintf( "MDHD, Trackscale in mdhd: %u\n", trackScale);
 
-		   if (!trackScale)
-			   trackScale = 600; // default
+           if (!trackScale)
+               trackScale = 600; // default
 
-		   uint64_t duration = (version == 1) ? son.read64() : son.read32();
+           uint64_t duration = (version == 1) ? son.read64() : son.read32();
 
-		   aprintf( "MDHD, duration in mdhd: %u (unscaled)\n", duration);
-		   duration = (duration * 1000.) / trackScale;
-		   aprintf( "MDHD, duration in mdhd: %u (scaled ms)\n", duration);
-		   trackDuration = duration;
-//		   printf("MDHD, Track duration: %s, trackScale: %u\n", ms2timedisplay((1000 * duration) / trackScale), trackScale);
+           aprintf( "MDHD, duration in mdhd: %u (unscaled)\n", duration);
+           duration = (duration * 1000.) / trackScale;
+           aprintf( "MDHD, duration in mdhd: %u (scaled ms)\n", duration);
+           trackDuration = duration;
+//           printf("MDHD, Track duration: %s, trackScale: %u\n", ms2timedisplay((1000 * duration) / trackScale), trackScale);
 
-		   break;
+           break;
        }
        case ADM_MP4_HDLR:
        {
@@ -625,34 +625,34 @@
             break;
        case ADM_MP4_STCO:
        {
-		   son.skipBytes(4);
+           son.skipBytes(4);
 
-		   info.nbCo = son.read32();
-		   printf("\t\tnbCo: %u\n", info.nbCo);
+           info.nbCo = son.read32();
+           printf("\t\tnbCo: %u\n", info.nbCo);
 
-		   info.Co = new uint64_t[info.nbCo];
+           info.Co = new uint64_t[info.nbCo];
 
-		   for(int j = 0; j < info.nbCo; j++)
-		   {
-			   info.Co[j] = son.read32();
-			   aprintf( "Chunk offset: %u / %u : %" PRIu64"\n", j, info.nbCo - 1, info.Co[j]);
-		   }
+           for(int j = 0; j < info.nbCo; j++)
+           {
+               info.Co[j] = son.read32();
+               aprintf( "Chunk offset: %u / %u : %" PRIu64"\n", j, info.nbCo - 1, info.Co[j]);
+           }
        }
        break;
        case ADM_MP4_STCO64:
        {
-		   son.skipBytes(4);
+           son.skipBytes(4);
 
-		   info.nbCo = son.read32();
-		   printf("\t\tnbCo: %u\n", info.nbCo);
+           info.nbCo = son.read32();
+           printf("\t\tnbCo: %u\n", info.nbCo);
 
-		   info.Co = new uint64_t[info.nbCo];
+           info.Co = new uint64_t[info.nbCo];
 
-		   for(int j = 0; j< info.nbCo; j++)
-		   {
-			   info.Co[j] = son.read64();
-			   aprintf( "Chunk offset: %u / %u : %" PRIu64"\n", j, info.nbCo - 1, info.Co[j]);
-		   }
+           for(int j = 0; j< info.nbCo; j++)
+           {
+               info.Co[j] = son.read64();
+               aprintf( "Chunk offset: %u / %u : %" PRIu64"\n", j, info.nbCo - 1, info.Co[j]);
+           }
        }
        break;
        case ADM_MP4_STSD:
@@ -973,16 +973,20 @@
                                         break;
                                 case 2:
                                         {
-                                          son.skipBytes(4);
-                                          son.skipBytes(4);son.skipBytes(4); // sample rate
-                                          int nbChan=son.read32();
-                                          printf("Channels = %d\n",nbChan);
-                                          son.skipBytes(4); // 0x7f000
-                                          son.skipBytes(4); // bits per coded channel
-                                          son.skipBytes(4); // lpcm flags
-                                          son.skipBytes(4); // byte per frame
-                                          son.skipBytes(4); // sample per frame
-                                          left-=4*8;
+                                          printf("v2.0 = %d\n",son.read32());
+                                          printf("v2.1 = %d\n",son.read32());
+                                          printf("v2.2 = %d\n",son.read32());
+#define MARK(x) {uint32_t v=son.read32(); printf(#x " => %d\n",v);x=v;}                                          
+                                          MARK(channels);
+                                          printf("0x7f000 = 0x%x\n",son.read32());
+                                          MARK(bpp);                                          
+                                          printf("LPCM flags= %d\n",son.read32());
+                                          printf("byte per frame = %d\n",son.read32());
+                                          printf("sample per frame = %d\n",son.read32());
+                                          ADIO.channels=channels;
+                                          info.bytePerPacket=bpp/8;
+                                          info.bytePerFrame=info.bytePerPacket*ADIO.channels;
+                                          left-=4*9;
                                         }
                                           break;
                                 }
@@ -995,7 +999,11 @@
                                             audioCodec(AC3);
                                             ADIO.byterate=128000>>3;
                                             break;
-
+                                    case MKFCCR('l','p','c','m'):
+                                            ADIO.frequency=44100; // Wrong !
+                                            ADIO.byterate=ADIO.frequency*ADIO.bitspersample*ADIO.channels/8;
+                                            audioCodec(PCM);
+                                            break;
                                     case MKFCCR('t','w','o','s'):
                                             audioCodec(LPCM);
                                             ADIO.byterate=ADIO.frequency*ADIO.bitspersample*ADIO.channels/8;
@@ -1059,8 +1067,6 @@
                                               left=0;
                                         }
                                         break;
-                                    
-                                
                                     case MKFCCR('m','s',0,0x55): // why 55 ???
                                     case MKFCCR('m','s',0,0x11): // why 11 ???
                                     case MKFCCR('m','p','4','a'):
@@ -1301,8 +1307,8 @@
                                           case 0x69:
                                           case 0x6b:
                                           case 0x6d:
-											  ADIO.encoding=WAV_MP3;
-											  break;
+                                                  ADIO.encoding=WAV_MP3;
+                                                  break;
                                           case 226:ADIO.encoding=WAV_AC3;break;
                                           break;
 
@@ -1381,5 +1387,3 @@
 }
 
 // EOF
-
-

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4audio.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4audio.cpp Changed

@@ -49,6 +49,9 @@
     ADM_assert(_fd);
 	_current_index=0;
 	_index=track->index;
+	_msg_counter = 0;
+	_msg_ratelimit = new ADMCountdown(200);
+	_msg_ratelimit->reset();
 
 	extraDataLen=track->extraDataSize;
 	extraData=track->extraData;
@@ -77,11 +80,14 @@
 
 ADM_mp4AudioAccess::~ADM_mp4AudioAccess()
 {
-       if(_fd)
-        {
-            fclose(_fd);
-            _fd=NULL;
-        }
+    if(_fd)
+    {
+        fclose(_fd);
+        _fd=NULL;
+    }
+    if(_msg_ratelimit)
+        delete _msg_ratelimit;
+    _msg_ratelimit = NULL;
 }
 /**
     \fn ADM_mp4AudioAccess
@@ -116,13 +122,27 @@
 */
 bool    ADM_mp4AudioAccess::getPacket(uint8_t *buffer, uint32_t *size, uint32_t maxSize,uint64_t *dts)
 {
-uint32_t r=0;
-double delta;
-	if(_current_index>=_nb_chunks)
+    uint32_t r=0;
+    double delta;
+    if(_current_index>=_nb_chunks)
+    {
+        if(_msg_ratelimit->done())
+        {
+            if(_msg_counter)
+            {
+                printf("[MP4Audio] : index max :%u/%u (message repeated %u times)\n",_current_index,_nb_chunks,_msg_counter);
+                _msg_counter = 0;
+            }else
+            {
+                printf("[MP4Audio] : index max :%u/%u\n",_current_index,_nb_chunks);
+            }
+            _msg_ratelimit->reset();
+        }else
         {
-              printf("[MP4Audio] : index max :%u/%u\n",_current_index,_nb_chunks);
-              return 0;
+            _msg_counter++;
         }
+        return 0;
+    }
 	  fseeko(_fd,_index[_current_index].offset,SEEK_SET);
 	  r=fread(buffer,1,_index[_current_index].size,_fd);
       if(!r)
@@ -133,6 +153,7 @@
       *dts=_index[_current_index].dts;
       *size=r;
 	  _current_index++;
+	  _msg_counter = 0;
 	  return true;
 }
 /**

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudioProbe.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudioProbe.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsBruteForce.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsBruteForce.cpp Changed

@@ -31,6 +31,7 @@
 #define MAX_PID (1<<17)
 #define MAX_BUFFER_SIZE (10*1024)
 static bool idAAC_ADTS(int pid,tsPacket *ts);
+static bool idAAC_LATM(int pid,tsPacket *ts);
 static bool idContent(int pid,tsPacket *ts,ADM_TS_TRACK_TYPE & trackType);
 static bool idMP2(int pid,tsPacket *ts);
 /**
@@ -305,6 +306,8 @@
                 }
 
         }
+       
+        // Mpeg audio ?
         if(idMP2(pid,ts))
         {
                 ADM_info("\t probably MP2\n");
@@ -318,7 +321,13 @@
                 trackType=ADM_TS_AAC_ADTS;
                 return true;
         }
-
+        // AAC LATM ?
+         if( idAAC_LATM(pid,ts))
+        {
+                ADM_info("\t probably AAC/LATM\n");
+                trackType=ADM_TS_AAC_LATM;
+                return true;
+        }
         ADM_info("Cannot identify track\n");
         return false;
 }
@@ -386,8 +395,40 @@
         }
         return false;
 }
-        /**
-    \fn idMP2
+/**
+ *  \fn idAAC_LATM
+    \brief return true if the tracks is AAC/LATM
+ * @param pid
+ * @param ts
+ * @return 
+ */
+bool idAAC_LATM(int pid, tsPacket *ts)
+{
+#define LATM_NB_PACKET 10
+#define LATM_MIN_MATCH 7
+        int match=0;
+        TS_PESpacket pes(pid);
+        for(int i=0;i<LATM_NB_PACKET;i++)
+        {
+            if(!ts->getNextPES(&pes))
+            {
+                ADM_warning("ADTS:Cannot get PES for pid=%d\n",pid);
+                return false;
+            }
+            uint8_t *p=pes.payload+pes.offset;
+            int key=(p[0]<<8)+p[1];
+            if((key & 0xffe0)==0x56e0)  // 0x2b7 shifted by one bit            
+                match++;
+        }
+        ADM_info("\t LATM match : %d/%d\n",match,LATM_MIN_MATCH);
+        if(match>=LATM_MIN_MATCH) 
+        {
+            return true;
+        }
+        return false;
+}
+/**
+    \fn idAAC_ADTS
     \brief return true if the tracks is AAC/ADTS
 */
 bool idAAC_ADTS(int pid,tsPacket *ts)
@@ -416,10 +457,8 @@
         ADM_info("\t Adts match : %d/%d\n",match,ADTS_NB_PACKET);
         if(match>=ADTS_MIN_MATCH) 
         {
-            
             return true;
         }
-        
         return false;
 }

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_odml.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_odml.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/CMakeLists.txt Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/qt4/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/qt4/CMakeLists.txt Changed

@@ -4,21 +4,6 @@
 ADD_DEFINITIONS("-std=c++11")
 
 ADD_DEFINITIONS(${VAPOURSYNTHSCRIPT_CFLAGS})
-GET_TARGET_PROPERTY(OLD PROPERTIES LINK_FLAGS)
-IF("${OLD}" MATCHES ".*NOT.*FOUND")
-   SET(OLD "")
-ENDIF("${OLD}" MATCHES ".*NOT.*FOUND")
-# Keep -L, discard everything else
-FOREACH(i ${VAPOURSYNTHSCRIPT_LDFLAGS})
-  IF(${i} MATCHES "^-L")
-        MESSAGE(STATUS "Updating linker flags  => ${i}")
-        SET(OLD "${i} ${OLD} ") 
-  ELSE(${i} MATCHES "^-L")
-        MESSAGE(STATUS "Updating linker libs  => ${i}")
-        LIST(APPEND LIBS_TO_LINK  ${i})
-  ENDIF(${i} MATCHES "^-L")
-ENDFOREACH(i ${VAPOURSYNTHSCRIPT_LDFLAGS})
-
 #
 ADD_DEFINITIONS(-DADM_UI_TYPE_BUILD=ADM_UI_QT4)
 SET(CONFIG_HEADER_TYPE ADM_BUILD_QT4)
@@ -49,6 +34,24 @@
 # Executable
 ###########################################
 ADD_EXECUTABLE(vsProxy_gui_${QT_EXTENSION} ${ADM_vsPROXY_SRCS})
+#
+GET_PROPERTY(OLD 
+                        TARGET vsProxy_gui_${QT_EXTENSION}
+                        PROPERTY LINK_FLAGS)
+IF("${OLD}" MATCHES ".*NOT.*FOUND")
+   SET(OLD "")
+ENDIF("${OLD}" MATCHES ".*NOT.*FOUND")
+# Keep -L, discard everything else
+FOREACH(i ${VAPOURSYNTHSCRIPT_LDFLAGS})
+  IF(${i} MATCHES "^-L")
+        MESSAGE(STATUS "Updating linker flags  => ${i}")
+        SET(OLD "${i} ${OLD} ") 
+  ELSE(${i} MATCHES "^-L")
+        MESSAGE(STATUS "Updating linker libs  => ${i}")
+        LIST(APPEND LIBS_TO_LINK  ${i})
+  ENDIF(${i} MATCHES "^-L")
+ENDFOREACH(i ${VAPOURSYNTHSCRIPT_LDFLAGS})
+
 SET_TARGET_PROPERTIES(vsProxy_gui_${QT_EXTENSION}  PROPERTIES LINK_FLAGS "${OLD}")
 
 ###########################################

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_muxers/muxerFlv/muxerFlv.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerFlv/muxerFlv.cpp Changed

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

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoDecoder/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoDecoder/CMakeLists.txt Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoEncoder/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/ADM_libvaEncoder.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.cpp Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264 Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp Added

@@ -0,0 +1,246 @@
+/***************************************************************************
+                          \fn ADM_ffVaEnc
+                          \brief Front end for libavcodec Mpeg4 asp encoder
+                             -------------------
+
+    copyright            : (C) 2002/2009 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_ffVAEncH264.h"
+#undef ADM_MINIMAL_UI_INTERFACE // we need the full UI
+#include "DIA_factory.h"
+//#define USE_NV12
+#if 1
+#define aprintf(...) {}
+#else
+#define aprintf printf
+#endif
+
+extern "C"
+{
+    #include "libavutil/opt.h"
+#include "libavutil/hwcontext.h"
+}
+
+ffvaenc_encoder VaEncSettings;
+
+/**
+        \fn ADM_ffVaEncEncoder
+*/
+ADM_ffVAEncH264Encoder::ADM_ffVAEncH264Encoder(ADM_coreVideoFilter *src,bool globalHeader) : ADM_coreVideoEncoderFFmpeg(src,NULL,globalHeader)
+{
+    //targetColorSpace=ADM_COLOR_YUV422P;
+    ADM_info("[ADM_ffVAEncH264Encoder] Creating.\n");
+    surface=NULL;
+}
+
+/**
+    \fn pre-open
+*/
+bool ADM_ffVAEncH264Encoder::configureContext(void)
+{
+    ADM_info("Configuring context for VAAPI encoder\n");
+#if 0
+    switch(VaEncSettings.preset)
+    {
+#define MIAOU(x,y) case NV_FF_PRESET_##x: ADM_assert(!av_opt_set(_context->priv_data,"preset",y, 0));break;
+
+     MIAOU(HP,"hp")
+     MIAOU(BD,"bd")
+     MIAOU(LL,"ll")
+     MIAOU(LLHP,"llhp")
+     MIAOU(LLHQ,"llhq")
+     MIAOU(HQ,"hq")
+default:break;
+    }
+#endif
+    int err = av_hwdevice_ctx_create(&(_context->hw_frames_ctx), AV_HWDEVICE_TYPE_VAAPI,   "", NULL, 0);
+    if(err)        
+    {
+        ADM_warning("Cannot initialize VAAPI hwdevice (%d)\n",err);
+        return false;
+    }    
+    //
+    _context->bit_rate=VaEncSettings.bitrate*1000;
+    _context->rc_max_rate=VaEncSettings.max_bitrate*1000;
+    _context->pix_fmt =AV_PIX_FMT_VAAPI;
+    
+    _frame->format=AV_PIX_FMT_VAAPI;
+    return true;
+}
+
+/**
+    \fn setup
+*/
+bool ADM_ffVAEncH264Encoder::setup(void)
+{
+//nvenc
+    surface=ADM_vaSurface::allocateWithSurface(source->getInfo()->width, source->getInfo()->height);
+    if(!surface)
+    {
+        ADM_warning("ffVaEnc : Cannot allocate surface\n");
+        return false;
+    }
+    if(false== ADM_coreVideoEncoderFFmpeg::setupByName("h264_vaapi"))
+    {
+        ADM_info("[ffMpeg] Setup failed\n");
+        return false;
+    }
+
+    ADM_info("[ffMpeg] Setup ok\n");
+
+    return true;
+}
+
+
+/**
+    \fn ~ADM_ffVaEncEncoder
+*/
+ADM_ffVAEncH264Encoder::~ADM_ffVAEncH264Encoder()
+{
+    ADM_info("[ffVaEncEncoder] Destroying.\n");
+    if(surface)
+    {
+        delete surface;
+        surface=NULL;
+    }
+}
+/**
+ */
+bool             ADM_ffVAEncH264Encoder::preEncode(void)
+{
+    uint32_t nb;
+    if(source->getNextFrame(&nb,image)==false)
+    {
+        printf("[ff] Cannot get next image\n");
+        return false;
+    }
+    prolog(image);
+
+    uint64_t p=image->Pts;
+    queueOfDts.push_back(p);
+    aprintf("Incoming frame PTS=%" PRIu64", delay=%" PRIu64"\n",p,getEncoderDelay());
+    p+=getEncoderDelay();
+    _frame->pts= timingToLav(p);    //
+    if(!_frame->pts) _frame->pts=AV_NOPTS_VALUE;
+
+    ADM_timeMapping map; // Store real PTS <->lav value mapping
+    map.realTS=p;
+    map.internalTS=_frame->pts;
+    mapper.push_back(map);
+
+    aprintf("Codec> incoming pts=%" PRIu64"\n",image->Pts);
+    //printf("--->>[PTS] :%"PRIu64", raw %"PRIu64" num:%"PRIu32" den:%"PRIu32"\n",_frame->pts,image->Pts,_context->time_base.num,_context->time_base.den);
+    
+    if(!surface->fromAdmImage(image))
+    {
+        ADM_warning("Cannot upload to vaSurface\n");
+        return false;
+    }
+    
+    _frame->data[0] = _frame->data[1] = _frame->data[2] = NULL;
+    _frame->data[3]=(uint8_t *)surface->surface;
+    
+  
+    return true;
+}
+/**
+    \fn encode
+*/
+bool         ADM_ffVAEncH264Encoder::encode (ADMBitstream * out)
+{
+int sz,q;
+again:
+    sz=0;
+    if(false==preEncode()) // Pop - out the frames stored in the queue due to B-frames
+    {
+        sz=encodeWrapper(NULL,out);
+        if (sz<= 0)
+        {
+            ADM_info("[ffnvenc] Error %d encoding video\n",sz);
+            return false;
+        }
+        ADM_info("[ffnvenc] Popping delayed bframes (%d)\n",sz);
+        goto link;
+        return false;
+    }
+    q=image->_Qp;
+
+    if(!q) q=2;
+    aprintf("[CODEC] Flags = 0x%x, QSCALE=%x, bit_rate=%d, quality=%d qz=%d incoming qz=%d\n",_context->flags,CODEC_FLAG_QSCALE,
+                                     _context->bit_rate,  _frame->quality, _frame->quality/ FF_QP2LAMBDA,q);
+
+    _frame->reordered_opaque=image->Pts;
+    _frame->width=image->GetWidth(PLANAR_Y);
+    _frame->height=image->GetHeight(PLANAR_Y);
+
+    sz=encodeWrapper(_frame,out);
+    if(sz<0)
+    {
+        ADM_warning("[ffnvenc] Error %d encoding video\n",sz);
+        return false;
+    }
+
+    if(sz==0) // no pic, probably pre filling, try again
+        goto again;
+link:
+    return postEncode(out,sz);
+}
+
+/**
+    \fn isDualPass
+
+*/
+bool         ADM_ffVAEncH264Encoder::isDualPass(void)
+{
+    return false;
+}
+
+/**
+    \fn jpegConfigure
+    \brief UI configuration for jpeg encoder
+*/
+
+bool         ffVAEncConfigure(void)
+{
+#if 0
+diaMenuEntry mePreset[]={
+  {NV_FF_PRESET_HP,QT_TRANSLATE_NOOP("ffnvenc","Low Quality")},
+  {NV_FF_PRESET_HQ,QT_TRANSLATE_NOOP("ffnvenc","High Quality")},
+  {NV_FF_PRESET_BD,QT_TRANSLATE_NOOP("ffnvenc","BluRay")},
+  {NV_FF_PRESET_LL,QT_TRANSLATE_NOOP("ffnvenc","Low Latency")},
+  {NV_FF_PRESET_LLHP,QT_TRANSLATE_NOOP("ffnvenc","Low Latency (LQ)")},
+  {NV_FF_PRESET_LLHQ,QT_TRANSLATE_NOOP("ffnvenc","Low Latency (HQ)")}
+};
+
+        ffnvenc_encoder *conf=&NvEncSettings;
+
+#define PX(x) &(conf->x)
+
+        diaElemMenu      qzPreset(PX(preset),QT_TRANSLATE_NOOP("ffnvenc","Preset:"),6,mePreset);
+        diaElemUInteger  bitrate(PX(bitrate),QT_TRANSLATE_NOOP("ffnvenc","Bitrate (kbps):"),1,50000);
+        diaElemUInteger  maxBitrate(PX(max_bitrate),QT_TRANSLATE_NOOP("ffnvenc","Max Bitrate (kbps):"),1,50000);
+          /* First Tab : encoding mode */
+        diaElem *diamode[]={&qzPreset,&bitrate,&maxBitrate};
+
+        if( diaFactoryRun(QT_TRANSLATE_NOOP("ffnvenc","libavcodec MPEG-4 configuration"),3,diamode))
+        {
+
+          return true;
+        }
+         return false;
+#endif
+return true;
+}
+// EOF

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.h Added

@@ -0,0 +1,58 @@
+/***************************************************************************
+                          \fn ADM_VideoEncoders
+                          \brief Internal handling of video encoders
+                             -------------------
+
+    copyright            : (C) 2002/2009 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+#include "ADM_coreLibVA/ADM_coreLibVA.h"
+#include "ADM_coreVideoEncoderFFmpeg.h"
+#include "ffVAEnc_H264.h"
+
+
+
+#define VAENC_CONF_DEFAULT \
+{ \
+		0, \
+                10000, \
+                20000,\
+	}
+
+
+
+/**
+        \class ADM_ffVAEncH264Encoder
+        \brief
+
+*/
+class ADM_ffVAEncH264Encoder : public ADM_coreVideoEncoderFFmpeg
+{
+protected:
+
+public:
+
+                           ADM_ffVAEncH264Encoder(ADM_coreVideoFilter *src,bool globalHeader);
+virtual                    ~ADM_ffVAEncH264Encoder();
+virtual        bool        configureContext(void);
+virtual        bool        setup(void);
+virtual        bool        encode (ADMBitstream * out);
+virtual const  char        *getFourcc(void) {return "H264";}
+
+virtual        bool        isDualPass(void) ;
+
+protected:
+                ADM_vaSurface *surface;
+                bool       preEncode(void);
+
+};

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/CMakeLists.txt Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEncH264_plugin.cpp Added

@@ -0,0 +1,54 @@
+/***************************************************************************
+                          \fn     nvEnc
+                          \brief  Plugin for nvEnc lav encoder
+                             -------------------
+
+    copyright            : (C) 2002/2016 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_ffVAEncH264.h"
+#include "ADM_coreVideoEncoderInternal.h"
+#include "ffVAEnc_H264_desc.cpp"
+extern bool            ffVAEncConfigure(void);
+extern ffvaenc_encoder VaEncSettings;
+
+void resetConfigurationData()
+{
+	ffvaenc_encoder defaultConf = VAENC_CONF_DEFAULT;
+
+	memcpy(&VaEncSettings, &defaultConf, sizeof(FFcodecSettings));
+}
+
+/**
+ * \fn nvEncProbe
+ */
+extern "C"
+{
+    static bool vaEncProbe(void)
+    {
+			return true;
+    }
+}
+
+ADM_DECLARE_VIDEO_ENCODER_PREAMBLE(ADM_ffVAEncH264Encoder);
+ADM_DECLARE_VIDEO_ENCODER_MAIN_EX("ffVAEncH264",
+                               "Intel H264",
+                               "Intel hw encoder",
+                                ffVAEncConfigure, // No configuration
+                                ADM_UI_ALL,
+                                1,0,0,
+                                ffvaenc_encoder_param, // conf template
+                                &VaEncSettings,NULL,NULL, // conf var
+                                vaEncProbe
+);

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.conf Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264.h Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264_desc.cpp Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ffVAEnc_H264_json.cpp Added

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.h Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vaEnc Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.cpp Added

@@ -0,0 +1,259 @@
+/***************************************************************************
+                          \fn ADM_ffNvEnc
+                          \brief Front end for libavcodec Mpeg4 asp encoder
+                             -------------------
+
+    copyright            : (C) 2002/2009 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_ffVaEnc.h"
+#undef ADM_MINIMAL_UI_INTERFACE // we need the full UI
+#include "DIA_factory.h"
+
+#define USE_VA_SURFACE 
+
+#ifdef USE_VA_SURFACE
+    #define MY_PÏXFMT AV_PIX_FMT_VAAPI
+#else
+    #define MY_PÏXFMT AV_PIX_FMT_YUV420P
+#endif
+
+
+#if 0
+#define aprintf(...) {}
+#else
+#define aprintf printf
+#endif
+
+extern "C"
+{
+    #include "libavutil/opt.h"
+}
+
+ffvaenc_encoder VaEncSettings = VAENC_CONF_DEFAULT;
+
+/**
+        \fn ADM_ffVaEncEncoder
+*/
+ADM_ffVaEncEncoder::ADM_ffVaEncEncoder(ADM_coreVideoFilter *src,bool globalHeader) : ADM_coreVideoEncoderFFmpeg(src,NULL,globalHeader)
+{
+    //targetColorSpace=ADM_COLOR_YUV422P;
+    ADM_info("[ffNvEncEncoder] Creating.\n");
+     frameContext=NULL;
+     deviceContext=NULL;
+}
+
+/**
+    \fn ~ADM_ffVaEncEncoder
+*/
+ADM_ffVaEncEncoder::~ADM_ffVaEncEncoder()
+{
+    ADM_info("[vaEncoder] Destroying.\n");
+    if(frameContext)
+    {
+        av_buffer_unref(&frameContext);
+    }
+    if(deviceContext)
+    {
+        av_buffer_unref(&deviceContext);
+    }
+}
+/**
+    \fn pre-open
+*/
+bool ADM_ffVaEncEncoder::configureContext(void)
+{
+    ADM_info("ConfigureContext\n");
+    _context->bit_rate   = VaEncSettings.bitrate*1000;
+    _context->rc_max_rate= VaEncSettings.max_bitrate*1000;
+    _context->pix_fmt    = MY_PÏXFMT;        
+    
+    // allocate device context
+    deviceContext=av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_VAAPI);
+    if(!deviceContext)
+    {
+        ADM_warning("Cannot allocate device context\n");
+        return false;
+    }
+    // setup device context
+    AVHWDeviceContext *devContext=(AVHWDeviceContext *)deviceContext->data;
+    AVVAAPIDeviceContext *vaContext=(AVVAAPIDeviceContext *)devContext->hwctx;
+    
+    vaContext->display=admLibVA::getVADisplay();  // if we get here VA is operationnal
+    
+    int er=av_hwdevice_ctx_init(deviceContext);
+    if(er)
+    {
+        ADM_warning("Cannot setup vaapi hw encoder (er=%d)\n",er);
+        return false;
+    }
+    
+    // Now setup the frame context..
+    
+    frameContext=av_hwframe_ctx_alloc(deviceContext);
+    if(!frameContext)
+    {
+        ADM_warning("Cannot allocate frameContext\n");
+        return false;
+    }
+    AVHWFramesContext *c=(AVHWFramesContext *)(frameContext->data);
+    c->format=MY_PÏXFMT;
+    c->sw_format=AV_PIX_FMT_YUV420P;
+    c->width=(getWidth()+15)&~15;
+    c->height=(getHeight()+15)&~15;;
+    
+    for(int i=0;i<VAENC_NB_SURFACES;i++)
+    {
+        ADM_vaSurface *surface=new ADM_vaSurface(c->width,c->height); // roundup ??
+        surface->surface= admLibVA::allocateSurface(c->width,c->height);
+        freeSurface.pushBack(surface);
+    }
+    c->initial_pool_size=VAENC_NB_SURFACES;
+    
+    
+    er=av_hwframe_ctx_init(frameContext);
+    if(er)
+    {
+        ADM_warning("Cannot setup vaapi hw frame (er=%d)\n",er);
+        return false;
+    }
+    
+    _context->hw_frames_ctx=frameContext;
+    
+    int w= getWidth();
+    int h= getHeight();
+    
+    w=(w+15)&~15;
+    h=(h+15)&~15;
+       
+  
+    
+    
+    ADM_info("configureContext ok\n");
+    return true;             
+}
+
+/**
+    \fn setup
+*/
+bool ADM_ffVaEncEncoder::setup(void)
+{
+    ADM_info("setup\n");
+    if(false== ADM_coreVideoEncoderFFmpeg::setupByName("h264_vaapi"))
+    {
+        ADM_info("[vaEncoder] Setup failed\n");
+        return false;
+    }
+
+    ADM_info("[vaEncoder] Setup ok\n");
+    
+  
+    return true;
+}
+
+
+
+/**
+    \fn encode
+*/
+bool         ADM_ffVaEncEncoder::encode (ADMBitstream * out)
+{
+int sz,q;
+ADM_vaSurface *s;
+again:
+    sz=0;
+    if(false==preEncode()) // Pop - out the frames stored in the queue due to B-frames
+    {
+        sz=encodeWrapper(NULL,out);
+        if (sz<= 0)
+        {
+            ADM_info("[vaEncoder] Error %d encoding video\n",sz);
+            return false;
+        }
+        ADM_info("[vaEncoder] Popping delayed bframes (%d)\n",sz);
+        goto link;
+        return false;
+    }
+    q=image->_Qp;
+
+    if(!q) q=2;
+    aprintf("[CODEC] Flags = 0x%x, QSCALE=%x, bit_rate=%d, quality=%d qz=%d incoming qz=%d\n",_context->flags,CODEC_FLAG_QSCALE,
+                                     _context->bit_rate,  _frame->quality, _frame->quality/ FF_QP2LAMBDA,q);
+#if defined(USE_VA_SURFACE)
+    s=freeSurface.pop();
+    printf("Surface=%d\n",s->surface);
+    if(!s->fromAdmImage(image))
+    {
+        ADM_warning("Cannot upload to surface\n");
+        freeSurface.pushBack(s);
+        return false;
+    }
+    inUseSurface.pushBack(s);
+    _frame->data[0]=_frame->data[1]=_frame->data[2]=NULL;
+    _frame->data[3]=(uint8_t *)s->surface;
+    
+#endif    
+    _frame->reordered_opaque=image->Pts;
+    _frame->width=image->GetWidth(PLANAR_Y);
+    _frame->height=image->GetHeight(PLANAR_Y);        
+    _frame->format=  MY_PÏXFMT;
+    sz=encodeWrapper(_frame,out);
+    
+    if(sz<0)
+    {
+        ADM_warning("[vaEncoder] Error %d encoding video\n",sz);
+        return false;
+    }
+
+    if(sz==0) // no pic, probably pre filling, try again
+        goto again;
+link:
+    return postEncode(out,sz);
+}
+
+/**
+    \fn isDualPass
+
+*/
+bool         ADM_ffVaEncEncoder::isDualPass(void)
+{   
+    return false;
+}
+
+/**
+    \fn jpegConfigure
+    \brief UI configuration for jpeg encoder
+*/
+
+bool         ffVaEncConfigure(void)
+{
+
+        ffvaenc_encoder *conf=&VaEncSettings;
+
+#define PX(x) &(conf->x)
+
+        
+        diaElemUInteger  bitrate(PX(bitrate),QT_TRANSLATE_NOOP("vaenc","Bitrate (kbps):"),1,50000);
+        diaElemUInteger  maxBitrate(PX(max_bitrate),QT_TRANSLATE_NOOP("vaenc","Max Bitrate (kbps):"),1,50000);
+          /* First Tab : encoding mode */
+        diaElem *diamode[]={&bitrate,&maxBitrate};
+
+        if( diaFactoryRun(QT_TRANSLATE_NOOP("vaenc","VAAPI H264 Encoder"),2,diamode))
+        {
+          
+          return true;
+        }
+         return false;
+}
+// EOF

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEnc.h Added

@@ -0,0 +1,68 @@
+/***************************************************************************
+                          \fn ADM_VideoEncoders
+                          \brief Internal handling of video encoders
+                             -------------------
+
+    copyright            : (C) 2002/2009 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+#include "ADM_ptrQueue.h"
+#include "ADM_coreVideoEncoderFFmpeg.h"
+#include "ADM_coreLibVA/ADM_coreLibVA.h"
+#include "ffVaEnc.h"
+extern "C" 
+{
+#include "libavutil/hwcontext.h"
+#include "libavutil/hwcontext_vaapi.h"
+}
+
+
+
+
+
+#define VAENC_CONF_DEFAULT \
+{ \
+		0, \
+                10000, \
+                20000,\
+	}
+
+
+
+/**
+        \class ADM_ffVaEncEncoder
+        \brief Dummy encoder that does nothing
+
+*/
+class ADM_ffVaEncEncoder : public ADM_coreVideoEncoderFFmpeg
+{
+#define VAENC_NB_SURFACES 16
+protected:
+            AVBufferRef        *frameContext;
+            AVBufferRef        *deviceContext;
+            ADM_ptrQueue<ADM_vaSurface >freeSurface;
+            ADM_ptrQueue<ADM_vaSurface >inUseSurface;
+            
+public:
+
+                           ADM_ffVaEncEncoder(ADM_coreVideoFilter *src,bool globalHeader);
+virtual                    ~ADM_ffVaEncEncoder();
+virtual        bool        configureContext(void);
+virtual        bool        setup(void);
+virtual        bool        encode (ADMBitstream * out);
+virtual const  char        *getFourcc(void) {return "H264";}
+
+virtual        bool        isDualPass(void) ;
+
+};
+

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vaEnc/ADM_ffVaEncPlugin.cpp Added

@@ -0,0 +1,93 @@
+/***************************************************************************
+                          \fn     nvEnc
+                          \brief  Plugin for nvEnc lav encoder
+                             -------------------
+
+    copyright            : (C) 2002/2016 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_ffVaEnc.h"
+#include "ADM_coreVideoEncoderInternal.h"
+#include "ffVaEnc_desc.cpp"
+extern bool            ffVaEncConfigure(void);
+extern ffvaenc_encoder VaEncSettings;
+
+void resetConfigurationData()
+{
+	ffvaenc_encoder defaultConf = VAENC_CONF_DEFAULT;
+
+	memcpy(&VaEncSettings, &defaultConf, sizeof(FFcodecSettings));
+}
+
+
+/**
+ *  \fn nvCheckDll
+ */
+
+static bool nvCheckDll(const char *zwin64, const char *zwin32, const char *zlinux)
+{
+        const char *dll;
+#ifdef _WIN32
+        #ifdef _WIN64
+            dll=zwin64;
+        #else
+            dll=zwin32;
+        #endif
+#else
+        dll=zlinux;
+#endif
+        
+        ADM_LibWrapper wrapper;
+        bool r=wrapper.loadLibrary(dll);
+        ADM_info("\t checking %s-> %d\n",dll,r);
+        return r;
+}
+/**
+ * \fn nvEncProbe
+ */
+extern "C"
+{
+    static bool vaEncProbe(void)
+    {
+#if 0
+        // Step 1 : Try to load cuda
+        if(!nvCheckDll("nvcuda.dll","nvcuda.dll","libcuda.so"))
+        {
+            ADM_warning("Cannot load cuda dll\n");
+            return false;
+        }
+        // Step 2 : Try to load encoder
+
+        if(!nvCheckDll("nvEncodeAPI64.dll","nvEncodeAPI.dll","libnvidia-encode.so.1"))
+        {
+            ADM_warning("Cannot load nvidia encode dll\n");
+            return false;
+        }
+#endif        
+        return true;
+    }
+
+}
+
+ADM_DECLARE_VIDEO_ENCODER_PREAMBLE(ADM_ffVaEncEncoder);
+ADM_DECLARE_VIDEO_ENCODER_MAIN_EX("ffVaEnc",
+                               "Intel H264",
+                               "Intel hw encoder",
+                                ffVaEncConfigure, // No configuration
+                                ADM_UI_ALL,
+                                1,0,0,
+                                ffvaenc_encoder_param, // conf template
+                                &VaEncSettings,NULL,NULL, // conf var
+                                vaEncProbe
+);

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vaEnc/CMakeLists.txt Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc.conf Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc.h Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc_desc.cpp Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vaEnc/ffVaEnc_json.cpp Added

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp Changed

@@ -61,19 +61,23 @@
   // -------------- preset, tune, idc ------------
   if(!x264Settings.useAdvancedConfiguration)
   {
-    char tune[200] = {0};
-    strcat(tune, x264Settings.general.tuning.c_str());
-    if(x264Settings.general.fast_decode) 
-    {
-      strcat(tune, ",");
-      strcat(tune, "fastdecode");
-    }
-    if(x264Settings.general.zero_latency)
-    {
-      strcat(tune, ",");
-      strcat(tune, "zero_latency");
-    }
-    x264_param_default_preset(&param, x264Settings.general.preset.c_str(), tune);
+        std::string tune;
+        if(x264Settings.general.tuning != std::string("none"))
+            tune = x264Settings.general.tuning;
+        if(x264Settings.general.fast_decode)
+        {
+            tune += std::string(",");
+            tune += std::string("fastdecode");
+        }
+        if(x264Settings.general.zero_latency)
+        {
+            tune += std::string(",");
+            tune += std::string("zerolatency");
+        }
+        if(tune.empty())
+            x264_param_default_preset(&param, x264Settings.general.preset.c_str(), NULL);
+        else
+            x264_param_default_preset(&param, x264Settings.general.preset.c_str(), tune.c_str());
   }else
   {
         param.b_bluray_compat=x264Settings.general.blueray_compatibility;

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp Changed

@@ -85,8 +85,7 @@
 static const char* listOfPresets[] = { "ultrafast", "superfast", "veryfast", "faster", "fast", "medium", "slow", "slower", "veryslow", "placebo" };
 #define NB_PRESET sizeof(listOfPresets)/sizeof(char*)
 
-// Empty string "" as tuning means no tuning. This is the default.
-static const char* listOfTunings[] = { "", "film", "animation", "grain", "stillimage", "psnr", "ssim" };
+static const char* listOfTunings[] = { "none", "film", "animation", "grain", "stillimage", "psnr", "ssim" };
 #define NB_TUNE sizeof(listOfTunings)/sizeof(char*)
 
 static const char* listOfProfiles[] = { "baseline", "main", "high", "high10", "high422", "high444" };
@@ -173,9 +172,7 @@
         for(int i=0;i<NB_TUNE;i++)
         {
             const char* _tn=listOfTunings[i];
-            // we pass an empty string to the encoder in order to disable tuning,
-            // but want to show a descriptive label to the user
-            if(_tn=="")
+            if(!strcmp(_tn,"none"))
                 _tn=QT_TRANSLATE_NOOP("x264","none");
             tunings->addItem(QString(_tn));
         }

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp Changed

@@ -50,15 +50,34 @@
     passNumber=0;
     logFile=NULL;
 }
+/**
+ * 
+ * @param naltype
+ * @return 
+ */
+static bool isIDRNal(NalUnitType naltype)
+{
+    switch (naltype) {
+    case NAL_UNIT_CODED_SLICE_BLA_W_LP:
+    case NAL_UNIT_CODED_SLICE_BLA_W_RADL:
+    case NAL_UNIT_CODED_SLICE_BLA_N_LP:
+    case NAL_UNIT_CODED_SLICE_IDR_W_RADL:
+    case NAL_UNIT_CODED_SLICE_IDR_N_LP:
+    case NAL_UNIT_CODED_SLICE_CRA:
+        return true;
+    default:
+        return false;
+    }
+}
 
 /**
     \fn encodeNals
 */
-int x265Encoder::encodeNals(uint8_t *buf, int size, x265_nal *nals, int nalCount, bool skipSei)
+int x265Encoder::encodeNals(uint8_t *buf, int size, x265_nal *nals, int nalCount, bool skipSei,bool &idrHint)
 {
     uint8_t *p = buf;
     int i;
-
+    idrHint=false;
     if (seiUserDataLen > 0 && nalCount > 0)
         {
         memcpy(p, seiUserData, seiUserDataLen);
@@ -69,15 +88,24 @@
     }
 
     for (i = 0; i < nalCount; i++)
+    {
+        if(isIDRNal((NalUnitType)nals[i].type))
         {
-        if (skipSei && (nals[i].type == NAL_UNIT_PREFIX_SEI || nals[i].type == NAL_UNIT_SUFFIX_SEI))
-                {
-            seiUserDataLen = nals[i].sizeBytes;
-            seiUserData = new uint8_t[seiUserDataLen];
-            memcpy(seiUserData, nals[i].payload, nals[i].sizeBytes);
-            continue;
+            aprintf("NAL IDR TYPE\n");
+            idrHint=true;
+        }
+        else
+        {
+            if (skipSei && (nals[i].type == NAL_UNIT_PREFIX_SEI || nals[i].type == NAL_UNIT_SUFFIX_SEI))
+            {
+                seiUserDataLen = nals[i].sizeBytes;
+                seiUserData = new uint8_t[seiUserDataLen];
+                memcpy(seiUserData, nals[i].payload, nals[i].sizeBytes);
+                continue;
+            }
         }
 
+        aprintf("Nal %d, type %d\n",i,nals[i].type);
         memcpy(p, nals[i].payload, nals[i].sizeBytes);
         p += nals[i].sizeBytes;
     }
@@ -97,7 +125,8 @@
 
     extraDataLen = x265_encoder_headers(handle, &nal, &nalCount);
     extraData = new uint8_t[extraDataLen];
-    extraDataLen = encodeNals(extraData, extraDataLen, nal, nalCount, true);
+    bool idr;
+    extraDataLen = encodeNals(extraData, extraDataLen, nal, nalCount, true,idr);
 
   return 1;
 }
@@ -175,7 +204,7 @@
       x265_nal          *nal;
       uint32_t          nbNal = 0;
       x265_picture      pic_out;
-
+      x265_picture_init(&param,&pic_out);
       out->flags = 0;
       
         int er;
@@ -249,7 +278,8 @@
 */
 bool x265Encoder::postAmble (ADMBitstream * out,uint32_t nbNals,x265_nal *nal,x265_picture *picout)
 {
-        int size = encodeNals(out->data, out->bufferSize, nal, nbNals, false);
+    bool idrHint;
+        int size = encodeNals(out->data, out->bufferSize, nal, nbNals, false,idrHint);
 
         if (size < 0)
         {
@@ -292,11 +322,16 @@
             }
             out->dts=out->pts;
         }
+        if(picout->sliceType==X265_TYPE_I && idrHint)
+        {
+            picout->sliceType=X265_TYPE_IDR;
+        }
         switch (picout->sliceType)
         {
         case X265_TYPE_IDR:
           out->flags = AVI_KEY_FRAME;
           /* First Idr ?*/
+          aprintf("NAL IDR\n");
           if(!param.bRepeatHeaders && seiUserData && firstIdr==true)
           {
               // Put our SEI front...
@@ -318,16 +353,20 @@
           }
           break;
         case X265_TYPE_I:
+          aprintf("NAL I\n");
           out->flags = AVI_P_FRAME;
           break;
         case X265_TYPE_P:
+          aprintf("NAL P\n");
           out->flags = AVI_P_FRAME;
           break;
         case X265_TYPE_B:
         case X265_TYPE_BREF:
+          aprintf("NAL B\n");
           out->flags = AVI_B_FRAME;
           break;
         default:
+          aprintf("NAL X\n");
           ADM_error ("[x265] Unknown image type: %d\n", picout->sliceType);
           //ADM_assert(0);
         }

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt Changed

@@ -2,6 +2,8 @@
 INCLUDE(ve_plugin)
 INCLUDE(ve_settings_plugin)
 
+
+
 SET(x265_SRCS 
         ADM_x265.cpp
         ADM_x265Plugin.cpp
@@ -11,7 +13,9 @@
 include(admCheckX265)
 checkX265()
 IF(USE_X265)
-  MESSAGE(STATUS "x265 plugin activated.")
+
+  MESSAGE(STATUS "x265 plugin activated, with cflags=${X265_CFLAGS}.")
+  ADD_DEFINITIONS(${X265_CFLAGS})
   INCLUDE_DIRECTORIES(${X265_INCLUDE_DIR})
 
   #-----------------------QT4 VERSION---------------------
@@ -39,10 +43,13 @@
   # ------------- PRESET -----------
   if(DO_SETTINGS)
     FILE(GLOB json_files ${CMAKE_CURRENT_SOURCE_DIR}/preset/*.json)
-    message(STATUS "Presets found : ${json_files}")
-    INSTALL_VIDEO_ENCODER_SETTINGS(x265 VERSION 3 FILES ${json_files})
+    if(json_files)
+      message(STATUS "Presets found : ${json_files}")
+      INSTALL_VIDEO_ENCODER_SETTINGS(x265 VERSION 3 FILES ${json_files})
+    endif(json_files)
   endif(DO_SETTINGS)
 ELSE(USE_X265)
   MESSAGE(STATUS "x265 disabled.")
 ENDIF(USE_X265)
 
+MESSAGE("")

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp Changed

@@ -82,8 +82,7 @@
 static const char* listOfPresets[] = { "ultrafast", "superfast", "veryfast", "faster", "fast", "medium", "slow", "slower", "veryslow", "placebo" };
 #define NB_PRESET sizeof(listOfPresets)/sizeof(char*)
 
-// Empty string "" as tuning means no tuning. This is the default.
-static const char* listOfTunings[] = { "", "psnr", "ssim", "grain", "zerolatency", "fastdecode" };
+static const char* listOfTunings[] = { "none", "psnr", "ssim", "grain", "zerolatency", "fastdecode" };
 #define NB_TUNE sizeof(listOfTunings)/sizeof(char*)
 
 static const char* listOfProfiles[] = { "main", "main10", "mainstillpicture" };
@@ -180,10 +179,8 @@
         tunings->clear();
         for(int i=0;i<NB_TUNE;i++)
         {
-            // we pass an empty string to the encoder in order to disable tuning,
-            // but want to show a descriptive label to the user
             const char* _tn=listOfTunings[i];
-            if(_tn=="")
+            if(!strcmp(_tn,"none"))
                 _tn=QT_TRANSLATE_NOOP("x265","none");
             tunings->addItem(QString(_tn));
         }

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/admIvtc Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp Added

@@ -0,0 +1,296 @@
+/***************************************************************************
+
+ Custom IVTC
+
+    copyright            : (C) 2017 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_vidMisc.h"
+#include "DIA_factory.h"
+#include "DIA_coreToolkit.h"
+#include "admIvtc.h"
+#include "admIvtc_desc.cpp"
+
+#include "ADM_admIvtc.h"
+#if defined( ADM_CPU_X86) && !defined(_MSC_VER)
+        #define CAN_DO_INLINE_X86_ASM
+#endif
+
+#if 1
+#define aprintf printf
+#else
+#define aprintf(...) {}
+#endif
+
+
+// Add the hook to make it valid plugin
+DECLARE_VIDEO_FILTER(   admIvtc,   // Class
+                        1,0,0,              // Version
+                        ADM_UI_ALL,         // UI
+                        VF_INTERLACING,            // Category
+                        "admIvtc",            // internal name (must be uniq!)
+                        QT_TRANSLATE_NOOP("admIvtc","ADM ivtc."),            // Display name
+                        QT_TRANSLATE_NOOP("admIvtc","All in one ivtc.") // Description
+                    );
+
+// Now implements the interesting parts
+/**
+    \fn admIvtc
+    \brief constructor
+*/
+admIvtc::admIvtc(  ADM_coreVideoFilter *in,CONFcouple *setup) : ADM_coreVideoFilterCached(11,in,setup)
+{
+    if(!setup || !ADM_paramLoad(setup,dupeRemover_param,&configuration))
+    {
+        // Default value
+        configuration.threshold=3;
+        configuration.show=false;
+        configuration.mode=1; // fast!
+        configuration.removeDupe=false;
+
+    }
+    for(int i=0;i<2;i++)
+        spare[i]=new ADMImageDefault(in->getInfo()->width,in->getInfo()->height);
+    myName="admIvtc";
+
+
+
+    startSequence=0;
+    state=IVTC_SYNCING;
+}
+/**
+    \fn admIvtc
+    \brief destructor
+*/
+admIvtc::~admIvtc()
+{
+    for(int i=0;i<2;i++)
+    {
+        delete spare[i];
+        spare[i]=NULL;
+    }
+}
+
+
+/**
+ *
+ * @param img
+ * @return
+ */
+bool admIvtc::postProcess(ADMImage *in,ADMImage *out,uint64_t newPts)
+{
+   
+    return true;
+}
+
+
+/**
+    \fn copyField
+*/
+ bool copyField(ADMImage *target, ADMImage *source, bool top)
+{
+    for(int i=0;i<3;i++)
+    {
+        ADM_PLANE plane=(ADM_PLANE )i;
+        uint8_t *dest=target->GetWritePtr(plane);
+        uint8_t *src=source->GetReadPtr(plane);
+
+        uint32_t sPitch=source->GetPitch(plane);
+        uint32_t dPitch=target->GetPitch(plane);
+        
+        if(false==top)
+        {
+            dest=dest+dPitch;
+            src=src+sPitch;
+        }
+
+
+        uint32_t h=target->GetHeight(plane);
+        uint32_t w=target->GetWidth(plane);
+
+        // copy one line out of two
+        h>>=1;
+        dPitch*=2;
+        sPitch*=2;
+
+        BitBlit(dest,dPitch,src,sPitch,w,h);
+
+    }
+    return true;
+}
+
+/**
+    \fn getCoupledConf
+    \brief Return our current configuration as couple name=value
+*/
+bool         admIvtc::getCoupledConf(CONFcouple **couples)
+{
+
+    return ADM_paramSave(couples, dupeRemover_param,&configuration);
+}
+
+void admIvtc::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, dupeRemover_param, &configuration);
+}
+
+/**
+    \fn getConfiguration
+    \brief Return current setting as a string
+*/
+const char *admIvtc::getConfiguration(void)
+{
+    static char bfer[1024];
+
+    sprintf(bfer,"IVTC Dupe Removed : Threshold =%u",(unsigned int)configuration.threshold);
+    return bfer;
+}
+/**
+ *
+ * @param usSeek
+ * @return
+ */
+bool         admIvtc::goToTime(uint64_t usSeek)
+{
+    vidCache->flush();
+    nextFrame=0;
+    state=IVTC_SYNCING;
+    return previousFilter->goToTime(usSeek);
+}
+/**
+    \fn configure
+*/
+bool admIvtc::configure( void)
+{
+
+#define PX(x) &(configuration.x)
+        diaElemUInteger   threshold(PX(threshold),QT_TRANSLATE_NOOP("ivtcRemover","_Noise:"),0,255);
+        diaElemToggle     show(PX(show),QT_TRANSLATE_NOOP("ivtcRemover","_Show:"));
+        diaElemToggle     remove(PX(removeDupe),QT_TRANSLATE_NOOP("ivtcRemover","_Remove duplicate:"));
+
+
+        diaMenuEntry menuMode[]={
+                {0,      QT_TRANSLATE_NOOP("ivtcRemover","Full")},
+                {1,      QT_TRANSLATE_NOOP("ivtcRemover","Fast")},
+                {2,      QT_TRANSLATE_NOOP("ivtcRemover","VeryFast")}
+                };
+
+
+
+        diaElemMenu      eMode(&configuration.mode,QT_TRANSLATE_NOOP("ivtcRemover","_Frame rate change:"),3,menuMode);
+
+        diaElem *elems[4]={&threshold,&remove,&eMode,&show};
+        return diaFactoryRun(QT_TRANSLATE_NOOP("ivtcRemover","DupeRemover"),4,elems);
+}
+/**
+*/
+static uint32_t smallDiff(uint8_t  *s1,uint8_t *s2,uint32_t noise, int count)
+{
+uint32_t df=0;
+uint32_t delta;
+    for(int x=0;x<count;x++)
+    {
+            delta=abs((int)(s1[x])-(int)(s2[x]));
+            if(delta>noise)
+                    df+=delta;
+    }
+    return df;
+}
+
+/**
+
+*/
+/* 3000 * 3000 max size, using uint32_t is safe... */
+static uint32_t computeFieldDiff(uint8_t  *s1,uint8_t *s2,uint32_t noise,int w,int h, int stride1, int stride2)
+{
+uint32_t df=0;
+uint32_t delta;
+
+    for(int y=0;y<h-1;y+=2)
+    {
+        for(int x=0;x<w;x++)
+        {
+                delta=abs((int)(s1[x])-(int)(s2[x]));
+                if(delta>noise)
+                        df+=delta;
+        }
+        s1+=stride1*2;
+        s2+=stride2*2;
+    }
+    return df;
+}
+/**
+ * \fn lumaDiff
+*/
+uint32_t admIvtc::lumaDiff(bool bottom,ADMImage *src1,ADMImage *src2,uint32_t noise)
+{
+    int stride1=src1->GetPitch(PLANAR_Y);
+    int stride2=src2->GetPitch(PLANAR_Y);
+    uint8_t *p1=YPLANE(src1);
+    uint8_t *p2=YPLANE(src2);
+    int w=src1->GetWidth(PLANAR_Y);
+    int h=src1->GetHeight(PLANAR_Y);
+    if(bottom)
+    {
+        p1+=stride1;
+        p2+=stride2;
+    }
+            
+    return computeFieldDiff(p1,p2,
+                noise,
+                w,h>>configuration.mode,
+                stride1<<configuration.mode,stride2<<configuration.mode);
+}
+
+/**
+ * \fn computeDelta
+ * @param left
+ * @param right
+ * @param threshold
+ * @return
+ */
+ivtcMatch admIvtc::computeMatch(ADMImage *left,ADMImage *right, int threshold)
+{
+   
+        uint32_t top=lumaDiff(false,left,right,threshold);
+        uint32_t bottom= lumaDiff(true,left,right,threshold);
+        
+#define MATCH_THRESHOLD        
+        
+        ivtcMatch match=IVTC_NO_MATCH;
+        const char *r="-";
+        if(top > 10*bottom)
+        {
+           r="BOTTOM match";
+           match= IVTC_BOTTOM_MATCH;
+        }
+        if(bottom > 10*top) 
+        {
+            r="Right match";
+            match= IVTC_TOP_MATCH;
+        }
+        aprintf("[Even:%d : Odd:%d] %s\n",top,bottom,r);
+
+        return match;
+}
+bool            admIvtc::displayStatus(ADMImage *image,const char *st)
+{
+    if(configuration.show)
+          image->printString(2,16,st);
+    return true;
+}
+
+
+/************************************************/
+//EOF

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.h Added

@@ -0,0 +1,82 @@
+/***************************************************************************
+
+ Custom IVTC
+
+    copyright            : (C) 2017 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+
+#define PERIOD 4
+
+#define MARK_PROGRESSIVE 'PRGS'
+#define MARK_DUPLICATE   'DUPE'
+
+
+enum ivtcMatch
+{
+    IVTC_NO_MATCH=0,
+    IVTC_TOP_MATCH=1,
+    IVTC_BOTTOM_MATCH=2
+};
+enum ivtcState
+{
+    IVTC_SYNCING,
+    IVTC_PROCESSING,
+    IVTC_RESYNCING,
+    IVTC_SKIPPING
+};
+/**
+    \class admIvtc
+*/
+class admIvtc : public  ADM_coreVideoFilterCached
+{
+public:              
+                enum searchMode
+                {
+                    full=0,
+                    fast=1,
+                    veryFast=2
+                };
+                                
+                                
+protected:
+                dupeRemover        configuration;
+                ivtcMatch          searchSync(int &offset);
+                bool               postProcess(ADMImage *in,ADMImage *out,uint64_t pts);
+                ivtcMatch          computeMatch(ADMImage *left,ADMImage *right, int threshold);
+public:
+                                   admIvtc(ADM_coreVideoFilter *previous,CONFcouple *conf);
+                                   ~admIvtc();
+                bool               goToTime(uint64_t usSeek);
+        virtual const char         *getConfiguration(void);                   /// Return  current configuration as a human readable string
+        virtual bool               getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image	 
+        virtual bool               getCoupledConf(CONFcouple **couples) ;     /// Return the current filter configuration
+        virtual void               setCoupledConf(CONFcouple *couples);
+        virtual bool               configure(void);                           /// Start graphical user interface
+                uint32_t           lumaDiff(bool bottom,ADMImage *src1,ADMImage *src2,uint32_t noise);
+                
+protected:                
+                ivtcState       state; // synced or searching
+                ivtcMatch       mode; // top or bottom
+                int             offsetInSequence; // Current frame in the IVTC pattern AA / AB / BC / CC / DD
+                int             startSequence;  // frame number of AA
+                ivtcMatch       matches[PERIOD*2]; //       
+                int             skipCount;
+protected:
+                bool            getNextImageInSequence(uint32_t *fn,ADMImage *image);
+                bool            trySimpleFieldMatching();
+                bool            tryInterlacingDetection(ADMImage **img);
+                bool            verifySamePattern(ADMImage **images, ivtcMatch candidate);
+                bool            displayStatus(ADMImage *image,const char *st);
+                ADMImage        *spare[2];
+};
\ No newline at end of file

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc_main.cpp Added

@@ -0,0 +1,416 @@
+/***************************************************************************
+
+ Custom IVTC
+
+    copyright            : (C) 2017 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_vidMisc.h"
+#include "DIA_factory.h"
+#include "DIA_coreToolkit.h"
+#include "admIvtc.h"
+#include "ADM_admIvtc.h"
+
+extern bool copyField(ADMImage *target, ADMImage *source, bool top);
+
+#if 1
+#define aprintf printf
+#else
+#define aprintf(...) {}
+#endif
+
+
+/**
+ * \fn lookupSync
+ * \brief Try to search for a sequence
+ * @return
+ */
+ivtcMatch  admIvtc::searchSync(int  &offset)
+{
+    ADMImage *images[PERIOD*2];
+  
+    offset=0xff;
+
+    aprintf("Searching sync\n");
+
+    for(int i=0;i<(PERIOD+2);i++)
+    {
+        images[i]=vidCache->getImage(nextFrame+i);
+        if(!images[i])
+        {            
+            return IVTC_NO_MATCH;
+        }
+    }
+    // if it not all NTSC, dont even try           
+    
+    int film=0;
+    for(int i=0;i<PERIOD+1;i++)
+    {
+        if((images[i+1]->Pts-images[i]->Pts)> 41000) // 24 fps
+            film++;
+    }
+    if(film)
+    {
+        aprintf("Not all NTSC, not even trying\n");
+         return IVTC_NO_MATCH;
+    }
+    for(int i=0;i<PERIOD+1;i++)
+    {
+        matches[i]=computeMatch(images[i],images[i+1],configuration.threshold);
+    }
+    for(int i=0;i<PERIOD;i++)
+    {
+        if(matches[i]!=IVTC_NO_MATCH && matches[i+1]==IVTC_NO_MATCH && matches[i+2]!=IVTC_NO_MATCH && matches[i+2]!=matches[i])
+        {
+            offset=i;
+            return matches[i];
+        }
+    }
+    return IVTC_NO_MATCH;   
+}
+
+/**
+ * 
+ * @param fn
+ * @param image
+ * @return 
+ */
+bool admIvtc::getNextImageInSequence(uint32_t *fn,ADMImage *image)
+{
+    int left,right;
+    uint8_t *hint=image->GetReadPtr(PLANAR_Y);
+    switch(offsetInSequence)
+    {
+
+        case 1:
+                left=startSequence+2;
+                right=startSequence+1;                
+                break;
+        case 2:
+                left=startSequence+3;
+                right=startSequence+2;
+                break;
+        case 3:
+        case 4:
+        default:
+            left=right=startSequence+offsetInSequence;            
+            break;
+    }
+    if(mode==IVTC_TOP_MATCH)
+    {
+    int med=left;
+        left=right;
+        right=med;
+    }
+    ADMImage *source1=vidCache->getImage(left);
+    if(!source1)
+    {
+        vidCache->unlockAll();
+        return false;
+    }
+    ADMImage *source2=vidCache->getImage(right);
+    if(!source2)
+    {
+        source2=source1;
+    }
+    copyField(image,source1,false);
+    copyField(image,source2,true);
+
+    if(offsetInSequence==2)
+        PutHintingData(image->GetReadPtr(PLANAR_Y),MARK_DUPLICATE);
+    else
+        PutHintingData(image->GetReadPtr(PLANAR_Y),MARK_PROGRESSIVE);
+    
+    if(configuration.show)
+    {
+        char st[200];
+        sprintf(st,"Seq=%d",offsetInSequence);
+        displayStatus(image,st);
+        
+        for(int i=0;i<=PERIOD;i++)
+        {
+            sprintf(st,"%d:%d",i,matches[i]);
+            image->printString(16,3+i,st);
+        }
+
+
+    }
+    image->Pts=vidCache->getImage(offsetInSequence+startSequence)->Pts;
+    offsetInSequence++;
+    if(offsetInSequence>PERIOD)
+        state=IVTC_RESYNCING;
+     vidCache->unlockAll();
+    *fn=nextFrame;
+    nextFrame++;
+    
+    return true;               
+}
+
+#define DUPLICATE_FROM_AND_END(x)  image->duplicateFull(x);\
+        vidCache->unlockAll(); \
+        *fn=nextFrame; \
+        nextFrame++; \
+        ;
+
+
+/**
+ * 
+ * @return 
+ */
+bool admIvtc::trySimpleFieldMatching()
+{
+    int offset;
+    ivtcMatch match=searchSync(offset);
+    aprintf(">>Match = %d, offset=%d,in =%d\n",match,offset,nextFrame);
+    if(match!=IVTC_NO_MATCH) // Gotcha
+    {
+        
+        offsetInSequence=1;
+        startSequence=nextFrame+offset;
+        mode=match;
+    
+        if(!offset)
+        {
+            state=IVTC_PROCESSING;
+            aprintf("Synced mode = %d\n",mode);
+            return true;
+        }else
+        {
+            state=IVTC_SKIPPING;
+            skipCount=offset;
+            aprintf("Need to skip %d frames offset\n",skipCount);
+            return true;
+        }
+    }
+    return false;
+}
+
+#define INTERLACED_THRESHOLD (30*30)
+
+/**
+ * 
+ * @return 
+ */
+uint32_t      ADMVideo_interlaceCount_C( ADMImage *top, ADMImage *bottom, int threshold,int skipFactor);
+bool admIvtc::tryInterlacingDetection(ADMImage **images)
+{
+    int ilaced[PERIOD+1];
+    for(int i=0;i<PERIOD+1;i++)
+    {
+        ilaced[i]=ADMVideo_interlaceCount_C(images[i],images[i],INTERLACED_THRESHOLD,configuration.mode);
+        aprintf("Interlaced [%d] %d\n",i,ilaced[i]);
+        
+    }
+    // We should have 2 interlaced and 3 progressive as P I I P P
+#define MORE(a,b)     (ilaced[a]>ilaced[b])
+    bool match1=MORE(1,0) && MORE(1,3) && MORE(1,4);
+    bool match2=MORE(2,0) && MORE(2,3) && MORE(2,4);
+    if(match1 && match2)
+    {
+        aprintf("Maybe IVTC pattern\n");
+        // Reconstruct first interlaced image, it should not be interlaced anymore
+        //copyField(spare[0],images[2],false); // bottom
+        //copyField(spare[0],images[1],true); //top
+        
+        //copyField(spare[1],images[2],true);
+        //copyField(spare[1],images[1],false);
+
+        int top=ADMVideo_interlaceCount_C(images[1],images[2],INTERLACED_THRESHOLD,configuration.mode);
+        int bottom=ADMVideo_interlaceCount_C(images[2],images[1],INTERLACED_THRESHOLD,configuration.mode);
+        
+        aprintf("Top = %d/%d\n",top,ilaced[1]);
+        aprintf("Bottom = %d/%d\n",bottom,ilaced[1]);
+     
+        if(top<ilaced[1] && top<bottom)
+        {
+            // match
+            aprintf("Match TOP \n");
+            offsetInSequence=1;
+            startSequence=nextFrame;
+            mode=IVTC_BOTTOM_MATCH;
+            state=IVTC_PROCESSING;
+            return true;
+        }else
+            if(bottom<ilaced[1] && bottom<top)
+            {
+                aprintf("Match BOTTOM \n");
+                offsetInSequence=1;
+                startSequence=nextFrame;
+                mode=IVTC_TOP_MATCH;
+                state=IVTC_PROCESSING;
+                return true;
+            }
+    }
+    return false;
+}
+
+bool admIvtc::verifySamePattern(ADMImage **images, ivtcMatch candidate)
+{
+    bool toptop;
+    if(candidate==IVTC_TOP_MATCH)
+        toptop=true;
+    else 
+        toptop=false;
+    
+    int before=ADMVideo_interlaceCount_C(images[1],images[1],INTERLACED_THRESHOLD,configuration.mode);
+    int before2=ADMVideo_interlaceCount_C(images[2],images[2],INTERLACED_THRESHOLD,configuration.mode);
+    //copyField(spare[0],images[2],toptop);
+    //copyField(spare[0],images[1],!toptop);   
+    
+    int after=0;
+    int after2=0;
+    if(toptop)
+    {
+        after=ADMVideo_interlaceCount_C(images[2],images[1],INTERLACED_THRESHOLD,configuration.mode);
+        after2=ADMVideo_interlaceCount_C(images[3],images[2],INTERLACED_THRESHOLD,configuration.mode);
+    }
+    else
+    {
+        after=ADMVideo_interlaceCount_C(images[1],images[2],INTERLACED_THRESHOLD,configuration.mode);
+        after2=ADMVideo_interlaceCount_C(images[2],images[3],INTERLACED_THRESHOLD,configuration.mode);
+    }
+    
+    aprintf("Before1  %d, After %d\n",before,after);
+    aprintf("Before2  %d, After %d\n",before2,after2);
+    
+    
+    
+    
+    if((after*3 < before*2) && (after2*3 < before2 *2))
+        return true;
+    return false;
+}
+
+/**
+ * 
+ * @param fn
+ * @param image
+ * @return 
+ */
+
+bool admIvtc::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    aprintf("--------------------\nMode = %d, offsetInSequence=%d\n",state,offsetInSequence);
+    if(state==IVTC_PROCESSING)
+        return  getNextImageInSequence(fn,image);        
+    
+    // Try to find sync...
+    // 1- preload cache
+    ADMImage *images[PERIOD+2];
+    for(int i=0;i<PERIOD+2;i++)
+    {
+        images[i]=vidCache->getImage(nextFrame+i);
+        if(!images[i])
+        {            
+            if(!i)
+            {
+                vidCache->unlockAll();
+                aprintf("Cannot get source image\n");
+                return false;
+            }
+            DUPLICATE_FROM_AND_END(images[0]);
+            aprintf("incomplete sequence\n");
+            return true;
+        }
+    }
+    
+    // we have found the pattern ahead, skip
+    if(state==IVTC_SKIPPING)
+    {
+        aprintf("Skipping %d left\n",skipCount);
+        
+        skipCount--;
+        DUPLICATE_FROM_AND_END(images[0]);
+         PutHintingData(image->GetReadPtr(PLANAR_Y),0);
+        if(!skipCount)
+        {
+            state=IVTC_PROCESSING;
+            aprintf("Swiching to processing\n");
+            displayStatus(image,"SEQ 0 ");
+            PutHintingData(image->GetReadPtr(PLANAR_Y),MARK_PROGRESSIVE);
+        }else
+            displayStatus(image,"SKIPPING");
+         
+         
+         return true;
+    }
+    
+    
+    // is the 2 first in NTSC mode ? 30 or 60 fps ?
+    bool rightFps=true;
+    for(int i=0;i<PERIOD+1;i++)
+    {
+        int deltaPts=(int)(images[i+1]->Pts-images[i+0]->Pts);
+        aprintf("Delta fps = %d \n",deltaPts);
+        if((deltaPts < 33000 || deltaPts>34000) && (deltaPts < 33000*2 || deltaPts>34000*2) )
+               rightFps=false;
+
+    }
+    
+    if(!rightFps)
+    {
+        DUPLICATE_FROM_AND_END(images[0]);
+        displayStatus(image,"Skipping,wrong fps");
+        aprintf("Wrong fps\n");
+        return true;
+    }
+
+    if(state==IVTC_RESYNCING)
+    {
+        if(verifySamePattern(images,mode))
+        {
+            aprintf("Same pattern\n");
+            state=IVTC_PROCESSING;
+            offsetInSequence=1;
+            startSequence=nextFrame;           
+            DUPLICATE_FROM_AND_END(images[0]);
+            displayStatus(image,"Seq: 0, same pattern");
+            PutHintingData(image->GetReadPtr(PLANAR_Y),MARK_PROGRESSIVE);
+            return true;
+        }else
+        {            
+            state=IVTC_SYNCING;
+        }
+               
+    }
+    
+    // Try to find our pattern
+    // first field matching, it works only if there is some movement
+    
+    if(!trySimpleFieldMatching())
+    {
+        tryInterlacingDetection(images);
+    }
+   
+    
+    ADMImage *img=vidCache->getImage(nextFrame);
+    if(!img)
+    {
+        vidCache->unlockAll();
+        return false;
+    }
+    DUPLICATE_FROM_AND_END(img);
+    if(state==IVTC_SYNCING)
+    {
+        displayStatus(image,"SYNCING, not sync found");
+    }else
+    {
+        displayStatus(image,"SEQ 0 ");
+        PutHintingData(image->GetReadPtr(PLANAR_Y),MARK_PROGRESSIVE);
+    }
+    return true;               
+}
+
+/************************************************/
+//EOF

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc_util.cpp Added

@@ -0,0 +1,59 @@
+/***************************************************************************
+
+ Custom IVTC
+
+    copyright            : (C) 2017 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#define SKIP_FACTOR 2   
+
+// C version
+uint32_t      ADMVideo_interlaceCount_C( ADMImage *top,ADMImage *bottom, int threshold,int skipFactor)
+
+{
+    uint32_t m=0;
+    int w=top->GetWidth(PLANAR_Y);
+    int h=top->GetHeight(PLANAR_Y);
+    
+    int pitchTop=top->GetPitch(PLANAR_Y);
+    uint8_t *srcTop=top->GetReadPtr(PLANAR_Y);
+
+    int pitchBottom=bottom->GetPitch(PLANAR_Y);
+    uint8_t *srcBottom=bottom->GetReadPtr(PLANAR_Y);
+
+    
+    uint8_t *p,*n,*c;
+    int j;
+    p=srcTop ;
+    c=srcBottom + pitchBottom;    
+    n=srcTop + pitchTop+pitchTop;
+    
+
+
+    for(int y=h>>(skipFactor+1);  y >2 ; y--)
+    {
+        for(int x=0;x<w;x++)
+        {
+            j=(int)p[x]-(int)c[x];
+            j*=(int)n[x]-(int)c[x];
+            if(  j >threshold)
+                m++;
+        }
+        p+=(2*pitchTop)<<skipFactor;
+        n+=(2*pitchTop)<<skipFactor;
+        c+=(2*pitchBottom)<<skipFactor;
+    }
+    return m;
+}
+

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/admIvtc/CMakeLists.txt Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc.conf Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc.h Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc_desc.cpp Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/admIvtc/admIvtc_json.cpp Added

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/DIA_flyAsharp.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/DIA_flyAsharp.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/asharp.ui -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/asharp.ui Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/CMakeLists.txt Changed

@@ -12,35 +12,27 @@
 #
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 SET(ADM_LIB ADM_libass)
-#  mputils.c
-IF(ADM_CPU_X86) # We have yasm, we use it to build ffmpeg. Borrowed from x265
-        find_program(YASM_EXECUTABLE 
-        NAMES yasm yasm-1.2.0-win32 yasm-1.2.0-win64
-        )
-        MESSAGE(STATUS "Yasm found as ${YASM_EXECUTABLE}")
-        enable_language(ASM_YASM)
-        SET(Asm x86/blend_bitmaps.asm  
-                x86/blur.asm    x86/cpuid.asm  
-                x86/rasterizer.asm  x86/utils.asm  
-                x86/x86inc.asm
-        )
-        IF(ADM_CPU_X86_64)
+SET(Asm x86/blend_bitmaps.asm  
+        x86/blur.asm    
+        x86/cpuid.asm  
+        x86/rasterizer.asm  
+        x86/utils.asm  
+        x86/x86inc.asm
+)
+IF(ADM_CPU_X86_64)
         SET(Asm ${Asm} x86/be_blur.asm )
-        ENDIF(ADM_CPU_X86_64)
+ENDIF(ADM_CPU_X86_64)
+IF(ADM_CPU_X86)
         ADD_DEFINITIONS(-DCONFIG_ASM) 
 ENDIF(ADM_CPU_X86)
 #
 SET(${ADM_LIB}_SRCS 
 ass_bitmap.c  ass.c  ass_cache.c  ass_fontconfig.c  ass_library.c   ass_render.c  ass_utils.c
 ass_font.c ass_parse.c ass_drawing.c ass_render_api.c ass_strtod.c ass_shaper.c
-ass_rasterizer_c.c ass_blur.c ass_font.c 
+ass_rasterizer_c.c ass_blur.c ass_font.c ass_rasterizer.c
 ${Asm}
 )
 
-IF(WIN32 AND NOT ADM_CPU_X86_64) # This is wrong, FIXME
-        SET(${ADM_LIB}_SRCS  ${${ADM_LIB}_SRCS} ass_rasterizer.c)
-ENDIF(WIN32 AND NOT ADM_CPU_X86_64)
-#
 ADD_DEFINITIONS(" -std=gnu99 ")
 #
 ADD_LIBRARY(${ADM_LIB} STATIC ${${ADM_LIB}_SRCS})
@@ -52,7 +44,7 @@
 ENDIF (FONTCONFIG_FOUND)
 
 # ?
-ADD_DEFINITIONS(${FONTCONFIG_CFLAGS} "-DCONFIG_ICONV=1 -DCONFIG_FREETYPE=1 -DCONFIG_RASTERIZER=1 -DCONFIG_FRIBIDI=1")
+ADD_DEFINITIONS(${FONTCONFIG_CFLAGS} -DCONFIG_ICONV=1 -DCONFIG_FREETYPE=1 -DCONFIG_RASTERIZER=1 -DCONFIG_FRIBIDI=1)
 TARGET_LINK_LIBRARIES(${ADM_LIB} ${LIBICONV_LIBRARY_DIR})
 
 IF (UNIX)

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/CMakeLists.txt Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/DIA_flyBlackenBorders.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/DIA_flyBlackenBorders.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/blackenBorders.ui -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/blackenBorders.ui Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/DIA_flyChromaShift.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/DIA_flyChromaShift.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/chromashift.ui -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/chromashift.ui Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/DIA_flyContrast.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/DIA_flyContrast.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/contrast.ui -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/contrast.ui Changed

@@ -13,9 +13,9 @@
   <property name="windowTitle">
    <string>Contrast</string>
   </property>
-  <layout class="QFormLayout" name="formLayout">
+  <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout_5">
+    <layout class="QVBoxLayout" name="verticalLayout_5" stretch="0,1">
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_2">
        <item>
@@ -145,7 +145,7 @@
            <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
-             <height>40</height>
+             <height>0</height>
             </size>
            </property>
           </spacer>
@@ -180,6 +180,12 @@
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>256</width>
+           <height>128</height>
+          </size>
+         </property>
          <property name="minimumSize">
           <size>
            <width>256</width>
@@ -205,7 +211,7 @@
      <item>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
-        <widget class="QSlider" name="horizontalSlider">
+        <widget class="ADM_QSlider" name="horizontalSlider">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -233,6 +239,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections>
   <connection>

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/CMakeLists.txt Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/DIA_flyCrop.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/DIA_flyCrop.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5 Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp Added

@@ -0,0 +1,452 @@
+/***************************************************************************
+ * \file GUI for crop filter
+ * \author mean 2002/2017 fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "./DIA_flyCrop.h"
+#include "./Q_crop.h"
+#include "ADM_toolkitQt.h"
+
+uint8_t Metrics( uint8_t *in, uint32_t width,uint32_t *avg, uint32_t *eqt);
+uint8_t MetricsV( uint8_t *in, uint32_t width,uint32_t height,uint32_t *avg, uint32_t *eqt);
+
+/**
+ * 
+ * @param parent
+ * @param width
+ * @param height
+ * @param in
+ * @param canvas
+ * @param slider
+ */
+flyCrop::flyCrop (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider)
+                : 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;
+    _oh=height;
+}
+flyCrop::~flyCrop()
+{
+    delete rubber;
+    rubber=NULL;
+}
+
+/**
+    \fn blank
+    \brief 
+*/
+
+static void blank(uint8_t *in, int w,int h,int stride)
+{
+    for(int y=0;y<h;y++)
+    {
+        memset(in,0,4*w);
+        uint8_t *p=in+1;
+        for(int x=0;x<w;x++)        
+            p[x<<2]=0xff;        
+        in+=stride;
+    }  
+}
+
+/**
+ * \fn processRgb
+ * @param imageIn
+ * @param imageOut
+ * @return 
+ */
+uint8_t    flyCrop::processRgb(uint8_t *imageIn, uint8_t *imageOut)
+{
+    memcpy(imageOut,imageIn,_w*_h*4);
+    
+    blank(imageOut,_w,top,4*_w);
+    blank(imageOut+(_w*4)*(_h-bottom),_w,bottom,4*_w);
+    blank(imageOut,left,_h,4*_w);
+    blank(imageOut+(_w-right-1)*4,right,_h,4*_w);
+    return true;
+}
+/**
+ * 
+ * @param imageIn
+ * @param imageOut
+ * @return 
+ */
+int bound(int val, int other, int maxx)
+{
+   int r=(int)maxx-(int)(val+other);
+   if(r<0) 
+        r=0;
+   return r;
+}
+/**
+ * \fn bandResized
+ * @param x
+ * @param y
+ * @param w
+ * @param h
+ * @return 
+ */
+bool    flyCrop::bandResized(int x,int y,int w, int h)
+{
+    aprintf("Rubber resized: x=%d, y=%d, w=%d, h=%d\n",x,y,w,h);
+    aprintf("Debug: old values: x=%d, y=%d, w=%d, h=%d\n",_ox,_oy,_ow,_oh);
+
+    double halfzoom=_zoom/2-0.01;
+    // try to recalculate values only if these values were actually modified by moving the handles
+    bool leftHandleMoved=false;
+    bool rightHandleMoved=false;
+    if((x+w)==(_ox+_ow) && (y+h)==(_oy+_oh))
+        leftHandleMoved=true;
+    if(x==_ox && y==_oy)
+        rightHandleMoved=true;
+
+    _ox=x;
+    _oy=y;
+    _ow=w;
+    _oh=h;
+
+    bool ignore=false;
+    if(leftHandleMoved && rightHandleMoved) // bogus event
+        ignore=true;
+
+    int normX, normY, normW, normH;
+    normX=(int)(((double)x+halfzoom)/_zoom);
+    normY=(int)(((double)y+halfzoom)/_zoom);
+    normW=(int)(((double)w+halfzoom)/_zoom);
+    normH=(int)(((double)h+halfzoom)/_zoom);
+
+    // resize the rubberband back into bounds once the user tries to drag handles out of sight
+    bool resizeRubber=false;
+    if(normX<0 || normY<0 || normX+normW>_w || normY+normH>_h)
+    {
+        resizeRubber=true;
+        aprintf("rubberband out of bounds, will be resized back\n");
+    }
+
+    if(ignore)
+    {
+        upload(false,resizeRubber);
+        return false;
+    }
+
+    if(rightHandleMoved)
+    {
+        right=bound(normX,normW,_w)&0xfffe;
+        bottom=bound(normY,normH,_h)&0xfffe;
+    }
+
+    if(normX<0) normX=0;
+    if(normY<0) normY=0;
+
+    if(leftHandleMoved)
+    {
+        top=normY&0xfffe;
+        left=normX&0xfffe;
+    }
+
+    upload(false,resizeRubber);
+    sameImage();
+    return true; 
+}
+/**
+ * \fn blockChanges
+ * @param block
+ * @return 
+ */
+#define APPLY_TO_ALL(x) {w->spinBoxLeft->x;w->spinBoxRight->x;w->spinBoxTop->x;w->spinBoxBottom->x;rubber->x;}
+bool flyCrop::blockChanges(bool block)
+{
+    Ui_cropDialog *w=(Ui_cropDialog *)_cookie;
+    APPLY_TO_ALL(blockSignals(block));
+    return true;
+}
+/**
+     \fn autoRun
+    \brief 
+*/
+#define THRESH_AVG   30
+#define THRESH_EQT   50
+
+int flyCrop::autoRun(uint8_t *in,int w,int h, int increment)
+{
+    uint32_t avg,eqt;
+    int y;
+    for(y=0;y<h;y++)	
+    {
+        Metrics(in,w,&avg,&eqt);
+        in+=increment;
+        if(avg> THRESH_AVG || eqt > THRESH_EQT)
+                break;
+    }
+    if(y)
+        y=y-1;
+    return y&0xfffe;
+}
+int flyCrop::autoRunV(uint8_t *in,int w,int h, int increment)
+{
+    uint32_t avg,eqt;
+    int y;
+    for(y=0;y<h;y++)	
+    {
+        MetricsV(in,w,h,&avg,&eqt);
+        in+=increment;
+        if(avg> THRESH_AVG || eqt > THRESH_EQT)
+                break;
+    }
+    if(y)
+        y=y-1;
+    return y&0xfffe;
+}
+/**
+ * 
+ * @return 
+ */
+uint8_t  flyCrop::autocrop(void)
+{
+uint8_t *in;
+uint32_t y,avg,eqt;
+    // Top
+
+
+    in=_yuvBuffer->GetReadPtr(PLANAR_Y);
+    int stride=_yuvBuffer->GetPitch(PLANAR_Y);
+    
+    top=autoRun(in,_w,((_h>>1)-2),stride);
+    bottom=autoRun(in+stride*(_h-1),_w,((_h>>1)-2),-stride);
+    left=autoRunV(in,_w,((_w>>1)-2),1);
+    right=autoRunV(in+_w-1,_w,((_w>>1)-2),-1);
+    upload(false,true);
+    sameImage();
+    return 1;
+}
+/**
+ * 
+ * @param redraw
+ * @return 
+ */
+uint8_t flyCrop::upload(bool redraw, bool toRubber)
+{
+    aprintf("left=%d, right=%d, top=%d, bottom=%d\n",left,right,top,bottom);
+    Ui_cropDialog *w=(Ui_cropDialog *)_cookie;
+    if(!redraw)
+    {
+        blockChanges(true);
+    }
+    w->spinBoxLeft->setValue(left);
+    w->spinBoxRight->setValue(right);
+    w->spinBoxTop->setValue(top);
+    w->spinBoxBottom->setValue(bottom);
+
+    if(toRubber)
+    {
+        rubber->nestedIgnore++;
+        rubber->move(_zoom*(float)left,_zoom*(float)top);
+        rubber->resize(_zoom*(float)(_w-left-right),_zoom*(float)(_h-top-bottom));
+        rubber->nestedIgnore--;
+    }
+
+    if(!redraw)
+    {
+         blockChanges(false);
+    }
+    return 1;
+}
+/**
+ * 
+ * @return 
+ */
+uint8_t flyCrop::download(void)
+{
+int reject=0;
+Ui_cropDialog *w=(Ui_cropDialog *)_cookie;
+#define SPIN_GET(x,y) x=w->spinBox##y->value();
+    SPIN_GET(left,Left);
+    SPIN_GET(right,Right);
+    SPIN_GET(top,Top);
+    SPIN_GET(bottom,Bottom);
+
+    aprintf("%d %d %d %d\n",left,right,top,bottom);
+
+    left&=0xffffe;
+    right&=0xffffe;
+    top&=0xffffe;
+    bottom&=0xffffe;
+
+    if((top+bottom)>_h)
+    {
+            top=bottom=0;
+            reject=1;
+            ADM_warning(" ** Rejected top bottom **\n");
+    }
+    if((left+right)>_w)
+    {
+            left=right=0;
+            reject=1;
+            ADM_warning(" ** Rejected left right **\n");
+    }
+    if(reject)
+            upload(false,true);
+    else
+    {
+        blockChanges(true);
+        rubber->nestedIgnore++;
+        rubber->move(_zoom*(float)left,_zoom*(float)top);
+        rubber->resize(_zoom*(float)(_w-left-right),_zoom*(float)(_h-top-bottom));
+        rubber->nestedIgnore--;
+        blockChanges(false);
+    }
+    return true;
+}
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_cropWindow::Ui_cropWindow(QWidget* parent, crop *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+uint32_t width,height;
+    ui.setupUi(this);
+    lock=0;
+    // Allocate space for green-ised video
+    width=in->getInfo()->width;
+    height=in->getInfo()->height;
+
+    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;
+    myCrop->bottom=param->bottom;
+    myCrop->_cookie=&ui;
+    myCrop->addControl(ui.toolboxLayout);
+    myCrop->upload(false,true);
+    myCrop->sliderChanged();
+
+    connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+    connect( ui.pushButtonAutoCrop,SIGNAL(clicked(bool)),this,SLOT(autoCrop(bool)));
+    connect( ui.pushButtonReset,SIGNAL(clicked(bool)),this,SLOT(reset(bool)));
+#define SPINNER(x) connect( ui.spinBox##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); 
+      SPINNER(Left);
+      SPINNER(Right);
+      SPINNER(Top);
+      SPINNER(Bottom);
+
+    show();
+    myCrop->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing both ways after the dialog has settled
+    myCrop->rubber->nestedIgnore--;
+}
+/**
+ * 
+ * @param foo
+ */
+void Ui_cropWindow::sliderUpdate(int foo)
+{
+    myCrop->sliderChanged();
+}
+/**
+ * 
+ * @param param
+ */
+void Ui_cropWindow::gather(crop *param)
+{
+    myCrop->download();
+    param->left=myCrop->left;
+    param->right=myCrop->right;
+    param->top=myCrop->top;
+    param->bottom=myCrop->bottom;
+    }
+/**
+ * 
+ */
+Ui_cropWindow::~Ui_cropWindow()
+{
+    if(myCrop) delete myCrop;
+    myCrop=NULL; 
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+/**
+ * 
+ * @param f
+ */
+void Ui_cropWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    myCrop->rubber->nestedIgnore++;
+    myCrop->download();
+    myCrop->sameImage();
+    myCrop->rubber->nestedIgnore--;
+    lock--;
+}
+/**
+ * 
+ * @param f
+ */
+void Ui_cropWindow::autoCrop( bool f )
+{
+    lock++;
+    myCrop->autocrop();
+    lock--;
+}
+/**
+ * 
+ * @param f
+ */
+void Ui_cropWindow::reset( bool f )
+{
+    myCrop->left=0;
+    myCrop->right=0;
+    myCrop->bottom=0;
+    myCrop->top=0;
+    lock++;
+    myCrop->upload();
+    myCrop->sameImage();
+    lock--;
+}
+/**
+ * 
+ * @param event
+ */
+void Ui_cropWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myCrop->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myCrop->adjustCanvasPosition();
+
+    int x=(int)((double)myCrop->left*myCrop->_zoom);
+    int y=(int)((double)myCrop->top*myCrop->_zoom);
+    int w=(int)((double)(myCrop->_w-(myCrop->left+myCrop->right))*myCrop->_zoom);
+    int h=(int)((double)(myCrop->_h-(myCrop->top+myCrop->bottom))*myCrop->_zoom);
+
+    myCrop->blockChanges(true);
+    myCrop->rubber->nestedIgnore++;
+    myCrop->rubber->move(x,y);
+    myCrop->rubber->resize(w,h);
+    myCrop->rubber->nestedIgnore--;
+    myCrop->blockChanges(false);
+}
+
+//EOF
+

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.h Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/Q_crop.cpp Added

@@ -0,0 +1,95 @@
+/***************************************************************************
+                          DIA_flyCrop.cpp  -  description
+                             -------------------
+
+        Common part of the crop dialog
+    
+    copyright            : (C) 2002/2017 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyCrop.h"
+#include "Q_crop.h"
+#include "ADM_toolkitQt.h"
+/**
+      \fn     DIA_getCropParams
+      \brief  Handle crop dialog
+*/
+int DIA_getCropParams(	const char *name,crop *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+
+    Ui_cropWindow dialog(qtLastRegisteredDialog(), param,in);
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+    qtUnregisterDialog(&dialog);
+    return ret;
+}
+
+/**
+     \fn Metrics
+	\brief Compute the average value of pixels	and eqt is the "ecart type"
+*/
+
+uint8_t Metrics( uint8_t *in, uint32_t width,uint32_t *avg, uint32_t *eqt)
+{
+
+uint32_t x;
+uint32_t sum=0,eq=0;
+uint8_t v;
+              for(x=0;x<width;x++)
+              {
+                      sum+=*(in+x);
+              }
+              sum=sum/width;
+              *avg=sum;
+              for(x=0;x<width;x++)
+              {
+                      v=*(in+x)-sum;
+                      eq+=v*v;
+              }
+              eq=eq/(width*width);
+              *eqt=eq;
+              return 1;
+}
+/**
+     \fn MetricsV
+	\brief Compute the average value of pixels	and eqt is the "ecart type"
+*/
+uint8_t MetricsV( uint8_t *in,uint32_t width, uint32_t height,uint32_t *avg, uint32_t *eqt)
+{
+
+uint32_t x;
+uint32_t sum=0,eq=0;
+uint8_t v;
+    for(x=0;x<height;x++)
+    {
+            sum+=*(in+x*width);
+    }
+    sum=sum/height;
+    *avg=sum;
+    for(x=0;x<height;x++)
+    {
+            v=*(in+x*width)-sum;
+            eq+=v*v;
+    }
+    eq=eq/(height*height);
+    *eqt=eq;
+    return 1;
+}
\ No newline at end of file

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/Q_crop.h Added

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui Added

@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>cropDialog</class>
+ <widget class="QDialog" name="cropDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>507</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Crop</string>
+  </property>
+  <layout class="QVBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QGridLayout">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <item row="0" column="3">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Right:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Top:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="4">
+      <widget class="QSpinBox" name="spinBoxRight">
+       <property name="maximum">
+        <number>2147483647</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>26</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="5">
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="6">
+      <widget class="QPushButton" name="pushButtonReset">
+       <property name="text">
+        <string>Reset</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QSpinBox" name="spinBoxTop">
+       <property name="maximum">
+        <number>2147483647</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="4">
+      <widget class="QSpinBox" name="spinBoxBottom">
+       <property name="maximum">
+        <number>2147483647</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Bottom:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Left:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="5">
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::MinimumExpanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="1">
+      <widget class="QSpinBox" name="spinBoxLeft">
+       <property name="maximum">
+        <number>2147483647</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="6">
+      <widget class="QPushButton" name="pushButtonAutoCrop">
+       <property name="text">
+        <string>Auto Crop</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>26</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView"/>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>spinBoxLeft</tabstop>
+  <tabstop>spinBoxRight</tabstop>
+  <tabstop>spinBoxTop</tabstop>
+  <tabstop>spinBoxBottom</tabstop>
+  <tabstop>pushButtonAutoCrop</tabstop>
+  <tabstop>pushButtonReset</tabstop>
+  <tabstop>horizontalSlider</tabstop>
+  <tabstop>graphicsView</tabstop>
+  <tabstop>buttonBox</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>cropDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>cropDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp Changed

@@ -26,6 +26,13 @@
 
 #include "eq2_desc.cpp"
 #include <math.h>
+
+#if defined( ADM_CPU_X86) && !defined(_MSC_VER)
+        #define CAN_DO_INLINE_X86_ASM
+        void affine_1d_MMX (oneSetting *par, ADMImage *srcImage, ADMImage *destImage,ADM_PLANE plane);
+#endif
+
+
 /**
     \class ADMVideoEq2
 */
@@ -34,8 +41,6 @@
 
   protected:
             eq2             _param;    
-            float           _hue;
-            float           _saturation;
             Eq2Settings     settings;   
             void            update(void);
   public:
@@ -142,7 +147,7 @@
   *fn=nextFrame++;
   image->copyInfo(mysrc);
 
-#ifdef ADM_CPU_X86
+#ifdef CAN_DO_INLINE_X86_ASM
   if(CpuCaps::hasMMX())
   {
         affine_1d_MMX(&(settings.param[0]),mysrc,image,PLANAR_Y);
@@ -219,8 +224,11 @@
   gw = par->w;
   lw = 1.0 - gw;
 
-  if ((g < 0.001) || (g > 1000.0)) {
-    g = 1.0;
+  if (g < 0.001) {
+    g = 0.001;
+  }
+  if (g > 1000.0) {
+    g = 1000.0;
   }
 
   g = 1.0 / g;
@@ -253,7 +261,7 @@
   par->lut_clean = 1;
 }
 
-#ifdef ADM_CPU_X86
+#ifdef CAN_DO_INLINE_X86_ASM
 /**
     \fn affine_1d_MMX
 */

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp Changed

@@ -16,130 +16,241 @@
 
 #include "Q_eq2.h"
 #include "ADM_toolkitQt.h"
+#include <QSignalMapper>
 
 //
 //	Video is in YV12 Colorspace
 //
 //
-  Ui_eq2Window::Ui_eq2Window(QWidget *parent, eq2 *param,ADM_coreVideoFilter *in) : QDialog(parent)
-  {
+
+/**
+    \fn ctor
+*/
+Ui_eq2Window::Ui_eq2Window(QWidget *parent, eq2 *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
     uint32_t width,height;
-        ui.setupUi(this);
-        lock=0;
-        // Allocate space for green-ised video
-        width=in->getInfo()->width;
-        height=in->getInfo()->height;
-
-        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
-        
-        myCrop=new flyEq2(this, width, height,in,canvas,ui.horizontalSlider);
-        memcpy(&(myCrop->param),param,sizeof(eq2));
-        myCrop->_cookie=&ui;
-        myCrop->addControl(ui.toolboxLayout);
-        myCrop->upload();
-        myCrop->sliderChanged();
-        myCrop->update();
-
-
-        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
-#define SPINNER(x) connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); 
-        SPINNER(Red);
-        SPINNER(Blue);
-        SPINNER(Green);
-         
-        SPINNER(Contrast);
-        SPINNER(Brightness);
-        SPINNER(Saturation);
-
-        SPINNER(Initial);
-        SPINNER(Weight);
-  }
-  void Ui_eq2Window::sliderUpdate(int foo)
-  {
+    ui.setupUi(this);
+    lock=0;
+    // Allocate space for green-ised video
+    width=in->getInfo()->width;
+    height=in->getInfo()->height;
+
+    canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+
+    myCrop=new flyEq2(this, width, height,in,canvas,ui.horizontalSlider);
+    memcpy(&(myCrop->param),param,sizeof(eq2));
+    myCrop->_cookie=&ui;
+    myCrop->addControl(ui.toolboxLayout);
+    myCrop->upload();
+    myCrop->sliderChanged();
+    myCrop->update();
+
+    QSignalMapper *signalMapper = new QSignalMapper(this);
+    connect( signalMapper,SIGNAL(mapped(QWidget*)),this,SLOT(resetSlider(QWidget*)));
+    connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+    QString rst = QString(QT_TRANSLATE_NOOP("eq2","Reset"));
+#define SPINNER(x) connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int)));\
+                   ui.horizontalSlider##x->setContextMenuPolicy(Qt::ActionsContextMenu);\
+                   QAction *reset##x = new QAction(rst,this);\
+                   ui.horizontalSlider##x->addAction(reset##x);\
+                   signalMapper->setMapping(reset##x,ui.horizontalSlider##x);\
+                   connect( reset##x,SIGNAL(triggered(bool)),signalMapper,SLOT(map()));
+    SPINNER(Contrast);
+    SPINNER(Brightness);
+    SPINNER(Saturation);
+
+    SPINNER(Initial);
+    SPINNER(Weight);
+
+    SPINNER(Red);
+    SPINNER(Blue);
+    SPINNER(Green);
+
+    setResetSliderEnabledState();
+
+    show();
+    myCrop->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+}
+
+/**
+    \fn sliderUpdate
+*/
+void Ui_eq2Window::sliderUpdate(int foo)
+{
     myCrop->sliderChanged();
-  }
-  void Ui_eq2Window::gather(eq2 *param)
-  {
-    
-        myCrop->download();
-        memcpy(param,&(myCrop->param),sizeof(eq2));
-  }
+}
+
+/**
+    \fn gather
+*/
+void Ui_eq2Window::gather(eq2 *param)
+{
+    myCrop->download();
+    memcpy(param,&(myCrop->param),sizeof(eq2));
+}
+
+/**
+    \brief when resetting sliders, set them to the following values
+*/
+const int Ui_eq2Window::initialValues[]=
+{
+    100, // contrast
+    0,   // brightness
+    100, // saturation
+
+    100, // initial
+    100, // weight
+
+    100, // red
+    100, // blue
+    100  // green
+};
+
+/**
+    \fn resetSlider
+*/
+#define RESET_SLIDER(x,y) if(control == ui.horizontalSlider##x) qobject_cast<QSlider*>(ui.horizontalSlider##x)->setValue(y);
+void Ui_eq2Window::resetSlider(QWidget *control)
+{
+    if(!control)
+        return;
+    RESET_SLIDER(Contrast,initialValues[0])
+    RESET_SLIDER(Brightness,initialValues[1])
+    RESET_SLIDER(Saturation,initialValues[2])
+
+    RESET_SLIDER(Initial,initialValues[3])
+    RESET_SLIDER(Weight,initialValues[4])
+
+    RESET_SLIDER(Red,initialValues[5])
+    RESET_SLIDER(Blue,initialValues[6])
+    RESET_SLIDER(Green,initialValues[7])
+}
+
+/**
+    \fn setResetSliderEnabledState
+*/
+#define CAN_RESET(x,y)\
+    if(ui.horizontalSlider##x->value() == y)\
+        ui.horizontalSlider##x->actions().at(0)->setEnabled(false);\
+    else\
+        ui.horizontalSlider##x->actions().at(0)->setEnabled(true);
+void Ui_eq2Window::setResetSliderEnabledState(void)
+{
+    CAN_RESET(Contrast,initialValues[0])
+    CAN_RESET(Brightness,initialValues[1])
+    CAN_RESET(Saturation,initialValues[2])
+
+    CAN_RESET(Initial,initialValues[3])
+    CAN_RESET(Weight,initialValues[4])
+
+    CAN_RESET(Red,initialValues[5])
+    CAN_RESET(Blue,initialValues[6])
+    CAN_RESET(Green,initialValues[7])
+}
+
+/**
+    \fn dtor
+*/
 Ui_eq2Window::~Ui_eq2Window()
 {
-  if(myCrop) delete myCrop;
-  myCrop=NULL; 
-  if(canvas) delete canvas;
-  canvas=NULL;
+    if(myCrop) delete myCrop;
+    myCrop=NULL;
+    if(canvas) delete canvas;
+    canvas=NULL;
 }
+
+/**
+    \fn valueChanged
+*/
 void Ui_eq2Window::valueChanged( int f )
 {
-  if(lock) return;
-  lock++;
-  myCrop->download();
-  myCrop->sameImage();
-  lock--;
+    if(lock) return;
+    lock++;
+    myCrop->download();
+    myCrop->sameImage();
+    setResetSliderEnabledState();
+    lock--;
+}
+
+/**
+    \fn resizeEvent
+*/
+void Ui_eq2Window::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myCrop->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myCrop->adjustCanvasPosition();
 }
 
 #define sliderSet(x,y) w->horizontalSlider##x->setValue((int)(param.y*100));
 #define sliderGet(x,y) param.y=w->horizontalSlider##x->value()/100.;
 //************************
+
+/**
+    \fn upload
+*/
 uint8_t flyEq2::upload(void)
 {
-Ui_eq2Dialog *w=(Ui_eq2Dialog *)_cookie;
+    Ui_eq2Dialog *w=(Ui_eq2Dialog *)_cookie;
 
+    sliderSet(Contrast,contrast);
+    sliderSet(Brightness,brightness);
+    sliderSet(Saturation,saturation);
 
-        sliderSet(Contrast,contrast);
-        sliderSet(Brightness,brightness);
-        sliderSet(Saturation,saturation);
+    sliderSet(Initial,gamma);
+    sliderSet(Weight,gamma_weight);
 
-        sliderSet(Red,rgamma);
-        sliderSet(Green,ggamma);
-        sliderSet(Blue,bgamma);
+    sliderSet(Red,rgamma);
+    sliderSet(Green,ggamma);
+    sliderSet(Blue,bgamma);
 
-        sliderSet(Initial,gamma);
-        sliderSet(Weight,gamma_weight);
-        
-       return 1;
+    return 1;
 }
+
+/**
+    \fn download
+*/
 uint8_t flyEq2::download(void)
 {
-	Ui_eq2Dialog *w=(Ui_eq2Dialog *)_cookie;
+    Ui_eq2Dialog *w=(Ui_eq2Dialog *)_cookie;
 
-        sliderGet(Contrast,contrast);
-        sliderGet(Brightness,brightness);
-        sliderGet(Saturation,saturation);
+    sliderGet(Contrast,contrast);
+    sliderGet(Brightness,brightness);
+    sliderGet(Saturation,saturation);
 
-        sliderGet(Red,rgamma);
-        sliderGet(Green,ggamma);
-        sliderGet(Blue,bgamma);
+    sliderGet(Initial,gamma);
+    sliderGet(Weight,gamma_weight);
 
-        sliderGet(Initial,gamma);
-        sliderGet(Weight,gamma_weight);
+    sliderGet(Red,rgamma);
+    sliderGet(Green,ggamma);
+    sliderGet(Blue,bgamma);
 
-return 1;
+    return 1;
 }
+
 /**
       \fn     DIA_getEQ2Param
       \brief  Handle MPlayer EQ2 flyDialog
 */
 uint8_t DIA_getEQ2Param(eq2 *param, ADM_coreVideoFilter *in)
 {
-        uint8_t ret=0;
-        Ui_eq2Window dialog(qtLastRegisteredDialog(), param,in);
-
-		qtRegisterDialog(&dialog);
+    uint8_t ret=0;
+    Ui_eq2Window dialog(qtLastRegisteredDialog(), param,in);
 
-        if(dialog.exec()==QDialog::Accepted)
-        {
-            dialog.gather(param); 
-            ret=1;
-        }
+    qtRegisterDialog(&dialog);
 
-		qtUnregisterDialog(&dialog);
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param);
+        ret=1;
+    }
 
-        return ret;
+    qtUnregisterDialog(&dialog);
+    return ret;
 }
 //____________________________________
 // EOF
-
-

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.h Changed

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

@@ -35,12 +35,12 @@
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
-      <enum>QSizePolicy::Ignored</enum>
+      <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>40</height>
+       <height>20</height>
       </size>
      </property>
     </spacer>
@@ -145,7 +145,7 @@
     </layout>
    </item>
    <item row="3" column="0" colspan="3">
-    <widget class="QSlider" name="horizontalSlider">
+    <widget class="ADM_QSlider" name="horizontalSlider">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
@@ -263,6 +263,25 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>horizontalSlider</tabstop>
+  <tabstop>horizontalSliderContrast</tabstop>
+  <tabstop>horizontalSliderBrightness</tabstop>
+  <tabstop>horizontalSliderSaturation</tabstop>
+  <tabstop>horizontalSliderInitial</tabstop>
+  <tabstop>horizontalSliderRed</tabstop>
+  <tabstop>horizontalSliderGreen</tabstop>
+  <tabstop>horizontalSliderBlue</tabstop>
+  <tabstop>horizontalSliderWeight</tabstop>
+  <tabstop>graphicsView</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp Changed

@@ -22,12 +22,21 @@
 #include "ivtcDupeRemover.h"
 #include "ivtcDupeRemover_desc.cpp"
 
+#if defined( ADM_CPU_X86) && !defined(_MSC_VER)
+        #define CAN_DO_INLINE_X86_ASM
+#endif
+
 #define PERIOD 4
 #if 0
 #define aprintf printf
 #else
 #define aprintf(...) {}
 #endif
+
+
+#define MARK_PROGRESSIVE 'PRGS'
+#define MARK_DUPLICATE   'DUPE'
+
 /**
     \class ivtcDupeRemover
 */
@@ -36,7 +45,7 @@
 public:
                 enum dupeState
                 {
-                    dupeSyncing,      
+                    dupeSyncing,
                     dupeSynced,
                     dupePassThrough
                 };
@@ -69,7 +78,8 @@
         virtual bool               getCoupledConf(CONFcouple **couples) ;     /// Return the current filter configuration
         virtual void               setCoupledConf(CONFcouple *couples);
         virtual bool               configure(void);                           /// Start graphical user interface
-        
+                uint32_t           lumaDiff(ADMImage *src1,ADMImage *src2,uint32_t noise);
+
 };
 
 // Add the hook to make it valid plugin
@@ -95,15 +105,21 @@
         configuration.threshold=5;
         configuration.show=false;
         configuration.mode=1; // fast!
-        
+
     }
     myName="ivtcDupeRemover";
-    
+
     incomingNum=0;
     currentNum=0;
     phaseStart=0;
     dupeOffset=0;
     state=dupeSyncing;
+    // ajust fps
+    double fps=info.frameIncrement;
+    
+    fps*=PERIOD+1;
+    fps/=PERIOD;
+    info.frameIncrement=fps;
 }
 /**
     \fn ivtcDupeRemover
@@ -117,60 +133,67 @@
  * @param left
  * @param right
  * @param threshold
- * @return 
+ * @return
  */
 uint32_t ivtcDupeRemover::computeDelta(ADMImage *left,ADMImage *right, int threshold)
 {
     if(!configuration.mode)
-        return ADMImage::lumaDiff(left,right,threshold);
+        return lumaDiff(left,right,threshold);
     // Else we take line every 5 or 9 lines
-    
+
     int scale=1+((int)configuration.mode*4);
-    
+
     ADMImageRef refLeft(left->GetWidth(PLANAR_Y),left->GetHeight(PLANAR_Y)/scale);
     ADMImageRef refRight(right->GetWidth(PLANAR_Y),right->GetHeight(PLANAR_Y)/scale);
-    
+
     refLeft._planes[0]=left->_planes[0];
     refLeft._planeStride[0]=left->_planeStride[0]/scale;
-    
+
     refRight._planes[0]=right->_planes[0];
     refRight._planeStride[0]=right->_planeStride[0]/scale;
-    
-     return ADMImage::lumaDiff(&refLeft,&refRight,threshold);
 
-    
+     return lumaDiff(&refLeft,&refRight,threshold);
+
+
 }
 /**
  * \fn lookupSync
  * \brief Try to search for a sequence
- * @return 
+ * @return
  */
 ivtcDupeRemover::dupeState ivtcDupeRemover::searchSync()
 {
     ADMImage *images[PERIOD+1];
-    
-    
-    aprintf("Searching sync\n");
-    
+
+
+    aprintf("dupeRemover : Searching sync\n");
+
     for(int i=0;i<(PERIOD+1);i++)
     {
         images[i]=vidCache->getImage(incomingNum+i);
         if(!images[i])
         {
             vidCache->unlockAll();
+            aprintf("No image (%d)\n",i);
             return dupeSyncing;
         }
-        if(GetHintingData(images[i]->GetReadPtr(PLANAR_Y),hints+i))
+        if(GetHintingData(images[i]->GetReadPtr(PLANAR_Y),hints+i)) // Returns true on error
         {
+            aprintf("[%d] No hint\n",i);
             hints[i]=0;
+        }else
+        {
+            aprintf("[%d] Got hint %x\n",i,hints[i]);
         }
     }
-    
+
     int film=0;
     for(int i=0;i<PERIOD;i++)
     {
+        int deltaPts=(int)(images[i+1]->Pts-images[i]->Pts);
         delta[i]=0;
-        if((images[i+1]->Pts-images[i]->Pts)> 41000) // 24 fps
+        aprintf("DeltaPts=%d\n",deltaPts);
+        if(deltaPts> 41000) // 24 fps
             film++;
     }
     // All of it is 24 fps, pass through
@@ -187,33 +210,57 @@
         vidCache->unlockAll();
         return dupeSyncing;
     }
-    // Ok, they are all NTSC,  let's find the minimum one
-    aprintf("Lets look for the closest one\n");
-    for(int i=0;i<PERIOD;i++)
+    
+    // Do we have hints ?
+    int nbProgressiveHint=0;
+    int nbDupeHint=0;
+    bool found=false;
+    for(int i=0;i<PERIOD+1;i++)
     {
-        if(images[i] && images[i+1])
-            delta[i]=computeDelta(images[i],images[i+1],configuration.threshold);
-        else
-            delta[i]=0x70000000; // Big number 
+        switch(hints[i])
+        {
+            case MARK_PROGRESSIVE: nbProgressiveHint++;break;
+            case MARK_DUPLICATE:  nbDupeHint++;dupeOffset=i;break;
+            default:break;
+        }
     }
-    uint32_t minDelta=0x7f000000;
-    for(int i=0;i<PERIOD;i++)
+    if(nbProgressiveHint==PERIOD && nbDupeHint==1)
     {
-        if(minDelta>delta[i]) 
+        aprintf("Hinting is giving the dupe at %d\n",dupeOffset);
+        found=true;
+    }
+
+    
+    // Ok, they are all NTSC,  let's find the minimum one
+    if(!found)
+    {
+        aprintf("Lets look for the closest one\n");
+        for(int i=0;i<PERIOD;i++)
         {
-            minDelta=delta[i];
-            dupeOffset=i;
-            
+            if(images[i] && images[i+1])
+                delta[i]=computeDelta(images[i],images[i+1],configuration.threshold);
+            else
+                delta[i]=0x70000000; // Big number
+        }
+        uint32_t minDelta=0x7f000000;
+        for(int i=0;i<PERIOD;i++)
+        {
+            if(minDelta>delta[i])
+            {
+                minDelta=delta[i];
+                dupeOffset=i;
+
+            }
         }
     }
     phaseStart=incomingNum;
     phaseStartPts=images[0]->Pts;
-    vidCache->unlockAll();    
+    vidCache->unlockAll();
     return dupeSynced;
 }
 /**
  * \fn dupeState2string
- * @return 
+ * @return
  */
 static const char *dupeState2string(ivtcDupeRemover::dupeState state)
 {
@@ -228,9 +275,9 @@
       return m;
 }
 /**
- * 
+ *
  * @param img
- * @return 
+ * @return
  */
 bool ivtcDupeRemover::postProcess(ADMImage *in,ADMImage *out,uint64_t newPts)
 {
@@ -244,7 +291,7 @@
             char s[256];
             const char *m=dupeState2string(state);
             out->printString(2,2,m);
-            for(int i=0;i<PERIOD;i++) 
+            for(int i=0;i<PERIOD;i++)
             {
                 sprintf(s,"Diff:%u",delta[i]);
                 out->printString(2,4+i,s);
@@ -295,19 +342,19 @@
               if((incomingNum-phaseStart)>PERIOD)
               {
                   nextState=dupeSyncing;
-              }              
+              }
               uint64_t newPts=phaseStartPts+count*41666;
               END_PROCESS(i,image,newPts,nextState);
               break;
             }
             break;
-        case dupePassThrough:   
+        case dupePassThrough:
             {
               ADMImage *i=vidCache->getImage(incomingNum);
               incomingNum++;
               if((incomingNum-phaseStart)>(PERIOD))
                       state=dupeSyncing;
-             END_PROCESS(i,image,ADM_NO_PTS,dupePassThrough);            
+             END_PROCESS(i,image,ADM_NO_PTS,dupePassThrough);
              break;
             }
         case dupeSyncing:
@@ -321,7 +368,7 @@
                 incomingNum++;
                 END_PROCESS(i,image,ADM_NO_PTS,nextState);
                 break;
-            }          
+            }
         default:
               ADM_assert(0);
 
@@ -335,7 +382,7 @@
 */
 bool         ivtcDupeRemover::getCoupledConf(CONFcouple **couples)
 {
-    
+
     return ADM_paramSave(couples, dupeRemover_param,&configuration);
 }
 
@@ -351,14 +398,14 @@
 const char *ivtcDupeRemover::getConfiguration(void)
 {
     static char bfer[1024];
-    
+
     sprintf(bfer,"IVTC Dupe Removed : Threshold =%u",(unsigned int)configuration.threshold);
     return bfer;
 }
 /**
- * 
+ *
  * @param usSeek
- * @return 
+ * @return
  */
 bool         ivtcDupeRemover::goToTime(uint64_t usSeek)
 {
@@ -378,21 +425,198 @@
         diaElemUInteger   threshold(PX(threshold),QT_TRANSLATE_NOOP("ivtcRemover","_Noise:"),0,255);
         diaElemToggle     show(PX(show),QT_TRANSLATE_NOOP("ivtcRemover","_Show:"));
 
-        
+
         diaMenuEntry menuMode[]={
                 {0,      QT_TRANSLATE_NOOP("ivtcRemover","Full")},
                 {1,      QT_TRANSLATE_NOOP("ivtcRemover","Fast")},
                 {2,      QT_TRANSLATE_NOOP("ivtcRemover","VeryFast")}
                 };
 
-        
-        
+
+
         diaElemMenu      eMode(&configuration.mode,QT_TRANSLATE_NOOP("ivtcRemover","_Frame rate change:"),3,menuMode);
 
         diaElem *elems[3]={&threshold,&show,&eMode};
         return diaFactoryRun(QT_TRANSLATE_NOOP("ivtcRemover","DupeRemover"),3,elems);
 }
+#ifdef CAN_DO_INLINE_X86_ASM
+static uint64_t __attribute__((used)) FUNNY_MANGLE(noise64);
+/**
+*/
+static uint32_t smallDiff(uint8_t  *s1,uint8_t *s2,uint32_t noise, int count)
+{
+uint32_t df=0;
+uint32_t delta;
+    for(int x=0;x<count;x++)
+    {
+            delta=abs((int)(s1[x])-(int)(s2[x]));
+            if(delta>noise)
+                    df+=delta;
+    }
+    return df;
+}
+
+/**
+ * \fn computeDiffMMX
+ * @param s1
+ * @param s2
+ * @param noise
+ * @param w
+ * @param l
+ * @param pitch1
+ * @param pitch2
+ * @return
+ */
+static uint32_t computeDiffMMX(uint8_t  *s1,uint8_t *s2,uint32_t noise,uint32_t w,uint32_t l, uint32_t pitch1, uint32_t pitch2)
+{
+uint32_t mod4,leftOver;
+uint64_t noise2=(uint64_t )noise;
+
+uint32_t result=0,tmpResult;
+        noise64=noise2+(noise2<<16)+(noise2<<32)+(noise2<<48);
+
+        leftOver=w&7;
+
+         __asm__ volatile(
+                         "pxor %%mm7,%%mm7\n"
+                         "movq " Mangle(noise64)", %%mm6\n"
+                :::  "memory"
+                 );
+
+          for(int y=0;y<l;y++)
+          {
+                mod4=w>>3;
+                if(leftOver)
+                    result+=smallDiff(s1+mod4*8,s2+mod4*8,noise,leftOver);
+                uint8_t *tmpS1=s1;
+                uint8_t *tmpS2=s2;
+
+                __asm__ volatile(
+                        "pxor           %%mm3,%%mm3\n"
+                        "1:"
+                // LEFT
+                        "movd           (%0),  %%mm0 \n"
+                        "movd           (%1),  %%mm1 \n"
+                        "punpcklbw      %%mm7, %%mm0 \n"
+                        "punpcklbw      %%mm7, %%mm1 \n"
+
+                        "movq           %%mm0, %%mm2 \n"
+                        "psubusw        %%mm1, %%mm2 \n"
+                        "psubusw        %%mm0, %%mm1 \n"
+                        "por            %%mm1, %%mm2 \n" // SAD
+
+                        "movq           %%mm2, %%mm0 \n"
+                        "pcmpgtw        %%mm6, %%mm2 \n" // Threshold against noise
+                        "pand           %%mm2, %%mm0 \n" //
+                        "movq           %%mm0, %%mm5 \n" //  %mm5 is the  A1 A2 A3 A4, we want the sum later
+                // RIGHT
+                        "movd           4(%0),  %%mm0 \n"
+                        "movd           4(%1),  %%mm1 \n"
+                        "punpcklbw      %%mm7, %%mm0 \n"
+                        "punpcklbw      %%mm7, %%mm1 \n"
+
+                        "movq           %%mm0, %%mm2 \n"
+                        "psubusw        %%mm1, %%mm2 \n"
+                        "psubusw        %%mm0, %%mm1 \n"
+                        "por            %%mm1, %%mm2 \n" // SAD
+
+                        "movq           %%mm2, %%mm0 \n"
+                        "pcmpgtw        %%mm6, %%mm2 \n" // Threshold against noise
+                        "pand           %%mm2, %%mm0 \n" // mm0 is B1 B2 B3 B4
+
+                        "paddW          %%mm5, %%mm0 \n"
+
+                // PACK
+                        "movq           %%mm0, %%mm1 \n" // MM0 is a b c d and we want
+                        "psrlq          $16,  %%mm1 \n"  // mm3+=a+b+c+d
+
+                        "movq           %%mm0, %%mm2 \n"
+                        "psrlq          $32,  %%mm2 \n"
+
+                        "movq           %%mm0, %%mm4 \n"
+                        "psrlq          $48,  %%mm4 \n"
+
+                        "paddw          %%mm1, %%mm0 \n"
+                        "paddw          %%mm2, %%mm4 \n"
+                        "paddw          %%mm4, %%mm0 \n" // MM0 is the sum
+
+                        "psllq          $48,  %%mm0 \n"
+                        "psrlq          $48,  %%mm0 \n" // Only keep 16 bits
+
+                        "paddw          %%mm0, %%mm3 \n" /* PADDQ is SSE2 */
+                        "add            $8,%0      \n"
+                        "add            $8,%1      \n"
+                        "sub            $1,%2      \n"
+                        "jnz            1b         \n"
+
+                : "=r" (tmpS1),"=r" (tmpS2),"=r"(mod4)
+                : "0"(tmpS1),"1"(tmpS2),"2"(mod4)
+                : "memory","0","1","2"
+                );
+                __asm__ volatile(
+
+                        "movd           %%mm3,(%0)\n"
+                        "emms\n"
+                :: "r"(&tmpResult)
+                );
+                result+=tmpResult;
+                s1+=pitch1;
+                s2+=pitch2;
+         }
+        // Pack result
+        return result;
+}
+
+
+#endif
+/**
+
+*/
+/* 3000 * 3000 max size, using uint32_t is safe... */
+static uint32_t computeDiff(uint8_t  *s1,uint8_t *s2,uint32_t noise,int w,int h, int stride1, int stride2)
+{
+uint32_t df=0;
+uint32_t delta;
 
+    for(int y=0;y<h;y++)
+    {
+        for(int x=0;x<w;x++)
+        {
+                delta=abs((int)(s1[x])-(int)(s2[x]));
+                if(delta>noise)
+                        df+=delta;
+        }
+        s1+=stride1;
+        s2+=stride2;
+    }
+    return df;
+}
+/**
+*/
+uint32_t ivtcDupeRemover::lumaDiff(ADMImage *src1,ADMImage *src2,uint32_t noise)
+{
+
+#ifdef CAN_DO_INLINE_X86_ASM
+uint32_t r1,r2;
+        if(CpuCaps::hasMMX())
+        {
+                uint32_t a= computeDiffMMX(YPLANE(src1),YPLANE(src2),noise,
+                    src1->GetWidth(PLANAR_Y),src1->GetHeight(PLANAR_Y),
+                    src1->GetPitch(PLANAR_Y),src2->GetPitch(PLANAR_Y));
+#if 0
+                uint32_t b= computeDiff(YPLANE(src1),YPLANE(src2),noise,
+                    src1->GetWidth(PLANAR_Y),src1->GetHeight(PLANAR_Y),
+                    src1->GetPitch(PLANAR_Y),src2->GetPitch(PLANAR_Y));
+                printf("MMX = %u, native =%u\n",a,b);
+#endif
+                return a;
+
+        }
+#endif
+        return computeDiff(YPLANE(src1),YPLANE(src2),noise,
+                src1->GetWidth(PLANAR_Y),src1->GetHeight(PLANAR_Y),
+                src1->GetPitch(PLANAR_Y),src2->GetPitch(PLANAR_Y));
+}
 
 /************************************************/
 //EOF

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/DIA_flyLogo.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/DIA_flyLogo.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp Changed

@@ -21,8 +21,9 @@
 #include "ADM_toolkitQt.h"
 #include "ADM_imageLoader.h"
 #include "DIA_fileSel.h"
+#include "ADM_last.h"
 
-#if 1
+#if 0
 #define aprintf printf
 #else
 #define aprintf(...) {}
@@ -59,22 +60,13 @@
  */
 void ADM_LogoCanvas::mouseReleaseEvent(QMouseEvent * event)
 {
-   
-    int x,y;
     QPoint p=event->pos();
-    QPoint pp=pos();
-    aprintf("Evt %d %d, %d %d\n",p.x(),p.y(), pp.x(),pp.y());
-#if 1 
-     x=p.x()-pp.x();
-     y=p.y()-pp.y();
-#else
-     x=p.x();
-     y=p.y();
-#endif     
-    
+    int x=p.x();
+    int y=p.y();
+
     if(x<0) x=0;
     if(y<0) y=0;    
-    
+
     aprintf("Released %d %d\n",x,y);
     emit movedSignal(x,y);
 
@@ -110,8 +102,14 @@
 {
      
     char buffer[2048];
-    if(FileSel_SelectRead(QT_TRANSLATE_NOOP("logo","Select Logo Image"),buffer,2048,""))
+    std::string source;
+    if(imageName.size())
+        source=imageName;
+    else
+        source=lastFolder;
+    if(FileSel_SelectRead(QT_TRANSLATE_NOOP("logo","Select Logo Image"),buffer,2048,source.c_str()))
     {
+        admCoreUtils::setLastReadFolder(std::string(buffer));
         if(tryToLoadimage(buffer))
         {
             myLogo->sameImage();
@@ -163,6 +161,7 @@
         
         image=NULL;;
         alpha=param->alpha;
+        admCoreUtils::getLastReadFolder(lastFolder);
         if(param->logoImageFile.size())
         {
             if(tryToLoadimage(param->logoImageFile.c_str()))
@@ -208,7 +207,8 @@
         myLogo->addControl(ui.toolboxLayout);
         
         show();
-          
+        myLogo->adjustCanvasPosition();
+        canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
   }
 /**
     \fn sliderUpdate
@@ -235,6 +235,7 @@
 */
 Ui_logoWindow::~Ui_logoWindow()
 {
+    admCoreUtils::setLastReadFolder(lastFolder);
     if(myLogo) delete myLogo;
     myLogo=NULL; 
     if(canvas) delete canvas;
@@ -285,6 +286,22 @@
  }
 
 /**
+    \fn resizeEvent
+*/
+void Ui_logoWindow::resizeEvent(QResizeEvent *event)
+{
+    if(lock) return;
+    if(!canvas->height())
+        return;
+    lock++;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myLogo->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myLogo->adjustCanvasPosition();
+    lock--;
+}
+
+/**
  * 
  * @param x
  * @param y
@@ -294,8 +311,10 @@
 {
     if(x<0) x=0;
     if(y<0) y=0;
-    param.x= x;
-    param.y= y;      
+    Ui_logoWindow *parent=(Ui_logoWindow *)this->_cookie;
+    double scale=(double)(parent->canvas->width()) / parent->_in->getInfo()->width;
+    param.x= (int)((double)x / scale);
+    param.y= (int)((double)y / scale);
     upload();
     return true;
 }

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/DIA_flyMpDelogo.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/DIA_flyMpDelogo.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/mpdelogo.ui -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/mpdelogo.ui Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp Changed

@@ -19,9 +19,6 @@
  *                                                                         *
  ***************************************************************************/
 #include "DIA_flyDialogQt4.h"
-#include "QRubberBand"
-#include "QSizeGrip"
-#include "QHBoxLayout"
 #include "ADM_default.h"
 #include "ADM_image.h"
 
@@ -50,11 +47,15 @@
  * @param slider
  */
  flyMpDelogo::flyMpDelogo (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
-                                    ADM_QCanvas *canvas, QSlider *slider) : 
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider) :
                 ADM_flyDialogYuv(parent,width, height,in,canvas, slider,RESIZE_AUTO) 
  {
-    rubber=new Resizable_rubber_band(this,canvas);
+    rubber=new ADM_rubberControl(this,canvas);
     rubber->resize(width,height);
+    _ox=0;
+    _oy=0;
+    _ow=width/2;
+    _oh=height/2;
  }
  /**
   * 
@@ -75,26 +76,66 @@
  */
 bool    flyMpDelogo::bandResized(int x,int y,int w, int h)
 {
-    aprintf("BandResized\n");        
+    bool leftGripMoved=false;
+    bool rightGripMoved=false;
+    if((x+w)==(_ox+_ow) && (y+h)==(_oy+_oh))
+        leftGripMoved=true;
+    if(x==_ox && y==_oy)
+        rightGripMoved=true;
+
+    _ox=x;
+    _oy=y;
+    _ow=w;
+    _oh=h;
+
+    bool ignore=false;
+    if(leftGripMoved && rightGripMoved) // bogus event
+        ignore=true;
+
     int nw,nh,nx,ny;
-    
-    delogo newParam;
-    
     double halfzoom=_zoom/2-0.01;
-    
-    newParam.lw=((double)w+halfzoom)/_zoom;
-    newParam.lh=((double)h+halfzoom)/_zoom;
-    newParam.xoff=((double)x+halfzoom)/_zoom;
-    newParam.yoff=((double)y+halfzoom)/_zoom;
-    
-    aprintf("%d x %d => %d x %d, %f\n",param.lw,param.lh,newParam.lw,newParam.lh,_zoom);
-    
-    param.lw=newParam.lw;
-    param.lh=newParam.lh;
-    param.xoff=newParam.xoff;
-    param.yoff=newParam.yoff;
-    
-    upload(false);
+    nw=(int)(((double)w-halfzoom)/_zoom);
+    nh=(int)(((double)h-halfzoom)/_zoom);
+    nx=(int)(((double)x+halfzoom)/_zoom);
+    ny=(int)(((double)y+halfzoom)/_zoom);
+
+    aprintf("%d x %d => %d x %d, normalized offsets nx=%d, ny=%d, zoom=%f\n",param.lw,param.lh,nw,nh,nx,ny,_zoom);
+    bool resizeRubber=false;
+    if(nx<0 || ny<0 || nx+nw>_w || ny+nh>_h)
+        resizeRubber=true;
+
+    if(ignore)
+    {
+        upload(false,resizeRubber);
+        return false;
+    }
+
+    uint32_t right=param.xoff+param.lw;
+    uint32_t bottom=param.yoff+param.lh;
+
+    if(nx+nw>_w)
+        nw=_w-nx;
+    if(ny+nh>_h)
+        nh=_h-ny;
+
+    if(nx<0) nx=0;
+    if(ny<0) ny=0;
+
+    if(leftGripMoved)
+    {
+        param.xoff=nx;
+        param.yoff=ny;
+        param.lw=right-nx;
+        param.lh=bottom-ny;
+    }
+
+    if(rightGripMoved)
+    {
+        param.lw=nw;
+        param.lh=nh;
+    }
+
+    upload(false,resizeRubber);
     //
     return true;
 }
@@ -112,52 +153,15 @@
                              param.lw,  param.lh,param.band,param.show);        
     else
     {
+        rubber->nestedIgnore++;
+        blockChanges(true);
         rubber->move(_zoom*(float)param.xoff,_zoom*(float)param.yoff);
         rubber->resize(_zoom*(float)param.lw,_zoom*(float)param.lh);
+        blockChanges(false);
+        rubber->nestedIgnore--;
     }
     return 1;
 }
-/**
-        \fn Ctor
-*/
-Resizable_rubber_band::Resizable_rubber_band(flyMpDelogo *fly,QWidget *parent) : QWidget(parent) 
-{
-  nestedIgnore=0;
-  flyParent=fly;
-  //tell QSizeGrip to resize this widget instead of top-level window
-  setWindowFlags(Qt::SubWindow);
-  QHBoxLayout* layout = new QHBoxLayout(this);
-  layout->setContentsMargins(0, 0, 0, 0);
-  QSizeGrip* grip1 = new QSizeGrip(this);
-  QSizeGrip* grip2 = new QSizeGrip(this);
-  grip1->setVisible(true);
-  grip2->setVisible(true);
-  layout->addWidget(grip1, 0, Qt::AlignLeft | Qt::AlignTop);
-  layout->addWidget(grip2, 0, Qt::AlignRight | Qt::AlignBottom);
-  rubberband = new QRubberBand(QRubberBand::Rectangle, this);
-  QPalette pal;
-  pal.setBrush(QPalette::Highlight, QBrush(Qt::red,Qt::DiagCrossPattern));
-  rubberband->setPalette(pal);
-  rubberband->setForegroundRole(QPalette::Highlight);
-  rubberband->move(0, 0);
-  rubberband->show();
-  show();
-}
-/**
-        \fn resizeEvent
-*/
-void Resizable_rubber_band::resizeEvent(QResizeEvent *) 
-{
-  int x,y,w,h;
-  x=pos().x();
-  y=pos().y();
-  w=size().width();
-  h=size().height();
-  aprintf("Resize event : %d x %d , %d x %d\n",x,y,w,h);
-  rubberband->resize(size());
-  if(!nestedIgnore)
-    flyParent->bandResized(pos().x(),pos().y(),size().width(),size().height());
-}
 
 /**
     \fn ctor
@@ -191,10 +195,6 @@
         SPINENTRY(spinY)->setMaximum(height);
         SPINENTRY(spinH)->setMaximum(height);
 
-        SPINENTRY(spinX)->setSingleStep(5);
-        SPINENTRY(spinY)->setSingleStep(5);
-        SPINENTRY(spinW)->setSingleStep(5);
-        SPINENTRY(spinH)->setSingleStep(5);
         aprintf("Uploading\n");
         myCrop->upload();
         myCrop->sliderChanged();
@@ -214,7 +214,29 @@
             doOnce=true;
         }
         ui.labelHelp->setPixmap(QPixmap(":/images/grips.png"));
+
+        show();
+        myCrop->adjustCanvasPosition();
+        canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
   }
+
+/**
+    \fn resizeEvent
+*/
+void Ui_mpdelogoWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myCrop->rubber->nestedIgnore++;
+    myCrop->blockChanges(true);
+    myCrop->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myCrop->adjustCanvasPosition();
+    myCrop->blockChanges(false);
+    myCrop->rubber->nestedIgnore--;
+}
+
 /**
     \fn sliderUpdate
 */
@@ -276,21 +298,6 @@
      }
  }
 
-/**
- * 
- * @param x
- * @param y
- * @return 
- */
-bool flyMpDelogo::setXy(int x,int y)
-{
-      printf("setXy\n");
-      param.xoff= x;
-      param.yoff= y;
-      upload(false);
-      return true;
-}
-
 #define MYSPIN(x) w->x
 //************************
 /**
@@ -307,7 +314,7 @@
      return true;
 }
 
-uint8_t flyMpDelogo::upload(bool redraw)
+uint8_t flyMpDelogo::upload(bool redraw, bool toRubber)
 {
     Ui_mpdelogoDialog *w=(Ui_mpdelogoDialog *)_cookie;
     if(!redraw)
@@ -322,6 +329,14 @@
     MYSPIN(spinH)->setValue(param.lh);   
     MYSPIN(spinBand)->setValue(param.band);   
 
+    if(toRubber)
+    {
+        rubber->nestedIgnore++;
+        rubber->resize((float)(param.lw)*_zoom,(float)(param.lh)*_zoom);
+        rubber->move((float)(param.xoff)*_zoom,(float)(param.yoff)*_zoom);
+        rubber->nestedIgnore--;
+    }
+
     if(!redraw)
     {
          blockChanges(false);
@@ -343,29 +358,12 @@
         param.lw= MYSPIN(spinW)->value();
         param.lh= MYSPIN(spinH)->value();
         param.band= MYSPIN(spinBand)->value();
-        rubber->nestedIgnore++;
-        blockChanges(true);
-        rubber->resize(_zoom*(float)param.lw,_zoom*(float)param.lh);
-        blockChanges(false);
-        rubber->nestedIgnore--;
         printf(">>>Download event : %d x %d , %d x %d\n",param.xoff,param.yoff,param.lw,param.lh);
         printf("Download\n");
         return true;
 }
 
 /**
-    \fn autoZoom
-*/
-void flyMpDelogo::autoZoom(bool state)
-{
-    rubber->nestedIgnore++;
-    blockChanges(true);
-    ADM_flyDialog::autoZoom(state);
-    blockChanges(false);
-    rubber->nestedIgnore--;
-}
-
-/**
       \fn     DIA_getMpDelogo
       \brief  Handle delogo dialog
 */

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.h Changed

@@ -17,56 +17,29 @@
     \class flyASharp
 */
 #include "delogo.h"
-class QRubberBand;
+class ADM_rubberControl;
 class flyMpDelogo;
-/**
-        \class Resizable_rubber_band
-        \brief http://stackoverflow.com/questions/19066804/implementing-resize-handles-on-qrubberband-is-qsizegrip-relevant
-*/
-class Resizable_rubber_band : public QWidget 
-{
-public:
-  flyMpDelogo     *flyParent;
-  Resizable_rubber_band(flyMpDelogo *fly,QWidget* parent = 0);
-  int               nestedIgnore;
-
-public:
-  QRubberBand* rubberband;
-  void resizeEvent(QResizeEvent *);
-  void blockSignals(bool sig)
-  {
-      rubberband->blockSignals(sig);
-  }
-  
-#if 0
-  void update()
-  {
-    rubberband->update();
-  }
-#endif
-};
 
 /**
     \class flyMpDelogo
 */
 class flyMpDelogo : public ADM_flyDialogYuv
 {
-protected:
+public:
     bool    blockChanges(bool block)  ;
 public:
    delogo      param;
    bool        preview;
-   Resizable_rubber_band *rubber;
+   ADM_rubberControl *rubber;
 public:
    uint8_t     processYuv(ADMImage* in, ADMImage *out);
    uint8_t     download(void);
-   uint8_t     upload() {return upload(true);}
-   uint8_t     upload(bool update);
+   uint8_t     upload() {return upload(true,true);}
+   uint8_t     upload(bool update, bool toRubber);
                flyMpDelogo (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
-                                    ADM_QCanvas *canvas, QSlider *slider);
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider);
                 
    virtual     ~flyMpDelogo() ;
-   bool         setXy(int x,int y);
    bool         setPreview(bool onoff)
                 {
                     preview=onoff;
@@ -77,6 +50,7 @@
                     return true;
                 }
     bool    bandResized(int x,int y,int w, int h);
-    void    autoZoom(bool state);
+private:
+    int _ox,_oy,_ow,_oh;
 };
 // EOF

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.h -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.h Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp Changed

@@ -5,7 +5,7 @@
 Original Authors
 Copyright (C) 2003
 Daniel Moreno <comac@comac.darktech.org>
-	& A'rpi
+        & A'rpi
 Resynced with ffmpeg lavfilter
  * Copyright (c) 2003 Daniel Moreno <comac AT comac DOT darktech DOT org>
  * Copyright (c) 2010 Baptiste Coudurier
@@ -211,45 +211,44 @@
 const char 	*ADMVideoMPD3D::getConfiguration(void)
  {
       static char str[1024];
-	  snprintf(str,1023," MPlayer Denoise 3D (Sp : %2.1f - %2.1f, Tmp:%2.1f - %2.1f)'",
-						param.luma_spatial,param.chroma_spatial,param.luma_temporal,param.chroma_temporal);
+   
+      snprintf(str,1023," MPlayer hqdn3d (Sp : %2.1f - %2.1f, Tmp:%2.1f - %2.1f)'",
+                                                param.luma_spatial,param.chroma_spatial,param.luma_temporal,param.chroma_temporal);
       return str;
-        
+
 }
 /**
     \fn configure
 */
 bool ADMVideoMPD3D::configure(void)
 {
-
-        
         ELEM_TYPE_FLOAT fluma_spatial,fchroma_spatial,fluma_temporal,fchroma_temporal;
 #define PX(x) &x
 #define OOP(x,y) f##x=(ELEM_TYPE_FLOAT )param.x;
-        
+
         OOP(luma_spatial,Luma);
         OOP(chroma_spatial,Chroma);
         OOP(luma_temporal,LumaTemporal);
         OOP(chroma_temporal,ChromaTemporal);
-        
+
         diaElemFloat   luma(PX(fluma_spatial),QT_TRANSLATE_NOOP("mp3d","_Spatial luma strength:"),0.1,100.);
         diaElemFloat   chroma(PX(fchroma_spatial),QT_TRANSLATE_NOOP("mp3d","S_patial chroma strength:"),0.,100.);
-        diaElemFloat   lumaTemporal(PX(fluma_temporal),QT_TRANSLATE_NOOP("mp3d","Luma _Temporal strength:"),0.,100.);
-        diaElemFloat   chromaTemporal(PX(fchroma_temporal),QT_TRANSLATE_NOOP("mp3d","Luma _Temporal strength:"),0.,100.);
-    
+        diaElemFloat   lumaTemporal(PX(fluma_temporal),QT_TRANSLATE_NOOP("mp3d","_Temporal luma strength:"),0.,100.);
+        diaElemFloat   chromaTemporal(PX(fchroma_temporal),QT_TRANSLATE_NOOP("mp3d","T_emporal chroma strength:"),0.,100.);
+
         diaElem *elems[4]={&luma,&chroma,&lumaTemporal,&chromaTemporal};
-  
-        if(  diaFactoryRun(QT_TRANSLATE_NOOP("mp3d","MPlayer denoise3d"),4,elems))
+
+        if(  diaFactoryRun(QT_TRANSLATE_NOOP("mp3d","MPlayer Denoise 3D HQ"),4,elems))
         {
 #undef OOP
 #define OOP(x,y) param.x=(float) f##x
-                OOP(luma_spatial,Luma);
-                OOP(chroma_spatial,Chroma);
-                OOP(luma_temporal,LumaTemporal);
-                OOP(chroma_temporal,ChromaTemporal);
-          
-                setup();
-                return 1;
+            OOP(luma_spatial,Luma);
+            OOP(chroma_spatial,Chroma);
+            OOP(luma_temporal,LumaTemporal);
+            OOP(chroma_temporal,ChromaTemporal);
+
+            setup();
+            return 1;
         }
         return 0;
 }
@@ -259,10 +258,10 @@
 ADMVideoMPD3D::~ADMVideoMPD3D()
 {
     if (context.Line)
-	{
-		delete [] context.Line;
-		context.Line=NULL;
-	}
+    {
+        delete [] context.Line;
+        context.Line=NULL;
+    }
 
     for(int i=0;i<3;i++)
     {
@@ -291,7 +290,7 @@
     ChromSpac = Param2 * Param1 / Param1;
     LumTmp    = Param3 * Param1 / Param1;
     ChromTmp  = LumTmp * ChromSpac / LumSpac;
-    
+
     PrecalcCoefs(context.Coefs[0], LumSpac);
     PrecalcCoefs(context.Coefs[1], LumTmp);
     PrecalcCoefs(context.Coefs[2], ChromSpac);
@@ -307,17 +306,17 @@
 {
 uint32_t page;
   memset(&context,0,sizeof(context));
-  
+
   context.Line=new unsigned int [in->getInfo()->width];
   page=info.width*info.height;
-  
+
   if(!couples || !ADM_paramLoad(couples,denoise3dhq_param,&param))
   {  		
-            param.mode=4;	
-			param.luma_spatial=PARAM1_DEFAULT;
-			param.chroma_spatial=PARAM2_DEFAULT;
-			param.luma_temporal=PARAM3_DEFAULT;
-            param.chroma_temporal=PARAM3_DEFAULT*PARAM2_DEFAULT/PARAM1_DEFAULT; //   ChromTmp  = LumTmp * ChromSpac / LumSpac;
+        param.mode=4;	
+        param.luma_spatial=PARAM1_DEFAULT;
+        param.chroma_spatial=PARAM2_DEFAULT;
+        param.luma_temporal=PARAM3_DEFAULT;
+        param.chroma_temporal=PARAM3_DEFAULT*PARAM2_DEFAULT/PARAM1_DEFAULT; //   ChromTmp  = LumTmp * ChromSpac / LumSpac;
   }
   setup();
 
@@ -329,7 +328,7 @@
 bool	ADMVideoMPD3D::getCoupledConf( CONFcouple **couples)
 {
     return ADM_paramSave(couples, denoise3dhq_param,&param);
-	
+
 }
 
 void ADMVideoMPD3D::setCoupledConf(CONFcouple *couples)
@@ -342,24 +341,24 @@
 */
 bool ADMVideoMPD3D::getNextFrame(uint32_t *fn,ADMImage *image)
 {
-	int cw= info.width>>1;
-	int ch= info.height>>1;
-    int W = info.width;
-	int H  = info.height;
-	uint32_t dlen,dflags;
-
-    ADMImage *src, *dst;
-    
+        int cw= info.width>>1;
+        int ch= info.height>>1;
+        int W = info.width;
+        int H  = info.height;
+        uint32_t dlen,dflags;
+
+        ADMImage *src, *dst;
+
         *fn=nextFrame;
         uint32_t n = nextFrame;
         printf("MP3d: next frame= %d\n",(int)n);
         src = vidCache->getImage(n);
         if(!src) return false;
-        
-		uint8_t *c,*d;
 
-		d=YPLANE(image);
-		c=YPLANE(src);
+        uint8_t *c,*d;
+
+        d=YPLANE(image);
+        c=YPLANE(src);
 
         deNoise(c,d,
                 context.Line,
@@ -371,9 +370,9 @@
                 context.Coefs[0],
                 context.Coefs[1]);
 
-	
-		d=UPLANE(image);
-		c=UPLANE(src);
+
+        d=UPLANE(image);
+        c=UPLANE(src);
 
        deNoise(c,d,
                 context.Line,
@@ -399,10 +398,10 @@
                 context.Coefs[3]);
 
 
-	nextFrame++;
-	image->copyInfo(src);
-    vidCache->unlockAll();
-	return 1;
+        nextFrame++;
+        image->copyInfo(src);
+        vidCache->unlockAll();
+        return 1;
 }
 /**
     \fn goToTime
@@ -416,6 +415,7 @@
         context.Frame[i]=NULL;
         if(t) av_free(t);
     }
+
     // Flush 
     return ADM_coreVideoFilterCached::goToTime(usSeek);
 }

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp Changed

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp Changed

@@ -32,6 +32,12 @@
 #include "DIA_factory.h"
 #include "yadif.h"
 #include "yadif_desc.cpp"
+
+#if defined( ADM_CPU_X86) && !defined(_MSC_VER)
+        #define CAN_DO_INLINE_X86_ASM
+#endif
+
+
 //************************************************
 #define MIN(a,b) ((a) > (b) ? (b) : (a))
 #define MAX(a,b) ((a) < (b) ? (b) : (a))
@@ -41,7 +47,7 @@
 #define MAX3(a,b,c) MAX(MAX(a,b),c)
 
 //===========================================================================//
-#ifdef ADM_CPU_X86
+#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);
@@ -203,7 +209,7 @@
                 n = nextFrame;
 
         src = vidCache->getImage(n);
-        *fn=n;
+        *fn=nextFrame;
         if(!src) return false;
         
   
@@ -379,7 +385,7 @@
 void (*filter_line)(int mode, uint8_t *dst, const uint8_t *prev, const uint8_t *cur, const uint8_t *next, int w, int refs, int parity);
 	int y;
 	filter_line = filter_line_c;
-#ifdef ADM_CPU_X86
+#ifdef CAN_DO_INLINE_X86_ASM
 	if (CpuCaps::hasMMXEXT()) 
 		filter_line = filter_line_mmx2;
 #endif
@@ -399,7 +405,7 @@
         }
         memcpy(dst + (h-1)*dst_stride, cur0 + (h-1)*refs, w);
 
-#ifdef ADM_CPU_X86
+#ifdef CAN_DO_INLINE_X86_ASM
 	if (CpuCaps::hasMMXEXT()) 
 		asm volatile("emms");
 #endif

avidemux_2.6.20.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif_asm.c -> avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif_asm.c Changed

avidemux_2.7.0.tar.gz/avidemux_plugins/ADM_videoFilters6/yadif/vf_yadif.asm Added

@@ -0,0 +1,243 @@
+;*****************************************************************************
+;* x86-optimized functions for yadif filter
+;*
+;* Copyright (C) 2006 Michael Niedermayer <michaelni@gmx.at>
+;* Copyright (c) 2013 Daniel Kang <daniel.d.kang@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
+;******************************************************************************
+
+%include "libavutil/x86/x86util.asm"
+
+SECTION_RODATA
+
+pb_1: times 16 db 1
+pw_1: times  8 dw 1
+
+SECTION .text
+
+%macro CHECK 2
+    movu      m2, [curq+t1+%1]
+    movu      m3, [curq+t0+%2]
+    mova      m4, m2
+    mova      m5, m2
+    pxor      m4, m3
+    pavgb     m5, m3
+    pand      m4, [pb_1]
+    psubusb   m5, m4
+    RSHIFT    m5, 1
+    punpcklbw m5, m7
+    mova      m4, m2
+    psubusb   m2, m3
+    psubusb   m3, m4
+    pmaxub    m2, m3
+    mova      m3, m2
+    mova      m4, m2
+    RSHIFT    m3, 1
+    RSHIFT    m4, 2
+    punpcklbw m2, m7
+    punpcklbw m3, m7
+    punpcklbw m4, m7
+    paddw     m2, m3
+    paddw     m2, m4
+%endmacro
+
+%macro CHECK1 0
+    mova    m3, m0
+    pcmpgtw m3, m2
+    pminsw  m0, m2
+    mova    m6, m3
+    pand    m5, m3
+    pandn   m3, m1
+    por     m3, m5
+    mova    m1, m3
+%endmacro
+
+%macro CHECK2 0
+    paddw   m6, [pw_1]
+    psllw   m6, 14
+    paddsw  m2, m6
+    mova    m3, m0
+    pcmpgtw m3, m2
+    pminsw  m0, m2
+    pand    m5, m3
+    pandn   m3, m1
+    por     m3, m5
+    mova    m1, m3
+%endmacro
+
+%macro LOAD 2
+    movh      %1, %2
+    punpcklbw %1, m7
+%endmacro
+
+%macro FILTER 3
+.loop%1:
+    pxor         m7, m7
+    LOAD         m0, [curq+t1]
+    LOAD         m1, [curq+t0]
+    LOAD         m2, [%2]
+    LOAD         m3, [%3]
+    mova         m4, m3
+    paddw        m3, m2
+    psraw        m3, 1
+    mova   [rsp+ 0], m0
+    mova   [rsp+16], m3
+    mova   [rsp+32], m1
+    psubw        m2, m4
+    ABS1         m2, m4
+    LOAD         m3, [prevq+t1]
+    LOAD         m4, [prevq+t0]
+    psubw        m3, m0
+    psubw        m4, m1
+    ABS1         m3, m5
+    ABS1         m4, m5
+    paddw        m3, m4
+    psrlw        m2, 1
+    psrlw        m3, 1
+    pmaxsw       m2, m3
+    LOAD         m3, [nextq+t1]
+    LOAD         m4, [nextq+t0]
+    psubw        m3, m0
+    psubw        m4, m1
+    ABS1         m3, m5
+    ABS1         m4, m5
+    paddw        m3, m4
+    psrlw        m3, 1
+    pmaxsw       m2, m3
+    mova   [rsp+48], m2
+
+    paddw        m1, m0
+    paddw        m0, m0
+    psubw        m0, m1
+    psrlw        m1, 1
+    ABS1         m0, m2
+
+    movu         m2, [curq+t1-1]
+    movu         m3, [curq+t0-1]
+    mova         m4, m2
+    psubusb      m2, m3
+    psubusb      m3, m4
+    pmaxub       m2, m3
+%if mmsize == 16
+    mova         m3, m2
+    psrldq       m3, 2
+%else
+    pshufw       m3, m2, q0021
+%endif
+    punpcklbw    m2, m7
+    punpcklbw    m3, m7
+    paddw        m0, m2
+    paddw        m0, m3
+    psubw        m0, [pw_1]
+
+    CHECK -2, 0
+    CHECK1
+    CHECK -3, 1
+    CHECK2
+    CHECK 0, -2
+    CHECK1
+    CHECK 1, -3
+    CHECK2
+
+    mova         m6, [rsp+48]
+    cmp   DWORD r8m, 2
+    jge .end%1
+    LOAD         m2, [%2+t1*2]
+    LOAD         m4, [%3+t1*2]
+    LOAD         m3, [%2+t0*2]
+    LOAD         m5, [%3+t0*2]
+    paddw        m2, m4
+    paddw        m3, m5
+    psrlw        m2, 1
+    psrlw        m3, 1
+    mova         m4, [rsp+ 0]
+    mova         m5, [rsp+16]
+    mova         m7, [rsp+32]
+    psubw        m2, m4
+    psubw        m3, m7
+    mova         m0, m5
+    psubw        m5, m4
+    psubw        m0, m7
+    mova         m4, m2
+    pminsw       m2, m3
+    pmaxsw       m3, m4
+    pmaxsw       m2, m5
+    pminsw       m3, m5
+    pmaxsw       m2, m0
+    pminsw       m3, m0
+    pxor         m4, m4
+    pmaxsw       m6, m3
+    psubw        m4, m2
+    pmaxsw       m6, m4
+
+.end%1:
+    mova         m2, [rsp+16]
+    mova         m3, m2
+    psubw        m2, m6
+    paddw        m3, m6
+    pmaxsw       m1, m2
+    pminsw       m1, m3
+    packuswb     m1, m1
+
+    movh     [dstq], m1
+    add        dstq, mmsize/2
+    add       prevq, mmsize/2
+    add        curq, mmsize/2
+    add       nextq, mmsize/2
+    sub   DWORD r4m, mmsize/2
+    jg .loop%1
+%endmacro
+
+%macro YADIF 0
+%if ARCH_X86_32
+cglobal yadif_filter_line, 4, 6, 8, 80, dst, prev, cur, next, w, prefs, \
+                                        mrefs, parity, mode
+%else
+cglobal yadif_filter_line, 4, 7, 8, 80, dst, prev, cur, next, w, prefs, \
+                                        mrefs, parity, mode
+%endif
+%if ARCH_X86_32
+    mov            r4, r5mp
+    mov            r5, r6mp
+    DECLARE_REG_TMP 4,5
+%else
+    movsxd         r5, DWORD r5m
+    movsxd         r6, DWORD r6m
+    DECLARE_REG_TMP 5,6
+%endif
+
+    cmp DWORD paritym, 0
+    je .parity0
+    FILTER 1, prevq, curq
+    jmp .ret
+
+.parity0:
+    FILTER 0, curq, nextq
+
+.ret:
+    RET
+%endmacro
+
+INIT_XMM ssse3
+YADIF
+INIT_XMM sse2
+YADIF
+%if ARCH_X86_32
+INIT_MMX mmxext
+YADIF
+%endif

avidemux_2.6.20.tar.gz/avidemux_plugins/CMakeLists.txt -> avidemux_2.7.0.tar.gz/avidemux_plugins/CMakeLists.txt Changed

@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 2.6)
-SET(AVIDEMUX_API_VERSION 2.6)
+cmake_minimum_required(VERSION 3.0)
+SET(AVIDEMUX_API_VERSION 2.7)
 
 SET(ADM_PROJECT AdmPlugins)
 SET(PLUGINS TRUE)
@@ -62,7 +62,7 @@
 #########################################
 include(admCoreIncludes)
 LINK_DIRECTORIES("${AVIDEMUX_SEARCH_LIB_DIR}")
-INCLUDE_DIRECTORIES("${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6")
+INCLUDE_DIRECTORIES("${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}")
 
 #########################################
 # Unbundle some libraries here
@@ -163,9 +163,9 @@
 ########################################
 MACRO(CHECK_ADM_CONFIG_H flavor result)
     MESSAGE(STATUS "Checking for avidemux/${flavor} includes and lib...")
-    MESSAGE(STATUS "It should be ${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6/${flavor}/config.h")
+    MESSAGE(STATUS "It should be ${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/${flavor}/config.h")
     set(ADM_INC "NOTFOUND")
-    FIND_PATH(ADM_INC config.h "${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6/${flavor}")
+    FIND_PATH(ADM_INC config.h "${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/${flavor}")
     #MESSAGE(STATUS "result : ${ADM_INC_NOT_FOUND},${ADM_INC}")
     IF(${ADM_INC} MATCHES "NOTFOUND")
         SET(${result} 0)

avidemux_2.6.20.tar.gz/bootStrapCrossMingwQt5_mxe.sh -> avidemux_2.7.0.tar.gz/bootStrapCrossMingwQt5_mxe.sh Changed

@@ -14,9 +14,23 @@
 external_liba52=0
 external_libmad=0
 do_release_pkg=1
+author_setup=0
 
 # Functions
 
+authorSetup()
+{
+    export SDLDIR=/mingw
+    export MINGW=/mingw
+    export MINGWDEV=/mingw_dev
+    export PATH=${MINGW}/bin:$PATH
+    export INSTALL_DIR=${MINGW}/Release
+    export QT_HOME=/mingw/Qt/current
+    export O_PARAL="-j 2"
+    export TOOLCHAIN_LOCATION=/mingw
+    export CFLAGS="-I/mingw/include -L/mingw/lib"
+}
+
 setupEnv()
 {
     export BUILDDATE=$(date +%y%m%d-%H%M%S)
@@ -39,18 +53,21 @@
     export MXE_ROOT=$mxerootdir
     export MXE_TARGET=${ARCH}-w64-mingw32.shared
     export QT_SELECT=5
-    export QT_HOME=${MXE_ROOT}/usr/${MXE_TARGET}/qt5
-    export MINGW=${MXE_ROOT}/usr/${MXE_TARGET}
-    export PATH=$PATH:${MXE_ROOT}/usr/bin:${QT_HOME}/bin
+    if [ "x$author_setup" = "x1" ]; then
+        authorSetup
+    else
+        export QT_HOME=${MXE_ROOT}/usr/${MXE_TARGET}/qt5
+        export MINGW=${MXE_ROOT}/usr/${MXE_TARGET};
+        export PATH=$PATH:${MXE_ROOT}/usr/bin:${QT_HOME}/bin
+        export TOOLCHAIN_LOCATION=${MXE_ROOT}/usr
+        export SDL2DIR=${MXE_ROOT}/usr/${MXE_TARGET}
+        export PARAL="-j $(nproc)"
+        export INSTALL_DIR=${MINGW}/out/avidemux
+    fi
+    export CROSS_PREFIX=$MXE_TARGET
     export PKG_CONFIG_PATH=$MINGW/lib/pkgconfig
     export PKG_CONFIG_LIBDIR=$MINGW/lib/pkgconfig
-    export CROSS_PREFIX=$MXE_TARGET
-    export SDL2DIR=${MXE_ROOT}/usr/${MXE_TARGET}
-    export INSTALL_DIR=${MINGW}/out/avidemux
-    #export INSTALL_DEV=${INSTALL_DIR}-dev
     export CXXFLAGS="-std=c++11"
-    export PARAL="-j $(nproc)"
-    export TOOLCHAIN_LOCATION=${MXE_ROOT}/usr
     export CROSS_C_COMPILER=gcc
     export CROSS_CXX_COMPILER=g++
 }
@@ -87,14 +104,15 @@
     -DCMAKE_AR:STRING=${CROSS_PREFIX}-ar \
     -DCMAKE_RC_COMPILER:STRING=${CROSS_PREFIX}-windres \
     -DAVIDEMUX_TOP_SOURCE_DIR="$TOP" \
-    -DTYPE2_CROSS_SETUP=true \
     -G "Unix Makefiles" \
     $EXTRA \
     $SOURCEDIR || fail cmake
     make $PARAL VERBOSE=1 >& /tmp/log$BUILDDIR || fail make
     make install || fail make_install
     # Only install  component=dev for dev package
-    # DESTDIR=${MINGWDEV} cmake -DCOMPONENT=dev -P cmake_install.cmake || fail make_install_dev
+    if [ "x$author_setup" = "x1" ]; then
+        DESTDIR=${MINGWDEV} cmake -DCOMPONENT=dev -P cmake_install.cmake || fail make_install_dev
+    fi
 }
 
 usage()
@@ -117,6 +135,7 @@
     echo "  --with-system-liba52  : Use the system liba52 (a52dec) instead of the bundled one"
     echo "  --with-system-libmad  : Use the system libmad instead of the bundled one"
     echo "  --nopkg               : Don't create a ZIP archive with all required libraries"
+    echo "  -a, --author          : Match the env setup used by the Author, implies --nopkg"
 }
 
 option_value()
@@ -200,7 +219,7 @@
     libmp3lame-*.dll \
     libogg-*.dll \
     libopus-*.dll \
-    libpcre16-*.dll \
+    libpcre2-16-*.dll \
     libpcre-*.dll \
     libpng16-*.dll \
     libsqlite3-*.dll \
@@ -256,6 +275,10 @@
         --64)
             bits=64
             ;;
+        -a|--author)
+            export author_setup=1
+            do_release_pkg=0
+            ;;
         --mxe-root=*)
             mxerootdir=$(dir_check $(option_name "$config_option") $(option_value "$config_option")) || exit 1
             ;;
@@ -318,6 +341,9 @@
 # Create destination directory
 
 echo "** Bootstrapping Avidemux **"
+if [ "x$author_setup" = "x1" ]; then
+    rm -Rf ${MINGWDEV}/*
+fi
 if [ -e "$INSTALL_DIR" -a "x$do_core" = "x1" -a "x$do_qt" = "x1" ]; then
     rm -Rf "$INSTALL_DIR";
 fi

avidemux_2.6.20.tar.gz/bootStrapOsx_Sierra.bash -> avidemux_2.7.0.tar.gz/bootStrapOsx_Sierra.bash Changed

@@ -1,11 +1,26 @@
 #!/bin/bash
 # Bootstrapper to semi-automatically build avidemux from source on OSX
 # (c) Mean 2009
-export MYQT=/usr/local/Cellar/qt5/5.6.1-1/
-export PATH=$PATH:$MYQT/bin/:/usr/local/bin:/opt//local/libexec/qt5/bin/ # Both brew and macport
-# Specify the the directory where you want to install avidemux (a.k.a. the cmake_install_prefix)
-# like export BASE_INSTALL_DIR="<full_path_to_installation>". This can be /usr/local or /opt/local (macports) or /sw (Fink)
-export DAT=`date +"%Y_%m_%d"`
+fallback_qtdir=/usr/local/opt/qt5
+if [ "x$MYQT" != "x" ] && [ -e "${MYQT}/bin/qmake" ] ; then
+    export PATH=$PATH:$MYQT/bin:/opt/local/libexec/qt5/bin # for macports; /usr/local/bin is in PATH by default anyway
+else
+    export PATH=$PATH:/opt/local/libexec/qt5/bin
+fi
+if ! $(which -s qmake) && [ -e "${fallback_qtdir}/bin/qmake" ] ; then
+    echo "Using ${fallback_qtdir} as fallback qt5 install path"
+    export PATH=$PATH:${fallback_qtdir}/bin
+fi
+if ! $(which -s qmake) ; then
+    echo "Error: No qmake executable found, aborting."
+    exit 1
+fi
+
+export MAJOR=`cat cmake/avidemuxVersion.cmake | grep "VERSION_MAJOR " | sed 's/..$//g' | sed 's/^.*"//g'`
+export MINOR=`cat cmake/avidemuxVersion.cmake | grep "VERSION_MINOR " | sed 's/..$//g' | sed 's/^.*"//g'`
+export PATCH=`cat cmake/avidemuxVersion.cmake | grep "VERSION_P " | sed 's/..$//g' | sed 's/^.*"//g'`
+export API_VERSION="${MAJOR}.${MINOR}"
+export DAT=`date +"%y%m%d-%Hh%Mm"`
 export gt=`git log --format=oneline -1 | head -c 11`
 export REV="${DAT}_$gt"
 #
@@ -14,23 +29,15 @@
 export FLAVOR="-DENABLE_QT5=True"
 export qt_ext=Qt5
 #
-export BASE_INSTALL_DIR="/";
-export BASE_APP="$HOME/Avidemux2.6.app/"
-export PREFIX="${BASE_APP}/Contents/Resources/"
-rm ~/A*.dmg
-rm -Rf $BASE_APP/*
-mkdir -p $BASE_APP
-mkdir -p $BASE_APP/Contents
-mkdir -p $BASE_APP/Contents/Resources
-echo "Revision : $REV"
 packages_ext=""
 do_core=1
-do_cli=0
+do_cli=1
 do_gtk=0   # Note that gtk is no fully longer supported on OSX. You are on your own here
 do_qt4=1
 do_plugins=1
 do_rebuild=0
 debug=0
+create_app_bundle=1
 #
 test -f $HOME/myCC  && export COMPILER="-DCMAKE_C_COMPILER=$HOME/myCC -DCMAKE_CXX_COMPILER=$HOME/myC++"
 
@@ -39,7 +46,23 @@
         echo "** Failed at $1**"
         exit 1
 }
-rm -Rf $PREFIX/*
+setupPaths()
+{
+# Specify the the directory where you want to install avidemux (a.k.a. the cmake_install_prefix)
+# like export BASE_INSTALL_DIR="<full_path_to_installation>". This can be /usr/local or /opt/local (macports) or /sw (Fink)
+        if [ "x$create_app_bundle" = "x1" ] ; then
+            export BASE_INSTALL_DIR="/"
+            export BASE_APP="$PWD/Avidemux${API_VERSION}.app"
+            export PREFIX="${BASE_APP}/Contents/Resources"
+            if [ ! -e $BASE_APP/Contents/Resources ] ; then
+                mkdir -p $BASE_APP/Contents/Resources
+            fi
+        else
+            export BASE_INSTALL_DIR="$PWD/out"
+            export BASE_APP="$BASE_INSTALL_DIR"
+            export PREFIX="$BASE_INSTALL_DIR"
+        fi
+}
 Process()
 {
         export BUILDDIR=$1
@@ -48,23 +71,23 @@
         export EXTRA="$3"
         export DEBUG=""
         BUILDER="Unix Makefiles"
-	echo "**************** $1 *******************"
+        echo "**************** $1 *******************"
         if [ "x$debug" = "x1" ] ; then 
                 DEBUG="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug  "
                 BUILDDIR="${BUILDDIR}_debug"
                 BUILDER="CodeBlocks - Unix Makefiles"
         fi
-        
+
         echo "Building $BUILDDIR from $SOURCEDIR with EXTRA=<$EXTRA>, DEBUG=<$DEBUG>"
         if [ "x$do_rebuild" != x1 ] ; then
-        	rm -Rf ./$BUILDDIR
-	fi
+            rm -Rf ./$BUILDDIR
+        fi
         mkdir -p $BUILDDIR || fail mkdir
         cd $BUILDDIR 
-        cmake $COMPILER $PKG $FAKEROOT -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_EDIT_COMMAND=vim -DAVIDEMUX_SOURCE_DIR=$TOP  $EXTRA $FLAVOR $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ
+        cmake $COMPILER $PKG $FAKEROOT -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_EDIT_COMMAND=vim -DAVIDEMUX_SOURCE_DIR=$TOP -DAVIDEMUX_VERSION="$ADM_VERSION" $EXTRA $FLAVOR $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ
         make -j 2 > /tmp/log$BUILDDIR || fail make
-	echo "** installing at $FAKEROOT_DIR **"
-	make install DESTDIR=$FAKEROOT_DIR || fail install
+        echo "** installing at $FAKEROOT_DIR **"
+        make install DESTDIR=$FAKEROOT_DIR || fail install
 }
 printModule()
 {
@@ -73,45 +96,82 @@
         if [ "x$value" = "x1" ]; then echo "    $name will be built"
         else echo "     $name will be skipped"
         fi
-        
-
 }
 config()
 {
+        setupPaths
         echo "Build configuration :"
         echo "******************* :"
         echo "Build type :"
         if [ "x$debug" = "x1" ] ; then echo   "Debug build"
         else echo   "Release build"
         fi
+        if [ "x$adm_version" = "x" ] ; then
+            export ADM_VERSION="${MAJOR}.${MINOR}.${PATCH}"
+        else
+            export ADM_VERSION=$adm_version
+        fi
+        echo "Avidemux version : $ADM_VERSION"
+        if [ "x$create_app_bundle" != "x1" ] ; then
+            echo "No macOS app bundle will be created"
+        fi
+        if [ "x$do_rebuild" != "x1" -a "x$BASE_APP" != "x" ] ; then
+            rm -Rf $BASE_APP/*
+        fi
         printModule $do_core Core
         printModule $do_gtk Gtk
-        printModule $do_qt4 Qt4
+        printModule $do_qt4 Qt
         printModule $do_cli Cli
         printModule $do_plugins Plugins
 }
 usage()
 {
-        echo "Bootstrap avidemux 2.6:"
+        echo "Bootstrap avidemux ${API_VERSION}:"
         echo "***********************"
         echo "  --help            : Print usage"
         echo "  --tgz             : Build tgz packages"
+        echo "  --nopkg           : Don't create macOS app bundle"
         echo "  --debug           : Switch debugging on"
- 	echo "  --rebuild         : Preserve existing build directories"
-        echo "  --with-core       : Build core"
-        echo "  --without-core    : Dont build core"
-        echo "  --with-cli        : Build cli"
-        echo "  --without-cli     : Dont build cli"
-        echo "  --with-core       : Build core"
-        echo "  --without-qt4     : Dont build qt4"
-        echo "  --with-plugins    : Build plugins"
-        echo "  --without-plugins : Dont build plugins"
-        config 
-
+        echo "  --rebuild         : Preserve existing build directories"
+        echo "  --output=NAME     : Specify a custom basename for dmg"
+        echo "  --version=STRING  : Specify a custom Avidemux version string"
+        echo "  --with-core       : Build core (default)"
+        echo "  --without-core    : Don't build core"
+        echo "  --with-cli        : Build cli (default)"
+        echo "  --without-cli     : Don't build cli"
+        echo "  --with-qt         : Build qt (default)"
+        echo "  --without-qt      : Don't build qt"
+        echo "  --with-plugins    : Build plugins (default)"
+        echo "  --without-plugins : Don't build plugins"
+        config
+}
+option_value()
+{
+        echo $(echo $* | cut -d '=' -f 2-)
+}
+validate()
+{
+        opt="$1"
+        str="$2"
+        if [ "$opt" = "adm_version" ] ; then
+            reg="[^a-zA-Z0-9_.-]"
+            msg="Only alphanumeric characters, hyphen, underscore and period are allowed for Avidemux version, aborting."
+        elif [ "$opt" = "output" ] ; then
+            reg="[^a-zA-Z0-9\ _.-]"
+            msg="Only alphanumeric characters, space, hyphen, underscore and period are allowed for .dmg basename, aborting."
+        else
+            >&2 echo "incorrect usage of validate(), aborting."
+            exit 1
+        fi
+        if [[ "$str" =~ $reg ]] ; then
+            >&2 echo $msg
+            exit 1
+        fi
 }
 # Could probably do it with getopts...
 while [ $# != 0 ] ;do
-        case "$1" in
+        config_option="$1"
+        case "$config_option" in
          -h|--help)
              usage
              exit 1
@@ -122,14 +182,20 @@
          --rebuild)
                 do_rebuild=1
                 ;;
-         --pause)
-                pause_script=true
-                ;;
          --tgz)
                 packages_ext=tar.gz
                 PKG="$PKG -DAVIDEMUX_PACKAGER=tgz"
                 ;;
-         --without-qt4)
+         --nopkg)
+                create_app_bundle=0
+                ;;
+         --output=*)
+                output=$(option_value "$config_option")
+                ;;
+         --version=*)
+                adm_version=$(option_value "$config_option")
+                ;;
+         --without-qt)
                 do_qt4=0
              ;;
          --without-cli)
@@ -141,7 +207,7 @@
          --without-core)
                 do_core=0
              ;;
-         --with-qt4)
+         --with-qt)
                 do_qt4=1
              ;;
          --with-cli)
@@ -154,76 +220,72 @@
                 do_core=1
              ;;
         *)
-                echo "unknown parameter $1"
+                echo "unknown parameter $config_option"
                 usage
                 exit 1
                 ;;
      esac
      shift
 done
+validate adm_version "$adm_version" || exit 1
+validate output "$output" || exit 1
 config
-echo "**BootStrapping avidemux **"
+echo "** BootStrapping avidemux **"
 export TOP=$PWD
 export POSTFIX=""
 echo "Top dir : $TOP"
-if [ "x$debug" = "x1" ] ; then echo   
+if [ "x$debug" = "x1" ] ; then echo
 POSTFIX="_debug"
 fi
-
-if [ "x$do_core" = "x1" ] ; then 
+if [ "x$create_app_bundle" = "x1" ] ; then
+    export DO_BUNDLE="-DCREATE_BUNDLE=true"
+else
+    export DO_BUNDLE="-UCREATE_BUNDLE"
+fi
+if [ "x$do_core" = "x1" ] ; then
         echo "** CORE **"
         cd $TOP
-        Process buildCore ../avidemux_core
+        Process buildCore ../avidemux_core $DO_BUNDLE
 fi
-if [ "x$do_qt4" = "x1" ] ; then 
-        echo "** QT4 **"
+if [ "x$do_qt4" = "x1" ] ; then
+        echo "** QT **"
         cd $TOP
-        Process buildQt4 ../avidemux/qt4
+        Process build${qt_ext} ../avidemux/qt4 $DO_BUNDLE
 fi
-if [ "x$do_cli" = "x1" ] ; then 
+if [ "x$do_cli" = "x1" ] ; then
         echo "** CLI **"
         cd $TOP
         Process buildCli ../avidemux/cli
 fi
-if [ "x$do_plugins" = "x1" ] ; then 
+if [ "x$do_plugins" = "x1" ] ; then
         echo "** Plugins **"
         cd $TOP
-        Process buildPluginsCommon ../avidemux_plugins -DPLUGIN_UI=COMMON 
+        Process buildPluginsCommon ../avidemux_plugins -DPLUGIN_UI=COMMON
 fi
-if [ "x$do_plugins" = "x1" -a "x$do_qt4" = "x1" ] ; then 
-        echo "** Plugins Qt4 **"
+if [ "x$do_plugins" = "x1" -a "x$do_qt4" = "x1" ] ; then
+        echo "** Plugins Qt **"
         cd $TOP
-        Process buildPluginsQt4 ../avidemux_plugins -DPLUGIN_UI=QT4 
+        Process buildPlugins${qt_ext} ../avidemux_plugins -DPLUGIN_UI=QT4
 fi
-if [ "x$do_plugins" = "x1" -a "x$do_cli" = "x1" ] ; then 
+if [ "x$do_plugins" = "x1" -a "x$do_cli" = "x1" ] ; then
         echo "** Plugins CLI **"
         cd $TOP
-        Process buildPluginsCLI ../avidemux_plugins -DPLUGIN_UI=CLI 
+        Process buildPluginsCLI ../avidemux_plugins -DPLUGIN_UI=CLI
 fi
-echo "** Copying Qt nib files**"
-cp -Rap $MYQT/qt_menu.nib   $PREFIX/bin/
-mkdir -p $PREFIX/Frameworks
-echo "**  Copying libraries **"
-echo "    Overriding icu libraries "
-cp $HOME/lib_override/* $PREFIX/lib/
-echo "** Deploy **"
-python $TOP/cmake/osx_libs_copyLibsSierra.py
-echo "**  Remapping libraries **"
-python $TOP/cmake/osx_libs_remap.py
-python $TOP/cmake/osx_libs_remap.py
-echo "** Finishing **"
-cp $TOP/cmake/osx/Info.plist $PREFIX/../
-mkdir $PREFIX/fonts
-cp $TOP/cmake/osx/fonts.conf $PREFIX/fonts
-mkdir -p $PREFIX/../MacOS
-cp $TOP/cmake/osx/Avidemux2.6 $PREFIX/../MacOS/Avidemux2.6.app
-chmod +x $PREFIX/../MacOS/Avidemux2.6.app
-# Copy icons
-echo "Copying icons"
-cp $TOP/cmake/osx/*.icns $PREFIX/
-# creating dmg file
+# 
 cd $TOP
-rm -f *.dmg
-hdiutil create Avidemux2.6_r${REV}.dmg -srcfolder $HOME/Avidemux2.6.app/ -ov
+if [ "x$create_app_bundle" = "x1" ] ; then
+    mkdir $PREFIX/fonts
+    cp $TOP/cmake/osx/fonts.conf $PREFIX/fonts
+    # Copy icons
+    echo "Copying icons"
+    cp $TOP/cmake/osx/*.icns $PREFIX/
+    mkdir -p $PREFIX/../MacOS
+    mkdir -p installer
+    rm -Rf installer/*
+    cd installer
+    cmake -DAVIDEMUX_VERSION="$ADM_VERSION" -DDMG_BASENAME="$output" -DBUILD_REV="$REV" ../avidemux/osxInstaller
+    make && make package
 echo "** Preparing packaging **"
+fi
 echo "** ALL DONE **"

avidemux_2.7.0.tar.gz/cmake/DeployQt5.cmake Added

@@ -0,0 +1,391 @@
+# - Functions to help assemble a standalone Qt5 executable.
+# A collection of CMake utility functions useful for deploying
+# Qt5 executables.
+#
+# The following functions are provided by this module:
+#   write_qt5_conf
+#   resolve_qt5_paths
+#   fixup_qt5_executable
+#   install_qt5_plugin_path
+#   install_qt5_plugin
+#   install_qt5_executable
+# Requires CMake 2.6 or greater because it uses function and
+# PARENT_SCOPE. Also depends on BundleUtilities.cmake.
+#
+#  WRITE_QT5_CONF(<qt_conf_dir> <qt_conf_contents>)
+# Writes a qt.conf file with the <qt_conf_contents> into <qt_conf_dir>.
+#
+#  RESOLVE_QT5_PATHS(<paths_var> [<executable_path>])
+# Loop through <paths_var> list and if any don't exist resolve them
+# relative to the <executable_path> (if supplied) or the CMAKE_INSTALL_PREFIX.
+#
+#  FIXUP_QT5_EXECUTABLE(<executable> [<qtplugins> <libs> <dirs> <plugins_dir> <request_qt_conf>])
+# Copies Qt plugins, writes a Qt configuration file (if needed) and fixes up a
+# Qt5 executable using BundleUtilities so it is standalone and can be
+# drag-and-drop copied to another machine as long as all of the system
+# libraries are compatible.
+#
+# <executable> should point to the executable to be fixed-up.
+#
+# <qtplugins> should contain a list of the names or paths of any Qt plugins
+# to be installed.
+#
+# <libs> will be passed to BundleUtilities and should be a list of any already
+# installed plugins, libraries or executables to also be fixed-up.
+#
+# <dirs> will be passed to BundleUtilities and should contain and directories
+# to be searched to find library dependencies.
+#
+# <plugins_dir> allows an custom plugins directory to be used.
+#
+# <request_qt_conf> will force a qt.conf file to be written even if not needed.
+#
+#  INSTALL_QT5_PLUGIN_PATH(plugin executable copy installed_plugin_path_var <plugins_dir> <component> <configurations>)
+# Install (or copy) a resolved <plugin> to the default plugins directory
+# (or <plugins_dir>) relative to <executable> and store the result in
+# <installed_plugin_path_var>.
+#
+# If <copy> is set to TRUE then the plugins will be copied rather than
+# installed. This is to allow this module to be used at CMake time rather than
+# install time.
+#
+# If <component> is set then anything installed will use this COMPONENT.
+#
+#  INSTALL_QT5_PLUGIN(plugin executable copy installed_plugin_path_var <plugins_dir> <component>)
+# Install (or copy) an unresolved <plugin> to the default plugins directory
+# (or <plugins_dir>) relative to <executable> and store the result in
+# <installed_plugin_path_var>. See documentation of INSTALL_QT5_PLUGIN_PATH.
+#
+#  INSTALL_QT5_EXECUTABLE(<executable> [<qtplugins> <libs> <dirs> <plugins_dir> <request_qt_conf> <component>])
+# Installs Qt plugins, writes a Qt configuration file (if needed) and fixes up
+# a Qt5 executable using BundleUtilities so it is standalone and can be
+# drag-and-drop copied to another machine as long as all of the system
+# libraries are compatible. The executable will be fixed-up at install time.
+# <component> is the COMPONENT used for bundle fixup and plugin installation.
+# See documentation of FIXUP_QT5_BUNDLE.
+
+#=============================================================================
+# Copyright 2011 Mike McQuaid <m...@mikemcquaid.com>
+# Copyright 2013 Mihai Moldovan <io...@ionic.de>
+# CMake - Cross Platform Makefile Generator
+# Copyright 2000-2011 Kitware, Inc., Insight Software Consortium
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+#
+# * Neither the names of Kitware, Inc., the Insight Software Consortium,
+#   nor the names of their contributors may be used to endorse or promote
+#   products derived from this software without specific prior written
+#   permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# The functions defined in this file depend on the fixup_bundle function
+# (and others) found in BundleUtilities.cmake
+
+include(BundleUtilities)
+set(DeployQt5_cmake_dir "${CMAKE_CURRENT_LIST_DIR}")
+set(DeployQt5_apple_plugins_dir "PlugIns")
+
+function(write_qt5_conf qt_conf_dir qt_conf_contents)
+        set(qt_conf_path "${qt_conf_dir}/qt.conf")
+        message(STATUS "Writing ${qt_conf_path}")
+        file(WRITE "${qt_conf_path}" "${qt_conf_contents}")
+endfunction()
+
+function(resolve_qt5_paths paths_var)
+        set(executable_path ${ARGV1})
+
+        set(paths_resolved)
+        foreach(path ${${paths_var}})
+                if(EXISTS "${path}")
+                        list(APPEND paths_resolved "${path}")
+                else()
+                        if(${executable_path})
+                                list(APPEND paths_resolved
+"${executable_path}/${path}")
+                        else()
+                                list(APPEND paths_resolved
+"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${path}")
+                        endif()
+                endif()
+        endforeach()
+        set(${paths_var} ${paths_resolved} PARENT_SCOPE)
+endfunction()
+
+function(fixup_qt5_executable executable)
+        set(qtplugins ${ARGV1})
+        set(libs ${ARGV2})
+        set(dirs ${ARGV3})
+        set(plugins_dir ${ARGV4})
+        set(request_qt_conf ${ARGV5})
+
+        message(STATUS "fixup_qt5_executable")
+        message(STATUS "  executable='${executable}'")
+        message(STATUS "  qtplugins='${qtplugins}'")
+        message(STATUS "  libs='${libs}'")
+        message(STATUS "  dirs='${dirs}'")
+        message(STATUS "  plugins_dir='${plugins_dir}'")
+        message(STATUS "  request_qt_conf='${request_qt_conf}'")
+
+        if(QT_LIBRARY_DIR)
+                list(APPEND dirs "${QT_LIBRARY_DIR}")
+        endif()
+        if(QT_BINARY_DIR)
+                list(APPEND dirs "${QT_BINARY_DIR}")
+        endif()
+
+        if(APPLE)
+                set(qt_conf_dir "${executable}/Contents/Resources")
+                set(executable_path "${executable}")
+                set(write_qt_conf TRUE)
+                if(NOT plugins_dir)
+                        set(plugins_dir "${DeployQt5_apple_plugins_dir}")
+                endif()
+        else()
+                get_filename_component(executable_path "${executable}" PATH)
+                if(NOT executable_path)
+                        set(executable_path ".")
+                endif()
+                set(qt_conf_dir "${executable_path}")
+                set(write_qt_conf ${request_qt_conf})
+        endif()
+
+        foreach(plugin ${qtplugins})
+                set(installed_plugin_path "")
+                install_qt5_plugin("${plugin}" "${executable}" 1
+installed_plugin_path)
+                list(APPEND libs ${installed_plugin_path})
+        endforeach()
+
+        foreach(lib ${libs})
+                if(NOT EXISTS "${lib}")
+                        message(FATAL_ERROR "Library does not exist: ${lib}")
+                endif()
+        endforeach()
+
+        resolve_qt5_paths(libs "${executable_path}")
+
+        if(write_qt_conf)
+                set(qt_conf_contents "[Paths]\nPlugins = ${plugins_dir}")
+                write_qt5_conf("${qt_conf_dir}" "${qt_conf_contents}")
+        endif()
+
+        fixup_bundle("${executable}" "${libs}" "${dirs}")
+endfunction()
+
+function(install_qt5_plugin_path plugin executable copy
+installed_plugin_path_var)
+        set(plugins_dir ${ARGV4})
+        set(component ${ARGV5})
+        set(configurations ${ARGV6})
+        if(EXISTS "${plugin}")
+                if(APPLE)
+                        if(NOT plugins_dir)
+                                set(plugins_dir
+"${DeployQt5_apple_plugins_dir}")
+                        endif()
+                        set(plugins_path
+"${executable}/Contents/${plugins_dir}")
+                else()
+                        get_filename_component(plugins_path "${executable}"
+PATH)
+                        if(NOT plugins_path)
+                                set(plugins_path ".")
+                        endif()
+                        if(plugins_dir)
+                                set(plugins_path
+"${plugins_path}/${plugins_dir}")
+                        endif()
+                endif()
+
+                set(plugin_group "")
+
+                get_filename_component(plugin_path "${plugin}" PATH)
+                get_filename_component(plugin_parent_path "${plugin_path}" PATH)
+                get_filename_component(plugin_parent_dir_name
+"${plugin_parent_path}" NAME)
+                get_filename_component(plugin_name "${plugin}" NAME)
+                string(TOLOWER "${plugin_parent_dir_name}"
+plugin_parent_dir_name)
+
+                if("${plugin_parent_dir_name}" STREQUAL "plugins")
+                        get_filename_component(plugin_group "${plugin_path}"
+NAME)
+                        set(${plugin_group_var} "${plugin_group}")
+                endif()
+                set(plugins_path "${plugins_path}/${plugin_group}")
+
+                if(${copy})
+                        file(MAKE_DIRECTORY "${plugins_path}")
+                        file(COPY "${plugin}" DESTINATION "${plugins_path}")
+                else()
+                        if(configurations AND (CMAKE_CONFIGURATION_TYPES OR
+CMAKE_BUILD_TYPE))
+                                set(configurations CONFIGURATIONS
+${configurations})
+                        else()
+                                unset(configurations)
+                        endif()
+                        install(FILES "${plugin}" DESTINATION "${plugins_path}"
+${configurations} ${component})
+                endif()
+                set(${installed_plugin_path_var}
+"${plugins_path}/${plugin_name}" PARENT_SCOPE)
+        endif()
+endfunction()
+
+function(install_qt5_plugin plugin executable copy installed_plugin_path_var)
+        set(plugins_dir ${ARGV4})
+        set(component ${ARGV5})
+        if(EXISTS "${plugin}")
+                install_qt5_plugin_path("${plugin}" "${executable}" "${copy}"
+"${installed_plugin_path_var}" "${plugins_dir}" "${component}")
+        else()
+                #string(TOUPPER "QT_${plugin}_PLUGIN" plugin_var)
+                set(plugin_release)
+                set(plugin_debug)
+                set(plugin_tmp_path)
+                set(plugin_find_path "${Qt5Core_DIR}/../../../plugins/")
+                get_filename_component(plugin_find_path "${plugin_find_path}"
+REALPATH)
+                if(COMMAND cmake_policy)
+                    CMAKE_POLICY(SET CMP0009 NEW)
+                    #CMAKE_POLICY(SET CMP0011 NEW) # disabling a warning about policy changing in this scope
+                endif(COMMAND cmake_policy)
+
+                if (APPLE)
+                    set(plugin_find_release_filename "lib${plugin}.dylib")
+                    set(plugin_find_debug_filename "lib${plugin}_debug.dylib")
+                    file(GLOB_RECURSE pluginlist "${plugin_find_path}" "${plugin_find_path}/*/lib*.dylib")
+                endif()
+                if(WIN32)
+                    set(plugin_find_release_filename "${plugin}.dll")
+                    set(plugin_find_debug_filename "${plugin}d.dll")
+                    file(GLOB_RECURSE pluginlist "${plugin_find_path}" "${plugin_find_path}/*/*.dll")
+                endif(WIN32)
+                foreach(found_plugin ${pluginlist})
+                  get_filename_component(curname "${found_plugin}" NAME)
+                  if("${curname}" STREQUAL "${plugin_find_release_filename}")
+                    set(plugin_tmp_release_path "${found_plugin}")
+                  endif()
+                  if("${curname}" STREQUAL "${plugin_find_debug_filename}")
+                    set(plugin_tmp_debug_path "${found_plugin}")
+                  endif()
+                endforeach()
+
+                if((NOT DEFINED plugin_tmp_release_path OR NOT EXISTS
+"${plugin_tmp_release_path}") AND (NOT DEFINED plugin_tmp_debug_PATH OR NOT
+EXISTS "${plugin_tmp_debug_path}"))
+                        message(WARNING "Qt plugin \"${plugin}\" not recognized
+or found.")
+                endif()
+
+                if(EXISTS "${plugin_tmp_release_path}")
+                  set(plugin_release "${plugin_tmp_release_path}")
+                elseif(EXISTS "${plugin_tmp_debug_path}")
+                  set(plugin_release "${plugin_tmp_debug_path}")
+                endif()
+
+                if(EXISTS "${plugin_tmp_debug_path}")
+                  set(plugin_debug "${plugin_tmp_debug_path}")
+                elseif(EXISTS "${plugin_tmp_release_path}")
+                  set(plugin_debug "${plugin_tmp_release_path}")
+                endif()
+
+                if(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+                        install_qt5_plugin_path("${plugin_release}"
+"${executable}" "${copy}" "${installed_plugin_path_var}_release"
+"${plugins_dir}" "${component}" "Release|RelWithDebInfo|MinSizeRel")
+                        install_qt5_plugin_path("${plugin_debug}"
+"${executable}" "${copy}" "${installed_plugin_path_var}_debug" "${plugins_dir}"
+"${component}" "Debug")
+
+                        if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
+                                set(${installed_plugin_path_var}
+${${installed_plugin_path_var}_debug})
+                        else()
+                                set(${installed_plugin_path_var}
+${${installed_plugin_path_var}_release})
+                        endif()
+                else()
+                        install_qt5_plugin_path("${plugin_release}"
+"${executable}" "${copy}" "${installed_plugin_path_var}" "${plugins_dir}"
+"${component}")
+                endif()
+        endif()
+        set(${installed_plugin_path_var} ${${installed_plugin_path_var}}
+PARENT_SCOPE)
+endfunction()
+
+function(install_qt5_executable executable)
+        set(qtplugins ${ARGV1})
+        set(libs ${ARGV2})
+        set(dirs ${ARGV3})
+        set(plugins_dir ${ARGV4})
+        set(request_qt_conf ${ARGV5})
+        set(component ${ARGV6})
+        if(QT_LIBRARY_DIR)
+                list(APPEND dirs "${QT_LIBRARY_DIR}")
+        endif()
+        if(QT_BINARY_DIR)
+                list(APPEND dirs "${QT_BINARY_DIR}")
+        endif()
+        if(component)
+                set(component COMPONENT ${component})
+        else()
+                unset(component)
+        endif()
+
+        get_filename_component(executable_absolute "${executable}" ABSOLUTE)
+        if(EXISTS "${QT_QTCORE_LIBRARY_RELEASE}")
+            gp_file_type("${executable_absolute}"
+"${QT_QTCORE_LIBRARY_RELEASE}" qtcore_type)
+        elseif(EXISTS "${QT_QTCORE_LIBRARY_DEBUG}")
+            gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY_DEBUG}"
+qtcore_type)
+        endif()
+        if(qtcore_type STREQUAL "system")
+                set(qt_plugins_dir "")
+        endif()
+
+        if(QT_IS_STATIC)
+                message(WARNING "Qt built statically: not installing plugins.")
+        else()
+                foreach(plugin ${qtplugins})
+                        set(installed_plugin_paths "")
+                        install_qt5_plugin("${plugin}" "${executable}" 0
+installed_plugin_paths "${plugins_dir}" "${component}")
+                        list(APPEND libs ${installed_plugin_paths})
+                endforeach()
+        endif()
+
+        resolve_qt5_paths(libs "")
+
+        install(CODE
+  "include(\"${DeployQt5_cmake_dir}/DeployQt5.cmake\")
+  set(BU_CHMOD_BUNDLE_ITEMS TRUE)
+  FIXUP_QT5_EXECUTABLE(\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${executable}\"
+\"\" \"${libs}\" \"${dirs}\" \"${plugins_dir}\" \"${request_qt_conf}\")"
+                ${component}
+        )
+endfunction()

avidemux_2.6.20.tar.gz/cmake/FindPatch.cmake -> avidemux_2.7.0.tar.gz/cmake/FindPatch.cmake Changed

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

@@ -1,147 +1,138 @@
-
-MACRO(checkQt5)
-#        SET(QT5_CHECKED 1)
-    IF (NOT QT5_CHECKED)
-        OPTION(QT5 "" ON)
-
-        MESSAGE(STATUS "Checking for Qt 5*")
-        MESSAGE(STATUS "******************")
-        IF(CROSS)
-                SET(CROSS5 ${QT_HOME}/lib/cmake)
-                MESSAGE(STATUS "Cross compiling override for QT5 : ${CROSS5}")
-                SET(CMAKE_MODULE_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_MODULE_PATH} )
-                SET(CMAKE_PREFIX_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_PREFIX_PATH} )
-                SET(CROSS5 ${QT_HOME}/lib64/cmake) # Mingw64
-                SET(CMAKE_MODULE_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_MODULE_PATH} )
-                SET(CMAKE_PREFIX_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_PREFIX_PATH} )
-                MESSAGE(STATUS "Search path ${CMAKE_MODULE_PATH}")
-                FIND_PACKAGE(Qt5Core)    
-                FIND_PACKAGE(Qt5Widgets)    
-                SET(QT_QTOPENGL_FOUND 1)
-    
-                #SET(QT_QTOPENGL_LIBRARY ${QT_HOME}//lib/libQt5OpenGL.a)
-                SET(QT_QTOPENGL_LIBRARIES Qt5OpenGL)
-                SET(QT_QTOPENGL_INCLUDE_DIR ${QT_HOME}/include/QtOpenGL)
-
-                IF(TYPE2_CROSS_SETUP)
-                        SET(QT_HEADERS_DIR   ${QT_HOME}/include  ${QT_HOME}/include/QtGui ${QT_HOME}/include/QtCore ${QT_HOME}/include/QtWidgets ${QT_HOME}/include/QtNetwork)
-                        SET(QT_INCLUDES    -I${QT_HOME}/include -I${QT_HOME}/include/QtGui -I${QT_HOME}/include/QtCore -I${QT_HOME}/include/QtWidgets -I${QT_HOME}/include/QtNetwork)
-                ELSE(TYPE2_CROSS_SETUP)
-                        SET(QT_HEADERS_DIR   ${QT_HOME}/include/qt5  ${QT_HOME}/include/qt5/QtGui ${QT_HOME}/include/qt5/QtCore ${QT_HOME}/include/qt5/QtWidgets ${QT_HOME}/include/qt5/QtNetwork)
-                        SET(QT_INCLUDES    -I${QT_HOME}/include/qt5 -I${QT_HOME}/include/qt5/QtGui -I${QT_HOME}/include/qt5/QtCore -I${QT_HOME}/include/qt5/QtWidgets -I${QT_HOME}/include/qt5/QtNetwork)
-                ENDIF(TYPE2_CROSS_SETUP)
-                SET(QT_INCLUDE_DIR   ${QT_HEADERS_DIR})
-                SET(QT_BINARY_DIR    ${QT_HOME}/bin)
-                SET(QT_LIBRARY_DIR   ${QT_HOME}/lib ${QT_HOME}/bin)
-                #SET(QT_QTCORE_LIBRARY ${QT_HOME}//lib/libQt5Core.a)
-                SET(QT_QTCORE_LIBRARY Qt5Core)
-                SET(QT_QTNETWORK_LIBRARY Qt5Network)
-                #SET(QT_QTGUI_LIBRARY  ${QT_HOME}//lib/libQt5Gui.a ${QT_HOME}//lib/libQt5Widgets.a))
-                SET(QT_QTGUI_LIBRARY  Qt5Gui Qt5Widgets Qt5OpenGL Qt5WinExtras)
-                SET(QT_EXTENSION qt5)
-                SET(QT_LIBRARY_EXTENSION QT5)
-                SET(QT5_FOUND True)
-                SET(ADM_QT_VERSION 5)
-                IF(TYPE2_CROSS_SETUP)
-                        SET(QT5_ROOT_DIR ${QT_HOME}/bin)
-                ELSE(TYPE2_CROSS_SETUP)
-                        SET(QT5_ROOT_DIR /usr/lib/x86_64-linux-gnu/qt5/bin)
-                ENDIF(TYPE2_CROSS_SETUP)
-                SET(QT_RCC_EXECUTABLE ${QT5_ROOT_DIR}/rcc)
-                SET(QT_MOC_EXECUTABLE ${QT5_ROOT_DIR}/moc)
-                SET(QT_UIC_EXECUTABLE ${QT5_ROOT_DIR}/uic)
-                LINK_DIRECTORIES( ${QT_LIBRARY_DIR})
-                #include(admCrossQt5)
-
-                MACRO(ADM_QT5_WRAP_UI a)
-                        QT5_WRAP_UI(${a} ${ARGN})
-                ENDMACRO(ADM_QT5_WRAP_UI a)
-                MACRO(ADM_QT5_WRAP_CPP a)
-                        QT5_WRAP_CPP(${a} ${ARGN})
-                ENDMACRO(ADM_QT5_WRAP_CPP a)
-                MACRO(ADM_QT5_ADD_RESOURCES a)
-                        QT5_ADD_RESOURCES(${a} ${ARGN})
-                ENDMACRO(ADM_QT5_ADD_RESOURCES a)
-        ELSE(CROSS) # NOT WIN32/64 cross
-                IF (QT5)
-                    MESSAGE(STATUS "  Checking for Qt5Core")
-                    FIND_PACKAGE(Qt5Core)    
-                    MESSAGE(STATUS "  Checking for Qt5Widgets")
-                    FIND_PACKAGE(Qt5Widgets)    
-                    MESSAGE(STATUS "  Checking for Qt5Network")
-                    FIND_PACKAGE(Qt5Network)    
-                    IF(WIN32)
-                        FIND_PACKAGE(Qt5WinExtras)    
-                    ENDIF(WIN32)
-                    IF(Qt5Core_FOUND AND Qt5Widgets_FOUND AND Qt5Network_FOUND)
-                        MESSAGE(STATUS "  Qt5 found ")
-                        SET(QT5_FOUND 1)
-                        SET(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}/QtWidgets ${Qt5Network_INCLUDE_DIRS})
-                        SET(QT_INCLUDE_DIR   ${QT_INCLUDES})
-                        SET(QT_QTCORE_LIBRARY ${Qt5Core_LIBRARIES})
-                        SET(QT_QTNETWORK_LIBRARY ${Qt5Network_LIBRARIES})
-                        SET(QT_QTGUI_LIBRARY  ${Qt5Widgets_LIBRARIES} ${Qt5WinExtras_LIBRARIES})
-                        SET(QT_DEFINITIONS    ${Qt5Core_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS})
-                        STRING(REGEX REPLACE "[\\]" "/" QT_INCLUDES "${QT_INCLUDES}")    # backslashes aren't taken care of properly on Windows
-                        MESSAGE(STATUS "QT5_INCLUDES     : ${QT_INCLUDES}")
-                        MESSAGE(STATUS "QT5_DEFINITIONS  : ${QT5_DEFINITIONS}")
-                        MESSAGE(STATUS "QT5_INCLUDES     : ${QT_INCLUDES}")
-                        MESSAGE(STATUS "QT5_LIBS         : ${QT_QTCORE_LIBRARY} : ${QT_QTGUI_LIBRARY} : ${QT_QTNETWORK_LIBRARY}")
-                        MARK_AS_ADVANCED(LRELEASE_EXECUTABLE)
-                        MARK_AS_ADVANCED(QT_MKSPECS_DIR)
-                        MARK_AS_ADVANCED(QT_PLUGINS_DIR)
-                        MARK_AS_ADVANCED(QT_QMAKE_EXECUTABLE)
-                        # Version independant macros
-                        MACRO(ADM_QT_WRAP_UI a)
-                                QT5_WRAP_UI(${a} ${ARGN})
-                        ENDMACRO(ADM_QT_WRAP_UI a)
-                        MACRO(ADM_QT_WRAP_CPP a)
-                                QT5_WRAP_CPP(${a} ${ARGN})
-                        ENDMACRO(ADM_QT_WRAP_CPP a)
-                        MACRO(ADM_QT_ADD_RESOURCES a)
-                                QT5_ADD_RESOURCES(${a} ${ARGN})
-                        ENDMACRO(ADM_QT_ADD_RESOURCES a)
-                        SET(QT_EXTENSION qt5)
-                        SET(QT_LIBRARY_EXTENSION QT5)
-                        SET(ADM_QT_VERSION 5)
-                        if (Qt5_POSITION_INDEPENDENT_CODE)
-                                SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
-                        endif (Qt5_POSITION_INDEPENDENT_CODE)
-                        # Do we have openGl also ?
-                        MESSAGE(STATUS "  Checking for Qt5OpenGL")
-                        FIND_PACKAGE(Qt5OpenGL)    
-                        IF(Qt5OpenGL_FOUND)
-                                SET(QT_QTOPENGL_FOUND True)
-                                SET(QT_QTOPENGL_INCLUDE_DIR ${Qt5OpenGL_INCLUDE_DIRS})
-                                SET(QT_QTOPENGL_LIBRARIES   ${Qt5OpenGL_LIBRARIES})
-                                MESSAGE(STATUS "  Found,include=${QT_OPENGL_INCLUDE_DIR}, libs=${QT_OPENGL_LIBRARIES}")
-                        ELSE(Qt5OpenGL_FOUND)
-                                MESSAGE(STATUS "  NOT Found")
-                        ENDIF(Qt5OpenGL_FOUND)
-       
-                        # Do we have qtScript also ?
-                        #FIND_PACKAGE(Qt5Script)
-                        #MESSAGE(STATUS "  Checking for Qt5Script")
-                        #IF(Qt5Script_FOUND)
-                            #MESSAGE(STATUS "   Qt5Script found")
-                            #SET(QT_QTSCRIPT_FOUND 1)    
-                            #SET(QT_QTSCRIPT_LIBRARY ${Qt5Script_LIBRARIES})
-                        #ELSE(Qt5Script_FOUND)
-                            #MESSAGE(STATUS "   Qt5Script NOT found")
-                        #ENDIF(Qt5Script_FOUND)
-                                # ----------------------------------
-                         
-                ELSE(Qt5Core_FOUND AND Qt5Widgets_FOUND  AND Qt5Network_FOUND)
-                        MESSAGE(STATUS "Some Qt5 components are missing")
-                ENDIF(Qt5Core_FOUND AND Qt5Widgets_FOUND  AND Qt5Network_FOUND)
-                        
-          ELSE (QT5)
-            MESSAGE("${MSG_DISABLE_OPTION}")
-          ENDIF (QT5)
-        ENDIF(CROSS) # WIN32/64 cross
-
-        SET(QT5_CHECKED 1)
-
-        MESSAGE("")
-    ENDIF (NOT QT5_CHECKED)
-ENDMACRO(checkQt5)
+
+MACRO(checkQt5)
+#        SET(QT5_CHECKED 1)
+    IF (NOT QT5_CHECKED)
+        OPTION(QT5 "" ON)
+
+        MESSAGE(STATUS "Checking for Qt 5*")
+        MESSAGE(STATUS "******************")
+        IF(CROSS)
+                SET(CROSS5 ${QT_HOME}/lib/cmake)
+                MESSAGE(STATUS "Cross compiling override for QT5 : ${CROSS5}")
+                SET(CMAKE_MODULE_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_MODULE_PATH} )
+                SET(CMAKE_PREFIX_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_PREFIX_PATH} )
+                SET(CROSS5 ${QT_HOME}/lib64/cmake) # Mingw64
+                SET(CMAKE_MODULE_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_MODULE_PATH} )
+                SET(CMAKE_PREFIX_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_PREFIX_PATH} )
+                MESSAGE(STATUS "Search path ${CMAKE_MODULE_PATH}")
+                FIND_PACKAGE(Qt5Core)    
+                FIND_PACKAGE(Qt5Widgets)    
+                SET(QT_QTOPENGL_FOUND 1)
+    
+                #SET(QT_QTOPENGL_LIBRARY ${QT_HOME}//lib/libQt5OpenGL.a)
+                SET(QT_QTOPENGL_LIBRARIES Qt5OpenGL)
+                SET(QT_QTOPENGL_INCLUDE_DIR ${QT_HOME}/include/QtOpenGL)
+		SET(QT_HEADERS_DIR   ${QT_HOME}/include  ${QT_HOME}/include/QtGui ${QT_HOME}/include/QtCore ${QT_HOME}/include/QtWidgets ${QT_HOME}/include/QtNetwork)
+		SET(QT_INCLUDES    -I${QT_HOME}/include -I${QT_HOME}/include/QtGui -I${QT_HOME}/include/QtCore -I${QT_HOME}/include/QtWidgets -I${QT_HOME}/include/QtNetwork)
+                SET(QT_INCLUDE_DIR   ${QT_HEADERS_DIR})
+                SET(QT_BINARY_DIR    ${QT_HOME}/bin)
+                SET(QT_LIBRARY_DIR   ${QT_HOME}/lib ${QT_HOME}/bin)
+                #SET(QT_QTCORE_LIBRARY ${QT_HOME}//lib/libQt5Core.a)
+                SET(QT_QTCORE_LIBRARY Qt5Core)
+                SET(QT_QTNETWORK_LIBRARY Qt5Network)
+                #SET(QT_QTGUI_LIBRARY  ${QT_HOME}//lib/libQt5Gui.a ${QT_HOME}//lib/libQt5Widgets.a))
+                SET(QT_QTGUI_LIBRARY  Qt5Gui Qt5Widgets Qt5OpenGL Qt5WinExtras)
+                SET(QT_EXTENSION qt5)
+                SET(QT_LIBRARY_EXTENSION QT5)
+                SET(QT5_FOUND True)
+                SET(ADM_QT_VERSION 5)
+		SET(QT5_ROOT_DIR ${QT_HOME}/bin)
+                SET(QT_RCC_EXECUTABLE ${QT5_ROOT_DIR}/rcc)
+                SET(QT_MOC_EXECUTABLE ${QT5_ROOT_DIR}/moc)
+                SET(QT_UIC_EXECUTABLE ${QT5_ROOT_DIR}/uic)
+                LINK_DIRECTORIES( ${QT_LIBRARY_DIR})
+                #include(admCrossQt5)
+
+                MACRO(ADM_QT5_WRAP_UI a)
+                        QT5_WRAP_UI(${a} ${ARGN})
+                ENDMACRO(ADM_QT5_WRAP_UI a)
+                MACRO(ADM_QT5_WRAP_CPP a)
+                        QT5_WRAP_CPP(${a} ${ARGN})
+                ENDMACRO(ADM_QT5_WRAP_CPP a)
+                MACRO(ADM_QT5_ADD_RESOURCES a)
+                        QT5_ADD_RESOURCES(${a} ${ARGN})
+                ENDMACRO(ADM_QT5_ADD_RESOURCES a)
+        ELSE(CROSS) # NOT WIN32/64 cross
+                IF (QT5)
+                    MESSAGE(STATUS "  Checking for Qt5Core")
+                    FIND_PACKAGE(Qt5Core)    
+                    MESSAGE(STATUS "  Checking for Qt5Widgets")
+                    FIND_PACKAGE(Qt5Widgets)    
+                    MESSAGE(STATUS "  Checking for Qt5Network")
+                    FIND_PACKAGE(Qt5Network)    
+                    IF(WIN32)
+                        FIND_PACKAGE(Qt5WinExtras)    
+                    ENDIF(WIN32)
+                    IF(Qt5Core_FOUND AND Qt5Widgets_FOUND AND Qt5Network_FOUND)
+                        MESSAGE(STATUS "  Qt5 found ")
+                        SET(QT5_FOUND 1)
+                        SET(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}/QtWidgets ${Qt5Network_INCLUDE_DIRS})
+                        SET(QT_INCLUDE_DIR   ${QT_INCLUDES})
+                        SET(QT_QTCORE_LIBRARY ${Qt5Core_LIBRARIES})
+                        SET(QT_QTNETWORK_LIBRARY ${Qt5Network_LIBRARIES})
+                        SET(QT_QTGUI_LIBRARY  ${Qt5Widgets_LIBRARIES} ${Qt5WinExtras_LIBRARIES})
+                        SET(QT_DEFINITIONS    ${Qt5Core_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS})
+                        STRING(REGEX REPLACE "[\\]" "/" QT_INCLUDES "${QT_INCLUDES}")    # backslashes aren't taken care of properly on Windows
+                        MESSAGE(STATUS "QT5_INCLUDES     : ${QT_INCLUDES}")
+                        MESSAGE(STATUS "QT5_DEFINITIONS  : ${QT5_DEFINITIONS}")
+                        MESSAGE(STATUS "QT5_INCLUDES     : ${QT_INCLUDES}")
+                        MESSAGE(STATUS "QT5_LIBS         : ${QT_QTCORE_LIBRARY} : ${QT_QTGUI_LIBRARY} : ${QT_QTNETWORK_LIBRARY}")
+                        MARK_AS_ADVANCED(LRELEASE_EXECUTABLE)
+                        MARK_AS_ADVANCED(QT_MKSPECS_DIR)
+                        MARK_AS_ADVANCED(QT_QMAKE_EXECUTABLE)
+                        # Version independant macros
+                        MACRO(ADM_QT_WRAP_UI a)
+                                QT5_WRAP_UI(${a} ${ARGN})
+                        ENDMACRO(ADM_QT_WRAP_UI a)
+                        MACRO(ADM_QT_WRAP_CPP a)
+                                QT5_WRAP_CPP(${a} ${ARGN})
+                        ENDMACRO(ADM_QT_WRAP_CPP a)
+                        MACRO(ADM_QT_ADD_RESOURCES a)
+                                QT5_ADD_RESOURCES(${a} ${ARGN})
+                        ENDMACRO(ADM_QT_ADD_RESOURCES a)
+                        SET(QT_EXTENSION qt5)
+                        SET(QT_LIBRARY_EXTENSION QT5)
+                        SET(ADM_QT_VERSION 5)
+                        if (Qt5_POSITION_INDEPENDENT_CODE)
+                                SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
+                        endif (Qt5_POSITION_INDEPENDENT_CODE)
+                        # Do we have openGl also ?
+                        MESSAGE(STATUS "  Checking for Qt5OpenGL")
+                        FIND_PACKAGE(Qt5OpenGL)    
+                        IF(Qt5OpenGL_FOUND)
+                                SET(QT_QTOPENGL_FOUND True)
+                                SET(QT_QTOPENGL_INCLUDE_DIR ${Qt5OpenGL_INCLUDE_DIRS})
+                                SET(QT_QTOPENGL_LIBRARIES   ${Qt5OpenGL_LIBRARIES})
+                                MESSAGE(STATUS "  Found,include=${QT_OPENGL_INCLUDE_DIR}, libs=${QT_OPENGL_LIBRARIES}")
+                        ELSE(Qt5OpenGL_FOUND)
+                                MESSAGE(STATUS "  NOT Found")
+                        ENDIF(Qt5OpenGL_FOUND)
+      	                get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
+			exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_PLUGINS" RETURN_VALUE return_code OUTPUT_VARIABLE QT_PLUGINS_DIR )
+                        MESSAGE(STATUS " plugin dir = ${QT_PLUGINS_DIR}")
+                        # Do we have qtScript also ?
+                        #FIND_PACKAGE(Qt5Script)
+                        #MESSAGE(STATUS "  Checking for Qt5Script")
+                        #IF(Qt5Script_FOUND)
+                            #MESSAGE(STATUS "   Qt5Script found")
+                            #SET(QT_QTSCRIPT_FOUND 1)    
+                            #SET(QT_QTSCRIPT_LIBRARY ${Qt5Script_LIBRARIES})
+                        #ELSE(Qt5Script_FOUND)
+                            #MESSAGE(STATUS "   Qt5Script NOT found")
+                        #ENDIF(Qt5Script_FOUND)
+                                # ----------------------------------
+                         
+                ELSE(Qt5Core_FOUND AND Qt5Widgets_FOUND  AND Qt5Network_FOUND)
+                        MESSAGE(STATUS "Some Qt5 components are missing")
+                ENDIF(Qt5Core_FOUND AND Qt5Widgets_FOUND  AND Qt5Network_FOUND)
+                        
+          ELSE (QT5)
+            MESSAGE("${MSG_DISABLE_OPTION}")
+          ENDIF (QT5)
+        ENDIF(CROSS) # WIN32/64 cross
+
+        SET(QT5_CHECKED 1)
+
+        MESSAGE("")
+    ENDIF (NOT QT5_CHECKED)
+ENDMACRO(checkQt5)

avidemux_2.6.20.tar.gz/cmake/admCheckX264.cmake -> avidemux_2.7.0.tar.gz/cmake/admCheckX264.cmake Changed

@@ -1,45 +1,45 @@
 MACRO(checkX264)
-	IF (NOT X264_CHECKED)
-		OPTION(X264 "" ON)
-
-		MESSAGE(STATUS "Checking for x264")
-		MESSAGE(STATUS "*****************")
-
-		IF (X264)
-			FIND_HEADER_AND_LIB(_X264 x264.h)
-
-			IF (_X264_FOUND)
-				FILE(READ ${_X264_INCLUDE_DIR}/x264.h X264_H)
-				STRING(REGEX MATCH "#define[ ]+X264_BUILD[ ]+([0-9]+)" X264_H "${X264_H}")
-				STRING(REGEX REPLACE ".*[ ]([0-9]+).*" "\\1" x264_version "${X264_H}")
-				MESSAGE(STATUS "  core version: ${x264_version}")
-				
-				IF (x264_version LESS 67)
-					MESSAGE("WARNING: x264 core version is too old.  At least version 67 is required.")
-					SET(X264_FOUND 0)
-				ELSE (x264_version LESS 67)
+        IF (NOT X264_CHECKED)
+                OPTION(X264 "" ON)
+
+                MESSAGE(STATUS "Checking for x264")
+                MESSAGE(STATUS "*****************")
+
+                IF (X264)
+                        FIND_HEADER_AND_LIB(_X264 x264.h)
+
+                        IF (_X264_FOUND)
+                                FILE(READ ${_X264_INCLUDE_DIR}/x264.h X264_H)
+                                STRING(REGEX MATCH "#define[ ]+X264_BUILD[ ]+([0-9]+)" X264_H "${X264_H}")
+                                STRING(REGEX REPLACE ".*[ ]([0-9]+).*" "\\1" x264_version "${X264_H}")
+                                MESSAGE(STATUS "  core version: ${x264_version}")
+
+                                IF (x264_version LESS 67)
+                                        MESSAGE("WARNING: x264 core version is too old.  At least version 67 is required.")
+                                        SET(X264_FOUND 0)
+                                ELSE (x264_version LESS 67)
                                         IF (x264_version GREATER 73)
-					        FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open_${x264_version})
+                                                FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open_${x264_version})
+                                        ELSE (x264_version GREATER 73)
+                                                FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open)
                                         ENDIF (x264_version GREATER 73)
-				ELSE (x264_version LESS 67)
-					FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open)
-				ENDIF (x264_version LESS 67)
-                                IF(X264_FOUND)
+                                ENDIF (x264_version LESS 67)
+                                IF (X264_FOUND)
                                         SET(USE_X264 True CACHE BOOL "")
                                 ENDIF(X264_FOUND)
-			ELSE (_X264_FOUND)
-				SET(X264_FOUND 0)
-			ENDIF (_X264_FOUND)
+                        ELSE (_X264_FOUND)
+                                SET(X264_FOUND 0)
+                        ENDIF (_X264_FOUND)
 
-			PRINT_LIBRARY_INFO("x264" X264_FOUND "${X264_INCLUDE_DIR}" "${X264_LIBRARY_DIR}")
-		ELSE (X264)
-			MESSAGE("${MSG_DISABLE_OPTION}")
-		ENDIF (X264)
+                        PRINT_LIBRARY_INFO("x264" X264_FOUND "${X264_INCLUDE_DIR}" "${X264_LIBRARY_DIR}")
+                ELSE (X264)
+                        MESSAGE("${MSG_DISABLE_OPTION}")
+                ENDIF (X264)
 
-		SET(X264_CHECKED 1)
+                SET(X264_CHECKED 1)
 
-		MESSAGE("")
-	ENDIF (NOT X264_CHECKED)
+                MESSAGE("")
+        ENDIF (NOT X264_CHECKED)
 
-	APPEND_SUMMARY_LIST("Video Encoder" "x264" "${USE_X264}")
+        APPEND_SUMMARY_LIST("Video Encoder" "x264" "${USE_X264}")
 ENDMACRO(checkX264)

avidemux_2.6.20.tar.gz/cmake/admCheckX265.cmake -> avidemux_2.7.0.tar.gz/cmake/admCheckX265.cmake Changed

avidemux_2.6.20.tar.gz/cmake/admConfigHelper.cmake -> avidemux_2.7.0.tar.gz/cmake/admConfigHelper.cmake Changed

avidemux_2.6.20.tar.gz/cmake/admDetermineSystem.cmake -> avidemux_2.7.0.tar.gz/cmake/admDetermineSystem.cmake Changed

avidemux_2.6.20.tar.gz/cmake/admFFmpegBuild.cmake -> avidemux_2.7.0.tar.gz/cmake/admFFmpegBuild.cmake Changed

avidemux_2.6.20.tar.gz/cmake/admFFmpegBuild_crossMingw.cmake -> avidemux_2.7.0.tar.gz/cmake/admFFmpegBuild_crossMingw.cmake Changed

@@ -29,7 +29,7 @@
                 # With clang we use the -mstackrealign -mstack-alignment=16
         ELSE("${CROSS_C_COMPILER}" STREQUAL "clang")
             # Old win32, for hack, not sure it really works with recent gcc
-        		xadd(--enable-memalign-hack)
+        		 # Not anymore xadd(--enable-memalign-hack)
         ENDIF("${CROSS_C_COMPILER}" STREQUAL "clang")
 endif (ADM_CPU_X86_32)
 
@@ -76,6 +76,10 @@
 IF(USE_DXVA2)
       xadd(--enable-dxva2)
       set(FFMPEG_DECODERS ${FFMPEG_DECODERS} h264_dxva2 hevc_dxva2)
+      # We assume 32 bits mean windows XP; disable d3d11
+      IF(NOT ADM_CPU_X86_64)
+            xadd(--disable-d3d11va)
+      ENDIF(NOT ADM_CPU_X86_64)
 ENDIF(USE_DXVA2)
 
 #@@
@@ -112,8 +116,8 @@
 ADM_FF_INSTALL_LIBS_AND_HEADERS()
 
 IF(USE_DXVA2)
-        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/dxva2.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
-        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/dxva2_internal.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/dxva2.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavcodec" COMPONENT dev)
+        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/dxva2_internal.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavcodec" COMPONENT dev)
 ENDIF(USE_DXVA2)
 
 #

avidemux_2.6.20.tar.gz/cmake/admFFmpegBuild_helpers.cmake -> avidemux_2.7.0.tar.gz/cmake/admFFmpegBuild_helpers.cmake Changed

@@ -159,15 +159,15 @@
     ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}")
     ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}")
 
-    INSTALL(FILES "${FFMPEG_BINARY_DIR}/libavutil/avconfig.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavutil" COMPONENT dev)
+    INSTALL(FILES "${FFMPEG_BINARY_DIR}/libavutil/avconfig.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavutil" COMPONENT dev)
 
     INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/avcodec.h" "${FFMPEG_SOURCE_DIR}/libavcodec/vdpau.h"
             "${FFMPEG_SOURCE_DIR}/libavcodec/version.h"
             "${FFMPEG_SOURCE_DIR}/libavcodec/audioconvert.h"
-            DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+            DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavcodec" COMPONENT dev)
     INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavformat/avformat.h" "${FFMPEG_SOURCE_DIR}/libavformat/avio.h"
             "${FFMPEG_SOURCE_DIR}/libavformat/version.h"
-            "${FFMPEG_SOURCE_DIR}/libavformat/flv.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavformat" COMPONENT dev)
+            "${FFMPEG_SOURCE_DIR}/libavformat/flv.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavformat" COMPONENT dev)
     INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavutil/attributes.h" "${FFMPEG_SOURCE_DIR}/libavutil/avutil.h"
             "${FFMPEG_SOURCE_DIR}/libavutil/buffer.h"
             "${FFMPEG_SOURCE_DIR}/libavutil/bswap.h" "${FFMPEG_SOURCE_DIR}/libavutil/common.h"
@@ -184,12 +184,17 @@
             "${FFMPEG_SOURCE_DIR}/libavutil/intfloat.h"
             "${FFMPEG_SOURCE_DIR}/libavutil/macros.h"
             "${FFMPEG_SOURCE_DIR}/libavutil/samplefmt.h"
-            "${FFMPEG_SOURCE_DIR}/libavutil/rational.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavutil" COMPONENT dev)
+            "${FFMPEG_SOURCE_DIR}/libavutil/hwcontext.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/hwcontext_vaapi.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/hwcontext_vdpau.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/hwcontext_dxva2.h"
 
-    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libpostproc/postprocess.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libpostproc" COMPONENT dev)
-    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libpostproc/version.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libpostproc" COMPONENT dev)
-    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libswscale/swscale.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libswscale" COMPONENT dev)
-    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libswscale/version.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libswscale" COMPONENT dev)
+            "${FFMPEG_SOURCE_DIR}/libavutil/rational.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavutil" COMPONENT dev)
+
+    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libpostproc/postprocess.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libpostproc" COMPONENT dev)
+    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libpostproc/version.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libpostproc" COMPONENT dev)
+    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libswscale/swscale.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libswscale" COMPONENT dev)
+    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libswscale/version.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libswscale" COMPONENT dev)
 ENDMACRO(ADM_FF_INSTALL_LIBS_AND_HEADERS)
 #
 #

avidemux_2.6.20.tar.gz/cmake/admFFmpegBuild_native.cmake -> avidemux_2.7.0.tar.gz/cmake/admFFmpegBuild_native.cmake Changed

@@ -21,6 +21,7 @@
 endif (FFMPEG_PERFORM_PATCH)
 
 xadd(--enable-pthreads)
+# help for debugging xadd(--disable-optimizations)
 
 if (USE_VDPAU)
     xadd(--enable-vdpau)
@@ -30,6 +31,7 @@
 if (USE_LIBVA)
     xadd(--enable-vaapi)
     set(FFMPEG_DECODERS ${FFMPEG_DECODERS} h264_vaapi hevc_vaapi)
+    set(FFMPEG_ENCODERS ${FFMPEG_ENCODERS} h264_vaapi hevc_vaapi)
 endif (USE_LIBVA)
 
 #@@
@@ -72,7 +74,7 @@
 ADM_FF_INSTALL_LIBS_AND_HEADERS()
 
 IF(USE_LIBVA)
-                INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/vaapi.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
-                INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/vaapi_internal.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+                INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/vaapi.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavcodec" COMPONENT dev)
+                #INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/vaapi_internal.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavcodec" COMPONENT dev)
 ENDIF(USE_LIBVA)
 # EOF

avidemux_2.6.20.tar.gz/cmake/admFFmpegBuild_vs.cmake -> avidemux_2.7.0.tar.gz/cmake/admFFmpegBuild_vs.cmake Changed

@@ -1,70 +1,86 @@
-include(admFFmpegBuild_helpers)
-
-#@@
-ADM_FF_SET_DEFAULT()
-
-IF(USE_NVENC)
-   SET(FFMPEG_ENCODERS ${FFMPEG_ENCODERS} nvenc)
-   xadd("--enable-nonfree")
-   xadd("--enable-nvenc")
-   set(FFMPEG_ENCODERS  ${FFMPEG_ENCODERS} nvenc_h264 nvenc_hevc)
-ENDIF(USE_NVENC)
-
-
-
-#@@
-ADM_FF_PATCH_IF_NEEDED()
-
-
-
-
-#@@
-ADM_FF_ADD_OPTIONS()
-
-
-xadd(--enable-w32threads)
-#
-xadd(--toolchain=msvc)
-
-#  Cross compiler override (win32 & win64)
-xadd(--extra-cflags  -I${VS_ROOT}/include)
-
-message(STATUS "Using VS compilation flag: ${FFMPEG_FLAGS}")
-
-ADM_FF_ADD_OPTIONS()
-
-
-
-ADM_FF_SET_EXTRA_FLAGS()
-
-
-IF(USE_DXVA2)
-      xadd(--enable-dxva2)
-      set(FFMPEG_DECODERS ${FFMPEG_DECODERS} h264_dxva2 hevc_dxva2)
-ENDIF(USE_DXVA2)
-
-#@@
-ADM_FF_BUILD_UNIX_STYLE()
-
-
-
-add_custom_command(OUTPUT
-                     "${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}"
-                     "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}"
-                     "${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}"
-                     "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}"
-                     "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}"
-                     "${FFMPEG_BINARY_DIR}/ffmpeg${CMAKE_EXECUTABLE_SUFFIX}"
-                     COMMAND ${BASH_EXECUTABLE} ffmpeg_make.sh WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}")
-
-
-ADM_FF_INSTALL_LIBS_AND_HEADERS()
-
-IF(USE_DXVA2)
-        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/dxva2.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
-        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/dxva2_internal.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
-ENDIF(USE_DXVA2)
-
-#
-#
-#
+include(admFFmpegBuild_helpers)
+
+#@@
+ADM_FF_SET_DEFAULT()
+
+IF(USE_NVENC)
+   SET(FFMPEG_ENCODERS ${FFMPEG_ENCODERS} nvenc)
+   xadd("--enable-nonfree")
+   xadd("--enable-nvenc")
+   set(FFMPEG_ENCODERS  ${FFMPEG_ENCODERS} nvenc_h264 nvenc_hevc)
+ENDIF(USE_NVENC)
+
+
+
+#@@
+ADM_FF_PATCH_IF_NEEDED()
+
+
+
+
+#@@
+ADM_FF_ADD_OPTIONS()
+
+
+xadd(--enable-w32threads)
+#
+xadd(--toolchain=msvc)
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+        MESSAGE(STATUS "Compiling ffmpeg in debug mode")
+        xadd(--extra-cflags  "-Z7")
+        xadd(--extra-ldflags "/DEBUG:FASTLINK")
+        xadd(--extra-ldflags "/DEBUGTYPE:CV")
+endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
+
+#  Cross compiler override (win32 & win64)
+xadd(--extra-cflags  -I${VS_ROOT}/include )
+xadd(--extra-ldflags  user32.lib )
+
+message(STATUS "Using VS compilation flag: ${FFMPEG_FLAGS}")
+
+ADM_FF_ADD_OPTIONS()
+
+
+
+ADM_FF_SET_EXTRA_FLAGS()
+
+
+IF(USE_DXVA2)
+      xadd(--enable-dxva2)
+      set(FFMPEG_DECODERS ${FFMPEG_DECODERS} h264_dxva2 hevc_dxva2)
+ENDIF(USE_DXVA2)
+
+#@@
+ADM_FF_BUILD_UNIX_STYLE()
+
+
+
+add_custom_command(OUTPUT
+                     "${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}"
+                     "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}"
+                     "${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}"
+                     "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}"
+                     "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}"
+                     "${FFMPEG_BINARY_DIR}/ffmpeg${CMAKE_EXECUTABLE_SUFFIX}"
+                     COMMAND ${BASH_EXECUTABLE} ffmpeg_make.sh WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}")
+
+
+ADM_FF_INSTALL_LIBS_AND_HEADERS()
+# This installs the .lib, we need to install also the dlls
+
+ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_ADM}avcodec-${LIBAVCODEC_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavformat/${LIBAVCODEC_ADM}avformat-${LIBAVFORMAT_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavutil/${LIBAVCODEC_ADM}avutil-${LIBAVUTIL_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libpostproc/${LIBAVCODEC_ADM}postproc-${LIBPOSTPROC_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libswscale/${LIBAVCODEC_ADM}swscale-${LIBSWSCALE_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+
+IF(USE_DXVA2)
+        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/dxva2.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavcodec" COMPONENT dev)
+        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/d3d11va.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavcodec" COMPONENT dev)
+        INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/dxva2_internal.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavcodec" COMPONENT dev)
+ENDIF(USE_DXVA2)
+
+#
+#
+#

avidemux_2.6.20.tar.gz/cmake/admFFmpegBuild_vs_import.cmake -> avidemux_2.7.0.tar.gz/cmake/admFFmpegBuild_vs_import.cmake Changed

@@ -44,17 +44,17 @@
 #INSTALL .dll => TODO
 
 # install header
-INSTALL(FILES "${IMPORT_FOLDER}/include/libavutil/avconfig.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavutil" COMPONENT dev)
+INSTALL(FILES "${IMPORT_FOLDER}/include/libavutil/avconfig.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavutil" COMPONENT dev)
 
 INSTALL(FILES "${IMPORT_FOLDER}/include/libavcodec/avcodec.h" "${IMPORT_FOLDER}/include/libavcodec/vdpau.h"
         "${IMPORT_FOLDER}/include/libavcodec/version.h"
         "${IMPORT_FOLDER}/include/libavcodec/audioconvert.h"
-        DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+        DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavcodec" COMPONENT dev)
 
 INSTALL(FILES "${IMPORT_FOLDER}/include/libavformat/avformat.h" "${IMPORT_FOLDER}/include/libavformat/avio.h"
         "${IMPORT_FOLDER}/include/libavformat/version.h"
         "${IMPORT_FOLDER}/include/libavformat/flv.h" 
-        DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavformat" COMPONENT dev)
+        DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavformat" COMPONENT dev)
 
 INSTALL(FILES "${IMPORT_FOLDER}/include/libavutil/attributes.h" 
         "${IMPORT_FOLDER}/include/libavutil/avutil.h"
@@ -78,19 +78,26 @@
         "${IMPORT_FOLDER}/include/libavutil/macros.h"
         "${IMPORT_FOLDER}/include/libavutil/samplefmt.h"
         "${IMPORT_FOLDER}/include/libavutil/rational.h" 
-        DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavutil" COMPONENT dev)
+        "${IMPORT_FOLDER}/include/libavutil/hwcontext_dxva2.h" 
+        DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavutil" COMPONENT dev)
 
-INSTALL(FILES "${IMPORT_FOLDER}/include/libpostproc/postprocess.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libpostproc" COMPONENT dev)
-INSTALL(FILES "${IMPORT_FOLDER}/include/libpostproc/version.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libpostproc" COMPONENT dev)
-INSTALL(FILES "${IMPORT_FOLDER}/include/libswscale/swscale.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libswscale" COMPONENT dev)
-INSTALL(FILES "${IMPORT_FOLDER}/include/libswscale/version.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libswscale" COMPONENT dev)
+INSTALL(FILES "${IMPORT_FOLDER}/include/libpostproc/postprocess.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libpostproc" COMPONENT dev)
+INSTALL(FILES "${IMPORT_FOLDER}/include/libpostproc/version.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libpostproc" COMPONENT dev)
+INSTALL(FILES "${IMPORT_FOLDER}/include/libswscale/swscale.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libswscale" COMPONENT dev)
+INSTALL(FILES "${IMPORT_FOLDER}/include/libswscale/version.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libswscale" COMPONENT dev)
 
 
 IF(USE_DXVA2)
-        INSTALL(FILES "${IMPORT_FOLDER}/include/libavcodec/dxva2.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
-        INSTALL(FILES "${IMPORT_FOLDER}/include/libavcodec/dxva2_internal.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
+        INSTALL(FILES "${IMPORT_FOLDER}/include/libavcodec/dxva2.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavcodec" COMPONENT dev)
+        INSTALL(FILES "${IMPORT_FOLDER}/include/libavcodec/d3d11va.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavcodec" COMPONENT dev)
+        INSTALL(FILES "${IMPORT_FOLDER}/include/libavcodec/dxva2_internal.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavcodec" COMPONENT dev)
 ENDIF(USE_DXVA2)
 
+#The above install the .libs
+# also install the .dll manually
 
-
+FILE(GLOB ffmpegDll "${IMPORT_FOLDER}/lib/*-*.dll")
+FOREACH(one ${ffmpegDll})
+        ADM_INSTALL_LIB_FILES(${one})
+ENDFOREACH(one ${ffmpegDll})
 # EOF

avidemux_2.6.20.tar.gz/cmake/admFFmpegVersion.cmake -> avidemux_2.7.0.tar.gz/cmake/admFFmpegVersion.cmake Changed

avidemux_2.6.20.tar.gz/cmake/admInstallDir.cmake -> avidemux_2.7.0.tar.gz/cmake/admInstallDir.cmake Changed

@@ -75,9 +75,10 @@
 #
 MACRO(ADM_INSTALL_INCLUDE_FOLDER folder targetName)
         INSTALL(DIRECTORY ${folder} 
-                DESTINATION ${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/${targetName}
+                DESTINATION ${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/${targetName}
                 COMPONENT dev
-                FILES_MATCHING PATTERN "*.h*"
+                FILES_MATCHING PATTERN "*.h*" 
+                               PATTERN  "*.asm"
                 )
 ENDMACRO(ADM_INSTALL_INCLUDE_FOLDER )
 ##
@@ -86,7 +87,7 @@
 #
 MACRO(ADM_INSTALL_QT_INCLUDE_FOLDER folder targetName)
         INSTALL(DIRECTORY ${folder} 
-                DESTINATION ${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/${QT_EXTENSION}/${targetName}
+                DESTINATION ${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/${QT_EXTENSION}/${targetName}
                 COMPONENT dev
                 FILES_MATCHING PATTERN "*.h*"
                 )
@@ -97,7 +98,7 @@
 #
 MACRO(ADM_INSTALL_CMAKE_FOLDER folder targetName)
         INSTALL(DIRECTORY ${folder} 
-                DESTINATION ${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/${targetName}
+                DESTINATION ${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/${targetName}
                 COMPONENT dev
                 FILES_MATCHING PATTERN "*.cmake*"
                 )
@@ -108,7 +109,7 @@
 #
 MACRO(ADM_INSTALL_CMAKE_HELPER_FOLDER folder targetName)
         INSTALL(DIRECTORY ${folder} 
-                DESTINATION ${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/cmake/${targetName}
+                DESTINATION ${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/cmake/${targetName}
                 COMPONENT dev
                 FILES_MATCHING PATTERN "*.c*"
                 )
@@ -118,7 +119,7 @@
 #
 MACRO(ADM_INSTALL_APP_HEADER folder )
         INSTALL(FILE ${folder} ${ARGN} 
-                DESTINATION ${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/ADM_app
+                DESTINATION ${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/ADM_app
                 COMPONENT dev
                 )
 ENDMACRO(ADM_INSTALL_APP_HEADER folder)

avidemux_2.6.20.tar.gz/cmake/admMainChecks.cmake -> avidemux_2.7.0.tar.gz/cmake/admMainChecks.cmake Changed

avidemux_2.7.0.tar.gz/cmake/admYasm.cmake Added

avidemux_2.7.0.tar.gz/cmake/admYasm_gcc.cmake Added

@@ -0,0 +1,77 @@
+#
+MACRO(YASMIFY)
+ENDMACRO(YASMIFY)
+IF(ADM_CPU_X86 )
+    MESSAGE(STATUS "Checking for YASM")
+    MESSAGE(STATUS "*****************")
+    FIND_PROGRAM(YASM_YASM yasm)
+    IF(YASM_YASM STREQUAL "<YASM_YASM>-NOTFOUND")
+        MESSAGE(FATAL_ERROR "Yasm Not found. Stopping here.")
+    ENDIF(YASM_YASM STREQUAL "<YASM_YASM>-NOTFOUND")
+    MESSAGE(STATUS "Found as ${YASM_YASM}")
+
+    SET(ASM_DIALECT "_NASM")
+
+    SET(CMAKE_ASM_SOURCE_FILE_EXTENSIONS nasm;nas;asm)
+    ENABLE_LANGUAGE(ASM_NASM)
+    SET(CMAKE_ASM_NASM_COMPILER ${YASM_YASM})
+    SET(ASM_ARGS "")
+    IF(APPLE)
+            SET(ASM_ARGS_FORMAT  "-f macho64 -DPREFIX")
+    ELSE(APPLE)
+      IF(WIN32)
+        IF(ADM_CPU_X86_64)
+            SET(ASM_ARGS_FORMAT  "-f win64")
+        ELSE(ADM_CPU_X86_64)
+            SET(ASM_ARGS_FORMAT  "-f win32 ")
+        ENDIF(ADM_CPU_X86_64)
+      ELSE(WIN32) # Linux
+        SET(ASM_ARGS_FORMAT      "-f elf -DPIC")
+      ENDIF(WIN32)
+    ENDIF(APPLE)
+
+    IF(WIN32 AND NOT ADM_CPU_X86_64)
+        SET(ASM_ARGS_FLAGS       "-DHAVE_ALIGNED_STACK=0 -DPREFIX")
+    ELSE(WIN32 AND NOT ADM_CPU_X86_64)
+        SET(ASM_ARGS_FLAGS       "-DHAVE_ALIGNED_STACK=1")
+    ENDIF(WIN32 AND NOT ADM_CPU_X86_64)
+
+      
+     
+    IF( ADM_CPU_X86_64 )
+        SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT} -m amd64 -DARCH_X86_64=1 -DARCH_X86_32=0")
+    ELSE( ADM_CPU_X86_64 )
+        SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT}  -DARCH_X86_64=0 -DARCH_X86_32=1")
+    ENDIF( ADM_CPU_X86_64 )
+    
+    SET(ASM_ARGS_FLAGS "${ASM_ARGS_FLAGS} -DHAVE_CPUNOP=0") # Not sure what this is for ?
+
+   IF(AVIDEMUX_THIS_IS_CORE)
+        SET(NASM_MACRO_FOLDER  ${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_core/include)
+   ELSE(AVIDEMUX_THIS_IS_CORE)
+        SET(NASM_MACRO_FOLDER  ${ADM_HEADER_DIR}/ADM_core/)
+   ENDIF(AVIDEMUX_THIS_IS_CORE)
+
+
+    
+
+    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+        SET(ASM_ARGS_FLAGS "${ASM_ARGS_FLAGS} -gdwarf2")
+    endif (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    
+    SET(CMAKE_ASM_NASM_FLAGS "${ASM_ARGS_FORMAT} ${ASM_ARGS_FLAGS} -I${NASM_MACRO_FOLDER}" CACHE INTERNAL "" )
+
+    
+    INCLUDE(CMakeASMInformation)
+    SET( CMAKE_ASM_NASM_COMPILE_OBJECT  "<CMAKE_ASM_NASM_COMPILER> ${CMAKE_ASM_NASM_FLAGS} -o <OBJECT> <SOURCE>" CACHE INTERNAL "")
+
+#
+#
+#get_cmake_property(_variableNames VARIABLES)
+#foreach (_variableName ${_variableNames})
+    #message(STATUS "${_variableName}=${${_variableName}}")
+#endforeach()
+
+ELSE(ADM_CPU_X86 )
+    MESSAGE(STATUS "Not X86, no need for yasm")
+ENDIF(ADM_CPU_X86 ) # Temp hack

avidemux_2.7.0.tar.gz/cmake/admYasm_vs.cmake Added

@@ -0,0 +1,55 @@
+#
+   MESSAGE(STATUS "Checking for YASM")
+   MESSAGE(STATUS "*****************")
+   FIND_PROGRAM(YASM_YASM yasm)
+   IF(YASM_YASM STREQUAL "<YASM_YASM>-NOTFOUND")
+       MESSAGE(FATAL_ERROR "Yasm Not found. Stopping here.")
+   ENDIF(YASM_YASM STREQUAL "<YASM_YASM>-NOTFOUND")
+   MESSAGE(STATUS "Found as ${YASM_YASM}")
+
+   SET(ASM_DIALECT "_NASM")
+
+   SET(CMAKE_ASM_SOURCE_FILE_EXTENSIONS nasm;nas;asm)
+   ENABLE_LANGUAGE(ASM_NASM)
+   SET(CMAKE_ASM_NASM_COMPILER ${YASM_YASM})
+   SET(ASM_ARGS "")
+   SET(ASM_ARGS_FLAGS  -DHAVE_ALIGNED_STACK=1  -DHAVE_CPUNOP=0)
+   SET(ASM_ARGS_FORMAT -f win64 -m amd64 -DARCH_X86_64=1 -DARCH_X86_32=0)
+
+   IF(AVIDEMUX_THIS_IS_CORE)
+        SET(NASM_MACRO_FOLDER  ${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_core/include)
+   ELSE(AVIDEMUX_THIS_IS_CORE)
+        SET(NASM_MACRO_FOLDER  ${ADM_HEADER_DIR}/ADM_core/)
+   ENDIF(AVIDEMUX_THIS_IS_CORE)
+
+
+    
+    SET(CMAKE_ASM_NASM_FLAGS ${ASM_ARGS_FORMAT} ${ASM_ARGS_FLAGS} -I${NASM_MACRO_FOLDER}  )
+    INCLUDE(CMakeASMInformation)
+    SET( CMAKE_ASM_NASM_COMPILE_OBJECT  "<CMAKE_ASM_NASM_COMPILER> ${CMAKE_ASM_NASM_FLAGS} -o <OBJECT> <SOURCE>" CACHE INTERNAL "")
+
+
+
+
+MACRO(YASMIFY out filez)
+           MESSAGE(STATUS "YASMIFY : ${filez}")
+           foreach(fl ${filez})
+             MESSAGE(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/${fl}.asm ==> ${CMAKE_CURRENT_BINARY_DIR}/${fl}.obj")
+             add_custom_command(
+                 OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${fl}.obj
+                 COMMAND ${CMAKE_COMMAND} -E echo   ${YASM_YASM} ARGS ${ASM_ARGS_FORMAT} ${ASM_ARGS_FLAGS} -I${NASM_MACRO_FOLDER}  -o ${CMAKE_CURRENT_BINARY_DIR}/${fl}.obj ${CMAKE_CURRENT_SOURCE_DIR}/${fl}.asm
+                 COMMAND ${YASM_YASM} ARGS ${ASM_ARGS_FORMAT} ${ASM_ARGS_FLAGS} -I${NASM_MACRO_FOLDER}  -o ${CMAKE_CURRENT_BINARY_DIR}/${fl}.obj ${CMAKE_CURRENT_SOURCE_DIR}/${fl}.asm
+                 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${fl}.asm)
+                 LIST( APPEND ${out} ${CMAKE_CURRENT_BINARY_DIR}/${fl}.obj)
+            endforeach(fl ${filez})
+        MESSAGE(STATUS "ASM files : ${${out}}")
+ENDMACRO(YASMIFY out filez)
+
+
+#
+#
+#get_cmake_property(_variableNames VARIABLES)
+#foreach (_variableName ${_variableNames})
+    #message(STATUS "${_variableName}=${${_variableName}}")
+#endforeach()
+

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

avidemux_2.6.20.tar.gz/cmake/commonCmakeApplication.cmake -> avidemux_2.7.0.tar.gz/cmake/commonCmakeApplication.cmake Changed

@@ -31,11 +31,11 @@
 include(admCoreIncludes)
 # Add ffmpeg to resolve ADM_libavcodec to the actual name, needed for vdpau
 include(admFFmpegUtil)
-registerFFmpeg("${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6" "${AVIDEMUX_SEARCH_LIB_DIR}" 1)
+registerFFmpeg("${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}" "${AVIDEMUX_SEARCH_LIB_DIR}" 1)
 # Verify ADM_coreConfig is there
-if(NOT EXISTS "${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6/ADM_coreConfig.h")
-        MESSAGE(FATAL_ERROR "CMAKE_INSTALL_PREFIX does not contain include/avidemux/2.6/ADM_coreConfig.h (${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6/ADM_coreConfig.h)")
-endif(NOT EXISTS "${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6/ADM_coreConfig.h")
+if(NOT EXISTS "${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/ADM_coreConfig.h")
+        MESSAGE(FATAL_ERROR "CMAKE_INSTALL_PREFIX does not contain include/avidemux/${AVIDEMUX_MAJOR_MINOR}/ADM_coreConfig.h (${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/ADM_coreConfig.h)")
+endif(NOT EXISTS "${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/ADM_coreConfig.h")
 
 LINK_DIRECTORIES("${AVIDEMUX_SEARCH_LIB_DIR}")
 #

avidemux_2.6.20.tar.gz/cmake/debianArch.cmake -> avidemux_2.7.0.tar.gz/cmake/debianArch.cmake Changed

avidemux_2.7.0.tar.gz/cmake/osx/Avidemux.in Changed

avidemux_2.6.20.tar.gz/cmake/osx/avidemux.icns -> avidemux_2.7.0.tar.gz/cmake/osx/avidemux.icns Changed

avidemux_2.6.20.tar.gz/cmake/osx_libs_copyLibsSierra.py -> avidemux_2.7.0.tar.gz/cmake/osx_libs_copyLibsSierra.py Changed

avidemux_2.6.20.tar.gz/cmake/osx_libs_qt5.py -> avidemux_2.7.0.tar.gz/cmake/osx_libs_qt5.py Changed

avidemux_2.6.20.tar.gz/cmake/osx_libs_remap.py -> avidemux_2.7.0.tar.gz/cmake/osx_libs_remap.py Changed

avidemux_2.6.20.tar.gz/cmake/ve_settings_plugin.cmake -> avidemux_2.7.0.tar.gz/cmake/ve_settings_plugin.cmake Changed

avidemux_2.6.20.tar.gz/cross-compiling.txt -> avidemux_2.7.0.tar.gz/cross-compiling.txt Changed

@@ -42,7 +42,7 @@
 3. Build required MXE packages for the targets specified above with
 
     cd /opt/mxe
-    make qtwinextras sdl2 ogg vorbis lame a52dec faad2 fdk-aac libmad opus fribidi libass xvidcore x264
+    make qttools qtwinextras sdl2 ogg vorbis lame a52dec faad2 fdk-aac libmad opus fribidi libass xvidcore x264
 
 This pulls in all the dependencies and can take a couple of hours. The final
 total size of the /opt/mxe folder may be about 2.2G. Please note that twolame
@@ -50,11 +50,11 @@
 of this writing.
 
 
-4. Download x265_2.1.tar.gz from
+4. Download x265_2.4.tar.gz from
 
     https://bitbucket.org/multicoreware/x265/downloads
 
-extract the content of the tarball, enter the 'x265_2.1/build' directory,
+extract the content of the tarball, enter the 'x265_2.4/build' directory,
 create a new subdirectory, e.g. 'mingw-w32', enter this subdirectory, create
 a 'build.cmake' file there with
 
@@ -74,7 +74,7 @@
 '/opt/mxe/usr/i686-w64-mingw32.shared' is not writable by the user).
 
 To build and install 64 bit x265, create e.g. 'mingw-w64' as a subdirectory of
-'x265_2.1/build', enter this subdirectory, create a 'build.cmake' file there
+'x265_2.4/build', enter this subdirectory, create a 'build.cmake' file there
 with
 
 SET(CMAKE_SYSTEM_NAME Windows)
@@ -96,11 +96,20 @@
 requirement is not met on Debian 8.
 
 
-5. Create a user-writable directory 'out' in '/opt/mxe/usr/x86_64-w64-mingw32.shared'
+5. To enable hardware-accelerated encoding provided by NVIDIA graphics cards of
+the Kepler generation and later, download the file "nvEncodeAPI.h" e.g. from
+
+    https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/compat/nvenc/nvEncodeAPI.h
+
+and copy it to /opt/mxe/usr/i686-w64-mingw32.shared/include/ or
+/opt/mxe/usr/x86_64-w64-mingw32.shared/include/ correspondingly.
+
+
+6. Create a user-writable directory 'out' in '/opt/mxe/usr/x86_64-w64-mingw32.shared'
 and in '/opt/mxe/usr/i686-w64-mingw32.shared' respectively.
 
 
-6. Enter the Avidemux top source directory and run
+7. Enter the Avidemux top source directory and run
 
     bash bootStrapCrossMingwQt5_mxe.sh
 
@@ -118,12 +127,8 @@
 partition, extract it on Windows and run 'avidemux.exe' from there.
 
 
-7. Issues:
-
-The build of the subtitle plugin and subsequently of the entire Avidemux
-package fails as of this writing unless the '--with-system-libass' option is
-added.
+8. Issues:
 
 As of this writing, twolame, aften, vapoursynth and avsproxy are not available.
 
-2016-12-13 UTC 09:02
+2017-06-13 UTC 23:00

avidemux_2.6.20.tar.gz/myOwnPlugins/demuxer/CMakeLists.txt -> avidemux_2.7.0.tar.gz/myOwnPlugins/demuxer/CMakeLists.txt Changed

avidemux_2.6.20.tar.gz/myOwnPlugins/muxer/CMakeLists.txt -> avidemux_2.7.0.tar.gz/myOwnPlugins/muxer/CMakeLists.txt Changed

avidemux_2.6.20.tar.gz/myOwnPlugins/videoFilter/logo/CMakeLists.txt -> avidemux_2.7.0.tar.gz/myOwnPlugins/videoFilter/logo/CMakeLists.txt Changed

avidemux_2.6.20.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/CMakeLists.txt -> avidemux_2.7.0.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/CMakeLists.txt Changed

Build Results
RPM Lint

Refresh

Comments for request 3929 0

Request History

enzokiel created request over 7 years ago

Update to version 2.7.0

enzokiel accepted request over 7 years ago