Request 2853 (accepted)

Overview

Request 2853 (accepted)

Update to version 2.6.13

Created by enzokiel almost 10 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,31 @@
 -------------------------------------------------------------------
+Sat Aug 20 11:14:21 UTC 2016 - joerg.lorenzen@ki.tng.de
+
+- Update to version 2.6.13
+  + OsX Toolchain updated
+  + Win64 Toolchain updated
+  + Linux AppImage (universal linux64 binaries)
+  + Core Update to libav* 3.0.2
+  + Edit Improved copy mode for h264/h265 video
+  + Audio AAC/ADTS import/export
+  + Filter new video filter : ivtcDupeRemover to remove duplicate
+    after 3:2 pulldown
+  + Qt Revamped refresh screen
+  + Filters ASS/SSA fixes
+  + Filters Improved logo filter with alpha channel
+  + Win32 Development files included in installer
+  + Filter ShaderLoader, load your openGL shaders as filters
+  + Linux Compatibility with newer gcc
+  + Filter Partial filter available only for one in/one out video
+    filters
+  + UI Add go fwd/go backward 60 sec buttons
+  + i18n Translations updated
+- Removed avidemux-find-lrelease-qt5.patch, fixed upstream
+- Fixed all patches
+- Disabled ix86 for SLES 11 because build currently fails
+  (perhaps compiler too old?)
+
+-------------------------------------------------------------------
 Tue Mar 08 16:09:34 UTC 2016 - joerg.lorenzen@ki.tng.de
 
 - Update to version 2.6.12

avidemux3.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package avidemux3
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,33 +23,22 @@
 %define         qtversion 4
 %endif
 
-%define         ffmpeg_version 2.8.6
-
 Name:           avidemux3
 Summary:        Graphical video editing and transcoding tool
-Version:        2.6.12
+Version:        2.6.13
 Release:        1
 Url:            http://avidemux.sourceforge.net/
 Source0:        avidemux_%{version}.tar.gz
 Source1:        avidemux3-qt.desktop
-Source2:        ffmpeg-%{ffmpeg_version}.tar.bz2
-Source3:        config.mak.diff
-Source4:        libavcodec_put_bits.h.patch
-Source5:        xvba_support_from_xbmc_xvba.patch
-Source6:        libavcodec_x86_fmtconvert_init.c.patch
-Source7:        libavcodec_mpegvideo_enc.c.patch
-Source8:        libavcodec_mpeg12enc.c.patch
-Source9:        libavcodec_avcodec.h.patch
-Source10:       libavcodec_nvenc.patch
+Source2:        config.mak.diff
 Patch0:         avidemux-cmake-2.8.8.patch
 Patch1:         avidemux-linking.patch
 Patch2:         avidemux-x264_plugins.patch
 Patch3:         avidemux-x265_plugins.patch
 Patch4:         avidemux-package_version.patch
 Patch5:         avidemux-bootStrap.patch
-Patch6:         avidemux-cpu_armel.patch
-Patch7:         avidemux-cmake-permissions.patch
-Patch8:         avidemux-find-lrelease-qt5.patch
+Patch6:         avidemux-cmake-permissions.patch
+Patch7:         avidemux-cpu_armel.patch
 License:        GPL-2.0
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 
@@ -147,10 +136,15 @@
 %endif
 %endif
 
-# Main package requires at least one frontend (cli, gtk or qt4)
+# Main package requires at least one frontend (cli or qt4)
 Requires:       avidemux3-frontend = %{version}-%{release}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+# ix86 build for SLES 11 currently fails
+%if 0%{?sles_version}
+ExclusiveArch:  x86_64
+%endif
+
 %description
 Avidemux is a free video editor designed for simple cutting, filtering and
 encoding tasks. It supports many file types, including AVI, DVD compatible
@@ -187,7 +181,6 @@
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Provides:       avidemux3-frontend = %{version}-%{release}
 Requires:       avidemux3 = %{version}-%{release}
-Requires:       avidemux3-help = %{version}-%{release}
 Recommends:     avidemux3-qt%{qtversion}-lang = %{version}-%{release}
 
 %description qt%{qtversion}
@@ -222,24 +215,6 @@
 
 This package provides translations for package avidemux3-qt%{qtversion}.
 
-%package help
-Summary:        Help files for avidemux
-Group:          Productivity/Multimedia/Video/Editors and Convertors
-BuildArch:      noarch
-
-%description help
-Avidemux is a free video editor designed for simple cutting, filtering and
-encoding tasks. It supports many file types, including AVI, DVD compatible
-MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated
-using projects, job queue and powerful scripting capabilities.
-
-Avidemux is available for Linux, BSD, Mac OS X and Microsoft Windows under
-the GNU GPL license. The program was written from scratch by Mean, but code
-from other people and projects has been used as well. Patches, translations
-and even bug reports are always welcome.
-
-This package contains the help files for avidemux.
-
 %endif
 
 %prep
@@ -250,36 +225,9 @@
 echo 'from Config import *' >> %{_sourcedir}/avidemux3-rpmlintrc
 echo 'addFilter("libdir-macro-in-noarch-package")' >> %{_sourcedir}/avidemux3-rpmlintrc
 %endif
-find ./ -name '*.bash' -exec dos2unix -q {} \;
-find ./ -name '*.cmake' -exec dos2unix -q {} \;
-find ./ -name '*.cpp' -exec dos2unix -q {} \;
-find ./ -name '*.sh' -exec dos2unix -q {} \;
-find ./ -name '*.sql' -exec dos2unix -q {} \;
-find ./ -name '*.txt' -exec dos2unix -q {} \;
-find . -type f -exec sed -i -e 's|intfloat_readwrite.h|intfloat.h|g' {} \;
-sed -i -e 's|set(FFMPEG_VERSION "2.7.6")|set(FFMPEG_VERSION "%{ffmpeg_version}")|g' cmake/admFFmpegBuild.cmake
-rm -f avidemux_core/ffmpeg_package/ffmpeg-2.7.6.tar.bz2
-cp %{S:2} avidemux_core/ffmpeg_package/
-pushd avidemux_core/ffmpeg_package/patches
-rm -f config.mak.diff
-rm -f libavcodec_put_bits.h.patch
-rm -f libavcodec_x86_fmtconvert_init.c.patch
-rm -f libavcodec_mpegvideo_enc.c.patch
-rm -f libavcodec_mpeg12enc.c.patch
-rm -f libavcodec_avcodec.h.patch
-rm -f libavcodec_nvenc.patch
-cp %{S:3} .
-cp %{S:4} .
-cp %{S:6} .
-cp %{S:7} .
-cp %{S:8} .
-cp %{S:9} .
-cp %{S:10} .
-pushd xvba
-rm -f xvba_support_from_xbmc_xvba.patch
-cp %{S:5} .
-popd
-popd
+for i in bash cmake cpp sh sql txt; do
+  find . -name \*.$i -print0 | xargs -0 dos2unix -q
+done
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
@@ -287,10 +235,8 @@
 %patch4 -p0
 %patch5 -p0
 %patch6 -p0
-%patch7 -p1
-%if %{with build_qt5}
-%patch8 -p0
-%endif
+%patch7 -p0
+cp -f %{S:2} avidemux_core/ffmpeg_package/patches/
 chmod 755 bootStrap.bash
 chmod 644 AUTHORS COPYING README
 
@@ -301,15 +247,14 @@
 export CXXFLAGS="%optflags -D__STDC_CONSTANT_MACROS -fno-strict-aliasing"
 %endif
 
-
 options+="--with-cli "
 %if 0%{?sles_version}
 options+="--without-qt4 "
 %else
 %if %{with build_qt5}
-options+="--with-qt4 --enable-qt5 "
-%else
 options+="--with-qt4 "
+%else
+options+="--with-qt4 --enable-qt4 "
 %endif
 %endif
 ./bootStrap.bash $options
@@ -343,9 +288,13 @@
 %postun cli -p /sbin/ldconfig
 
 %if ! 0%{?sles_version}
-%post qt%{qtversion} -p /sbin/ldconfig
+%post qt%{qtversion}
+/sbin/ldconfig
+%desktop_database_post
 
-%postun qt%{qtversion} -p /sbin/ldconfig
+%postun qt%{qtversion}
+/sbin/ldconfig
+%desktop_database_postun
 %endif
 
 %files
@@ -456,7 +405,6 @@
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/veryFast.json
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/fast.json
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/iPhone.json
-%{_libdir}/ADM_plugins6/scriptEngines/libADM_script_spiderMonkey.so
 %{_libdir}/ADM_plugins6/scriptEngines/libADM_script_tinyPy.so
 %{_libdir}/ADM_plugins6/videoDecoders/libADM_vd_vpx.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffDv.so
@@ -469,14 +417,11 @@
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_png.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_yv12.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_hf_hflip.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_addBorders.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_avsfilter.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_black.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_blackenBorders.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_changeFps.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_colorYuv.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_decimate.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_denoise3d.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_denoise3dhq.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_DgBob.so
@@ -485,11 +430,12 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_fadeToBlack.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_FluxSmooth.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_gauss.so
+%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_hflip.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_hzstackField.so
+%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ivtcDupeRemover.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_kernelDeint.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_largeMedian.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_lavDeint.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_logo.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_lumaOnly.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_mean.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_median.so
@@ -510,13 +456,6 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vflip.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_yadif.so
-%dir %{_datadir}/ADM6_addons
-%dir %{_datadir}/ADM6_addons/avsfilter
-%{_datadir}/ADM6_addons/avsfilter/avsload.exe
-%{_datadir}/ADM6_addons/avsfilter/pipe_source.dll
-%if ! 0%{?sles_version}
-%{_datadir}/pixmaps/avidemux3.png
-%endif
 %{_mandir}/man1/avidemux.1.gz
 %doc AUTHORS COPYING README
 
@@ -533,6 +472,7 @@
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_CropCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_eq2Cli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_HueCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_logoCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_mpdelogoCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so
 
@@ -544,10 +484,14 @@
 %{_libdir}/libADM_openGLQT%{qtversion}6.so
 %{_libdir}/libADM_render6_QT%{qtversion}.so
 %{_libdir}/libADM_UIQT%{qtversion}6.so
-%dir %{_libdir}/ADM_plugins6/scriptEngines/qt%{qtversion}
+%dir %{_libdir}/ADM_plugins6/shaderDemo
+%dir %{_libdir}/ADM_plugins6/shaderDemo/1
 %dir %{_libdir}/ADM_plugins6/videoEncoders/qt%{qtversion}
 %dir %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}
-%{_libdir}/ADM_plugins6/scriptEngines/qt%{qtversion}/libadm_script_QT%{qtversion}.so
+%{_libdir}/ADM_plugins6/shaderDemo/1/bump.shader
+%{_libdir}/ADM_plugins6/shaderDemo/1/lightning.shader
+%{_libdir}/ADM_plugins6/shaderDemo/1/ripple.shader
+%{_libdir}/ADM_plugins6/shaderDemo/1/zigzag.shader
 %{_libdir}/ADM_plugins6/videoEncoders/qt%{qtversion}/libADM_ve_x264_QT%{qtversion}.so
 %{_libdir}/ADM_plugins6/videoEncoders/qt%{qtversion}/libADM_ve_x265_QT%{qtversion}.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_asharpQT%{qtversion}.so
@@ -558,22 +502,22 @@
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_glBenchmark.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_glResize.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_HueQT%{qtversion}.so
+%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_logoQT%{qtversion}.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_mpdelogoQT%{qtversion}.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_rotateGlFrag2.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_sampleGlFrag2.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_sampleGlVertex.so
+%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_shaderLoaderGl.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_swscaleResizeQT%{qtversion}.so
 %{_datadir}/applications/avidemux3-qt%{qtversion}.desktop
+%{_datadir}/pixmaps/avidemux3.png
 
-%files -n avidemux3-qt%{qtversion}-lang
-%defattr(-,root,root)
-%dir %{_datadir}/avidemux3/qt%{qtversion}
-%{_datadir}/avidemux3/qt%{qtversion}/i18n/
-
-%files help
+%files qt%{qtversion}-lang
 %defattr(-,root,root)
 %dir %{_datadir}/avidemux3
-%{_datadir}/avidemux3/help/
+%dir %{_datadir}/avidemux3/qt%{qtversion}
+%dir %{_datadir}/avidemux3/qt%{qtversion}/i18n
+%{_datadir}/avidemux3/qt%{qtversion}/i18n/*.qm
 %endif
 
 %changelog

avidemux-bootStrap.patch Changed

avidemux-cmake-2.8.8.patch Changed

avidemux-cmake-permissions.patch Changed

avidemux-cpu_armel.patch Changed

avidemux-find-lrelease-qt5.patch Deleted

avidemux-linking.patch Changed

@@ -1,6 +1,6 @@
---- avidemux/cli/CMakeLists.txt.orig	2014-11-28 22:27:34.737989374 +0100
-+++ avidemux/cli/CMakeLists.txt	2014-11-28 22:27:19.740246591 +0100
-@@ -80,6 +80,16 @@
+--- avidemux/cli/CMakeLists.txt.orig	2016-08-18 21:32:46.369436856 +0200
++++ avidemux/cli/CMakeLists.txt	2016-08-18 21:32:46.325437648 +0200
+@@ -111,6 +111,16 @@
  )
  
  ###########################################
@@ -17,9 +17,9 @@
  # External libs
  ###########################################
  # gettext
---- avidemux/qt4/CMakeLists.txt.orig	2014-11-28 22:27:34.741989405 +0100
-+++ avidemux/qt4/CMakeLists.txt	2014-11-28 22:27:19.746246489 +0100
-@@ -118,6 +118,16 @@
+--- avidemux/qt4/CMakeLists.txt.orig	2016-08-18 21:32:46.309437935 +0200
++++ avidemux/qt4/CMakeLists.txt	2016-08-18 21:32:45.809446926 +0200
+@@ -161,6 +161,16 @@
  )
  
  ###########################################
@@ -36,8 +36,8 @@
  # External libs
  ###########################################
  # gettext
---- avidemux/qt4/ADM_jobs/src/CMakeLists.txt.orig	2015-02-10 07:29:57.000000000 +0100
-+++ avidemux/qt4/ADM_jobs/src/CMakeLists.txt	2015-02-11 13:46:33.536379900 +0100
+--- avidemux/qt4/ADM_jobs/src/CMakeLists.txt.orig	2016-08-18 21:32:45.845446279 +0200
++++ avidemux/qt4/ADM_jobs/src/CMakeLists.txt	2016-08-18 21:32:45.825446639 +0200
 @@ -67,6 +67,16 @@
  TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreJobs)
  TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreUtils6)

avidemux-package_version.patch Changed

@@ -1,6 +1,6 @@
 diff -uNr avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp.orig avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
---- avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp.orig	2015-03-07 18:10:59.000000000 +0100
-+++ avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2015-03-07 18:51:50.109120416 +0100
+--- avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp.orig	2016-08-18 21:28:20.890212309 +0200
++++ avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2016-08-18 21:28:38.589893823 +0200
 @@ -143,7 +143,7 @@
      QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath();
  #else
@@ -10,42 +10,59 @@
  #endif
  
      QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode));
-diff -uNr avidemux/qt4/ADM_userInterfaces/ui_support.cpp.orig avidemux/qt4/ADM_userInterfaces/ui_support.cpp
---- avidemux/qt4/ADM_userInterfaces/ui_support.cpp.orig	2015-03-07 18:10:59.000000000 +0100
-+++ avidemux/qt4/ADM_userInterfaces/ui_support.cpp	2015-03-07 18:51:50.163119306 +0100
-@@ -104,12 +104,12 @@
-                 
-                 
- #ifdef __APPLE__
--	QString appdir = QCoreApplication::applicationDirPath() + "/../share/avidemux6/"+QString(partialPath.c_str());
-+	QString appdir = QCoreApplication::applicationDirPath() + "/../share/avidemux3/"+QString(partialPath.c_str());
-                 
- #elif defined(_WIN32)
- 	QString appdir = QCoreApplication::applicationDirPath() + QString(partialPath.c_str());
- #else
--	QString appdir = ADM_getInstallRelativePath("share","avidemux6",partialPath.c_str());
-+	QString appdir = ADM_getInstallRelativePath("share","avidemux3",partialPath.c_str());
- #endif
-         QString languageFile=QString(lang);
-     int nbLoaded=0;
-diff -uNr avidemux_core/ADM_core/src/ADM_fileio.cpp.orig avidemux_core/ADM_core/src/ADM_fileio.cpp
---- avidemux_core/ADM_core/src/ADM_fileio.cpp.orig	2015-03-07 18:10:59.000000000 +0100
-+++ avidemux_core/ADM_core/src/ADM_fileio.cpp	2015-03-07 18:51:50.858105023 +0100
-@@ -463,9 +463,9 @@
- 		else
- 			ADM_DIR_NAME = "avidemux";
- #elif defined __HAIKU__
--		const char *ADM_DIR_NAME = "config/settings/avidemux6";
-+		const char *ADM_DIR_NAME = "config/settings/avidemux3";
- #else
--		const char *ADM_DIR_NAME = ".avidemux6";
-+		const char *ADM_DIR_NAME = ".avidemux3";
- #endif
+diff -uNr avidemux_core/ADM_core/src/ADM_folder_linux.cpp.orig avidemux_core/ADM_core/src/ADM_folder_linux.cpp
+--- avidemux_core/ADM_core/src/ADM_folder_linux.cpp.orig	2016-08-18 21:28:19.062245202 +0200
++++ avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2016-08-18 21:28:36.461932112 +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/");
+         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/");
+-        char *ppath=ADM_getInstallRelativePath("share","avidemux6",partialPath.c_str());
++        char *ppath=ADM_getInstallRelativePath("share","avidemux3",partialPath.c_str());
+         ADM_i18nDir=std::string(ppath);
+         delete  ppath;
+         ppath=NULL;
+@@ -143,7 +143,7 @@
+     strcpy(ADM_basedir, homeEnv);
+     AddSeparator(ADM_basedir);
+ 
+-    const char *ADM_DIR_NAME = ".avidemux6";
++    const char *ADM_DIR_NAME = ".avidemux3";
+ 
+     strcat(ADM_basedir, ADM_DIR_NAME);
+     strcat(ADM_basedir, ADM_SEPARATOR);
+diff -uNr avidemux_core/ADM_core/src/ADM_folder_mac.cpp.orig avidemux_core/ADM_core/src/ADM_folder_mac.cpp
+--- avidemux_core/ADM_core/src/ADM_folder_mac.cpp.orig	2016-08-18 21:28:19.066245131 +0200
++++ avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2016-08-18 21:28:36.465932040 +0200
+@@ -124,7 +124,7 @@
+     strcpy(ADM_basedir, homeEnv);
+     AddSeparator(ADM_basedir);
+ 
+-    const char *ADM_DIR_NAME = ".avidemux6";
++    const char *ADM_DIR_NAME = ".avidemux3";
  
- 		strcat(ADM_basedir, ADM_DIR_NAME);
+     strcat(ADM_basedir, ADM_DIR_NAME);
+     strcat(ADM_basedir, ADM_SEPARATOR);
+@@ -145,7 +145,7 @@
+ {    
+     
+     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());
+     std::string r=std::string(ppath);
+     delete  ppath;
+     ppath=NULL;
 diff -uNr avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp.orig avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
---- avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp.orig	2015-03-07 18:10:59.000000000 +0100
-+++ avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2015-03-07 18:51:54.903021895 +0100
+--- avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp.orig	2016-08-18 21:28:16.106298394 +0200
++++ avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2016-08-18 21:28:32.997994441 +0200
 @@ -260,7 +260,7 @@
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1,
  			(string("Executing ") + string(name) + string("...")).c_str());
@@ -56,8 +73,8 @@
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1, "Done");
  
 diff -uNr cmake/se_plugin.cmake.orig cmake/se_plugin.cmake
---- cmake/se_plugin.cmake.orig	2015-03-07 18:10:59.000000000 +0100
-+++ cmake/se_plugin.cmake	2015-03-07 18:51:56.589987225 +0100
+--- cmake/se_plugin.cmake.orig	2016-08-18 21:28:21.774196403 +0200
++++ cmake/se_plugin.cmake	2016-08-18 21:28:39.449878348 +0200
 @@ -15,7 +15,7 @@
  if (WIN32)
      set(helpDir "${CMAKE_INSTALL_PREFIX}/help/${_engineName}")
@@ -68,17 +85,17 @@
  
      install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}" COMPONENT plugins)
 diff -uNr cmake/sql/update.sh.orig cmake/sql/update.sh
---- cmake/sql/update.sh.orig	2015-03-07 18:10:59.000000000 +0100
-+++ cmake/sql/update.sh	2015-03-07 18:51:56.393991253 +0100
+--- cmake/sql/update.sh.orig	2016-08-18 21:28:21.710197555 +0200
++++ cmake/sql/update.sh	2016-08-18 21:28:39.393879356 +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 cmake/Ts.cmake.orig cmake/Ts.cmake
---- cmake/Ts.cmake.orig	2015-03-07 18:10:59.000000000 +0100
-+++ cmake/Ts.cmake	2015-03-07 18:51:56.421990678 +0100
-@@ -41,7 +41,7 @@
+--- cmake/Ts.cmake.orig	2016-08-18 21:28:21.558200289 +0200
++++ cmake/Ts.cmake	2016-08-18 21:28:39.249881947 +0200
+@@ -28,7 +28,7 @@
          IF(WIN32)
                  SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")
          ELSE(WIN32)

avidemux-x264_plugins.patch Changed

@@ -1,27 +1,25 @@
---- avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt.orig	2015-02-23 18:53:40.000000000 +0100
-+++ avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt	2015-02-26 14:06:02.512830400 +0100
+--- avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt.orig	2016-08-18 21:32:39.405562081 +0200
++++ avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt	2016-08-18 21:32:38.945570353 +0200
 @@ -27,15 +27,16 @@
      INSTALL_VIDEO_ENCODER_QT4(ADM_ve_x264_${QT_LIBRARY_EXTENSION})
    endif(DO_QT4)
    #-----------------------/QT4 VERSION---------------------
 -  #-----------------------GTK or CLI VERSION---------------------
--  if((DO_GTK) OR (DO_CLI))
++  #-----------------------CLI VERSION----------------------
+   if(DO_COMMON)
 -    ADD_VIDEO_ENCODER(ADM_ve_x264_other   ADM_x264_noui.cpp ${x264_SRCS})
 -    ADD_TARGET_CFLAGS(ADM_ve_x264_other "-DADM_UI_TYPE_BUILD=1") # CLI!
 -    TARGET_LINK_LIBRARIES(ADM_ve_x264_other "${X264_LIBRARY_DIR}")
 -    TARGET_LINK_LIBRARIES(ADM_ve_x264_other ADM_core6)
 -    INIT_VIDEO_ENCODER(ADM_ve_x264_other)
 -    INSTALL_VIDEO_ENCODER(ADM_ve_x264_other)
--  endif((DO_GTK) OR (DO_CLI))
-+  #-----------------------CLI VERSION----------------------
-+  if(DO_CLI)
 +    ADD_VIDEO_ENCODER(ADM_ve_x264_cli   ADM_x264_noui.cpp ${x264_SRCS})
 +    ADD_TARGET_CFLAGS(ADM_ve_x264_cli "-DADM_UI_TYPE_BUILD=1") # CLI!
 +    TARGET_LINK_LIBRARIES(ADM_ve_x264_cli "${X264_LIBRARY_DIR}")
 +    TARGET_LINK_LIBRARIES(ADM_ve_x264_cli ADM_core6)
 +    INIT_VIDEO_ENCODER(ADM_ve_x264_cli)
 +    INSTALL_VIDEO_ENCODER(ADM_ve_x264_cli)
-+  endif(DO_CLI)
+   endif(DO_COMMON)
 +  #-----------------------/CLI VERSION---------------------
    # ------------- PRESET -----------
    if(DO_SETTINGS)

avidemux-x265_plugins.patch Changed

@@ -1,27 +1,25 @@
---- avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt.orig	2015-02-23 18:53:40.000000000 +0100
-+++ avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt	2015-02-26 14:06:03.794031200 +0100
+--- avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt.orig	2016-08-18 21:32:39.473560859 +0200
++++ avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt	2016-08-18 21:32:39.449561290 +0200
 @@ -27,15 +27,16 @@
      INSTALL_VIDEO_ENCODER_QT4(ADM_ve_x265_${QT_LIBRARY_EXTENSION})
    endif(DO_QT4)
    #-----------------------/QT4 VERSION---------------------
 -  #-----------------------GTK or CLI VERSION---------------------
--  if((DO_GTK) OR (DO_CLI))
++  #-----------------------CLI VERSION----------------------
+   if(DO_COMMON)
 -    ADD_VIDEO_ENCODER(ADM_ve_x265_other   ADM_x265_noui.cpp ${x265_SRCS})
 -    ADD_TARGET_CFLAGS(ADM_ve_x265_other "-DADM_UI_TYPE_BUILD=1") # CLI!
 -    TARGET_LINK_LIBRARIES(ADM_ve_x265_other "${X265_LIBRARY_DIR}")
 -    TARGET_LINK_LIBRARIES(ADM_ve_x265_other ADM_core6)
 -    INIT_VIDEO_ENCODER(ADM_ve_x265_other)
 -    INSTALL_VIDEO_ENCODER(ADM_ve_x265_other)
--  endif((DO_GTK) OR (DO_CLI))
-+  #-----------------------CLI VERSION----------------------
-+  if(DO_CLI)
 +    ADD_VIDEO_ENCODER(ADM_ve_x265_cli   ADM_x265_noui.cpp ${x265_SRCS})
 +    ADD_TARGET_CFLAGS(ADM_ve_x265_cli "-DADM_UI_TYPE_BUILD=1") # CLI!
 +    TARGET_LINK_LIBRARIES(ADM_ve_x265_cli "${X265_LIBRARY_DIR}")
 +    TARGET_LINK_LIBRARIES(ADM_ve_x265_cli ADM_core6)
 +    INIT_VIDEO_ENCODER(ADM_ve_x265_cli)
 +    INSTALL_VIDEO_ENCODER(ADM_ve_x265_cli)
-+  endif(DO_CLI)
+   endif(DO_COMMON)
 +  #-----------------------/CLI VERSION---------------------
    # ------------- PRESET -----------
    if(DO_SETTINGS)

config.mak.diff Changed

libavcodec_avcodec.h.patch Deleted

@@ -1,29 +0,0 @@
---- libavcodec/avcodec.h.orig	2015-09-10 16:03:09.110337744 +0200
-+++ libavcodec/avcodec.h	2015-09-10 16:03:09.132337918 +0200
-@@ -1008,6 +1008,10 @@
- #define CODEC_FLAG2_DROP_FRAME_TIMECODE AV_CODEC_FLAG2_DROP_FRAME_TIMECODE
- #define CODEC_FLAG2_IGNORE_CROP   AV_CODEC_FLAG2_IGNORE_CROP
- 
-+//MEANX: NEVER EVER USE CLOSED GOP ?
-+#define CODEC_FLAG2_32_PULLDOWN   0x80000000
-+// /MEANX
-+
- #define CODEC_FLAG2_CHUNKS        AV_CODEC_FLAG2_CHUNKS
- #define CODEC_FLAG2_SHOW_ALL      AV_CODEC_FLAG2_SHOW_ALL
- #define CODEC_FLAG2_EXPORT_MVS    AV_CODEC_FLAG2_EXPORT_MVS
-@@ -2579,6 +2583,7 @@
-      * - decoding: unused
-      */
-     int rc_buffer_size;
-+    int rc_buffer_size_header;  /*< That one is set in the header MEANX*/
- 
-     /**
-      * ratecontrol override, see RcOverride
-@@ -2602,6 +2607,7 @@
-      * - decoding: Set by user, may be overwritten by libavcodec.
-      */
-     int rc_max_rate;
-+    int rc_max_rate_header; /*< That one is set in the header MEANX */
- 
-     /**
-      * minimum bitrate

libavcodec_mpeg12enc.c.patch Deleted

@@ -1,157 +0,0 @@
---- libavcodec/mpeg12enc.c.orig	2015-09-10 16:03:12.576365227 +0200
-+++ libavcodec/mpeg12enc.c	2015-09-10 16:03:12.615365537 +0200
-@@ -256,6 +256,7 @@
-         put_sbits(&s->pb, 12, s->width  & 0xFFF);
-         put_sbits(&s->pb, 12, s->height & 0xFFF);
- 
-+#if 0 // MEANX
-         for (i = 1; i < 15; i++) {
-             int64_t error = aspect_ratio.num * (1LL<<32) / aspect_ratio.den;
-             if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO || i <= 1)
-@@ -271,11 +272,40 @@
-             }
-         }
- 
--        put_bits(&s->pb, 4, s->aspect_ratio_info);
--        put_bits(&s->pb, 4, s->frame_rate_index);
--
--        if (s->avctx->rc_max_rate) {
--            v = (s->avctx->rc_max_rate + 399) / 400;
-+#endif // MEANX
-+            // MEANX put_bits(&s->pb, 4, s->aspect_ratio_info);
-+            // MEANX put_bits(&s->pb, 4, s->frame_rate_index);
-+ // MEANX 4:3
-+   if(s->avctx->sample_aspect_ratio.num==16 && s->avctx->sample_aspect_ratio.den==9)
-+             {
-+                 //printf("FFmpeg : Wide\n");
-+                 put_bits(&s->pb,4,3); //16:9
-+             }
-+             else        //4:3
-+             {
-+               if(s->codec_id == CODEC_ID_MPEG2VIDEO)
-+                 put_bits(&s->pb, 4, 2);
-+               else
-+                 put_bits(&s->pb, 4, 12); // MPEG1
-+             }
-+ // /MEANX
-+// MEANX : Pulldown
-+            if((s->avctx->flags2 & CODEC_FLAG2_32_PULLDOWN) && (s->codec_id == CODEC_ID_MPEG2VIDEO))
-+             {           
-+                 put_bits(&s->pb, 4,4);
-+             }
-+             else
-+             {                                  
-+                 put_bits(&s->pb, 4, s->frame_rate_index);
-+             } //MEANX pulldown
-+
-+            // MEANX if(s->avctx->rc_max_rate){
-+                // MEANX v = (s->avctx->rc_max_rate + 399) / 400;
-+           // MEANX  if(s->avctx->rc_max_rate_header){ //MEANX we use header
-+           // MEANX      v = (s->avctx->rc_max_rate_header + 399) / 400;
-+            if(s->avctx->rc_buffer_size_header) // MEANX we use header
-+            {
-+                vbv_buffer_size = s->avctx->rc_buffer_size_header;
-             if (v > 0x3ffff && s->codec_id == AV_CODEC_ID_MPEG1VIDEO)
-                 v = 0x3ffff;
-         } else {
-@@ -325,7 +355,19 @@
-             put_bits(&s->pb, 3, s->avctx->profile); // profile
-             put_bits(&s->pb, 4, s->avctx->level);   // level
- 
--            put_bits(&s->pb, 1, s->progressive_sequence);
-+   // MEANX pulldown put_bits(&s->pb, 1, s->progressive_sequence);
-+  // MEANX Pulldown
-+ if(s->avctx->flags2 & CODEC_FLAG2_32_PULLDOWN) //MEANX
-+                        put_bits(&s->pb, 1, 0);
-+                else
-+                        put_bits(&s->pb, 1, s->progressive_sequence);
-+
-+
-+// /MEANX
-+
-+
-+
-+// MEANX                 put_bits(&s->pb, 1, s->progressive_sequence);
-             put_bits(&s->pb, 2, s->chroma_format);
-             put_bits(&s->pb, 2, s->width  >> 12);
-             put_bits(&s->pb, 2, s->height >> 12);
-@@ -427,6 +469,7 @@
- 
- void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
- {
-+    int tff, rff; //MEANX
-     AVFrameSideData *side_data;
-     mpeg1_encode_sequence_header(s);
- 
-@@ -465,6 +508,46 @@
- 
-     s->frame_pred_frame_dct = 1;
-     if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
-+// MEANX
-+        if(s->avctx->flags2 & CODEC_FLAG2_32_PULLDOWN)
-+        {
-+        
-+                switch((s->picture_number - 
-+                          s->gop_picture_number)&3)
-+                {
-+                        case 0:
-+                        default:
-+                                rff=1;
-+                                tff=1;
-+                                break;
-+                        case 1:
-+                                rff=0;
-+                                tff=0;
-+                                break;
-+                        case 2:
-+                                rff=1;
-+                                tff=0;
-+                                break;
-+                        case 3:
-+                                rff=0;
-+                                tff=1;
-+                                break;
-+                }               
-+           }
-+        else
-+        {
-+                if (s->progressive_sequence) 
-+                {
-+                        tff=0; /* no repeat */
-+                } else 
-+                {
-+                        tff=s->current_picture_ptr->f->top_field_first;
-+                }
-+                rff=s->repeat_first_field;
-+        
-+        }
-+
-+// /MEANX
-         put_header(s, EXT_START_CODE);
-         put_bits(&s->pb, 4, 8);                 /* pic ext */
-         if (s->pict_type == AV_PICTURE_TYPE_P ||
-@@ -484,10 +567,14 @@
- 
-         av_assert0(s->picture_structure == PICT_FRAME);
-         put_bits(&s->pb, 2, s->picture_structure);
-+#if 0 // MEANX
-         if (s->progressive_sequence)
-             put_bits(&s->pb, 1, 0);             /* no repeat */
-         else
-             put_bits(&s->pb, 1, s->current_picture_ptr->f->top_field_first);
-+#endif // MEANX
-+        put_bits(&s->pb, 1, tff);  //MEANX PULLDOWN
-+
-         /* XXX: optimize the generation of this flag with entropy measures */
-         s->frame_pred_frame_dct = s->progressive_sequence;
- 
-@@ -496,7 +583,8 @@
-         put_bits(&s->pb, 1, s->q_scale_type);
-         put_bits(&s->pb, 1, s->intra_vlc_format);
-         put_bits(&s->pb, 1, s->alternate_scan);
--        put_bits(&s->pb, 1, s->repeat_first_field);
-+        // MEANX put_bits(&s->pb, 1, s->top_field_first);
-+        put_bits(&s->pb, 1, rff); // MEANX
-         s->progressive_frame = s->progressive_sequence;
-         /* chroma_420_type */
-         put_bits(&s->pb, 1, s->chroma_format ==

libavcodec_mpegvideo_enc.c.patch Deleted

@@ -1,37 +0,0 @@
---- libavcodec/mpegvideo_enc.c.orig	2015-09-10 21:42:19.055613989 +0200
-+++ libavcodec/mpegvideo_enc.c	2015-09-10 21:42:19.096613316 +0200
-@@ -498,14 +498,14 @@
-                "Warning vbv_delay will be set to 0xFFFF (=VBR) as the "
-                "specified vbv buffer is too large for the given bitrate!\n");
-     }
--
-+#if 0 // MEANX
-     if ((s->avctx->flags & AV_CODEC_FLAG_4MV) && s->codec_id != AV_CODEC_ID_MPEG4 &&
-         s->codec_id != AV_CODEC_ID_H263 && s->codec_id != AV_CODEC_ID_H263P &&
-         s->codec_id != AV_CODEC_ID_FLV1) {
-         av_log(avctx, AV_LOG_ERROR, "4MV not supported by codec\n");
-         return -1;
-     }
--
-+#endif
-     if (s->obmc && s->avctx->mb_decision != FF_MB_DECISION_SIMPLE) {
-         av_log(avctx, AV_LOG_ERROR,
-                "OBMC is only supported with simple mb decision\n");
-@@ -597,7 +597,7 @@
-         av_log(avctx, AV_LOG_ERROR, "interlacing not supported by codec\n");
-         return -1;
-     }
--
-+#if 0 // MEANX
-     // FIXME mpeg2 uses that too
-     if (s->mpeg_quant && (   s->codec_id != AV_CODEC_ID_MPEG4
-                           && s->codec_id != AV_CODEC_ID_MPEG2VIDEO)) {
-@@ -605,7 +605,7 @@
-                "mpeg2 style quantization not supported by codec\n");
-         return -1;
-     }
--
-+#endif
-     if ((s->mpv_flags & FF_MPV_FLAG_CBP_RD) && !avctx->trellis) {
-         av_log(avctx, AV_LOG_ERROR, "CBP RD needs trellis quant\n");
-         return -1;

libavcodec_nvenc.patch Deleted

@@ -1,143 +0,0 @@
---- libavcodec/nvenc.c.orig	2015-09-10 16:03:16.151393593 +0200
-+++ libavcodec/nvenc.c	2015-09-10 16:03:16.198393966 +0200
-@@ -960,19 +960,19 @@
- 
-         switch (avctx->pix_fmt) {
-         case AV_PIX_FMT_YUV420P:
--            allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YV12_PL;
--            break;
-+            //allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YV12_PL;
-+            //break;
- 
-         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;
-+        //case AV_PIX_FMT_YUV444P:
-+            //allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YUV444_PL;
-+            //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;
-         }
-@@ -1198,6 +1198,28 @@
- 
-     return res;
- }
-+/**
-+        MEANX
-+*/
-+static void interleave_nv12(unsigned char *dest, int dest_stride,unsigned char *u,int u_stride,unsigned char *v,int v_stride,int width, int height)
-+{
-+        int x,y;
-+        unsigned char *d;
-+        unsigned char *pu;
-+        unsigned char *pv;
-+        for(y=0;y<height;y++)
-+        {
-+                d=dest;dest+=dest_stride;
-+                pu=u;u+=u_stride;
-+                pv=v;v+=v_stride;
-+                for(x=0;x<width;x++)
-+                {
-+                        *(d++)=*(pu++);
-+                        *(d++)=*(pv++);
-+                }
-+
-+        }
-+} 
- 
- static int nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
-     const AVFrame *frame, int *got_packet)
-@@ -1235,62 +1257,33 @@
-         if (nv_status != NV_ENC_SUCCESS) {
-             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->data0, frame->linesize0,
--                avctx->width, avctx->height);
--
--            buf += inSurf->height * lockBufferParams.pitch;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch >> 1,
--                frame->data2, frame->linesize2,
--                avctx->width >> 1, avctx->height >> 1);
--
--            buf += (inSurf->height * lockBufferParams.pitch) >> 2;
-+        }  
-+        { 
-+        uint8_t *buf = lockBufferParams.bufferDataPtr;
- 
--            av_image_copy_plane(buf, lockBufferParams.pitch >> 1,
--                frame->data1, frame->linesize1,
--                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,
-+        av_image_copy_plane(buf, lockBufferParams.pitch,
-                 frame->data0, frame->linesize0,
-                 avctx->width, avctx->height);
-+// MEANX : We accept YV12 and interleave while copying, it saves us one intermediate image buffer
-+        buf += inSurf->height * lockBufferParams.pitch;
-+        switch(avctx->pix_fmt)
-+        {
-+                case AV_PIX_FMT_YUV420P:
-+                        // Interleave U & V to NV12
-+                        interleave_nv12(buf, lockBufferParams.pitch,frame->data1,frame->linesize1,frame->data2,frame->linesize2,avctx->width>>1, avctx->height>>1); 
-+                        break;
-+
-+                case AV_PIX_FMT_NV12:
-+                        av_image_copy_plane(buf, lockBufferParams.pitch,
-+                                frame->data1, frame->linesize1,
-+                                avctx->width, avctx->height >> 1);
-+                        break;
-+                default:
-+                        av_log(avctx, AV_LOG_FATAL, "NVENC: Invalid pixel format!\n");
-+                        return AVERROR(EINVAL);
- 
--            buf += inSurf->height * lockBufferParams.pitch;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch,
--                frame->data1, frame->linesize1,
--                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->data0, frame->linesize0,
--                avctx->width, avctx->height);
--
--            buf += inSurf->height * lockBufferParams.pitch;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch,
--                frame->data1, frame->linesize1,
--                avctx->width, avctx->height);
--
--            buf += inSurf->height * lockBufferParams.pitch;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch,
--                frame->data2, frame->linesize2,
--                avctx->width, avctx->height);
--        } else {
--            av_log(avctx, AV_LOG_FATAL, "Invalid pixel format!\n");
--            return AVERROR(EINVAL);
--        }
--
--        nv_status = p_nvenc->nvEncUnlockInputBuffer(ctx->nvencoder, inSurf->input_surface);
-+       }
-+       nv_status = p_nvenc->nvEncUnlockInputBuffer(ctx->nvencoder, inSurf->input_surface);
-         if (nv_status != NV_ENC_SUCCESS) {
-             av_log(avctx, AV_LOG_FATAL, "Failed unlocking input buffer!\n");
-             return AVERROR_EXTERNAL;

libavcodec_put_bits.h.patch Deleted

libavcodec_x86_fmtconvert_init.c.patch Deleted

xvba_support_from_xbmc_xvba.patch Deleted

@@ -1,854 +0,0 @@
-diff --git a/configure b/configure
-index d557cac..ba1f392 100755
---- a/configure
-+++ b/configure
-@@ -144,6 +144,7 @@
-   --disable-vaapi          disable VAAPI code autodetect
-   --enable-vda             enable VDA code
-   --disable-vdpau          disable VDPAU code autodetect
-+  --disable-xvba           disable XVBA code
- 
- Individual component options:
-   --disable-everything     disable all components listed below
-@@ -1216,6 +1217,7 @@
-     vaapi
-     vda
-     vdpau
-+    xvba
- "
- 
- LIBRARY_LIST="
-@@ -1845,6 +1847,7 @@
- dxva2_deps="dxva2api_h"
- vaapi_deps="va_va_h"
- vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
-+xvba_deps="amd_amdxvba_h"
- vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"
- vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
- 
-@@ -1865,6 +1868,8 @@
- h264_vdpau_decoder_select="h264_decoder"
- h264_vdpau_hwaccel_deps="vdpau"
- h264_vdpau_hwaccel_select="h264_decoder"
-+h264_xvba_hwaccel_select="h264_decoder"
-+h264_xvba_hwaccel_deps="xvba"
- mpeg_vdpau_decoder_deps="vdpau"
- mpeg_vdpau_decoder_select="mpegvideo_decoder"
- mpeg1_vdpau_decoder_deps="vdpau"
-@@ -1877,6 +1882,8 @@
- mpeg2_vaapi_hwaccel_deps="vaapi"
- mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"
- mpeg2_vdpau_hwaccel_deps="vdpau"
-+mpeg2_xvba_hwaccel_select="mpeg2video_decoder"
-+mpeg2_xvba_hwaccel_deps="xvba"
- mpeg2_vdpau_hwaccel_select="mpeg2video_decoder"
- mpeg4_crystalhd_decoder_select="crystalhd"
- mpeg4_vaapi_hwaccel_deps="vaapi"
-@@ -1895,11 +1902,14 @@
- vc1_vdpau_decoder_select="vc1_decoder"
- vc1_vdpau_hwaccel_deps="vdpau"
- vc1_vdpau_hwaccel_select="vc1_decoder"
-+vc1_xvba_hwaccel_select="vc1_decoder"
-+vc1_xvba_hwaccel_deps="xvba"
- wmv3_crystalhd_decoder_select="crystalhd"
- wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel"
- wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
- wmv3_vdpau_decoder_select="vc1_vdpau_decoder"
- wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
-+wmv3_xvba_hwaccel_select="vc1_xvba_hwaccel"
- 
- # parsers
- h264_parser_select="golomb h264chroma h264dsp h264pred h264qpel videodsp"
-@@ -3853,6 +3863,7 @@
- check_header unistd.h
- check_header vdpau/vdpau.h
- check_header vdpau/vdpau_x11.h
-+check_header amd/amdxvba.h
- check_header VideoDecodeAcceleration/VDADecoder.h
- check_header windows.h
- check_header X11/extensions/XvMClib.h
-diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index dc065a5..c386923 100644
---- a/libavcodec/Makefile
-+++ b/libavcodec/Makefile
-@@ -12,6 +12,7 @@ HEADERS = avcodec.h                                                     \
-           vdpau.h                                                       \
-           version.h                                                     \
-           xvmc.h                                                        \
-+          xvba.h                                                        \
- 
- OBJS = allcodecs.o                                                      \
-        audioconvert.o                                                   \
-@@ -73,6 +74,7 @@ OBJS-$(CONFIG_SHARED)                  += log2_tab.o
- OBJS-$(CONFIG_SINEWIN)                 += sinewin.o
- OBJS-$(CONFIG_VAAPI)                   += vaapi.o
- OBJS-$(CONFIG_VDPAU)                   += vdpau.o
-+OBJS-$(CONFIG_XVBA)                    += xvba.o
- OBJS-$(CONFIG_VIDEODSP)                += videodsp.o
- OBJS-$(CONFIG_VP3DSP)                  += vp3dsp.o
- 
-@@ -232,6 +234,7 @@ OBJS-$(CONFIG_H264_VAAPI_HWACCEL)      += vaapi_h264.o
- OBJS-$(CONFIG_H264_VDA_HWACCEL)        += vda_h264.o
- OBJS-$(CONFIG_H264_VDA_DECODER)        += vda_h264_dec.o
- OBJS-$(CONFIG_H264_VDPAU_HWACCEL)      += vdpau_h264.o
-+OBJS-$(CONFIG_H264_XVBA_HWACCEL)       += xvba_h264.o
- OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.o huffyuvdec.o
- OBJS-$(CONFIG_HUFFYUV_ENCODER)         += huffyuv.o huffyuvenc.o
- OBJS-$(CONFIG_IAC_DECODER)             += imc.o
-@@ -295,6 +298,7 @@ OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o          \
- OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL)     += dxva2_mpeg2.o
- OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL)     += vaapi_mpeg2.o
- OBJS-$(CONFIG_MPEG2_VDPAU_HWACCEL)     += vdpau_mpeg12.o
-+OBJS-$(CONFIG_MPEG2_XVBA_HWACCEL)      += xvba_mpeg2.o
- OBJS-$(CONFIG_MPEG2VIDEO_DECODER)      += mpeg12.o mpeg12data.o
- OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o          \
-                                           timecode.o
-@@ -459,6 +463,7 @@ OBJS-$(CONFIG_VC1_DECODER)             += vc1dec.o vc1.o vc1data.o vc1dsp.o \
- OBJS-$(CONFIG_VC1_DXVA2_HWACCEL)       += dxva2_vc1.o
- OBJS-$(CONFIG_VC1_VAAPI_HWACCEL)       += vaapi_vc1.o
- OBJS-$(CONFIG_VC1_VDPAU_HWACCEL)       += vdpau_vc1.o
-+OBJS-$(CONFIG_VC1_XVBA_HWACCEL)        += xvba_vc1.o
- OBJS-$(CONFIG_VCR1_DECODER)            += vcr1.o
- OBJS-$(CONFIG_VMDAUDIO_DECODER)        += vmdav.o
- OBJS-$(CONFIG_VMDVIDEO_DECODER)        += vmdav.o
-@@ -788,6 +793,7 @@ SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
- SKIPHEADERS-$(CONFIG_LIBUTVIDEO)       += libutvideo.h
- SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
- SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_internal.h
-+SKIPHEADERS-$(CONFIG_XVBA)             += xvba_internal.h
- SKIPHEADERS-$(CONFIG_VDA)              += vda.h
- SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h
- SKIPHEADERS-$(HAVE_OS2THREADS)         += os2threads.h
-diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
-index 584446f..7a8f61c 100644
---- a/libavcodec/allcodecs.c
-+++ b/libavcodec/allcodecs.c
-@@ -79,18 +79,22 @@ void avcodec_register_all(void)
-     REGISTER_HWACCEL(H264_VAAPI,        h264_vaapi);
-     REGISTER_HWACCEL(H264_VDA,          h264_vda);
-     REGISTER_HWACCEL(H264_VDPAU,        h264_vdpau);
-+    REGISTER_HWACCEL(H264_XVBA,         h264_xvba);
-     REGISTER_HWACCEL(MPEG1_VDPAU,       mpeg1_vdpau);
-     REGISTER_HWACCEL(MPEG2_DXVA2,       mpeg2_dxva2);
-     REGISTER_HWACCEL(MPEG2_VAAPI,       mpeg2_vaapi);
-     REGISTER_HWACCEL(MPEG2_VDPAU,       mpeg2_vdpau);
-+    REGISTER_HWACCEL(MPEG2_XVBA,        mpeg2_xvba);
-     REGISTER_HWACCEL(MPEG4_VAAPI,       mpeg4_vaapi);
-     REGISTER_HWACCEL(MPEG4_VDPAU,       mpeg4_vdpau);
-     REGISTER_HWACCEL(VC1_DXVA2,         vc1_dxva2);
-     REGISTER_HWACCEL(VC1_VAAPI,         vc1_vaapi);
-     REGISTER_HWACCEL(VC1_VDPAU,         vc1_vdpau);
-+    REGISTER_HWACCEL(VC1_XVBA,          vc1_xvba);
-     REGISTER_HWACCEL(WMV3_DXVA2,        wmv3_dxva2);
-     REGISTER_HWACCEL(WMV3_VAAPI,        wmv3_vaapi);
-     REGISTER_HWACCEL(WMV3_VDPAU,        wmv3_vdpau);
-+    REGISTER_HWACCEL(WMV3_XVBA,         wmv3_xvba);
- 
-     /* video codecs */
-     REGISTER_ENCODER(A64MULTI,          a64multi);
-diff --git a/libavcodec/h264.c b/libavcodec/h264.c
-index 3a83b4b..96b6c30 100644
---- a/libavcodec/h264.c
-+++ b/libavcodec/h264.c
-@@ -81,6 +81,9 @@ static const enum AVPixelFormat h264_hwaccel_pixfmt_list_420 = {
- #if CONFIG_H264_VDPAU_HWACCEL
-     AV_PIX_FMT_VDPAU,
- #endif
-+#if CONFIG_H264_XVBA_HWACCEL
-+    AV_PIX_FMT_XVBA_VLD,
-+#endif
-     AV_PIX_FMT_YUV420P,
-     AV_PIX_FMT_NONE
- };
-diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
-index 2130c74..4d611f9 100644
---- a/libavcodec/vc1dec.c
-+++ b/libavcodec/vc1dec.c
-@@ -5807,6 +5807,9 @@ static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420 = {
- #if CONFIG_VDPAU
-     AV_PIX_FMT_VDPAU,
- #endif
-+#if CONFIG_XVBA
-+    AV_PIX_FMT_XVBA_VLD,
-+#endif
-     AV_PIX_FMT_YUV420P,
-     AV_PIX_FMT_NONE
- };
-diff --git a/libavcodec/xvba.c b/libavcodec/xvba.c
-new file mode 100644
-index 0000000..c6ff2fe
---- /dev/null
-+++ b/libavcodec/xvba.c
-@@ -0,0 +1,77 @@
-+/*
-+ * HW decode acceleration for MPEG-2, H.264 and VC-1
-+ *
-+ * Copyright (C) 2005-2011 Team XBMC
-+ *
-+ * 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
-+ */
-+
-+
-+/**
-+ * \addtogroup XVBA_Decoding
-+ *
-+ * @{
-+ */
-+
-+#include <stdint.h>
-+#include "xvba.h"
-+#include "xvba_internal.h"
-+#include "avcodec.h"
-+#include "mpegvideo.h"
-+
-+int ff_xvba_translate_profile(int profile) {
-+
-+  if (profile == 66)
-+    return 1;
-+  else if (profile == 77)
-+    return 2;
-+  else if (profile == 100)
-+    return 3;
-+  else if (profile == 0)
-+    return 4;
-+  else if (profile == 1)
-+    return 5;
-+  else if (profile == 3)
-+    return 6;
-+  else
-+    return -1;
-+}
-+
-+// See page 25 of the documentation
-+int ff_xvba_translate_picture_structure(int picture_structure) {
-+  if(picture_structure == PICT_BOTTOM_FIELD)
-+    return 0;
-+  else if (picture_structure == PICT_TOP_FIELD)
-+    return 1;
-+  else //PICT_FRAME by default
-+    return 3;
-+}
-+
-+void ff_xvba_add_slice_data(struct xvba_render_state *render, const uint8_t *buffer, uint32_t size) {
-+
-+  render->buffers = av_fast_realloc(
-+         render->buffers,
-+         &render->buffers_alllocated,
-+         sizeof(struct xvba_bitstream_buffers)*(render->num_slices + 1)
-+  );
-+
-+  render->buffersrender->num_slices.buffer = buffer;
-+  render->buffersrender->num_slices.size = size;
-+
-+  render->num_slices++;
-+}
-+
-diff --git a/libavcodec/xvba.h b/libavcodec/xvba.h
-new file mode 100644
-index 0000000..e590faf
---- /dev/null
-+++ b/libavcodec/xvba.h
-@@ -0,0 +1,72 @@
-+/*
-+ * HW decode acceleration for MPEG-2, H.264 and VC-1
-+ *
-+ * Copyright (C) 2005-2011 Team XBMC
-+ *
-+ * 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
-+ */
-+
-+#ifndef AVCODEC_XVBA_H
-+#define AVCODEC_XVBA_H
-+
-+#include <stdint.h>
-+#include <X11/Xlib.h>
-+#include <amd/amdxvba.h>
-+
-+
-+/**
-+ * \defgroup XVBA_Decoding VA API Decoding
-+ * \ingroup Decoder
-+ * @{
-+ */
-+
-+/** \brief The videoSurface is used for rendering. */
-+#define FF_XVBA_STATE_USED_FOR_RENDER 1
-+
-+/**
-+ * \brief The videoSurface is needed for reference/prediction.
-+ * The codec manipulates this.
-+ */
-+#define FF_XVBA_STATE_USED_FOR_REFERENCE 2
-+
-+/**
-+ * \brief The videoSurface holds a decoded frame.
-+ * The codec manipulates this.
-+ */
-+#define FF_XVBA_STATE_DECODED 4
-+
-+/* @} */
-+
-+struct xvba_bitstream_buffers
-+{
-+  const void *buffer;
-+  unsigned int size;
-+};
-+
-+struct xvba_render_state {
-+
-+  int state; ///< Holds FF_XVBA_STATE_* values.
-+  void *surface;
-+  XVBAPictureDescriptor *picture_descriptor;
-+  XVBAQuantMatrixAvc *iq_matrix;
-+  unsigned int num_slices;
-+  struct xvba_bitstream_buffers *buffers;
-+  uint32_t buffers_alllocated;
-+  int psf;
-+};
-+
-+#endif /* AVCODEC_XVBA_H */
-diff --git a/libavcodec/xvba_h264.c b/libavcodec/xvba_h264.c
-new file mode 100644
-index 0000000..20ba2f2
---- /dev/null
-+++ b/libavcodec/xvba_h264.c
-@@ -0,0 +1,194 @@
-+/*
-+ * H.264 HW decode acceleration through XVBA
-+ *
-+ * Copyright (C) 2005-2011 Team XBMC
-+ *
-+ * 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 "xvba.h"
-+#include "xvba_internal.h"
-+#include "h264.h"
-+#include <assert.h>
-+
-+/** @file
-+ *  This file implements the glue code between FFmpeg's and XvBA API's
-+ *  structures for H.264 decoding.
-+ */
-+
-+
-+/** Initialize and start decoding a frame with XVBA. */
-+static int start_frame(AVCodecContext          *avctx,
-+                       av_unused const uint8_t *buffer,
-+                       av_unused uint32_t       size)
-+{
-+  H264Context * const h = avctx->priv_data;
-+  struct xvba_render_state *render;
-+  XVBAPictureDescriptor *pic_descriptor;
-+  int i;
-+
-+  render = (struct xvba_render_state *)h->cur_pic_ptr->f.data0;
-+  assert(render);
-+
-+  if (render->picture_descriptor == 0)
-+    return -1;
-+
-+  pic_descriptor = render->picture_descriptor;
-+
-+  for (i = 0; i < 2; ++i) {
-+      int foc = h->cur_pic_ptr->field_poci;
-+      if (foc == INT_MAX)
-+          foc = 0;
-+      pic_descriptor->avc_curr_field_order_cnt_listi = foc;
-+  }
-+
-+  pic_descriptor->avc_frame_num = h->frame_num;
-+
-+  render->num_slices = 0;
-+
-+  return 0;
-+}
-+
-+/** End a hardware decoding based frame. */
-+static int end_frame(AVCodecContext *avctx)
-+{
-+  H264Context * const h = avctx->priv_data;
-+  struct xvba_render_state *render;
-+  XVBAPictureDescriptor *pic_descriptor;
-+  XVBAQuantMatrixAvc *iq_matrix;
-+
-+  render = (struct xvba_render_state *)h->cur_pic_ptr->f.data0;
-+  assert(render);
-+
-+  if (render->picture_descriptor == 0 || render->iq_matrix == 0)
-+    return -1;
-+
-+  pic_descriptor = render->picture_descriptor;
-+  iq_matrix = render->iq_matrix;
-+
-+  av_dlog(avctx, "end_frame()\n");
-+
-+  /* Fill in Picture Parameters*/
-+  pic_descriptor->profile                                     = ff_xvba_translate_profile(avctx->profile);
-+  pic_descriptor->level                                       = avctx->level;
-+  pic_descriptor->width_in_mb                                 = h->mb_width;
-+  pic_descriptor->height_in_mb                                = h->mb_height;
-+
-+  pic_descriptor->picture_structure                           = ff_xvba_translate_picture_structure(h->picture_structure);
-+
-+  pic_descriptor->chroma_format                               = h->chroma_format_idc ? h->chroma_format_idc : 1;
-+  pic_descriptor->avc_intra_flag                              = (h->slice_type == AV_PICTURE_TYPE_I) ? 1 : 0;
-+  pic_descriptor->avc_reference                               = (h->cur_pic_ptr->f.reference & 3) ? 1 : 0;
-+
-+  pic_descriptor->avc_bit_depth_luma_minus8                   = h->sps.bit_depth_luma - 8;
-+  pic_descriptor->avc_bit_depth_chroma_minus8                 = h->sps.bit_depth_chroma - 8;
-+  pic_descriptor->avc_log2_max_frame_num_minus4               = h->sps.log2_max_frame_num -4;
-+  pic_descriptor->avc_pic_order_cnt_type                      = h->sps.poc_type;
-+  pic_descriptor->avc_log2_max_pic_order_cnt_lsb_minus4       = h->sps.log2_max_poc_lsb - 4;
-+  pic_descriptor->avc_num_ref_frames                          = h->sps.ref_frame_count;
-+  pic_descriptor->avc_reserved_8bit                           = 0;
-+
-+  /* Set a level that can decode stuff in every case without a lookup table 
-+     xvba seems to have problems only when the number of Reframes goes beyond
-+     the max support number of Level4.1@High. So in praxis decoding a Level 3.0
-+     file that in deed has level4.1@High specs does not matter. We use this fact
-+     and check if the ref_frames stay in the range Level4.1@high can decode if
-+     not, we set Level5.1 */
-+  if (pic_descriptor->avc_num_ref_frames > 4) {
-+    const unsigned int mbw = pic_descriptor->width_in_mb;
-+    const unsigned int mbh = pic_descriptor->height_in_mb;
-+    // this matches Level4.1@High stats to differ between <= 4.1 and 5.1
-+    const unsigned int max_ref_frames = 12288 * 1024 / (mbw * mbh * 384);
-+    const unsigned int num_ref_frames = pic_descriptor->avc_num_ref_frames;
-+    if (max_ref_frames < num_ref_frames)
-+        pic_descriptor->level = 51;
-+  }
-+
-+  pic_descriptor->avc_num_slice_groups_minus1                 = h->pps.slice_group_count - 1;
-+  pic_descriptor->avc_num_ref_idx_l0_active_minus1            = h->pps.ref_count0 - 1;
-+  pic_descriptor->avc_num_ref_idx_l1_active_minus1            = h->pps.ref_count1 - 1;
-+
-+  pic_descriptor->avc_pic_init_qp_minus26                     = h->pps.init_qp - 26;
-+  pic_descriptor->avc_pic_init_qs_minus26                     = h->pps.init_qs - 26;
-+  pic_descriptor->avc_chroma_qp_index_offset                  = h->pps.chroma_qp_index_offset0;
-+  pic_descriptor->avc_second_chroma_qp_index_offset           = h->pps.chroma_qp_index_offset1;
-+  pic_descriptor->avc_slice_group_change_rate_minus1          = 0; // not implemented in ffmpeg
-+  pic_descriptor->avc_reserved_16bit                          = 0; // must be 0
-+  memset(pic_descriptor->avc_field_order_cnt_list,0,sizeof(pic_descriptor->avc_field_order_cnt_list)); // must be 0
-+  memset(pic_descriptor->avc_slice_group_map,0,sizeof(pic_descriptor->avc_slice_group_map)); // must be 0
-+
-+  // sps
-+  pic_descriptor->sps_info.avc.delta_pic_always_zero_flag     = h->sps.delta_pic_order_always_zero_flag;
-+  pic_descriptor->sps_info.avc.direct_8x8_inference_flag      = h->sps.direct_8x8_inference_flag;
-+  pic_descriptor->sps_info.avc.frame_mbs_only_flag            = h->sps.frame_mbs_only_flag;
-+  pic_descriptor->sps_info.avc.gaps_in_frame_num_value_allowed_flag = h->sps.gaps_in_frame_num_allowed_flag;
-+  pic_descriptor->sps_info.avc.mb_adaptive_frame_field_flag   = h->sps.mb_aff;
-+  pic_descriptor->sps_info.avc.residual_colour_transform_flag = h->sps.residual_color_transform_flag;
-+  pic_descriptor->sps_info.avc.xvba_avc_sps_reserved          = 0;
-+
-+  // pps
-+  pic_descriptor->pps_info.avc.entropy_coding_mode_flag       = h->pps.cabac;
-+  pic_descriptor->pps_info.avc.pic_order_present_flag         = h->pps.pic_order_present;
-+  pic_descriptor->pps_info.avc.weighted_pred_flag             = h->pps.weighted_pred;
-+  pic_descriptor->pps_info.avc.weighted_bipred_idc            = h->pps.weighted_bipred_idc;
-+  pic_descriptor->pps_info.avc.deblocking_filter_control_present_flag = h->pps.deblocking_filter_parameters_present;
-+  pic_descriptor->pps_info.avc.constrained_intra_pred_flag    = h->pps.constrained_intra_pred;
-+  pic_descriptor->pps_info.avc.redundant_pic_cnt_present_flag = h->pps.redundant_pic_cnt_present;
-+  pic_descriptor->pps_info.avc.transform_8x8_mode_flag        = h->pps.transform_8x8_mode;
-+  pic_descriptor->pps_info.avc.xvba_avc_pps_reserved          = 0; // must be 0
-+
-+  memcpy(iq_matrix->bScalingLists4x4, h->pps.scaling_matrix4, sizeof(iq_matrix->bScalingLists4x4));
-+  memcpy(iq_matrix->bScalingLists8x80, h->pps.scaling_matrix80, sizeof(iq_matrix->bScalingLists8x80));
-+  memcpy(iq_matrix->bScalingLists8x81, h->pps.scaling_matrix83, sizeof(iq_matrix->bScalingLists8x80));
-+
-+  // Wait for an I-frame before start decoding. Workaround for ATI UVD and UVD+ GPUs
-+  if (!h->got_first_iframe) {
-+      if (h->slice_type != AV_PICTURE_TYPE_I && h->slice_type != AV_PICTURE_TYPE_SI)
-+          return -1;
-+      h->got_first_iframe = 1;
-+  }
-+
-+  ff_h264_draw_horiz_band(h, 0, h->avctx->height);
-+
-+  return 0;
-+}
-+
-+/** Decode the given H.264 slice with XVBA. */
-+static int decode_slice(AVCodecContext *avctx,
-+                        const uint8_t  *buffer,
-+                        uint32_t        size)
-+{
-+  H264Context * const h = avctx->priv_data;
-+  struct xvba_render_state *render;
-+
-+  render = (struct xvba_render_state *)h->cur_pic_ptr->f.data0;
-+  assert(render);
-+
-+  ff_xvba_add_slice_data(render, buffer, size);
-+
-+  return 0;
-+}
-+
-+AVHWAccel ff_h264_xvba_hwaccel = {
-+    .name           = "h264_xvba",
-+    .type           = AVMEDIA_TYPE_VIDEO,
-+    .id             = CODEC_ID_H264,
-+    .pix_fmt        = AV_PIX_FMT_XVBA_VLD,
-+    .start_frame    = start_frame,
-+    .end_frame      = end_frame,
-+    .decode_slice   = decode_slice,
-+};
-diff --git a/libavcodec/xvba_internal.h b/libavcodec/xvba_internal.h
-new file mode 100644
-index 0000000..18faa3e
---- /dev/null
-+++ b/libavcodec/xvba_internal.h
-@@ -0,0 +1,25 @@
-+/*
-+ * HW decode acceleration for MPEG-2, H.264 and VC-1
-+ *
-+ * Copyright (C) 2005-2011 Team XBMC
-+ *
-+ * 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
-+ */
-+
-+int ff_xvba_translate_profile(int profile);
-+int ff_xvba_translate_picture_structure(int picture_structure);
-+void ff_xvba_add_slice_data(struct xvba_render_state *render, const uint8_t *buffer, uint32_t size);
-diff --git a/libavcodec/xvba_mpeg2.c b/libavcodec/xvba_mpeg2.c
-new file mode 100644
-index 0000000..0fc7d78
---- /dev/null
-+++ b/libavcodec/xvba_mpeg2.c
-@@ -0,0 +1,52 @@
-+/*
-+ * MPEG-2 HW decode acceleration through XVBA
-+ *
-+ * Copyright (C) 2005-2011 Team XBMC
-+ *
-+ * 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 "dsputil.h"
-+
-+static int start_frame(AVCodecContext *avctx, av_unused const uint8_t *buffer, av_unused uint32_t size)
-+{
-+    struct MpegEncContext * const s = avctx->priv_data;
-+    return 0;
-+}
-+
-+static int end_frame(AVCodecContext *avctx)
-+{
-+    return 0;
-+}
-+
-+static int decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size)
-+{
-+    struct MpegEncContext * const s = avctx->priv_data;
-+    return 0;
-+}
-+
-+AVHWAccel ff_mpeg2_xvba_hwaccel = {
-+    .name           = "mpeg2_xvba",
-+    .type           = AVMEDIA_TYPE_VIDEO,
-+    .id             = CODEC_ID_MPEG2VIDEO,
-+    .pix_fmt        = AV_PIX_FMT_XVBA_VLD,
-+    .capabilities   = 0,
-+    .start_frame    = start_frame,
-+    .end_frame      = end_frame,
-+    .decode_slice   = decode_slice,
-+    .priv_data_size = 0,
-+};
-diff --git a/libavcodec/xvba_vc1.c b/libavcodec/xvba_vc1.c
-new file mode 100644
-index 0000000..e7a85a7
---- /dev/null
-+++ b/libavcodec/xvba_vc1.c
-@@ -0,0 +1,193 @@
-+/*
-+ * VC-1 HW decode acceleration through XVBA
-+ *
-+ * Copyright (C) 2005-2011 Team XBMC
-+ *
-+ * 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 "xvba.h"
-+#include "xvba_internal.h"
-+#include "vc1.h"
-+#include "vc1data.h"
-+#include <assert.h>
-+
-+
-+/** @file
-+ * Implement structures of ffmpeg <-> XvBA
-+ */
-+
-+/* Initialize and start decoding a frame with XvBA */
-+static int start_frame(AVCodecContext *avctx,
-+				av_unused const uint8_t *buffer, 
-+				av_unused uint32_t size)
-+{
-+    VC1Context * const v = avctx->priv_data;
-+    MpegEncContext * const s = &v->s;
-+    struct xvba_render_state *render;
-+
-+    render = (struct xvba_render_state *)s->current_picture_ptr->f.data0;
-+    assert(render);
-+    
-+    render->num_slices = 0;
-+    return 0;
-+}
-+
-+/* End a hardware decoding based frame */
-+static int end_frame(AVCodecContext *avctx)
-+{
-+    VC1Context* const v = avctx->priv_data;
-+    MpegEncContext* const s = &v->s;
-+    struct xvba_render_state *render, *last, *next;
-+    XVBAPictureDescriptor *pic_descriptor;
-+
-+    render = (struct xvba_render_state *)s->current_picture_ptr->f.data0;
-+    assert(render);
-+
-+    if (render->picture_descriptor == 0)
-+      return -1;
-+
-+    pic_descriptor = render->picture_descriptor;
-+    
-+    av_dlog(avctx, "xvba_vc1_end_frame()\n");
-+    
-+    memset(pic_descriptor, 0, sizeof(*pic_descriptor));
-+
-+    /* Fill in Parameters - for reference see AMD sdk documentation */
-+    pic_descriptor->profile                                 = ff_xvba_translate_profile(v->profile);
-+    pic_descriptor->level                                   = v->level;
-+    //done like in va-driver and vaapi
-+    if (v->profile == PROFILE_ADVANCED) {
-+      pic_descriptor->width_in_mb                           = s->avctx->coded_width;
-+      pic_descriptor->height_in_mb                          = s->avctx->coded_height;
-+    } else {
-+      pic_descriptor->width_in_mb                           = s->mb_width;
-+      pic_descriptor->height_in_mb                          = s->mb_height;
-+    }
-+
-+    pic_descriptor->picture_structure                       = ff_xvba_translate_picture_structure(s->picture_structure);
-+
-+    // xvba-video set this to 1 only 4:2:0 supported
-+    // doc says: if not set, choose 1 - we try this
-+    pic_descriptor->chroma_format                           = 1;
-+    pic_descriptor->avc_intra_flag                          = s->pict_type == AV_PICTURE_TYPE_I || v->bi_type == 1;
-+    pic_descriptor->avc_reference                           = (s->current_picture_ptr->f.reference & 3) ? 1 : 0;
-+    
-+    // VC-1 explicit parameters see page 30 of sdk
-+    // sps_info
-+    pic_descriptor->sps_info.vc1.postprocflag               = v->postprocflag;
-+    
-+    // done as in vaapi
-+    pic_descriptor->sps_info.vc1.pulldown                   = v->broadcast;
-+    pic_descriptor->sps_info.vc1.interlace                  = v->interlace;
-+    pic_descriptor->sps_info.vc1.tfcntrflag                 = v->tfcntrflag;
-+    pic_descriptor->sps_info.vc1.finterpflag                = v->finterpflag;
-+    pic_descriptor->sps_info.vc1.reserved                   = 1;
-+    // eventually check if this makes sense together with interlace
-+    pic_descriptor->sps_info.vc1.psf                        = v->psf;
-+    // what about if it is a frame (page 31)
-+    // looked at xvba-driver
-+    pic_descriptor->sps_info.vc1.second_field               = v->interlace && v->second_field && (v->fcm == ILACE_FIELD);
-+    pic_descriptor->sps_info.vc1.xvba_vc1_sps_reserved      = 0;
-+    
-+    // VC-1 explicit parameters see page 30 of sdk
-+    // pps_info
-+    pic_descriptor->pps_info.vc1.panscan_flag               = v->panscanflag;
-+    pic_descriptor->pps_info.vc1.refdist_flag               = v->refdist_flag;
-+    pic_descriptor->pps_info.vc1.loopfilter                 = s->loop_filter;
-+    pic_descriptor->pps_info.vc1.fastuvmc                   = v->fastuvmc;
-+    pic_descriptor->pps_info.vc1.extended_mv                = v->extended_mv;
-+    pic_descriptor->pps_info.vc1.dquant                     = v->dquant;
-+    pic_descriptor->pps_info.vc1.vstransform                = v->vstransform;
-+    pic_descriptor->pps_info.vc1.overlap                    = v->overlap;
-+    pic_descriptor->pps_info.vc1.quantizer                  = v->quantizer_mode;
-+    pic_descriptor->pps_info.vc1.extended_dmv               = v->extended_dmv;   
-+    pic_descriptor->pps_info.vc1.maxbframes                 = s->avctx->max_b_frames;
-+    pic_descriptor->pps_info.vc1.rangered                   = (pic_descriptor->profile == PROFILE_SIMPLE) ? 0 : v->rangered;   
-+    pic_descriptor->pps_info.vc1.syncmarker                 = (pic_descriptor->profile == PROFILE_SIMPLE) ? 0 : s->resync_marker;
-+    pic_descriptor->pps_info.vc1.multires                   = v->multires;
-+    pic_descriptor->pps_info.vc1.reserved                   = 1;
-+    pic_descriptor->pps_info.vc1.range_mapy_flag            = v->range_mapy_flag;
-+    pic_descriptor->pps_info.vc1.range_mapy                 = v->range_mapy;
-+    pic_descriptor->pps_info.vc1.range_mapuv_flag           = v->range_mapuv_flag;
-+    pic_descriptor->pps_info.vc1.range_mapuv                = v->range_mapuv;
-+    pic_descriptor->pps_info.vc1.xvba_vc1_pps_reserved      = 0;
-+    
-+    pic_descriptor->past_surface                            = 0;
-+    pic_descriptor->future_surface                          = 0;
-+    switch (s->pict_type) {
-+    case AV_PICTURE_TYPE_B:
-+        next = (struct xvba_render_state *)s->next_picture.f.data0;
-+        assert(next);
-+        if (next)
-+          pic_descriptor->past_surface = next->surface;
-+        // fall-through
-+    case AV_PICTURE_TYPE_P:
-+        last = (struct xvba_render_state *)s->last_picture.f.data0;
-+        assert(last);
-+        if (last)
-+          pic_descriptor->future_surface = last->surface;
-+        break;
-+    }
-+    render->psf = v->psf;
-+
-+    ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
-+
-+    return 0;
-+}
-+
-+static int decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size)
-+{
-+  VC1Context* const v = avctx->priv_data;
-+  MpegEncContext* const s = &v->s;
-+  struct xvba_render_state *render;
-+
-+  render = (struct xvba_render_state *)s->current_picture_ptr->f.data0;
-+  assert(render);
-+
-+  if (avctx->codec_id == CODEC_ID_VC1 &&
-+      size >= 4 && IS_MARKER(AV_RB32(buffer))) {
-+      buffer += 4;
-+      size   -= 4;
-+  }
-+
-+  ff_xvba_add_slice_data(render, buffer, size);
-+
-+  return 0;
-+}
-+
-+#if CONFIG_WMV3_XVBA_HWACCEL
-+AVHWAccel ff_wmv3_xvba_hwaccel = {
-+    .name           = "wmv3_xvba",
-+    .type           = AVMEDIA_TYPE_VIDEO,
-+    .id             = CODEC_ID_WMV3,
-+    .pix_fmt        = AV_PIX_FMT_XVBA_VLD,
-+    .start_frame    = start_frame,
-+    .end_frame      = end_frame,
-+    .decode_slice   = decode_slice,
-+};
-+#endif
-+
-+AVHWAccel ff_vc1_xvba_hwaccel = {
-+    .name           = "vc1_xvba",
-+    .type           = AVMEDIA_TYPE_VIDEO,
-+    .id             = CODEC_ID_VC1,
-+    .pix_fmt        = AV_PIX_FMT_XVBA_VLD,
-+    .start_frame    = start_frame,
-+    .end_frame      = end_frame,
-+    .decode_slice   = decode_slice,
-+};
-diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
-index 1016dba..53dfec1 100644
---- a/libavutil/pixdesc.c
-+++ b/libavutil/pixdesc.c
-@@ -1141,6 +1141,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptorsAV_PIX_FMT_NB = {
-         .log2_chroma_h = 1,
-         .flags = PIX_FMT_HWACCEL,
-     },
-+    AV_PIX_FMT_XVBA_VLD = {
-+        .name = "xvba_vld",
-+        .log2_chroma_w = 1,
-+        .log2_chroma_h = 1,
-+        .flags = PIX_FMT_HWACCEL,
-+    },
-     AV_PIX_FMT_YUV420P9LE = {
-         .name = "yuv420p9le",
-         .nb_components = 3,
-diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
-index 1c00ac4..6437e29 100644
---- a/libavutil/pixfmt.h
-+++ b/libavutil/pixfmt.h
-@@ -124,6 +124,7 @@ enum AVPixelFormat {
-     AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data3 contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
-     AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data3 contains a vaapi_render_state struct which contains fields extracted from headers
-     AV_PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data3 contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-+    AV_PIX_FMT_XVBA_VLD,  ///< HW decoding through xvba, Picture.data3 contains a xvba_rander_state struct which contains the bitstream of the slices
- 
-     AV_PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-     AV_PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian

avidemux_2.6.12.tar.gz/avidemux/common/ADM_audiocodec Deleted

avidemux_2.6.12.tar.gz/avidemux/common/ADM_audiocodec/ADM_8bits.cpp Deleted

@@ -1,61 +0,0 @@
-/***************************************************************************
-                          ADM_8bits.cpp  -  description
-                             -------------------
-    begin                : Fri Aug 5 2003
-    copyright            : (C) 2003 by mean
-    email                : fixounet@free.fr
-
-	This is a dummy coded that converts a 8 bits input sample to
-	a 16 bits ouput samples
-
-	It is used as it is because internally avidemux can only deal with
-	16 bits audio samples
-
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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 <math.h>
-
-
-#include "fourcc.h"
-#include "ADM_coreAudio.h"
-#include "ADM_audiocodec/ADM_audiocodec.h"
-
-
-ADM_Audiocodec8Bits::ADM_Audiocodec8Bits( uint32_t fourcc,const WAVHeader &info) :  
-            ADM_Audiocodec(fourcc,info)
-{
- 	ADM_assert(fourcc==WAV_8BITS||fourcc==WAV_8BITS_UNSIGNED);
-	if(fourcc==WAV_8BITS_UNSIGNED)
-			_unsign=1;
-	else
-			_unsign=0;
-
-}
-ADM_Audiocodec8Bits::~ADM_Audiocodec8Bits( )
-{
-
-}
-uint8_t ADM_Audiocodec8Bits::run(uint8_t *inptr, uint32_t nbIn, float *outptr, uint32_t *nbOut)
-{
-  float f;
-        for (int n = 0; n < nbIn; n++) {
-                f=(float) *inptr++;
-                if(_unsign)
-                        *(outptr++) = (f - 128.) / 256.;
-                else
-                        *(outptr++) = f / 256.;
-        }
-        *nbOut=nbIn;
-	return 1;
-}
-
-

avidemux_2.6.12.tar.gz/avidemux/common/ADM_audiocodec/ADM_audiocodec.cpp Deleted

@@ -1,88 +0,0 @@
-/***************************************************************************
-     \file                     ADM_audiocodec.cpp  
-     \brief   Front end for audio decoder
-    copyright            : (C) 2002/2009 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.                                   *
- *                                                                         *
- ***************************************************************************/
-#include "ADM_default.h"
-
-#include "fourcc.h"
-#include "ADM_coreAudio.h"
-#include "ADM_audiocodec/ADM_audiocodec.h"
-extern ADM_Audiocodec *ADM_ad_searchCodec(uint32_t fourcc,	WAVHeader *info,uint32_t extraLength,uint8_t *extraData);
-
-ADM_Audiocodec	*getAudioCodec(uint32_t fourcc,WAVHeader *info,uint32_t extra,uint8_t *extraData)
-{
-ADM_Audiocodec *out = NULL;
-
-		// fake codec for 8 bits
-		if(fourcc==WAV_PCM)
-			{
-				if(info)
-					if(info->bitspersample==8)
-                        {
-                            info->encoding=fourcc=WAV_8BITS_UNSIGNED;
-                        }
-
-			}
-
- 		switch(fourcc)
-   			{
-
-				case WAV_PCM:
-                    printf("audioCodec Audio codec:  WAV\n");
-#ifdef ADM_BIG_ENDIAN
-                    out= (ADM_Audiocodec *)new ADM_AudiocodecWavSwapped(fourcc,*info);
-#else
-					out= (ADM_Audiocodec *)new ADM_AudiocodecWav(fourcc,*info);
-#endif
-                  			break;
-				case WAV_8BITS:
-					printf("audioCodec 8 BIts pseudo codec\n");
-                    out= (ADM_Audiocodec *)new ADM_Audiocodec8Bits(fourcc,*info);
-					break;
-				case WAV_8BITS_UNSIGNED:
-					printf("audioCodec 8 BIts pseudo codec unsigned\n");
-    					out= (ADM_Audiocodec *)new ADM_Audiocodec8Bits(fourcc,*info);
-					break;
-		  		case WAV_LPCM:
-					printf("audioCodec Audio codec:  LPCM swapped\n");
-#ifndef ADM_BIG_ENDIAN
-                    out= (ADM_Audiocodec *)new ADM_AudiocodecWavSwapped(fourcc,*info);
-#else
-					out= (ADM_Audiocodec *)new ADM_AudiocodecWav(fourcc,*info);
-#endif
-                  		break;
-            default:
-            	out= ADM_ad_searchCodec(fourcc,info,extra,extraData);
-            	break;
-        	}
-
-	if (out == NULL)
-	{
-		printf("audioCodec Unknown codec : %"PRIu32"\n",fourcc);
-		out = (ADM_Audiocodec *) new ADM_AudiocodecUnknown(fourcc,*info);
-	}
-	// For channel mapping, simple case we do it here so that the decoder does not have
-	// to worry.
-	// For more complicated case (channel >2) , it is up to the decoder to do it...
-	switch(info->channels)
-	{
-			case 1: out->channelMapping0 = ADM_CH_MONO;
-					break;
-			case 2: out->channelMapping0 = ADM_CH_FRONT_LEFT;
-					out->channelMapping1 = ADM_CH_FRONT_RIGHT;
-					break;
-			default:break;
-
-
-	}
-	return out;
-}

avidemux_2.6.12.tar.gz/avidemux/common/ADM_audiocodec/ADM_codecwav.cpp Deleted

@@ -1,48 +0,0 @@
-/***************************************************************************
-                          ADM_codecwav.cpp  -  description
-                             -------------------
-    begin                : Fri May 31 2002
-    copyright            : (C) 2002 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 <math.h>
-#include "ADM_audiocodec/ADM_audiocodec.h"
-
-ADM_AudiocodecWav::ADM_AudiocodecWav( uint32_t fourcc,const WAVHeader &info ) : ADM_Audiocodec(fourcc,info)
-{
-    ADM_info("Creating not swapped wav decoder (PCM)\n");
-}
-ADM_AudiocodecWav::~ADM_AudiocodecWav()
-{
-
-}
-
-uint8_t ADM_AudiocodecWav::isCompressed( void )
-{
- 	return 0;
-}
-
-uint8_t ADM_AudiocodecWav::run(uint8_t * inptr, uint32_t nbIn, float * outptr, uint32_t * nbOut)
-{
-	int16_t *in = (int16_t *) inptr;
-
-	*nbOut=nbIn / 2;
-	for (int i = 0; i < *nbOut; i++) {
-		*(outptr++) = (float)*in / 32768;
-		in++;
-	}
-
-	return 1;
-}
-
-

avidemux_2.6.12.tar.gz/avidemux/common/ADM_audiocodec/ADM_lpcm.cpp Deleted

@@ -1,65 +0,0 @@
-/***************************************************************************
-                          ADM_lpcm .cpp  -  description
-                             -------------------
-
-	Handle DVD LPCM, i.e. swapped PC PCM
-    begin                : Fri May 5 2003
-    copyright            : (C) 2003 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 <math.h>
-
-#include "ADM_audiocodec/ADM_audiocodec.h"
-
-ADM_AudiocodecWavSwapped::ADM_AudiocodecWavSwapped( uint32_t fourcc,const WAVHeader &info ) : ADM_Audiocodec(fourcc,info)
-{
-	channelMapping0 = ADM_CH_FRONT_LEFT;
-	channelMapping1 = ADM_CH_FRONT_RIGHT;
-	channelMapping2 = ADM_CH_FRONT_CENTER;
-	channelMapping3 = ADM_CH_LFE;
-	channelMapping4 = ADM_CH_REAR_LEFT;
-	channelMapping5 = ADM_CH_REAR_RIGHT;
-    ADM_info("Creating swapped wav decoder (LPCM)\n");
-}
-
-ADM_AudiocodecWavSwapped::~ADM_AudiocodecWavSwapped()
-{
-
-}
-
-uint8_t ADM_AudiocodecWavSwapped::isCompressed( void )
-{
- 	return 1;
-}
-
-uint8_t ADM_AudiocodecWavSwapped::run(uint8_t * inptr, uint32_t nbIn, float *outptr, uint32_t * nbOut)
-{
-	if (nbIn < 2)
-		return 1;
-
-	if (nbIn&1) {
-		ADM_error("Error: nbIn (%i) odd in lpcm", nbIn);
-		abort();
-	}
-
-	int16_t sample;
-	*nbOut=nbIn / 2;
-	for (int i = 0; i < *nbOut; i++) {
-		sample = (inptr0 << 8) | inptr1;
-		*(outptr++) = (float)sample / 32768;
-		inptr += 2;
-	}
-
-	return 1;
-}
-

avidemux_2.6.12.tar.gz/avidemux/common/ADM_audiocodec/CMakeLists.txt Deleted

avidemux_2.6.12.tar.gz/avidemux/common/ADM_videoCodec/include/ADM_codecLibVA.h Deleted

@@ -1,63 +0,0 @@
-/**
-        \file FFLIBVA
- *      \brief wrapper around ffmpeg wrapper around libva
- */
-#ifdef USE_LIBVA
-#include "X11/Xlib.h"
-#include "va/va.h"
-
-#include <BVector.h>
-#include "ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA.h"
-#include "ADM_threads.h"
-/**
- * \class decoderFFLIBVA
- */
-#define ADM_MAX_SURFACE 16+6+1
-class decoderFFLIBVA:public decoderFF
-{
-friend class ADM_vaSurface;
-protected:
-protected:
-                    bool          alive;
-                    int           b_age;
-                    int           ip_age2;
-                    ADMImage      *scratch;
-                    VAContextID   libva;
-                    int           nbSurface;
-                    vaapi_context *va_context;
-                    VASurfaceID   surfacesADM_MAX_SURFACE;
-
-                    //
-                    BVector <ADM_vaSurface  *> freeSurfaceQueue;
-                    BVector <ADM_vaSurface  *> allSurfaceQueue;
-                    //
-                    
-                    
-public:     // Callbacks
-                    int         getBuffer(AVCodecContext *avctx, AVFrame *pic);
-                    void        releaseBuffer(struct AVCodecContext *avctx, AVFrame *pic);
-                    void        goOn(  AVFrame *d,int type);   
-                    
-                    bool        reclaimImage(ADM_vaSurface *img);
-                    ADM_vaSurface *lookupBySurfaceId(VASurfaceID id);
-                    
-public:
-            // public API
-                                decoderFFLIBVA (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp);
-                                ~decoderFFLIBVA();
-    virtual         bool        uncompress (ADMCompressedImage * in, ADMImage * out);
-
-    virtual         bool        dontcopy (void)
-                      {
-                        return 1; // For now, we give a reference to the fully decoded image
-                      }
-
-    virtual         bool        bFramePossible (void)
-      {
-        return 1;
-      }
-    virtual const   char        *getDecoderName(void) {return "LIBVA";}
-    virtual         bool        initializedOk(void)  {return alive;};
-static              bool        fccSupported(uint32_t fcc);
-};
-#endif

avidemux_2.6.12.tar.gz/avidemux/common/ADM_videoCodec/include/ADM_codecVdpau.h Deleted

@@ -1,36 +0,0 @@
-#ifdef USE_VDPAU
-class decoderFFVDPAU:public decoderFF
-{
-protected:
-                    bool alive;
-                    int b_age;
-                    int ip_age2;
-
-                    void     *vdpau;
-                    ADMImage *scratch;
-                    ADMImage *vdpau_copy;
-                    uint64_t vdpau_pts;
-                    bool     decode_status;                    
-public:     // Callbacks
-                    int     getBuffer(AVCodecContext *avctx, AVFrame *pic);
-                    void    releaseBuffer(struct AVCodecContext *avctx, AVFrame *pic);
-                    void    goOn( const AVFrame *d,int type);            
-public:
-            // public API
-                    decoderFFVDPAU (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp);
-                    ~decoderFFVDPAU();
-    virtual bool uncompress (ADMCompressedImage * in, ADMImage * out);
-
-    virtual bool dontcopy (void)
-                      {
-                        return 0; // We cannot use ffmpeg internal buffer, they dont exist!
-                      }
-
-    virtual bool bFramePossible (void)
-      {
-        return 1;
-      }
-    virtual const char *getDecoderName(void) {return "VDPAU";}
-    virtual bool  initializedOk(void)  {return alive;};
-};
-#endif

avidemux_2.6.12.tar.gz/avidemux/common/ADM_videoCodec/include/ADM_ffmpeg_vdpau_internal.h Deleted

@@ -1,49 +0,0 @@
-/***************************************************************************
-            \file              ADM_ffmpeg_vdpau.cpp  
-            \brief Decoder using half ffmpeg/half VDPAU
-
-    The ffmpeg part is to preformat inputs for VDPAU
-    VDPAU is loaded dynamically to be able to make a binary
-        and have something working even if the target machine
-        does not have vdpau
-
-
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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 <vector>
-extern "C" {
-static void draw(struct AVCodecContext *s,    const AVFrame *src, int offset4,    int y, int type, int height);
-static int ADM_VDPAUgetBuffer(AVCodecContext *avctx, AVFrame *pic);
-static void ADM_VDPAUreleaseBuffer(struct AVCodecContext *avctx, AVFrame *pic);
-}
-
-
-#define NB_SURFACE 50
-typedef struct 
-{
-        VdpDecoder            vdpDecoder;
-        vdpau_render_state *rendersNB_SURFACE;
-        std::vector <vdpau_render_state *>freeQueue;
-
-}vdpauContext;
-
-#define VDPAU ((vdpauContext *)vdpau)
-
-#define WRAP_Open_TemplateVdpauByName(argz,codecid) \
-    WRAP_Open_Template(avcodec_find_decoder_by_name,argz,,codecid,{\
-            _context->opaque          = this;\
-            _context->get_buffer      = ADM_VDPAUgetBuffer;\
-            _context->release_buffer  = ADM_VDPAUreleaseBuffer;\
-            _context->draw_horiz_band = draw;\
-            _context->slice_flags     = SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD;\
-            _context->get_format      = vdpauGetFormat;})
-

avidemux_2.6.12.tar.gz/avidemux/commonCmakeApplication.cmake Deleted

@@ -1,134 +0,0 @@
-########################################
-# Definitions and Includes
-########################################
-if (NOT PLUGINS)
-	SET(AVIDEMUX_TOP_SOURCE_DIR ${CMAKE_SOURCE_DIR}/../..)
-endif (NOT PLUGINS)
-
-SET(CMAKE_MODULE_PATH "${AVIDEMUX_TOP_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
-include(avidemuxVersion)
-
-IF (WIN32)
-	SET(ADM_PLUGIN_DIR "plugins")
-ELSE (WIN32)
-	SET(ADM_PLUGIN_DIR "ADM_plugins6")
-ENDIF (WIN32)
-
-include(admConfigSummary)
-INITIALISE_SUMMARY_LISTS()
-
-########################################
-# Shared cmake part
-########################################
-ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES)
-include(admMainChecks)
-
-########################################
-# Add include dirs
-########################################
-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)
-# 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")
-
-LINK_DIRECTORIES("${AVIDEMUX_SEARCH_LIB_DIR}")
-#
-INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/ADM_muxerGate/include/")
-
-IF (GETTEXT_FOUND)
-	INCLUDE_DIRECTORIES(${GETTEXT_INCLUDE_DIR})
-ENDIF (GETTEXT_FOUND)
-
-INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../common/")
-INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../common/ADM_audioFilter/include")
-INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../common/ADM_commonUI")
-INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../common/ADM_videoFilter2/include")
-INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../common/ADM_videoEncoder/include")
-INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../common/ADM_editor/include")
-#
-# Add main source
-#
-SET(ADM_EXE_SRCS
-../common/ADM_preview.cpp
-../common/ADM_previewNavigate.cpp
-../common/gui_main.cpp
-../common/gui_autodrive.cpp
-../common/GUI_jobs.cpp
-../common/gui_navigate.cpp
-../common/gui_play.cpp
-../common/gui_save.cpp
-../common/gui_savenew.cpp
-../common/main.cpp
-../common/gui_action.cpp
-../common/gui_blackframes.cpp
-../common/ADM_gettext.cpp
-../common/ADM_slave.cpp
-)
-
-########################################
-# FFmpeg
-########################################
-include_directories("${AVIDEMUX_TOP_SOURCE_DIR}/ffmpeg")
-
-#############################################
-# Add core libs
-#############################################
-SET(coreLibs
-ADM_core6
-ADM_audioParser6
-ADM_coreAudio6
-ADM_coreAudioFilterAPI6
-ADM_coreAudioDevice6
-ADM_coreAudioEncoder6
-ADM_coreDemuxer6
-ADM_coreImage6
-ADM_coreMuxer6
-ADM_coreUI6
-ADM_coreUtils6
-ADM_coreSocket6
-ADM_coreVideoEncoder6
-ADM_coreVideoFilter6
-)
-
-#############################################
-# Add common libs
-#############################################
-SET(commonLibs1
-
-ADM_muxerGate6
-ADM_audioFilter6
-ADM_editor6
-ADM_audiocodec6
-ADM_videocodec6
-ADM_coreVideoCodec6
-ADM_commonUI6
-)
-
-if (USE_VDPAU)
-	SET(commonLibs1 ${commonLibs1} ADM_coreVDPAU6)
-endif (USE_VDPAU)
-if (USE_XVBA)
-	SET(commonLibs1 ${commonLibs1} ADM_coreXvba6)
-endif (USE_XVBA)
-if (USE_LIBVA)
-	SET(commonLibs1 ${commonLibs1} ADM_coreLibVA6)
-endif (USE_LIBVA)
-
-SET(commonLibs1 ${commonLibs1} ADM_libavcodec ADM_libavutil)
-
-
-
-SET(commonLibs2
-ADM_coreJobs
-ADM_osSupport6
-ADM_script6
-ADM_videoEncoder6
-ADM_internalVideoFilter6
-ADM_toolkit6
-)
-
-# END

avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/include/ADM_debug.h Deleted

@@ -1,47 +0,0 @@
-/***************************************************************************
-                        Debug #define, ugly actually
-                             -------------------
-    begin                : Fri Apr 12 2002
-    copyright            : (C) 2002 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.                                   *
- *                                                                         *
- ***************************************************************************/
-#if !defined(MODULE_NAME)
-         #error define MODULE_NAME when using aprintf !
-#endif
-
-#define ADM_PRINT_ERROR         0
-#define ADM_PRINT_INFO          1
-#define ADM_PRINT_DEBUG         2
-#define ADM_PRINT_VERY_VERBOSE  3
-
-#if !defined(ADM_DEBUG)
-         #define aprintf(prt, ...) ;
-         #define adm_printf(level,prt,...) ;
-#else
-        #if (MODULE_NAME !=0x8000)
-	#ifdef __cplusplus
-	extern "C" {
-	#endif
-	 	void indirect_printf(int entity, const char *fmt, ...);
-                void indirect_printf_long(int level,const char *modname,int entity, const char *prf, ...);
-	#ifdef __cplusplus
-	}
-	#endif
-			
-                #define aprintf(prt, ...) indirect_printf(MODULE_NAME,prt, ## __VA_ARGS__)
-                #define adm_printf(level,prt, ...) indirect_printf_long(level,__FILE__,MODULE_NAME,prt, ## __VA_ARGS__)
-        #else
-                #define aprintf(prt, ...) ;
-                #define adm_printf(level,prt, ...) ;
-        #endif
-#endif
-

avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/include/ADM_debugID.h Deleted

@@ -1,35 +0,0 @@
-
-#define  MODULE_OGM 		1
-#define  MODULE_CODEC 	        2
-#define  MODULE_MPEG		4
-#define  MODULE_EDITOR 	        8
-#define  MODULE_GUI	 	0x10
-#define  MODULE_SAVE_AVI 	0x20
-#define  MODULE_FILTER		0x40
-#define  MODULE_NUV		0x80
-#define MODULE_ASF MODULE_NUV
-#define  MODULE_MP4     	0x000100
-#define  MODULE_CLOCKnTIMELEFT  0x000200
-#define  MODULE_COMMANDLINE     0x000400
-#define  MODULE_PREVIEW	 	0x000800
-#define MODULE_AUDIO		0x001000
-#define MODULE_ENCODER		0x002000
-#define MODULE_AUDIO_FILTER     0x004000
-#define  MODULE_DEBUG 		0x008000
-#define MODULE_UI		0x010000
-#define  MODULE_3GP 		0x020000
-#define  MODULE_MPEG_DEMUX	0x040000
-#define  MODULE_AUDIO_EDITOR    0x080000
-#define MODULE_INPIC		0x100000
-#define MODULE_MPEG2ENC		0x200000
-#define MODULE_ODML		0x400000
-#define MODULE_OGM_AUDIO	0x800000
-#define MODULE_REQUANT		0x1000000
-#define MODULE_TCREQUANT	0x2000000
-#define MODULE_UNPACKER		0x4000000
-#define MODULE_ADEVICE		0x8000000
-#define MODULE_SCRIPT		0x10000000
-#define MODULE_OGM_WRITE	0x20000000
-#define MODULE_XVID_RCTL	0x40000000
-#define MODULE_LAVFORMAT	0x80000000    
-

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp.orig Deleted

@@ -1,116 +0,0 @@
-/**
-    \file ADM_audioStream
-    \brief Base class
-
-(C) Mean 2008
-GPL-v2
-*/
-#include "ADM_default.h"
-#include "ADM_audioStreamMP3.h"
-#include "../../ADM_audio/ADM_mp3info.h"
-
-/**
-    \fn ADM_audioStreamMP3
-    \brief constructor
-*/
-ADM_audioStreamMP3::ADM_audioStreamMP3(WAVHeader *header,ADM_audioAccess *access) : ADM_audioStreamBuffered(header,access)
-{
-    // If hinted..., compute the duration ourselves
-    if(access->isCBR()==true && access->canSeekOffset()==true)
-    {
-        // We can compute the duration from the length
-        float size=access->getLength();
-              size/=header->byterate; // Result is in second
-              size*=1000;
-              size*=1000; // s->us
-              durationInUs=(uint64_t)size;
-              return;
-    }
-    // and built vbr map if needed
-    // The 2 conditions below means there is no gap i.e. avi style stream
-    // else not needed
-    if(access->isCBR()==false && access->canSeekTime()==false)
-    {
-        ADM_assert(access->canSeekOffset()==true);
-        buildTimeMap();
-    }
-
-}
-
-/**
-    \fn ADM_audioStream
-    \brief destructor
-*/
-ADM_audioStreamMP3::~ADM_audioStreamMP3()
-{
-   
-}
-/**
-    \fn goToTime
-    \brief goToTime
-*/
-bool         ADM_audioStreamMP3::goToTime(uint64_t nbUs)
-{
-    if(access->canSeekTime()==true)
-    {
-        if( access->goToTime(nbUs)==true)
-        {
-           lastDts=nbUs;
-           limit=start=0;
-           refill();
-           return 1;
-        }
-        return 1;
-    }
-    // If CBR we can use the default way
-    if(access->isCBR()==true)
-        return ADM_audioStream::goToTime(nbUs);
-    // if VBR use our time map
-}
-/**
-        \fn getPacket
-*/
-uint8_t ADM_audioStreamMP3::getPacket(uint8_t *buffer,uint32_t *size, uint32_t sizeMax,uint32_t *nbSample,uint64_t *dts)
-{
-#define ADM_LOOK_AHEAD 4 // Need 4 bytes...
-uint8_t dataADM_LOOK_AHEAD;
-MpegAudioInfo info;
-uint32_t offset;
-    while(1)
-    {
-        // Do we have enough ? Refill if needed ?
-        if(needBytes(ADM_LOOK_AHEAD)==false) return 0;
-        // Peek
-        peek(ADM_LOOK_AHEAD,data);
-        if(getMpegFrameInfo(data,ADM_LOOK_AHEAD, &info,NULL,&offset))
-        {
-            ADM_assert(info.size<=sizeMax);
-            if(needBytes(info.size)==true)
-            {
-                *size=info.size;
-                read(*size,buffer);
-                *nbSample=info.samples;
-                advanceDts(*nbSample);
-                *dts=lastDts;
-                return 1;
-            }
-            
-        }
-        //discard one byte
-        read8();
-    }
-}
-/**
-    \fn buildTimeMap
-    \brief Build a timeMap i.e. the table making the relation between offset and time
-           it is only used for VBR with offset access, time access does not it it 
-
-*/
-bool ADM_audioStreamMP3::buildTimeMap(void)
-{
-    //access->goToOffset(0);
-    
-
-}
-
-// EOF

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreSubtitles/inc Deleted

avidemux_2.6.12.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-2.7.6.tar.bz2 Deleted

avidemux_2.6.12.tar.gz/cmake_compile_check Deleted

avidemux_2.6.12.tar.gz/myOwnPlugins/videoFilter/CMakeLists.txt Deleted

@@ -1,58 +0,0 @@
-###################################################
-MESSAGE("#####################################")
-MESSAGE("Custom videoFilter plugin template Started")
-MESSAGE("#####################################")
-MESSAGE("")
-
-SET(ADM_PROJECT AdmLogoVideoFilter)
-SET(PLUGINS TRUE)
-SET(DO_COMMON TRUE)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.7 FATAL_ERROR)
-########################################
-# Where is the top dir ?
-########################################
-
-MESSAGE(STATUS "Checking for AVIDEMUX_SOURCE_DIR, AVIDEMUX_LIB_DIR, AVIDEMUX_INCLUDE_DIR...")
-IF (NOT AVIDEMUX_SOURCE_DIR)
-	MESSAGE(FATAL_ERROR "Please add -DAVIDEMUX_SOURCE_DIR=path_to_avidemux_source. You just need the source tree.")
-ELSE (NOT AVIDEMUX_TOP_SOURCE_DIR)
-        # We need TOP_SOURCE_DIR 
-	SET(AVIDEMUX_TOP_SOURCE_DIR "${AVIDEMUX_SOURCE_DIR}" CACHE STRING "")
-ENDIF (NOT AVIDEMUX_SOURCE_DIR)
-
-# Common definitions...
-SET(CMAKE_MODULE_PATH "${AVIDEMUX_TOP_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
-include(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux/commonCmakeApplication.cmake)
-########################################
-# Add include dirs
-########################################
-SET(AVIDEMUX_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
-MARK_AS_ADVANCED(AVIDEMUX_INSTALL_DIR)
-include(admInstallDir)
-#########################################
-# Get regular stuff from main app
-#########################################
-include(admCoreIncludes)
-LINK_DIRECTORIES("${AVIDEMUX_SEARCH_LIB_DIR}")
-INCLUDE_DIRECTORIES(${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6/)
-
-IF (FRESH_BUILD)
-	MESSAGE("")
-ENDIF (FRESH_BUILD)
-
-########################################
-# Global options
-########################################
-OPTION(VERBOSE "" OFF)
-################################################
-# Now really define our plugin...
-###############################################
-INCLUDE(vf_plugin)
-
-
-SET(ADM_vf_logo_SRCS ADM_vidLogo.cpp)
-
-ADD_VIDEO_FILTER(ADM_vf_logo_sample ${ADM_vf_logo_SRCS})
-TARGET_LINK_LIBRARIES(ADM_vf_logo_sample ADM_coreImageLoader6 )
-INIT_VIDEO_FILTER(ADM_vf_logo_sample)
-INSTALL_VIDEO_FILTER(ADM_vf_logo_sample)

avidemux_2.6.12.tar.gz/myOwnPlugins/videoFilter/readme.txt Deleted

avidemux_2.6.12.tar.gz/AUTHORS -> avidemux_2.6.13.tar.gz/AUTHORS Changed

avidemux_2.6.12.tar.gz/addons/avsfilter/avspipecomm.h -> avidemux_2.6.13.tar.gz/addons/avsfilter/avspipecomm.h Changed

avidemux_2.6.13.tar.gz/appImage Added

avidemux_2.6.13.tar.gz/appImage/AppRun Added

avidemux_2.6.13.tar.gz/appImage/avidemux.desktop Added

avidemux_2.6.13.tar.gz/appImage/avidemux.png Added

avidemux_2.6.13.tar.gz/appImage/check.sh Added

avidemux_2.6.13.tar.gz/appImage/deploy.sh Added

@@ -0,0 +1,138 @@
+#!/bin/bash
+# look here https://github.com/probonopd/AppImages/blob/master/recipes/scribus/Recipe
+# export QT_DEBUG_PLUGINS=1 
+# export LD_DEBUG=amm LD_DEBUG_OUTPUT=/tmp/somefile
+
+fail()
+{
+        echo "************************* $* FAILED"
+        echo "************************* $* FAILED"
+        echo "************************* $* FAILED"
+        echo "************************* $* FAILED"
+        echo "************************* $* FAILED"
+        echo "************************* $* FAILED"
+        echo "************************* $* FAILED"
+        exit 1
+
+}
+cpyX86()
+{
+        cp -t ../lib  /usr/lib/x86_64-linux-gnu/$1 || fail copy_x86lib $1
+
+}
+cpyX86Rename()
+{
+        cp -t ../lib/$2  /usr/lib/x86_64-linux-gnu/$1 || fail copy_x86lib $1
+}
+cpyLib()
+{
+        cp -t ../lib  /usr/lib/$1 || fail copy_lib $i
+
+}
+cpyRootLib()
+{
+        cp -t ../lib  /lib/$1 || fail copy_lib $i
+
+}
+cpyRootx86Lib()
+{
+        cp -t ../lib  /lib/x86_64-linux-gnu/$1 || fail copy_lib $i
+
+}
+
+
+
+echo " ** Creating AppImage file **"
+
+if  "${QT_HOME}" = ""  ; then
+  echo "QT_HOME not set, cancelling"
+  exit 1
+fi
+export LD_LIBRARY_PATH=$QT_HOME/lib:$LD_LIBRARY_PATH
+export ORG=$PWD
+export APP_NAME=app
+rm -f $APP_NAME
+cd install/usr/bin
+cp avidemux3_qt5 avidemux3_portable
+mkdir -p ../lib/qt5
+mkdir -p ../lib/qt5/plugins
+# libz
+#cpyRootx86Lib libz.so.1
+
+# qt5
+ldd avidemux3_portable | grep libQ | sed 's/^.*=>//g' | sed 's/ (.*$//g' | xargs cp -t ../lib/qt5/ || fail qt5
+ldd avidemux3_portable | grep icu | sed 's/^.*=>//g' | sed 's/ (.*$//g' | xargs cp -t ../lib/qt5 || fail icu
+cp ${QT_HOME}/lib/libQt5DBus.so.5 ../lib/qt5 || failQtDbus
+cp ${QT_HOME}/lib/libQt5XcbQpa.so.5  ../lib/qt5 || failQtXcb
+
+#cpyRootx86Lib libdbus-1.so.3
+
+cp -Rap -t ../lib/qt5/plugins ${QT_HOME}/plugins/platforms  || fail qtplugins
+# Support libs
+for i in libffi.so.5  libsqlite3.so.0 libpng12.so.0 libgobject-2.0.so.0 libgthread-2.0.so.0 
+do
+        cpyX86 $i
+done
+
+cp -t ../lib /lib/x86_64-linux-gnu/libpcre.so.3 || fail pcre
+cp -t ../lib /lib/x86_64-linux-gnu/libglib-2.0.so.0 || fail glib
+cp -t ../lib /lib/x86_64-linux-gnu/libjson.so.0 || fail json
+cpyRootx86Lib libudev.so.0
+
+# audio plugins
+for i in libfaad.so.2 libfaac.so.0 libmp3lame.so.0 libvorbis.so.0 libvorbisenc.so.2 libaften.so.0 libogg.so.0
+do
+        cpyX86 $i
+done
+
+cpyLib libopus.so.0 
+# Audio device
+cpyX86 libpulse-simple.so.0
+cpyX86 libpulse.so.0
+cp -Rap /usr/lib/x86_64-linux-gnu/pulseaudio ../lib/ || fail pulsecommon_folder
+cp -t ../lib /usr/lib/x86_64-linux-gnu/pulseaudio/libpulsecommon-2.0.so || fail pulsecommon
+ 
+# subtitles
+for i in libfreetype.so.6 libfribidi.so.0 libfontconfig.so.1 
+do 
+        cpyX86 $i
+done
+cpyRootx86Lib libexpat.so.1
+# x264
+cpyLib libx264.so.148
+cpyLib libx265.so.79
+# Display lib
+cpyX86 libvdpau.so.1
+cpyX86 libXv.so.1
+cpyLib libva.so.1
+cpyLib libva-x11.so.1
+
+cp -t ../lib /usr/lib/dri/nvidia_drv_video.so || fail nvidia_drv_video
+cp -t ../lib /usr/lib/dri/i965_drv_video.so  || fail intel_drv_video
+# patch
+sed -i -e 's|/usr/lib/dri|././/././lib|g'   ../lib/libva.so.1
+sed -i -e 's|/usr/lib/x86_64-linux-gnu/dri|././././././/./././././/./lib|g'  ../lib/libva.so.1
+
+#intel, not sure it works
+
+# Fixup link
+cd ../lib
+cd ../bin
+# Qt path
+echo "Paths" > qt.conf
+echo "Prefix=../lib/qt5" >> qt.conf
+
+
+cd ..
+#find . -type f -exec sed -i -e 's|/usr|../lib/|g' {} \; ; cd -
+find . -type f -exec sed -i -e 's|/usr/lib/x86_64-linux-gnu|./././././././././././lib|g' {} \; ; cd ..
+find . -type f -exec sed -i -e 's|/usr/lib|././/lib|g' {} \; ; cd ..
+#
+cd $ORG
+cp appImage/AppRun install
+cp appImage/avidemux.png install
+cp appImage/avidemux.desktop install
+
+cd $ORG
+AppImageAssistant  install $APP_NAME
+

avidemux_2.6.13.tar.gz/avidemux/admAppSettings.cmake Added

avidemux_2.6.12.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_shell/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_shell/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux/cli/ADM_userInterfaces/ui_support.cpp -> avidemux_2.6.13.tar.gz/avidemux/cli/ADM_userInterfaces/ui_support.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/cli/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux/cli/CMakeLists.txt Changed

@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 
+SET(AVIDEMUX_API_VERSION 2.6)
 SET(ADM_PROJECT Avidemux_cli)
 
 MESSAGE("")
@@ -8,7 +9,37 @@
 MESSAGE("#########################################")
 MESSAGE("")
 
-include(../commonCmakeApplication.cmake)
+MESSAGE(STATUS "Checking for avidemux development files ..")
+
+IF(NOT FAKEROOT)
+	SET(AVIDEMUX_FAKEROOT "")
+else(NOT FAKEROOT)
+	SET(AVIDEMUX_FAKEROOT "${FAKEROOT}/")
+endif(NOT FAKEROOT)
+
+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}")
+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(admWindRes)
 
 ##########################################
@@ -18,7 +49,7 @@
 SET(CONFIG_HEADER_TYPE ADM_BUILD_CLI)
 SET(UI_SUFFIX cli)
 
-CONFIGURE_FILE("${AVIDEMUX_TOP_SOURCE_DIR}/cmake/config.h.cmake" "${CMAKE_BINARY_DIR}/config/cli/config.h")
+CONFIGURE_FILE("${ADM_CMAKE_DIR}/config.h.cmake" "${CMAKE_BINARY_DIR}/config/cli/config.h")
 MESSAGE(STATUS "CLI config.h generated")
 
 INCLUDE_DIRECTORIES(BEFORE "${CMAKE_BINARY_DIR}/config/cli/")
@@ -115,4 +146,7 @@
 include(admPackager)
 admPackager(cliPackage)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/config/cli/config.h DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/cli" COMPONENT dev) 
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/ADM_UIs/include/DIA_flyDialogCli.h   DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/cli/ADM_UIs" COMPONENT dev) 
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/ADM_UIs/include/ADM_UI_Cli6_export.h DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/cli/ADM_UIs" COMPONENT dev) 
 MESSAGE("")
+

avidemux_2.6.13.tar.gz/avidemux/common/ADM_audioCodec Added

avidemux_2.6.13.tar.gz/avidemux/common/ADM_audioCodec/CMakeLists.txt Added

avidemux_2.6.13.tar.gz/avidemux/common/ADM_audioCodec/src Added

avidemux_2.6.13.tar.gz/avidemux/common/ADM_audioCodec/src/ADM_8bits.cpp Added

@@ -0,0 +1,61 @@
+/***************************************************************************
+                          ADM_8bits.cpp  -  description
+                             -------------------
+    begin                : Fri Aug 5 2003
+    copyright            : (C) 2003 by mean
+    email                : fixounet@free.fr
+
+	This is a dummy coded that converts a 8 bits input sample to
+	a 16 bits ouput samples
+
+	It is used as it is because internally avidemux can only deal with
+	16 bits audio samples
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 <math.h>
+
+
+#include "fourcc.h"
+#include "ADM_coreAudio.h"
+#include "ADM_audiocodec.h"
+
+
+ADM_Audiocodec8Bits::ADM_Audiocodec8Bits( uint32_t fourcc,const WAVHeader &info) :  
+            ADM_Audiocodec(fourcc,info)
+{
+ 	ADM_assert(fourcc==WAV_8BITS||fourcc==WAV_8BITS_UNSIGNED);
+	if(fourcc==WAV_8BITS_UNSIGNED)
+			_unsign=1;
+	else
+			_unsign=0;
+
+}
+ADM_Audiocodec8Bits::~ADM_Audiocodec8Bits( )
+{
+
+}
+uint8_t ADM_Audiocodec8Bits::run(uint8_t *inptr, uint32_t nbIn, float *outptr, uint32_t *nbOut)
+{
+  float f;
+        for (int n = 0; n < nbIn; n++) {
+                f=(float) *inptr++;
+                if(_unsign)
+                        *(outptr++) = (f - 128.) / 256.;
+                else
+                        *(outptr++) = f / 256.;
+        }
+        *nbOut=nbIn;
+	return 1;
+}
+
+

avidemux_2.6.13.tar.gz/avidemux/common/ADM_audioCodec/src/ADM_audiocodec.cpp Added

@@ -0,0 +1,84 @@
+/***************************************************************************
+     \file                     ADM_audiocodec.cpp  
+     \brief   Front end for audio decoder
+    copyright            : (C) 2002/2009 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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "ADM_default.h"
+
+#include "fourcc.h"
+#include "ADM_coreAudio.h"
+#include "ADM_audiocodec.h"
+extern ADM_Audiocodec *ADM_ad_searchCodec(uint32_t fourcc,	WAVHeader *info,uint32_t extraLength,uint8_t *extraData);
+
+ADM_Audiocodec	*getAudioCodec(uint32_t fourcc,WAVHeader *info,uint32_t extra,uint8_t *extraData)
+{
+ADM_Audiocodec *out = NULL;
+
+    // fake codec for 8 bits
+    if(fourcc==WAV_PCM)
+    {
+        if(info)
+            if(info->bitspersample==8)
+            {
+                info->encoding=fourcc=WAV_8BITS_UNSIGNED;
+            }
+    }
+
+    switch(fourcc)
+    {
+        case WAV_PCM:
+                    ADM_info("audioCodec Audio codec:  WAV\n");
+#ifdef ADM_BIG_ENDIAN
+                    out= (ADM_Audiocodec *)new ADM_AudiocodecWavSwapped(fourcc,*info);
+#else
+                    out= (ADM_Audiocodec *)new ADM_AudiocodecWav(fourcc,*info);
+#endif
+                    break;
+        case WAV_8BITS:
+                    ADM_info("audioCodec 8 BIts pseudo codec\n");
+                    out= (ADM_Audiocodec *)new ADM_Audiocodec8Bits(fourcc,*info);
+                    break;
+        case WAV_8BITS_UNSIGNED:
+                    ADM_info("audioCodec 8 BIts pseudo codec unsigned\n");
+                    out= (ADM_Audiocodec *)new ADM_Audiocodec8Bits(fourcc,*info);
+                    break;
+        case WAV_LPCM:
+                    ADM_info("audioCodec Audio codec:  LPCM swapped\n");
+#ifndef ADM_BIG_ENDIAN
+                    out= (ADM_Audiocodec *)new ADM_AudiocodecWavSwapped(fourcc,*info);
+#else
+                    out= (ADM_Audiocodec *)new ADM_AudiocodecWav(fourcc,*info);
+#endif
+                    break;
+        default:
+                    out= ADM_ad_searchCodec(fourcc,info,extra,extraData);
+                    break;
+        }
+
+        if (out == NULL)
+        {
+                ADM_warning("audioCodec Unknown codec : %" PRIu32"\n",fourcc);
+                out = (ADM_Audiocodec *) new ADM_AudiocodecUnknown(fourcc,*info);
+        }
+        // For channel mapping, simple case we do it here so that the decoder does not have
+        // to worry.
+        // For more complicated case (channel >2) , it is up to the decoder to do it...
+        switch(info->channels)
+        {
+                        case 1: out->channelMapping0 = ADM_CH_MONO;
+                                        break;
+                        case 2: out->channelMapping0 = ADM_CH_FRONT_LEFT;
+                                        out->channelMapping1 = ADM_CH_FRONT_RIGHT;
+                                        break;
+                        default:break;
+        }
+        return out;
+}

avidemux_2.6.13.tar.gz/avidemux/common/ADM_audioCodec/src/ADM_codecwav.cpp Added

@@ -0,0 +1,48 @@
+/***************************************************************************
+                          ADM_codecwav.cpp  -  description
+                             -------------------
+    begin                : Fri May 31 2002
+    copyright            : (C) 2002 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 <math.h>
+#include "ADM_audiocodec.h"
+
+ADM_AudiocodecWav::ADM_AudiocodecWav( uint32_t fourcc,const WAVHeader &info ) : ADM_Audiocodec(fourcc,info)
+{
+    ADM_info("Creating not swapped wav decoder (PCM)\n");
+}
+ADM_AudiocodecWav::~ADM_AudiocodecWav()
+{
+
+}
+
+uint8_t ADM_AudiocodecWav::isCompressed( void )
+{
+ 	return 0;
+}
+
+uint8_t ADM_AudiocodecWav::run(uint8_t * inptr, uint32_t nbIn, float * outptr, uint32_t * nbOut)
+{
+	int16_t *in = (int16_t *) inptr;
+
+	*nbOut=nbIn / 2;
+	for (int i = 0; i < *nbOut; i++) {
+		*(outptr++) = (float)*in / 32768;
+		in++;
+	}
+
+	return 1;
+}
+
+

avidemux_2.6.13.tar.gz/avidemux/common/ADM_audioCodec/src/ADM_lpcm.cpp Added

@@ -0,0 +1,65 @@
+/***************************************************************************
+                          ADM_lpcm .cpp  -  description
+                             -------------------
+
+	Handle DVD LPCM, i.e. swapped PC PCM
+    begin                : Fri May 5 2003
+    copyright            : (C) 2003 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 <math.h>
+
+#include "ADM_audiocodec.h"
+
+ADM_AudiocodecWavSwapped::ADM_AudiocodecWavSwapped( uint32_t fourcc,const WAVHeader &info ) : ADM_Audiocodec(fourcc,info)
+{
+	channelMapping0 = ADM_CH_FRONT_LEFT;
+	channelMapping1 = ADM_CH_FRONT_RIGHT;
+	channelMapping2 = ADM_CH_FRONT_CENTER;
+	channelMapping3 = ADM_CH_LFE;
+	channelMapping4 = ADM_CH_REAR_LEFT;
+	channelMapping5 = ADM_CH_REAR_RIGHT;
+    ADM_info("Creating swapped wav decoder (LPCM)\n");
+}
+
+ADM_AudiocodecWavSwapped::~ADM_AudiocodecWavSwapped()
+{
+
+}
+
+uint8_t ADM_AudiocodecWavSwapped::isCompressed( void )
+{
+ 	return 1;
+}
+
+uint8_t ADM_AudiocodecWavSwapped::run(uint8_t * inptr, uint32_t nbIn, float *outptr, uint32_t * nbOut)
+{
+	if (nbIn < 2)
+		return 1;
+
+	if (nbIn&1) {
+		ADM_error("Error: nbIn (%i) odd in lpcm", nbIn);
+		abort();
+	}
+
+	int16_t sample;
+	*nbOut=nbIn / 2;
+	for (int i = 0; i < *nbOut; i++) {
+		sample = (inptr0 << 8) | inptr1;
+		*(outptr++) = (float)sample / 32768;
+		inptr += 2;
+	}
+
+	return 1;
+}
+

avidemux_2.6.13.tar.gz/avidemux/common/ADM_audioCodec/src/ADM_pluginLoad.cpp Changed

avidemux_2.6.13.tar.gz/avidemux/common/ADM_audioCodec/src/CMakeLists.txt Added

avidemux_2.6.12.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_access.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_access.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_bridge.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_bridge.cpp Changed

@@ -27,6 +27,17 @@
 #else
 #define aprintf printf
 #endif
+/**
+ * 
+ * @param in
+ * @return 
+ */
+static int64_t  _ms2us(int32_t in)
+{
+   int64_t us=(int64_t ) in;
+   us*=1000LL;
+   return us;
+}
 
 /**
     \fn AUDMAudioFilter_Bridge
@@ -34,45 +45,48 @@
 AUDMAudioFilter_Bridge::AUDMAudioFilter_Bridge(ADM_edAudioTrack *incoming,
                           uint32_t startInMs,int32_t shiftMs) : AUDMAudioFilter(NULL)
 {
+  shiftMs=-shiftMs;
   _incoming=incoming;
   memcpy(&_wavHeader,_incoming->getInfo(),sizeof(_wavHeader));
   // For SBR TEST
   //_wavHeader.frequency*=2;
   _wavHeader.frequency=_incoming->getOutputFrequency();
   // /For SBR Test
-  _startTime=startInMs;
-  shiftMs=-shiftMs;
-  _shift=shiftMs;
+  _startTimeUs=_ms2us(startInMs);
+  _shiftUs=_ms2us(shiftMs);
+  
   _hold=0;
   rewind();
   
-  ADM_info("Bridge Starting with time %"PRIu32" ms, shift %"PRIi32" ms\n",startInMs,-shiftMs);
-  // If shiftMS is > 0, it means we have to go in the future, just increse _startTime
+  ADM_info("Bridge Starting with time %s , shift %" PRIi32" ms\n",ADM_us2plain(startInMs*1000LL),-shiftMs);
+  // If shiftMS is > 0, it means we have to go in the future, just increase _startTime
   if(shiftMs>0)
   {
-    _startTime+=_shift;
+    _startTimeUs+=_shiftUs;
   }
   else if(shiftMs<0) // In that case we have to go either in the past and/or duplicate frames
   {
     shiftMs=-shiftMs;
-    if(_startTime>shiftMs)  
+    _shiftUs=-_shiftUs;
+    if(_startTimeUs>_shiftUs)  
     {
-      _startTime-=shiftMs;
+      _startTimeUs-=_shiftUs;
     }else
     {
       double nbSample;
       
-      shiftMs-=_startTime;
-      _startTime=0;
-      nbSample=shiftMs;
-      nbSample*=_wavHeader.frequency; 
-      nbSample/=1000.;
-      nbSample*=_wavHeader.channels;
-      _hold=(int32_t)nbSample;
+      _shiftUs-=_startTimeUs;
+      _startTimeUs=0;
+      double dNbSample=_shiftUs;
+      
+      dNbSample*=_wavHeader.frequency; 
+      dNbSample/=1000000.;
+      dNbSample*=_wavHeader.channels;
+      _hold=(int32_t)dNbSample;
     }
     
   }
-  printf("Bridge Ending with time %u, sample %u\n",_startTime,_hold);
+  ADM_info("Bridge Ending with time %s, sample %u\n",ADM_us2plain(_startTimeUs),_hold);
   rewind();
 }
 /**
@@ -88,10 +102,8 @@
 */
 uint8_t AUDMAudioFilter_Bridge::rewind(void)
 {
-uint64_t ttime=_startTime;
-  ttime*=1000; // ms->us
-  ADM_info("AudioBridge Going to time %d\n",_startTime);
-  uint8_t r= _incoming->goToTime(ttime);
+  ADM_info("AudioBridge Going to time %s\n",ADM_us2plain(_startTimeUs));
+  uint8_t r= _incoming->goToTime(_startTimeUs);
   if(!r) ADM_warning("AudioBridge Failed!\n");
   return r;
 }
@@ -147,14 +159,14 @@
           dts=ADM_NO_PTS;
       }
       uint64_t endDts=dts+got*sampleToUs;
-      aprintf("StartTime : %s\n",ADM_us2plain(_startTime*1000));
+      aprintf("StartTime : %s\n",ADM_us2plain(_startTimeUs));
       aprintf("packet start : %s\n",ADM_us2plain(dts));
       aprintf("packet end : %s\n",ADM_us2plain(endDts));
       
-      if(dts!=ADM_NO_PTS && endDts < _startTime*1000)
+      if(dts!=ADM_NO_PTS && endDts < _startTimeUs)
       {
           ADM_info("Packet too early, dropping it... :%s",ADM_us2plain(dts));
-          ADM_info("/ start is at :%s\n",ADM_us2plain(_startTime*1000));
+          ADM_info("\n start is at :%s\n",ADM_us2plain(_startTimeUs));
           continue;
       }
       got*=_wavHeader.channels; // sample->float

avidemux_2.6.12.tar.gz/avidemux/common/ADM_commonUI/DIA_jobs_save.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_commonUI/DIA_jobs_save.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_commonUI/DIA_prefs.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_commonUI/DIA_prefs.cpp Changed

@@ -27,7 +27,7 @@
 #endif
 
 extern void 		AVDM_audioPref( void );
-extern const char* getNativeRendererDesc();
+extern const char* getNativeRendererDesc(int type);
 
 
 
@@ -103,9 +103,10 @@
     DOME(4,dring);
      
 // Cpu caps
-#define CPU_CAPS(x)    	if(CpuCaps::myCpuMask & ADM_CPUCAP_##x) caps##x=1; else caps##x=0;
+#define CPU_CAPS(x)    	if(cpuMask & ADM_CPUCAP_##x) caps##x=1; else caps##x=0;
     
-    	if(CpuCaps::myCpuMask==ADM_CPUCAP_ALL) capsAll=1; else capsAll=0;
+        uint32_t cpuMask=CpuCaps::getMask();
+    	if(cpuMask==ADM_CPUCAP_ALL) capsAll=1; else capsAll=0;
     	CPU_CAPS(MMX);
     	CPU_CAPS(MMXEXT);
     	CPU_CAPS(3DNOW);
@@ -226,15 +227,15 @@
 
         diaElemFrame frameSimd(QT_TRANSLATE_NOOP("adm","SIMD"));
 
-		diaElemToggle capsToggleAll(&capsAll,QT_TRANSLATE_NOOP("adm","Enable all SIMD"));
+        diaElemToggle capsToggleAll(&capsAll,QT_TRANSLATE_NOOP("adm","Enable all SIMD"));
         diaElemToggle capsToggleMMX(&capsMMX, QT_TRANSLATE_NOOP("adm","Enable MMX"));
-		diaElemToggle capsToggleMMXEXT(&capsMMXEXT, QT_TRANSLATE_NOOP("adm","Enable MMXEXT"));
-		diaElemToggle capsToggle3DNOW(&caps3DNOW, QT_TRANSLATE_NOOP("adm","Enable 3DNOW"));
-		diaElemToggle capsToggle3DNOWEXT(&caps3DNOWEXT, QT_TRANSLATE_NOOP("adm","Enable 3DNOWEXT"));
-		diaElemToggle capsToggleSSE(&capsSSE, QT_TRANSLATE_NOOP("adm","Enable SSE"));
-		diaElemToggle capsToggleSSE2(&capsSSE2, QT_TRANSLATE_NOOP("adm","Enable SSE2"));
-		diaElemToggle capsToggleSSE3(&capsSSE3, QT_TRANSLATE_NOOP("adm","Enable SSE3"));
-		diaElemToggle capsToggleSSSE3(&capsSSSE3, QT_TRANSLATE_NOOP("adm","Enable SSSE3"));
+        diaElemToggle capsToggleMMXEXT(&capsMMXEXT, QT_TRANSLATE_NOOP("adm","Enable MMXEXT"));
+        diaElemToggle capsToggle3DNOW(&caps3DNOW, QT_TRANSLATE_NOOP("adm","Enable 3DNOW"));
+        diaElemToggle capsToggle3DNOWEXT(&caps3DNOWEXT, QT_TRANSLATE_NOOP("adm","Enable 3DNOWEXT"));
+        diaElemToggle capsToggleSSE(&capsSSE, QT_TRANSLATE_NOOP("adm","Enable SSE"));
+        diaElemToggle capsToggleSSE2(&capsSSE2, QT_TRANSLATE_NOOP("adm","Enable SSE2"));
+        diaElemToggle capsToggleSSE3(&capsSSE3, QT_TRANSLATE_NOOP("adm","Enable SSE3"));
+        diaElemToggle capsToggleSSSE3(&capsSSSE3, QT_TRANSLATE_NOOP("adm","Enable SSSE3"));
 
 		capsToggleAll.link(0, &capsToggleMMX);
 		capsToggleAll.link(0, &capsToggleMMXEXT);
@@ -281,7 +282,7 @@
         diaElemToggle   togTagMp3(&balternate_mp3_tag,QT_TRANSLATE_NOOP("adm","_Use alternative tag for MP3 in .mp4"));
         
         diaMenuEntry videoMode={
-                             {RENDER_GTK, getNativeRendererDesc(), NULL}
+                             {RENDER_GTK, getNativeRendererDesc(0), NULL}
 #ifdef USE_XV
                              ,{RENDER_XV,   QT_TRANSLATE_NOOP("adm","XVideo (best)"),NULL}
 #endif
@@ -388,13 +389,14 @@
      uint32_t languageIndex=0;
      languageDescriptor myLanguages={
                 {"auto","System language"},
+                {"da_DK","Dansk"},
+                {"de","Deutsch"},
                 {"en","English"},
+                {"es","Español"},
                 {"fr","Français"},
-                {"de","German"},
-                {"es","Spanish"},
-                {"it","Italian"},
-                {"ru","Pyckuu"},
-                {"pl","Polish"},
+                {"it","Italiano"},
+                {"pl","Polski"},
+                {"ru","Русский"},
         };
         uint32_t nbLanguages=sizeof(myLanguages)/sizeof(languageDescriptor);
         char *currentLanguage;
@@ -444,8 +446,8 @@
 
         
         /* Display */
-        diaElemToggle togDisplayRefreshCap(&refreshCapEnabled,"_Limit Refresh Rate");
-        diaElemUInteger displayRefreshCap(&refreshCapValue,"Refresh Rate Cap (ms)",10,1000);
+        diaElemToggle togDisplayRefreshCap(&refreshCapEnabled,QT_TRANSLATE_NOOP("adm","_Limit Refresh Rate"));
+        diaElemUInteger displayRefreshCap(&refreshCapValue,QT_TRANSLATE_NOOP("adm","Refresh Rate Cap (ms)"),10,1000);
 
             
 #ifdef USE_SDL
@@ -467,8 +469,8 @@
 		diaElemTabs tabThreading(QT_TRANSLATE_NOOP("adm","Threading"),2,(diaElem **)diaThreading);
 
 		/* Avisynth tab */
-		diaElemToggle togAskAvisynthPort(&askPortAvisynth,"_Always ask which port to use");
-		diaElemUInteger uintDefaultPortAvisynth(&defaultPortAvisynth,"Default port to use",1024,65535);
+		diaElemToggle togAskAvisynthPort(&askPortAvisynth,QT_TRANSLATE_NOOP("adm","_Always ask which port to use"));
+		diaElemUInteger uintDefaultPortAvisynth(&defaultPortAvisynth,QT_TRANSLATE_NOOP("adm","Default port to use"),1024,65535);
 		diaElem *diaAvisynth={&togAskAvisynthPort, &uintDefaultPortAvisynth};
 		diaElemTabs tabAvisynth("Avisynth",2,(diaElem **)diaAvisynth);
 
@@ -492,24 +494,26 @@
             prefs->set(FEATURES_ENABLE_OPENGL,hasOpenGl);
 #endif
     // cpu caps
+            uint32_t cpuMaskOut;
             if(capsAll)
             {
-                    CpuCaps::myCpuMask=ADM_CPUCAP_ALL;
+                    cpuMaskOut=ADM_CPUCAP_ALL;
             }else
             {
-                    CpuCaps::myCpuMask=0;
+                    cpuMaskOut=0;
     #undef CPU_CAPS
-    #define CPU_CAPS(x)    	if(caps##x) CpuCaps::myCpuMask|= ADM_CPUCAP_##x;        	    	
-            CPU_CAPS(MMX);
-            CPU_CAPS(MMXEXT);
-            CPU_CAPS(3DNOW);
-            CPU_CAPS(3DNOWEXT);
-            CPU_CAPS(SSE);
-            CPU_CAPS(SSE2);
-            CPU_CAPS(SSE3);
-            CPU_CAPS(SSSE3);
+    #define CPU_CAPS(x)    	if(caps##x) cpuMaskOut|= ADM_CPUCAP_##x;        	    	
+                    CPU_CAPS(MMX);
+                    CPU_CAPS(MMXEXT);
+                    CPU_CAPS(3DNOW);
+                    CPU_CAPS(3DNOWEXT);
+                    CPU_CAPS(SSE);
+                    CPU_CAPS(SSE2);
+                    CPU_CAPS(SSE3);
+                    CPU_CAPS(SSSE3);
             }
-            prefs->set(FEATURES_CPU_CAPS,CpuCaps::myCpuMask);
+            prefs->set(FEATURES_CPU_CAPS,cpuMaskOut);
+            CpuCaps::setMask(cpuMaskOut);
             //
             prefs->set(FEATURES_CAP_REFRESH_ENABLED,refreshCapEnabled);
             prefs->set(FEATURES_CAP_REFRESH_VALUE,refreshCapValue);

avidemux_2.6.12.tar.gz/avidemux/common/ADM_commonUI/myOwnMenu.h -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_commonUI/myOwnMenu.h Changed

@@ -2,9 +2,7 @@
     \file myOwnMenus
 
 */
-#ifndef MY_OWN_MENUS
-#define MY_OWN_MENUS
-
+#pragma once
 #include <vector>
 #include <string>
 
@@ -30,69 +28,72 @@
     const char *icon;
     const char *shortCut;
 }MenuEntry;
+
 #ifdef MENU_DECLARE
 static const MenuEntry _myMenuFile = {
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Open"),    NULL,ACT_OPEN_VIDEO,       MKICON(fileopen), "Ctrl+O"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Append"),  NULL,ACT_APPEND_VIDEO     ,NULL,             "Ctrl+A"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save"),    NULL,ACT_SAVE_VIDEO       ,MKICON(filesaveas),"Ctrl+S"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Queue"),   NULL,ACT_SAVE_QUEUE       ,NULL              ,"Ctrl+U"},
-            {MENU_SUBMENU,QT_TRANSLATE_NOOP("adm","Save as Image"),    NULL,ACT_DUMMY    ,NULL,NULL},
-            {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save as BMP"),    NULL,ACT_SAVE_BMP ,NULL,"Ctrl+M"},
-            {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save as JPEG"),   NULL,ACT_SAVE_JPG ,NULL,"Ctrl+E"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Close"),   NULL,ACT_CLOSE          ,NULL,                "Ctrl+W"},
-            {MENU_SEPARATOR,QT_TRANSLATE_NOOP("adm","-"),NULL,ACT_DUMMY             ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Information"),NULL,ACT_VIDEO_PROPERTIES,                 MKICON(info),NULL},
-            {MENU_SEPARATOR,QT_TRANSLATE_NOOP("adm","-"),NULL,ACT_DUMMY             ,NULL,NULL},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Open"),               NULL,ACT_OPEN_VIDEO,       MKICON(fileopen), "Ctrl+O"},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Append"),             NULL,ACT_APPEND_VIDEO     ,NULL,             "Ctrl+A"},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save"),               NULL,ACT_SAVE_VIDEO       ,MKICON(filesaveas),"Ctrl+S"},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Queue"),              NULL,ACT_SAVE_QUEUE       ,NULL              ,"Ctrl+U"},
+            {MENU_SUBMENU,QT_TRANSLATE_NOOP("adm","Save as Image"),     NULL,ACT_DUMMY    ,NULL,NULL},
+            {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save as BMP"),     NULL,ACT_SAVE_BMP ,NULL,"Ctrl+M"},
+            {MENU_SUBACTION,QT_TRANSLATE_NOOP("adm","Save as JPEG"),    NULL,ACT_SAVE_JPG ,NULL,"Ctrl+E"},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Close"),              NULL,ACT_CLOSE          ,NULL,                "Ctrl+W"},
+            {MENU_SEPARATOR,QT_TRANSLATE_NOOP("adm","-"),               NULL,ACT_DUMMY             ,NULL,NULL},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Information"),        NULL,ACT_VIDEO_PROPERTIES,                 MKICON(info),NULL},
+            {MENU_SEPARATOR,QT_TRANSLATE_NOOP("adm","-"),               NULL,ACT_DUMMY             ,NULL,NULL},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Connect to avsproxy"),NULL,ACT_AVS_PROXY,NULL},
-            {MENU_SEPARATOR,QT_TRANSLATE_NOOP("adm","-"),NULL,ACT_DUMMY             ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Quit"),    NULL,ACT_EXIT           ,NULL,"Ctrl+Q"}
+            {MENU_SEPARATOR,QT_TRANSLATE_NOOP("adm","-"),               NULL,ACT_DUMMY             ,NULL,NULL},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Quit"),               NULL,ACT_EXIT           ,NULL,"Ctrl+Q"}
         };
 
 std::vector<MenuEntry> myMenuFile(_myMenuFile, _myMenuFile + sizeof(_myMenuFile) / sizeof(_myMenuFile0));
 
 static const MenuEntry _myMenuEdit = {
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Undo"),        NULL,ACT_Undo       ,NULL,"Ctrl+Z"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Edit"),  NULL,ACT_ResetSegments,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Cut"),         NULL,ACT_Cut        ,NULL,"Ctrl+X"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Copy"),        NULL,ACT_Copy       ,NULL,"Ctrl+C"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Paste"),       NULL,ACT_Paste      ,NULL,"Ctrl+V"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Delete"),      NULL,ACT_Delete     ,NULL,"Delete"},
-            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY             ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Set Marker A"),NULL,ACT_MarkA      ,NULL,""},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Set Marker B"),NULL,ACT_MarkB      ,NULL,""},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Undo"),               NULL,ACT_Undo       ,NULL,"Ctrl+Z"},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Edit"),         NULL,ACT_ResetSegments,NULL,NULL},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Cut"),                NULL,ACT_Cut        ,NULL,"Ctrl+X"},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Copy"),               NULL,ACT_Copy       ,NULL,"Ctrl+C"},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Paste"),              NULL,ACT_Paste      ,NULL,"Ctrl+V"},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Delete"),             NULL,ACT_Delete     ,NULL,"Delete"},
+            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY             ,NULL,       NULL},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Set Marker A"),       NULL,ACT_MarkA      ,NULL,"Ctrl+PgUp"},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Set Marker B"),       NULL,ACT_MarkB      ,NULL,"Ctrl+PgDown"},
+            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY             ,NULL,       NULL},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Preferences"),        NULL,ACT_PREFERENCES,NULL,NULL},
             {MENU_SEPARATOR,"-",NULL,ACT_DUMMY             ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Preferences"), NULL,ACT_PREFERENCES,NULL,NULL},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save current settings as default"), NULL,ACT_SaveAsDefault,NULL,NULL},
         };
 
 std::vector<MenuEntry> myMenuEdit(_myMenuEdit, _myMenuEdit + sizeof(_myMenuEdit) / sizeof(_myMenuEdit0));
 
 static const MenuEntry _myMenuVideo = {
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Decoder Option"),  NULL,ACT_DecoderOption      ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","PostProcessing"),  NULL,ACT_SetPostProcessing  ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Filters"),        NULL,ACT_VIDEO_FILTERS      ,NULL,"Ctrl+Alt+F"},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Decoder Option"),     NULL,ACT_DecoderOption      ,NULL,NULL},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","PostProcessing"),     NULL,ACT_SetPostProcessing  ,NULL,NULL},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Filters"),            NULL,ACT_VIDEO_FILTERS      ,NULL,"Ctrl+Alt+F"},
         };
 
 std::vector<MenuEntry> myMenuVideo(_myMenuVideo, _myMenuVideo + sizeof(_myMenuVideo) / sizeof(_myMenuVideo0));
 
 static const MenuEntry _myMenuAudio = {
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Select Track"),    NULL,ACT_AUDIO_SELECT_TRACK ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save audio"),      NULL,ACT_SAVE_AUDIO         ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Filters"),        NULL,ACT_AUDIO_FILTERS      ,NULL,NULL},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Select Track"),       NULL,ACT_AUDIO_SELECT_TRACK ,NULL,NULL},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save audio"),         NULL,ACT_SAVE_AUDIO         ,NULL,NULL},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Filters"),            NULL,ACT_AUDIO_FILTERS      ,NULL,NULL},
         };
 
 std::vector<MenuEntry> myMenuAudio(_myMenuAudio, _myMenuAudio + sizeof(_myMenuAudio) / sizeof(_myMenuAudio0));
 
 static const MenuEntry _myMenuHelp = {
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Build Option"),    NULL,ACT_BUILT_IN           ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Plugins"),         NULL,ACT_PLUGIN_INFO        ,NULL,NULL},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Build Option"),       NULL,ACT_BUILT_IN           ,NULL,NULL},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Plugins"),            NULL,ACT_PLUGIN_INFO        ,NULL,NULL},
 #ifdef _WIN32
 			{MENU_SEPARATOR,"-",NULL,ACT_DUMMY             ,NULL,NULL},
 			{MENU_SUBMENU, QT_TRANSLATE_NOOP("adm","&Advanced"), NULL, ACT_DUMMY, NULL, NULL},
 			{MENU_SUBACTION, QT_TRANSLATE_NOOP("adm","Open Application &Log"), NULL, ACT_OPEN_APP_LOG, NULL, NULL},
 			{MENU_SUBACTION, QT_TRANSLATE_NOOP("adm","Open Application Data &Folder"), NULL, ACT_OPEN_APP_FOLDER, NULL, NULL},
 #endif
-			{MENU_SEPARATOR,"-",NULL,ACT_DUMMY             ,NULL,NULL},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","About"),          NULL,ACT_ABOUT              ,NULL,NULL},
+            {MENU_SEPARATOR,"-",                                        NULL,ACT_DUMMY             ,NULL,NULL},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","About"),              NULL,ACT_ABOUT              ,NULL,NULL},
         };
 
 std::vector<MenuEntry> myMenuHelp(_myMenuHelp, _myMenuHelp + sizeof(_myMenuHelp) / sizeof(_myMenuHelp0));
@@ -108,10 +109,10 @@
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Black Frame"),    NULL,ACT_NextBlackFrame ,MKICON(next_black),    NULL},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","First Frame"),         NULL,ACT_Begin          ,MKICON(player_start),  "Home"},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Last Frame"),          NULL,ACT_End            ,MKICON(player_end),    "End"},
-            {MENU_SEPARATOR,"-",               NULL,ACT_DUMMY          ,NULL,NULL},
+            {MENU_SEPARATOR,"-",               NULL,ACT_DUMMY          , NULL,NULL},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Marker A"),      NULL,ACT_GotoMarkA      ,MKICON(markA)         ,"PgUp"},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Marker B"),      NULL,ACT_GotoMarkB      ,MKICON(markB)         ,"PgDown"},
-            {MENU_SEPARATOR,"-",               NULL,ACT_DUMMY          ,NULL,NULL},
+            {MENU_SEPARATOR,"-",               NULL,ACT_DUMMY          , NULL,NULL},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Time"),          NULL,ACT_GotoTime       ,NULL,                 "Ctrl+T" },
         };
 
@@ -127,4 +128,3 @@
 std::vector<MenuEntry> myMenuView(_myMenuView, _myMenuView + sizeof(_myMenuView) / sizeof(_myMenuView0));
 
 #endif
-#endif

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/include/ADM_edAudioTrackExternal.h -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/include/ADM_edAudioTrackExternal.h Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/include/ADM_edScriptGenerator.h -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/include/ADM_edScriptGenerator.h Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/include/ADM_edit.hxx -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/include/ADM_edit.hxx Changed

@@ -38,7 +38,7 @@
  #include "ADM_colorspace.h"
 
  #include "ADM_audioStream.h"
- #include "ADM_audiocodec/ADM_audiocodec.h"
+ #include "ADM_audiocodec.h"
  #include "ADM_segment.h"
  #include <BVector.h>
  #include "ADM_edAudioTrack.h"
@@ -222,9 +222,9 @@
 public:
                     uint64_t    getLastKeyFramePts(void);
                     uint64_t    getCurrentFramePts(void);
-					bool		setCurrentFramePts(uint64_t pts);
+                    bool		setCurrentFramePts(uint64_t pts);
                     bool        goToTimeVideo(uint64_t time);
-					void		getCurrentFrameFlags(uint32_t *flags, uint32_t *quantiser);
+                    void		getCurrentFrameFlags(uint32_t *flags, uint32_t *quantiser);
                     bool        goToIntraTimeVideo(uint64_t time);
                     bool        nextPicture(ADMImage *image,bool dontcross=false);
                     bool        samePicture(ADMImage *image);
@@ -239,6 +239,7 @@
 public:
                     uint8_t	    updateVideoInfo(aviInfo *info);
                     uint32_t 	getSpecificMpeg4Info( void );
+                    bool        getNonClosedGopDelay(uint64_t time,uint32_t *delay);
 /************************************ /audioStream ******************************/
                     bool            getAudioStreamsInfo(uint64_t xtime,uint32_t *nbStreams, audioInfo **infos);
                     bool            changeAudioStream(uint64_t xtime,uint32_t newstream);
@@ -267,7 +268,7 @@
                     bool                getPKFramePTS(uint64_t *frameTime);
                     bool                getDtsFromPts(uint64_t *time);
                                         /// Returns pts-dts for given frame
-                    bool		        getPtsDtsDelta(uint64_t *frameTime);
+                    bool		getPtsDtsDelta(uint64_t frametime, uint64_t *delta);
 /******************************* Post Processing ************************************/
                     uint8_t             setPostProc( uint32_t type, uint32_t strength,	bool swapuv);
                     uint8_t             getPostProc( uint32_t *type, uint32_t *strength,bool  *swapuv);

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/include/ADM_segment.h -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/include/ADM_segment.h Changed

@@ -100,14 +100,24 @@
     \brief The video is a collection of segment.
             Each segment refers to its source (the reference) and the part of the source the segment is made of.
 */
+
+
 class _SEGMENT
 {
 public:
+  typedef enum
+  {
+    ADM_NO_DROP                 =0,
+    ADM_DROPPING                =2,
+    ADM_DROP_MAYBE_AFER_SWITCH  =1
+  }SegState;
+  
+public:
         uint32_t _reference; /// Reference video
         uint64_t _refStartTimeUs; /// Starting time in reference
         uint64_t _startTimeUs; /// Start time in current (=sum(_duration of previous seg))
         uint64_t _durationUs; ///
-        uint32_t _dropBframes;
+        SegState _dropBframes; /// Internal state machine to know is we should drop bframe that are orphean
         uint64_t _refStartDts;
         void clear(void) 
         {
@@ -115,7 +125,7 @@
             _refStartTimeUs=0;
             _startTimeUs=0;
             _durationUs=0;
-            _dropBframes=0;
+            _dropBframes=ADM_NO_DROP;
             _refStartDts=0;
         }
         _SEGMENT() {clear();}

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/ADM_edRender.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/src/ADM_edRender.cpp Changed

@@ -57,12 +57,12 @@
         t-=seg->_refStartTimeUs;
         if(t<0)
         {
-            ADM_warning("Segment time is negative time : %"PRIu64" ms, refStartTime:%"PRIu64" ms!\n",*time/1000,seg->_refStartTimeUs/1000);
+            ADM_warning("Segment time is negative time : %" PRIu64" ms, refStartTime:%" PRIu64" ms!\n",*time/1000,seg->_refStartTimeUs/1000);
         }
         t+=seg->_startTimeUs;
         if(t<0)
         {
-            ADM_error("Absolute time is negative time : %"PRId64" ms, _startTime:%"PRIu64" ms!\n",t/1000,seg->_startTimeUs/1000);
+            ADM_error("Absolute time is negative time : %" PRId64" ms, _startTime:%" PRIu64" ms!\n",t/1000,seg->_startTimeUs/1000);
             t=0;
         }
         *time=(uint64_t )t;
@@ -104,7 +104,7 @@
     {
         if(false==switchToSegment(s))
         {
-            ADM_warning("Cannot go to segment %"PRIu32"\n",s);
+            ADM_warning("Cannot go to segment %" PRIu32"\n",s);
             return false;
         }
     }
@@ -129,7 +129,7 @@
         dts=time;
     
     _nextFrameDts=dts;
-    seg->_dropBframes=1;
+    seg->_dropBframes=_SEGMENT::ADM_DROP_MAYBE_AFER_SWITCH;
     return true;
 }
 /**
@@ -175,7 +175,7 @@
 uint32_t seg;
     if(false==_segments.convertLinearTimeToSeg(startTime,&seg,&segTime))
     {
-        ADM_warning("Cannot find segment for time %"PRIu64" ms\n",startTime/1000);
+        ADM_warning("Cannot find segment for time %" PRIu64" ms\n",startTime/1000);
         return false;
     }
     
@@ -185,17 +185,17 @@
     if(!s->_reference && !segTime && s->_refStartTimeUs<v->firstFramePts)
     {
         segTime=v->firstFramePts;
-        ADM_warning("Fixating start time to %"PRIu64" ms\n",segTime/1000);
+        ADM_warning("Fixating start time to %" PRIu64" ms\n",segTime/1000);
     }
     uint64_t to=segTime+s->_refStartTimeUs;
     if(false==seektoTime(s->_reference,to))
     {
-            ADM_warning("Cannot seek to beginning of segment %"PRIu32" at  %"PRIu64" ms\n",s,to/1000);
+            ADM_warning("Cannot seek to beginning of segment %" PRIu32" at  %" PRIu64" ms\n",s,to/1000);
             return false;
     }
     _currentSegment=seg;
     int64_t newTime=(int64_t)v->lastDecodedPts+(int64_t)s->_startTimeUs-(int64_t)s->_refStartTimeUs;
-    ADM_info("Seek done, in reference, gone to %"PRIu64" with segment start at %"PRIu64"\n",v->lastDecodedPts,s->_refStartTimeUs);
+    ADM_info("Seek done, in reference, gone to %" PRIu64" with segment start at %" PRIu64"\n",v->lastDecodedPts,s->_refStartTimeUs);
     SET_CURRENT_PTS(newTime);
     return true;
 
@@ -241,7 +241,7 @@
         tail=seg->_startTimeUs+seg->_durationUs;
         if(pts>=tail)
         {
-                ADM_info("Got an image (%"PRIu32" ms, but is out of this segment (%"PRIu32"+%"PRIu32"=%"PRIu32" ms)\n",
+                ADM_info("Got an image (%" PRIu32" ms, but is out of this segment (%" PRIu32"+%" PRIu32"=%" PRIu32" ms)\n",
                                                                     pts,seg->_startTimeUs,seg->_durationUs,tail);
                 _segments.dump();
                 goto np_nextSeg;
@@ -297,13 +297,13 @@
                 uint64_t previousKf;
                 if(false==searchPreviousKeyFrameInRef(ref,refTime,&previousKf))
                 {
-                    ADM_warning("Cannot find previous keyframe in ref %d, time=%"PRIu64" \n",ref,refTime);
+                    ADM_warning("Cannot find previous keyframe in ref %d, time=%" PRIu64" \n",ref,refTime);
                     return false;
                 }
                 // go to it...
                 if(false==seektoTime(ref,previousKf,false))
                 {
-                    ADM_warning("Cannot seek to time=%"PRIu64" \n",previousKf);
+                    ADM_warning("Cannot seek to time=%" PRIu64" \n",previousKf);
                     return false;            
                 }
                 // Now forward till we reach out frame
@@ -321,7 +321,7 @@
                 }
                 if(image->Pts!=targetPts)
                 {
-                    ADM_error("Could not retrieve our own frame at PTS=%"PRIu64" ms\n",targetPts/1000);
+                    ADM_error("Could not retrieve our own frame at PTS=%" PRIu64" ms\n",targetPts/1000);
                     return false;
                 }
                 return true;
@@ -354,7 +354,7 @@
                 return true;
             }
         }
-        ADM_info("while looking for frame %"PRIu64"\n",_currentPts);
+        ADM_info("while looking for frame %" PRIu64"\n",_currentPts);
         vid->_videoCache->dump();
         // The previous is not available
         // either it is in the same segment but we have decoded later in that segment
@@ -393,7 +393,7 @@
                     }
                     ADM_warning("The image found is before refStartTime ???\n");
                 }
-                ADM_error("Find our frame and its predecessor (%"PRIu64"), but it is out of range\n",refPts);
+                ADM_error("Find our frame and its predecessor (%" PRIu64"), but it is out of range\n",refPts);
                 vid->_videoCache->dump();
                 return false;
         }
@@ -468,7 +468,7 @@
             return true;
       }
       ADM_error("Cannot find same image in cache\n"); 
-      ADM_info("Looking for PTS=%"PRIu64" ms\n",refPts/1000);
+      ADM_info("Looking for PTS=%" PRIu64" ms\n",refPts/1000);
       ref->_videoCache->dump();
       return false;
 }
@@ -492,9 +492,9 @@
                         // Since it is not YV12 it MUST be a ref
                         ADM_assert(src->isRef());
                         
-                        uint32_t srcStrides3;
+                        int       srcStrides3;
                         uint8_t  *srcPlanes3;
-                        uint32_t dstStrides3;
+                        int       dstStrides3;
                         uint8_t  *dstPlanes3;
 
                         src->GetPitches(srcStrides);
@@ -546,7 +546,7 @@
 {
     if(_currentSegment==_segments.getNbSegments()-1)
     {
-        ADM_warning("This is the last segment (%"PRIu32")\n",_currentSegment);
+        ADM_warning("This is the last segment (%" PRIu32")\n",_currentSegment);
         return false;
     }
     if(true==switchToSegment(_currentSegment+1,dontdecode)) return true;
@@ -561,12 +561,12 @@
 {
     if(s+1>_segments.getNbSegments())
     {
-        ADM_warning("Cannot switch to segment:%"PRIu32"\n",s);
+        ADM_warning("Cannot switch to segment:%" PRIu32"\n",s);
         return false;
     }
     _SEGMENT *seg=_segments.getSegment(s);
     ADM_assert(seg);
-    ADM_info("Trying to switch to seg %"PRIu32" with startTime in reference pic= %"PRIu32" ms\n",s,seg->_refStartTimeUs/1000);
+    ADM_info("Trying to switch to seg %" PRIu32" with startTime in reference pic= %" PRIu32" ms\n",s,seg->_refStartTimeUs/1000);
         // If the refStartTime is 0, it is the first image
         // But the fist image might not be = 0
       _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
@@ -580,11 +580,11 @@
     
     if(false==seektoTime(seg->_reference,from,dontdecode))
     {
-            ADM_warning("Cannot seek to beginning of segment %"PRIu32" at  %"PRIu64" ms\n",s,from/1000);
+            ADM_warning("Cannot seek to beginning of segment %" PRIu32" at  %" PRIu64" ms\n",s,from/1000);
             return false;
     }
     _currentSegment=s;
-    ADM_info("Switched ok to segment %"PRIu32" (dontdecode=%d)\n",s,dontdecode);
+    ADM_info("Switched ok to segment %" PRIu32" (dontdecode=%d)\n",s,dontdecode);
     return true;
 }
 /**

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/ADM_edRenderInternal.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/src/ADM_edRenderInternal.cpp Changed

@@ -50,13 +50,13 @@
     if(_segments.isKeyFrameByTime(ref,timeToSeek))
     {
         seekTime=timeToSeek;
-        ADM_info("First frame of the new segment is a keyframe at %"PRIu32"ms\n",seekTime/1000);
+        ADM_info("First frame of the new segment is a keyframe at %" PRIu32"ms\n",seekTime/1000);
         found=true;
     }else   
     {
         if(false==searchPreviousKeyFrameInRef(ref,timeToSeek,&seekTime))
         {
-            ADM_warning("Cannot identify the keyframe before %"PRIu64" ms\n",seekTime/1000);
+            ADM_warning("Cannot identify the keyframe before %" PRIu64" ms\n",seekTime/1000);
             return false;
         }
     }
@@ -71,7 +71,7 @@
     
     if(false==DecodePictureUpToIntra(ref,frame))
     {
-        ADM_warning("Cannot decode up to intra %"PRIu64" at %"PRIu64" ms\n",frame,seekTime/1000);
+        ADM_warning("Cannot decode up to intra %" PRIu64" at %" PRIu64" ms\n",frame,seekTime/1000);
         return false;
     }
     if(found==true) return true;
@@ -87,16 +87,16 @@
         vid->lastReadPts=pts;
         if(pts==timeToSeek)
         {
-            ADM_info("Image found, pts=%"PRIu64" ms\n",pts/1000);
+            ADM_info("Image found, pts=%" PRIu64" ms\n",pts/1000);
             return true;
         }
         if(pts>timeToSeek)
         {
-            ADM_info("Image not found,searching %"PRIu64" ms, got  pts=%"PRIu64" ms\n",timeToSeek/1000,pts/1000);
+            ADM_info("Image not found,searching %" PRIu64" ms, got  pts=%" PRIu64" ms\n",timeToSeek/1000,pts/1000);
             return false;
         }
     }
-    ADM_warning("seekToFrame failed for frame at PTS= %"PRIu64" ms, next image failed\n",timeToSeek/1000);
+    ADM_warning("seekToFrame failed for frame at PTS= %" PRIu64" ms, next image failed\n",timeToSeek/1000);
     return false;
 }
 /**
@@ -117,7 +117,7 @@
   ADMImage *in=cache->getByPts(vid->lastDecodedPts);
   if(!in)
   {
-    printf("ADM_Composer::getSamePicture Failed, while looking for Pts=%"PRIu64" ms\n",vid->lastDecodedPts);
+    printf("ADM_Composer::getSamePicture Failed, while looking for Pts=%" PRIu64" ms\n",vid->lastDecodedPts);
     cache->dump();
     return false;
   }
@@ -159,7 +159,7 @@
             // Duplicate
             if(out)
             {
-                aprintf("getNextPicture Looking for after> %"PRIu64", got %"PRIu64" delta=%"PRIi32" ms\n",vid->lastReadPts,img->Pts,(img->Pts-vid->lastReadPts)/1000);
+                aprintf("getNextPicture Looking for after> %" PRIu64", got %" PRIu64" delta=%" PRIi32" ms\n",vid->lastReadPts,img->Pts,(img->Pts-vid->lastReadPts)/1000);
                 out->duplicate(img);
                 vid->lastReadPts=img->Pts;
                 currentFrame++;
@@ -167,7 +167,7 @@
             return true;
         }else   
         {
-            aprintf("getNextPic Loop:%d, looking for pts> :%"PRIu64" ms %"PRIu64" us\n",loop,vid->lastReadPts/1000,vid->lastReadPts);
+            aprintf("getNextPic Loop:%d, looking for pts> :%" PRIu64" ms %" PRIu64" us\n",loop,vid->lastReadPts/1000,vid->lastReadPts);
 #ifdef VERBOSE
             cache->dump();
 #endif
@@ -175,7 +175,7 @@
         }
     }
     ADM_warning("nextPictureInternal Failed\n");
-    ADM_warning("while looking for %"PRIu64" us, %"PRIu64" ms\n",vid->lastReadPts,vid->lastReadPts/1000);
+    ADM_warning("while looking for %" PRIu64" us, %" PRIu64" ms\n",vid->lastReadPts,vid->lastReadPts/1000);
     cache->dump();
     return false;
 }
@@ -212,7 +212,7 @@
      aprintf("Editor Decoding frame %u\n",frame);
      if (!demuxer->getFrame (frame,&img))
      {
-            ADM_warning("getFrame failed for frame %"PRIu32"\n",vid->lastSentFrame);
+            ADM_warning("getFrame failed for frame %" PRIu32"\n",vid->lastSentFrame);
             return false;
      }
 
@@ -220,17 +220,17 @@
      result=cache->getFreeImage();
      if(!result)
      {
-            ADM_warning(" Cache full for frame %"PRIu32"\n",vid->lastSentFrame);
+            ADM_warning(" Cache full for frame %" PRIu32"\n",vid->lastSentFrame);
             return false;
       }
-        aprintf("Demuxed frame %"PRIu32" with pts=%"PRId64" us, %"PRId64" ms\n",
+        aprintf("Demuxed frame %" PRIu32" with pts=%" PRId64" us, %" PRId64" ms\n",
             frame,
             img.demuxerPts,
             img.demuxerPts/1000);
     
       if(!decompressImage(result,&img,ref))
       {
-         ADM_info("Decoding error for frame %"PRIu32", not necessarily a problem\n",vid->lastSentFrame);
+         ADM_info("Decoding error for frame %" PRIu32", not necessarily a problem\n",vid->lastSentFrame);
          stats.nbNoImage++;
          cache->invalidate(result);
          return true; // Not an error in itself
@@ -259,7 +259,7 @@
                 aprintf("Editor got PTS\n");
                 vid->lastDecodedPts=pts;
             }
-    aprintf(">>Decoded frame %"PRIu32" with pts=%"PRId64" us, %"PRId64" ms, ptsdelta=%"PRId64" ms \n",
+    aprintf(">>Decoded frame %" PRIu32" with pts=%" PRId64" us, %" PRId64" ms, ptsdelta=%" PRId64" ms \n",
         frame,
         vid->lastDecodedPts,
         vid->lastDecodedPts/1000,
@@ -268,7 +268,7 @@
     if(old>vid->lastDecodedPts) 
     {
         stats.nbPtsgoingBack++;
-        ADM_warning(">>>>> PTS going backward by %"PRId64" ms\n",(old-vid->lastDecodedPts)/1000);
+        ADM_warning(">>>>> PTS going backward by %" PRId64" ms\n",(old-vid->lastDecodedPts)/1000);
         ADM_warning("Dropping frame!\n");
         cache->invalidate(result);
         return false;
@@ -332,7 +332,7 @@
             // Fill in with black
             return false;
         }
-        aprintf("::Decompress in:%"PRIu32" out:%"PRIu32" flags:%x\n",in->demuxerPts,out->Pts,out->flags);
+        aprintf("::Decompress in:%" PRIu32" out:%" PRIu32" flags:%x\n",in->demuxerPts,out->Pts,out->flags);
 	// If not quant and it is already YV12, we can stop here
     // Also, if the image is decoded through hw, dont do post proc
 	if(tmpImage->refType!=ADM_HW_NONE || 
@@ -433,7 +433,7 @@
          
          if (!demuxer->getFrame (vid->lastSentFrame,&img))
          {
-                ADM_warning(" getFrame failed for frame %"PRIu32"\n",vid->lastSentFrame);
+                ADM_warning(" getFrame failed for frame %" PRIu32"\n",vid->lastSentFrame);
                 //cache->flush();
                 return false;
          }
@@ -445,14 +445,14 @@
          }
          if(!result)
          {
-                ADM_warning(" Cache full for frame %"PRIu32"\n",vid->lastSentFrame);
+                ADM_warning(" Cache full for frame %" PRIu32"\n",vid->lastSentFrame);
                 return false;
           }
-           aprintf("Decoder Demuxer Frame %"PRIu32" pts=%"PRIu64" ms, %"PRIu64" us\n",vid->lastSentFrame,img.demuxerPts/1000,
+           aprintf("Decoder Demuxer Frame %" PRIu32" pts=%" PRIu64" ms, %" PRIu64" us\n",vid->lastSentFrame,img.demuxerPts/1000,
                                                                     img.demuxerPts);
           if(!decompressImage(result,&img,ref))
           {
-             ADM_info(" decode error for frame %"PRIu32", not necessarily a problem\n",vid->lastSentFrame);
+             ADM_info(" decode error for frame %" PRIu32", not necessarily a problem\n",vid->lastSentFrame);
              //cache->dump();
              cache->invalidate(result);
              //cache->dump();
@@ -462,7 +462,7 @@
             {
                 
                 uint64_t pts=result->Pts;
-                aprintf("Decoder Decoder Frame %"PRIu32" pts=%"PRIu64" ms, %"PRIu64" us\n",vid->lastSentFrame,
+                aprintf("Decoder Decoder Frame %" PRIu32" pts=%" PRIu64" ms, %" PRIu64" us\n",vid->lastSentFrame,
                                                         result->Pts/1000,result->Pts);
                 if(pts==ADM_COMPRESSED_NO_PTS) // No PTS available ?
                 {
@@ -497,7 +497,7 @@
     }
     if(found==false)
     {
-        ADM_warning(" Could not find decoded frame, wanted PTS :%"PRIu32" PTS=%"PRIu64" ms, %"PRIu64" us\n",frame,wantedPts/1000,wantedPts);
+        ADM_warning(" Could not find decoded frame, wanted PTS :%" PRIu32" PTS=%" PRIu64" ms, %" PRIu64" us\n",frame,wantedPts/1000,wantedPts);
         cache->dump();
         return false;
     }

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/ADM_edSearch.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/src/ADM_edSearch.cpp Changed

@@ -36,7 +36,7 @@
     // 1- Convert frameTime to segments
     if(false== _segments.convertLinearTimeToSeg(  *frameTime, &seg, &segTime))
     {
-        ADM_warning(" Cannot find seg for time %"PRId64"\n",*frameTime);
+        ADM_warning(" Cannot find seg for time %" PRId64"\n",*frameTime);
         return false;
     }   
     // 
@@ -91,7 +91,7 @@
     // 1- Convert frameTime to segments
     if(false== _segments.convertLinearTimeToSeg(  *frameTime, &seg, &segTime))
     {
-        ADM_warning(" Cannot find seg for time %"PRId64"\n",*frameTime);
+        ADM_warning(" Cannot find seg for time %" PRId64"\n",*frameTime);
         return false;
     }   
     // Special case : The very first frame FIXME
@@ -105,7 +105,7 @@
               uint64_t pts=vid->firstFramePts;
               //
               *frameTime+=pts;
-              ADM_warning("This video does not start at 0 but at %"PRIu64" ms, compensating\n",pts/1000);
+              ADM_warning("This video does not start at 0 but at %" PRIu64" ms, compensating\n",pts/1000);
               _segments.convertLinearTimeToSeg(  *frameTime, &seg, &segTime);
            }
       }
@@ -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 previous keyfr 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;
         }
@@ -149,21 +149,21 @@
     \fn getPtsDtsDelta
 */
 
-bool			ADM_Composer::getPtsDtsDelta(uint64_t *frameTime)
+bool			ADM_Composer::getPtsDtsDelta(uint64_t frameTime, uint64_t *outDelta)
 {
 uint64_t refTime,nkTime,segTime;
 int lastSeg=_segments.getNbSegments();
 uint32_t seg;
 bool r;
     // 1- Convert frameTime to segments
-    if(false== _segments.convertLinearTimeToSeg(  *frameTime, &seg, &segTime))
+    if(false== _segments.convertLinearTimeToSeg(  frameTime, &seg, &segTime))
     {
-        ADM_warning(" Cannot find seg for time %"PRId64"\n",*frameTime);
+        ADM_warning(" Cannot find seg for time %" PRId64"\n",frameTime);
         return false;
     }   
     // 
     _SEGMENT *s=_segments.getSegment(seg);
-    int64_t delta=*frameTime-s->_startTimeUs; // Delta compared to the beginning of this seg
+    int64_t delta=(int64_t)frameTime-(int64_t)s->_startTimeUs; // Delta compared to the beginning of this seg
     
     delta+=s->_refStartTimeUs;
     if(delta<0)
@@ -177,12 +177,12 @@
     uint64_t dts;
     if(false==_segments.dtsFromPts(ref,refTime,&dts))
     {
-        ADM_error("Cannot get dtsFromDts for time %"PRIu64"\n",refTime);
-        *frameTime=0;
+        ADM_error("Cannot get dtsFromDts for time %" PRIu64"\n",refTime);
+        *outDelta=0;
         return false;
     }
     // Ok we have PTS and DTS, returns difference
-    *frameTime=refTime-dts;
+    *outDelta=refTime-dts;
     return true;
 }
 /**
@@ -212,7 +212,7 @@
             uint32_t hh,mm,ss,ms,ms2;
             ms=pts/1000;
             ms2time(ms,&hh,&mm,&ss,&ms2);
-            ADM_info("Found nextkeyframe %"PRIu32" %u:%u:%u at frame %"PRIu32"\n",ms,hh,mm,ss,i);
+            ADM_info("Found nextkeyframe %" PRIu32" %u:%u:%u at frame %" PRIu32"\n",ms,hh,mm,ss,i);
             *nkTime=pts;
             return true;
         }
@@ -339,7 +339,7 @@
     // 1- Convert frameTime to segments
     if(false== _segments.convertLinearTimeToSeg(  *time, &seg, &segTime))
     {
-        ADM_warning(" Cannot find seg for time %"PRId64"\n",*time);
+        ADM_warning(" Cannot find seg for time %" PRId64"\n",*time);
         return false;
     }  
     _SEGMENT *s=_segments.getSegment(seg);
@@ -349,7 +349,7 @@
     uint64_t dts;
     if(false==_segments.dtsFromPts(s->_reference,pts,&dts))
     {
-        ADM_warning("Cannot get DTS from PTS=%"PRIu64"ms\n",pts/1000);
+        ADM_warning("Cannot get DTS from PTS=%" PRIu64"ms\n",pts/1000);
         return false;
     }
     dts=dts+s->_startTimeUs;

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/ADM_edStub.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/src/ADM_edStub.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/ADM_edVideoCopy.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/src/ADM_edVideoCopy.cpp Changed

@@ -68,8 +68,8 @@
         // After a seg switch we are at the keyframe before or equal to where we want to go
         // if the dts do not match, it means we went back too much
         // When re-encoding, it's not a problem, it is when copying.
-        ADM_info("seg:%d refDTS=%"PRIu64"\n",seg->_reference,seg->_refStartDts);
-        ADM_info("seg:%d imgDTS=%"PRIu64"\n",seg->_reference,img.demuxerDts);
+        ADM_info("seg:%d refDTS=%" PRIu64"\n",seg->_reference,seg->_refStartDts);
+        ADM_info("seg:%d imgDTS=%" PRIu64"\n",seg->_reference,img.demuxerDts);
         if(!seg->_refStartDts && !seg->_reference)
         {
             ADM_info("Ignoring first seg (unreliable DTS)\n");
@@ -95,10 +95,96 @@
 */
 static bool bFrameDroppable(uint32_t fcc)
 {
-    if(isH264Compatible(fcc)) return false;
+    if(isH264Compatible(fcc)) 
+      return false;
+    if(isH265Compatible(fcc)) 
+      return false;    
     return true;
 }
 /**
+ * 
+ * @param time
+ * @param delay
+ * \brief for x264/x265 we dont want to drop the non closed gop bframe(s)
+ * They will be decoded after our first intra but shown before. 
+ * They are needed because they might be used as reference for later frames.
+ * 
+ * For older codec (mpeg4 ASP, Mpeg1,...) these bframes can be just dropped.
+ * 
+ * This function tries to find out the maximum delay we must add
+ * so that the overall PTS of these frames dont get negative.
+ * @return 
+ */
+bool        ADM_Composer::getNonClosedGopDelay(uint64_t time,uint32_t *delay)
+{
+  aviInfo    info;
+  uint32_t   segNo;
+  uint64_t   segTime;
+    *delay=0;
+    if(!_segments.convertLinearTimeToSeg(time,&segNo,&segTime))
+      {
+        ADM_warning("Cannot navigate to get nonclosedgop\n");
+        return false;
+      }
+   _SEGMENT *seg=_segments.getSegment(segNo);
+    ADM_assert(seg);
+   _VIDEOS *vid=_segments.getRefVideo(seg->_reference);   
+   uint64_t pts,dts;
+   
+    vid->_aviheader->getVideoInfo (&info);
+    //
+    if(bFrameDroppable(info.fcc))
+    {
+        return true; // no need to add extra delay
+    }
+    // Look ahead to see if we have some late bframe in the past
+    int nb=vid->_aviheader->getMainHeader ()->dwTotalFrames;
+    int found=-1;
+    if(!segTime)
+    {
+      found=0;
+       vid->_aviheader->getPtsDts(0,&pts,&dts);
+    }
+    else
+        for(int i=0;i<nb;i++)
+        {
+            vid->_aviheader->getPtsDts (i,&pts,&dts);
+            if(pts==segTime)
+              {
+                    found=i;
+                    break;
+              }
+        }
+    if(found==-1)
+      {
+        ADM_warning("Cannot find the frame\n");
+        return false;
+      }
+    for(int i=found+1;i<found+16;i++)
+    {
+            uint32_t flags;
+            vid->_aviheader->getFlags(i,&flags);
+            if(!(flags & AVI_B_FRAME))
+            {
+                ADM_info("Not a bframe, stopping (%d)\n",i-found);
+              break;
+            }
+            vid->_aviheader->getPtsDts(i,&pts,&dts);
+            if(pts<segTime)
+              {
+                ADM_info("frame %d is early \n",i);
+                uint32_t delta=segTime-pts;
+                if(delta>*delay) *delay=delta;
+              }else
+                {
+                    ADM_info("Pts delta = %d\n",(int)(pts-segTime));
+                }
+    }
+    ADM_info("Found maximum non closed gop delay = %d\n",*delay);
+    return true;
+}
+
+/**
         \fn getCompressedPicture
         \brief bypass decoder and directly get the source image
 
@@ -129,7 +215,7 @@
     // Get next pic?
     if(false==demuxer->getFrame (vid->lastSentFrame,img))
     {
-        ADM_info("Failed to get next frame for ref %"PRIu32"\n",seg->_reference);
+        ADM_info("Failed to get next frame for ref %" PRIu32"\n",seg->_reference);
         goto nextSeg;
     }
     aprintf("Got frame %d, PTS=%s  ",img->demuxerFrameNo,ADM_us2plain(img->demuxerPts));
@@ -139,29 +225,29 @@
     aviInfo    info;
     vid->_aviheader->getVideoInfo (&info);
     //
+    // after a segment switch, we may have some frames from "the past"
+    // if the cut point is not a keyframe, drop them
+    
     if(bFrameDroppable(info.fcc))
     {
         if(img->flags & AVI_B_FRAME)
         {
-            if(seg->_dropBframes==2) 
+            if(seg->_dropBframes==_SEGMENT::ADM_DROPPING) 
             {
-                ADM_warning("%"PRIu32" Dropping bframes\n",fn);
+                ADM_warning("%" PRIu32" Dropping bframes\n",fn);
                 goto againGet;
             }
         }else
         { // not a bframe
             switch(seg->_dropBframes)
             {
-                case 2: seg->_dropBframes=0;break;
-                case 1: seg->_dropBframes=2;break;
+                case _SEGMENT::ADM_NO_DROP                : break;
+                case _SEGMENT::ADM_DROPPING               : seg->_dropBframes=_SEGMENT::ADM_NO_DROP;break;
+                case _SEGMENT::ADM_DROP_MAYBE_AFER_SWITCH : seg->_dropBframes=_SEGMENT::ADM_DROPPING;break;
                 default: break;
             }
         }
     }
-    //aprintf("Bframe droppable=%d, lastSentFrame=%d\n",seg->_dropBframes,vid->lastSentFrame);
-    // after a segment switch, we may have some frames from "the past"
-    // if the cut point is not a keyframe, drop them
-#if 1
     if( img->demuxerDts!=ADM_NO_PTS)
     {
         bool drop=false;
@@ -174,7 +260,7 @@
         }
         // Seeking is not accurate when cutting on non intra
         // we might have some frames that are clearly too early , even in seg0
-        if(img->demuxerPts!=ADM_NO_PTS)
+        if(img->demuxerPts!=ADM_NO_PTS && bFrameDroppable(info.fcc))
         {
             if(img->demuxerPts+seg->_startTimeUs<seg->_refStartTimeUs)
             {
@@ -188,7 +274,7 @@
             goto againGet;
         
     }
-#endif
+
     // Need to switch seg ?
     tail=seg->_refStartTimeUs+seg->_durationUs;
     // Guess DTS
@@ -232,11 +318,11 @@
 	// border case due to rounding we can have pts slighly above dts
 	if(signedPts!=ADM_NO_PTS && _nextFrameDts!=ADM_NO_PTS)
 	{
-                signedDts=_nextFrameDts;
-                if(signedPts != ADM_NO_PTS && signedDts>signedPts)
+        signedDts=_nextFrameDts;
+        if(signedPts != ADM_NO_PTS && signedDts>signedPts)
 		{
 			// not sure it is correct. We may want to do it the other way around, i.e. bumping pts
-			ADM_warning("Compensating for rounding error with PTS=%"PRId64"ms DTS=%"PRId64"ms \n",signedPts,signedDts);
+			ADM_warning("Compensating for rounding error with PTS=%" PRId64"ms DTS=%" PRId64"ms \n",signedPts,signedDts);
                         signedPts=signedDts;
 		}
 	}
@@ -246,10 +332,11 @@
 // we add a bit of timeIncrement to compensate for rounding
         if(_nextFrameDts!=ADM_NO_PTS)
         {
-            if(_nextFrameDts>(signedDts+vid->timeIncrementInUs/10))
+            if(_nextFrameDts>(signedDts+(int64_t)(vid->timeIncrementInUs/10)))
             {
-                ADM_error("Frame %"PRIu32" DTS is going back in time : expected : %"PRId64" ms got : %"PRId64" ms\n",
-                                                fn,_nextFrameDts/1000,signedDts/1000);
+                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);
+                goto againGet;
             }
         }
         _nextFrameDts=signedDts;
@@ -264,13 +351,13 @@
         int64_t nextDts=nextSeg->_startTimeUs+nextSeg->_refStartDts;
         if(nextDts<nextSeg->_refStartTimeUs)
         {
-            ADM_warning("%"PRIu32" next DTS is negative %"PRIu64" %"PRIu64" ms\n",fn,nextDts,nextSeg->_refStartTimeUs);
+            ADM_warning("%" PRIu32" next DTS is negative %" PRIu64" %" PRIu64" ms\n",fn,nextDts,nextSeg->_refStartTimeUs);
         }else       
         {
             nextDts-=nextSeg->_refStartTimeUs;
             if(signedDts>=nextDts)
             {
-                ADM_warning("%"PRIu32" have to switch segment, DTS limit reached %"PRIu64" %"PRIu64"\n",fn,img->demuxerDts/1000,nextDts/1000);
+                ADM_warning("%" PRIu32" have to switch segment, DTS limit reached %" PRIu64" %" PRIu64"\n",fn,img->demuxerDts/1000,nextDts/1000);
                 goto nextSeg;
             }
         }
@@ -303,7 +390,7 @@
     }
     // Mark it as drop b frames...
     _SEGMENT *thisseg=_segments.getSegment(_currentSegment);
-    thisseg->_dropBframes=1;
+    thisseg->_dropBframes=_SEGMENT::ADM_DROP_MAYBE_AFER_SWITCH;
     ADM_info("Retrying for next segment\n");
     return getCompressedPicture(videoDelay,img);
    
@@ -327,7 +414,7 @@
     // Get next pic?
     if(false==demuxer->getFrame (frameNum,img))
     {
-        ADM_info("Failed to get next frame for ref %"PRIu32"\n",seg->_reference);
+        ADM_info("Failed to get next frame for ref %" PRIu32"\n",seg->_reference);
         return false;
     }
    return true;

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/ADM_edit.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/src/ADM_edit.cpp Changed

@@ -33,10 +33,6 @@
 #include "DIA_coreToolkit.h"
 #include "prefs.h"
 
-#include "ADM_debugID.h"
-#define MODULE_NAME MODULE_EDITOR
-#include "ADM_debug.h"
-
 //#include "ADM_outputfmt.h"
 #include "ADM_edPtsDts.h"
 #include "ADM_vidMisc.h"
@@ -179,7 +175,7 @@
 	if(!video._aviheader)
 	{
 		char str512+1;
-		snprintf(str,512,QT_TR_NOOP("Cannot find a demuxer for %s"), name);
+		snprintf(str,512,QT_TRANSLATE_NOOP("ADM_Composer","Cannot find a demuxer for %s"), name);
 		str512 = '\0';
 		GUI_Error_HIG(str,NULL);
 		return false;
@@ -206,7 +202,7 @@
 				prefs->set(AVISYNTH_AVISYNTH_LOCALPORT, localPort);
 			}
 		}
-		uint8_t dummy = { portValue , portValue >> 8};
+		uint8_t dummy = { (uint8_t)portValue ,(uint8_t)( portValue >> 8)};
 		ret = video._aviheader->open((char *)dummy);
 	}
 	else
@@ -215,7 +211,7 @@
    // check opening was successful
    if (ret == 0) {
      char str512+1;
-     snprintf(str,512,QT_TR_NOOP("Attempt to open %s failed!"), name);
+     snprintf(str,512,QT_TRANSLATE_NOOP("ADM_Composer","Attempt to open %s failed!"), name);
       str512 = '\0';
       GUI_Error_HIG(str,NULL);
       video._aviheader=NULL;
@@ -241,7 +237,7 @@
                  (strlen(str)?" and ":""),
                  (strlen(str)?" are ":" is ") );
          str512 = '\0';
-         GUI_Error_HIG(str,QT_TR_NOOP("You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:\n1.) \"resize\" / \"add border\" / \"crop\" each stream to the same resolution\n2.) concatinate them together"));
+         GUI_Error_HIG(str,QT_TRANSLATE_NOOP("ADM_Composer","You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:\n1.) \"resize\" / \"add border\" / \"crop\" each stream to the same resolution\n2.) concatenate them together"));
          delete video._aviheader;
          return false;
       }
@@ -343,9 +339,12 @@
                 audioTrackPool.addInternalTrack(trackFromVideo);
             }
       }
+      if(!_segments.getNbRefVideos()) // only for 1st video
+      {
         activeAudioTracks.clear();
         for(int i=0;i<nbAStream;i++)
             activeAudioTracks.addTrack(i,audioTrackPool.at(i)); // default add 1st track of video pool
+      }
     }
 
   printf ("Editor Decoder FCC: ");
@@ -476,7 +475,7 @@
   {
     if(false==_segments.getRefFromTime(time,&ref))
     {
-        ADM_warning("Cannot get ref from time %"PRId64" ms\n",time/1000);
+        ADM_warning("Cannot get ref from time %" PRId64" ms\n",time/1000);
         return false;
     }
     _segments.getRefVideo(ref)->decoder->setParam ();
@@ -525,7 +524,7 @@
 
     if(false==_segments.getRefFromTime(xtime,&ref))
     {
-        ADM_warning("Editor getAudioStreamsInfo failed for time %"PRId64" ms\n",xtime);
+        ADM_warning("Editor getAudioStreamsInfo failed for time %" PRId64" ms\n",xtime);
         return false;
     }
 
@@ -564,7 +563,7 @@
 
         if(false==_segments.getRefFromTime(xtime,&ref))
         {
-            ADM_warning("Editor::getCurrentAudioStreamNumber Cannot get ref video for time %"PRId64" ms\n",xtime/1000);
+            ADM_warning("Editor::getCurrentAudioStreamNumber Cannot get ref video for time %" PRId64" ms\n",xtime/1000);
             return 0;
         }
 
@@ -720,7 +719,7 @@
 
             v->_aviheader->getFlags(i,&flags);
             v->_aviheader->getPtsDts(i,&pts,&dts);
-            printf("%"PRIu32" flags:%04"PRIx32" ",i,flags);
+            printf("%" PRIu32" flags:%04" PRIx32" ",i,flags);
             printf("pts :%s ",ADM_us2plain(pts));
             printf("dts :%s \n",ADM_us2plain(dts));
     }

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/ADM_segment.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/src/ADM_segment.cpp Changed

@@ -23,7 +23,7 @@
 #include "ADM_pp.h"
 #include "ADM_colorspace.h"
 #include "ADM_vidMisc.h"
-#include "ADM_audiocodec/ADM_audiocodec.h"
+#include "ADM_audiocodec.h"
 #include "ADM_codec.h"
 #include "DIA_coreToolkit.h"
 #include "ADM_vidMisc.h"
@@ -69,7 +69,7 @@
         demuxer->getPtsDts(0,&pts,&dts);
         if(pts!=ADM_NO_PTS && pts >0)
         {
-            ADM_warning("Updating firstFramePTS, The first frame has a PTS >0, adjusting to %"PRIu64" ms\n",pts/1000);
+            ADM_warning("Updating firstFramePTS, The first frame has a PTS >0, adjusting to %" PRIu64" ms\n",pts/1000);
             ref->firstFramePts=pts;
         }else
         {
@@ -83,7 +83,7 @@
     {
     _SEGMENT *seg=getSegment(n-1);
     uint64_t dur=ref->_aviheader->getVideoDuration();
-    printf("Current duration %"PRIu64" ms real one %"PRIu64" ms\n",dur/1000,seg->_durationUs/1000);
+    printf("Current duration %" PRIu64" ms real one %" PRIu64" ms\n",dur/1000,seg->_durationUs/1000);
     }
 
     return true;
@@ -142,7 +142,7 @@
               //ref->timeIncrementInUs=minDelta;
 
   
-  ADM_info("Editor About %"PRIu64" microseconds per frame\n",ref->timeIncrementInUs);
+  ADM_info("Editor About %" PRIu64" microseconds per frame\n",ref->timeIncrementInUs);
   ref->_nb_video_frames = info.nb_frames;
   //
   //  And automatically create the segment
@@ -166,7 +166,7 @@
         if(pts==ADM_NO_PTS) ADM_warning("First frame has unknown PTS\n");
         if(pts!=ADM_NO_PTS &&pts)
         {
-            ADM_warning("The first frame has a PTS >0, adjusting to %"PRIu64" ms\n",pts/1000);
+            ADM_warning("The first frame has a PTS >0, adjusting to %" PRIu64" ms\n",pts/1000);
             ref->firstFramePts=pts;
         }
 
@@ -419,7 +419,7 @@
     uint64_t segTime;
     if(false== convertLinearTimeToSeg(  xtime, &seg, &segTime))
     {
-        ADM_warning("Cannot identify segment for time %"PRIu64" ms\n",xtime/1000);
+        ADM_warning("Cannot identify segment for time %" PRIu64" ms\n",xtime/1000);
         return false;
     }
     _SEGMENT *s=getSegment(seg);
@@ -475,7 +475,7 @@
             return true;
         }
     }
-    ADM_warning("Cannot find segment matching time %"PRIu64"ms \n",frameTime/1000);
+    ADM_warning("Cannot find segment matching time %" PRIu64"ms \n",frameTime/1000);
     dump();
     return false;
 }
@@ -510,7 +510,7 @@
             {
                 if(dts>time)
                 {
-                    ADM_error("We reached frame %d with a PTS of %"PRIu64" when looking for PTS %"PRIu64"\n",
+                    ADM_error("We reached frame %d with a PTS of %" PRIu64" when looking for PTS %" PRIu64"\n",
                                             i,dts,time);
                     warn=true;
                 }
@@ -530,7 +530,7 @@
         ADM_assert(v);
         if(false==TimeToFrame(v,seekTime,&frame,&flags))
         {
-            ADM_error("Cannot find frame with time %"PRIu64"ms\n",seekTime/1000);
+            ADM_error("Cannot find frame with time %" PRIu64"ms\n",seekTime/1000);
             ADM_assert(0);
         }
         uint32_t next;
@@ -565,21 +565,21 @@
     uint32_t startSeg,endSeg;
     uint64_t startOffset,endOffset;
 
-    ADM_info("Cutting from %"PRIu64" to %"PRIu64" ms\n",from/1000,to/1000);
+    ADM_info("Cutting from %" PRIu64" to %" PRIu64" ms\n",from/1000,to/1000);
     dump();
     if(false==convertLinearTimeToSeg( from,&startSeg,&startOffset))
     {
-        ADM_warning("Cannot get starting point (%"PRIu64" ms\n",from/1000);
+        ADM_warning("Cannot get starting point (%" PRIu64" ms\n",from/1000);
         return false;
     }
     if(false==convertLinearTimeToSeg( to,&endSeg,&endOffset))
     {
-        ADM_warning("Cannot get starting point (%"PRIu64" ms\n",from/1000);
+        ADM_warning("Cannot get starting point (%" PRIu64" ms\n",from/1000);
         return false;
     }
 
-    ADM_info("Start, seg %"PRIu32" Offset :%"PRIu64" ms\n",startSeg,startOffset);
-    ADM_info("End  , seg %"PRIu32" Offset :%"PRIu64" ms\n",endSeg,endOffset);
+    ADM_info("Start, seg %" PRIu32" Offset :%" PRIu64" ms\n",startSeg,startOffset);
+    ADM_info("End  , seg %" PRIu32" Offset :%" PRIu64" ms\n",endSeg,endOffset);
     ListOfSegments tmp=segments;
     
 
@@ -638,11 +638,11 @@
         _SEGMENT s=l.at(i);
 
         printf("Segment :%d/%d\n",i,n);
-        printf("\tReference    :%"PRIu32"    %s\n",s._reference,ADM_us2plain(s._reference));
-        printf("\tstartLinear  :%08"PRIu64" %s\n",s._startTimeUs,ADM_us2plain(s._startTimeUs));
-        printf("\tduration     :%08"PRIu64" %s\n",s._durationUs,ADM_us2plain(s._durationUs));
-        printf("\trefStartPts  :%08"PRIu64" %s\n",s._refStartTimeUs,ADM_us2plain(s._refStartTimeUs));
-        printf("\trefStartDts  :%08"PRIu64" %s\n",s._refStartDts,ADM_us2plain(s._refStartDts));
+        printf("\tReference    :%" PRIu32"    %s\n",s._reference,ADM_us2plain(s._reference));
+        printf("\tstartLinear  :%08" PRIu64" %s\n",s._startTimeUs,ADM_us2plain(s._startTimeUs));
+        printf("\tduration     :%08" PRIu64" %s\n",s._durationUs,ADM_us2plain(s._durationUs));
+        printf("\trefStartPts  :%08" PRIu64" %s\n",s._refStartTimeUs,ADM_us2plain(s._refStartTimeUs));
+        printf("\trefStartDts  :%08" PRIu64" %s\n",s._refStartDts,ADM_us2plain(s._refStartDts));
     }
 }
 
@@ -657,11 +657,11 @@
         _SEGMENT *s=getSegment(i);
 
         printf("Segment :%d/%d\n",i,n);
-        printf("\tReference    :%"PRIu32"    %s\n",s->_reference,ADM_us2plain(s->_reference));
-        printf("\tstartLinear  :%08"PRIu64" %s\n",s->_startTimeUs,ADM_us2plain(s->_startTimeUs));
-        printf("\tduration     :%08"PRIu64" %s\n",s->_durationUs,ADM_us2plain(s->_durationUs));
-        printf("\trefStartPts  :%08"PRIu64" %s\n",s->_refStartTimeUs,ADM_us2plain(s->_refStartTimeUs));
-        printf("\trefStartDts  :%08"PRIu64" %s\n",s->_refStartDts,ADM_us2plain(s->_refStartDts));
+        printf("\tReference    :%" PRIu32"    %s\n",s->_reference,ADM_us2plain(s->_reference));
+        printf("\tstartLinear  :%08" PRIu64" %s\n",s->_startTimeUs,ADM_us2plain(s->_startTimeUs));
+        printf("\tduration     :%08" PRIu64" %s\n",s->_durationUs,ADM_us2plain(s->_durationUs));
+        printf("\trefStartPts  :%08" PRIu64" %s\n",s->_refStartTimeUs,ADM_us2plain(s->_refStartTimeUs));
+        printf("\trefStartDts  :%08" PRIu64" %s\n",s->_refStartDts,ADM_us2plain(s->_refStartDts));
 }
 /**
     \fn dumpRefVideos
@@ -677,9 +677,9 @@
         _VIDEOS *s=getRefVideo(i);
 
         printf("Videos :%d/%d\n",i,n);
-        printf("\tfirstFramePts      :%08"PRIu64" %s\n",s->firstFramePts,ADM_us2plain(s->firstFramePts));
-        printf("\ttimeIncrementInUs  :%08"PRIu64" %s\n",s->timeIncrementInUs,ADM_us2plain(s->timeIncrementInUs));
-        printf("\tnb frames    :%04"PRIu32"\n",s->_nb_video_frames);
+        printf("\tfirstFramePts      :%08" PRIu64" %s\n",s->firstFramePts,ADM_us2plain(s->firstFramePts));
+        printf("\ttimeIncrementInUs  :%08" PRIu64" %s\n",s->timeIncrementInUs,ADM_us2plain(s->timeIncrementInUs));
+        printf("\tnb frames    :%04" PRIu32"\n",s->_nb_video_frames);
     }
 
 }
@@ -697,7 +697,7 @@
     vidHeader *demuxer=vid->_aviheader;
     if(false==TimeToFrame(vid,pts,&frame,&flags))
     {
-            ADM_warning("Cannot get frame with pts=%"PRIu64" ms\n",pts/1000);
+            ADM_warning("Cannot get frame with pts=%" PRIu64" ms\n",pts/1000);
             return false;
     }
     // Now get DTS..
@@ -726,7 +726,7 @@
     }
     if(deltaFrame<0)
     {
-        ADM_warning("Cannot find a valid DTS for pts=%"PRIu64"ms\n",pts/1000);
+        ADM_warning("Cannot find a valid DTS for pts=%" PRIu64"ms\n",pts/1000);
         *dts=pts;
         return false;
     }
@@ -777,12 +777,12 @@
     ADM_assert(seg);
     if(linear<seg->_startTimeUs)
     {
-        ADM_warning("This given time is not in the segment: Given time %"PRIu64", seg start at %"PRIu64"\n",
+        ADM_warning("This given time is not in the segment: Given time %" PRIu64", seg start at %" PRIu64"\n",
                         linear, seg->_startTimeUs);
     }
     if(linear>=seg->_startTimeUs+seg->_durationUs)
     {
-        ADM_warning("This given time is not in the segment: Given time %"PRIu64", seg end at %"PRIu64"\n",
+        ADM_warning("This given time is not in the segment: Given time %" PRIu64", seg end at %" PRIu64"\n",
                         linear, seg->_startTimeUs+seg->_durationUs);
 
     }

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edActiveAudioTracks.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edActiveAudioTracks.cpp Changed

@@ -19,24 +19,24 @@
 
 unsigned int ActiveAudioTracks::size() const
 {
-	return tracks.size();
+        return tracks.size();
 }
 
 EditableAudioTrack* ActiveAudioTracks::atEditable(int ix)
 {
-	if (ix >= size())
-	{
-		ADM_warning("Request to get track at %d, only %d tracks available\n", ix, size());
-		return NULL;
-	}
+    if (ix >= size())
+    {
+            ADM_warning("Request to get track at %d, only %d tracks available\n", ix, size());
+            return NULL;
+    }
 
-	return tracksix;
+    return tracksix;
 }
 
 ADM_edAudioTrack* ActiveAudioTracks::atEdAudio(int ix)
 {
-	EditableAudioTrack *e = atEditable(ix);
-	return e->edTrack;
+    EditableAudioTrack *e = atEditable(ix);
+    return e->edTrack;
 }
 
 bool ActiveAudioTracks::dump()
@@ -58,66 +58,68 @@
 
 bool ActiveAudioTracks::addTrack(EditableAudioTrack *x)
 {
-	if (!x)
-	{
-		ADM_warning("Cannot add editable track to active track! \n");
-		return false;
-	}
-
-	tracks.append(x) ;
-	return true;
+    if (!x)
+    {
+            ADM_warning("Cannot add editable track to active track! \n");
+            return false;
+    }
+
+    tracks.append(x) ;
+    return true;
 }
 
 bool ActiveAudioTracks::addTrack(int poolIndex,ADM_edAudioTrack *x)
 {
-	if (!x)
-	{
-		ADM_warning("Cannot add track to active track! \n");
-		return false;
-	}
+    if (!x)
+    {
+            ADM_warning("Cannot add track to active track! \n");
+            return false;
+    }
 
-	EditableAudioTrack *e = new EditableAudioTrack;
+    EditableAudioTrack *e = new EditableAudioTrack;
     e->poolIndex=poolIndex;
-	e->edTrack = x;
-	tracks.append(e) ;
-	return true;
+    e->edTrack = x;
+    tracks.append(e) ;
+    return true;
 }
 
 bool ActiveAudioTracks::clear()
 {
-	int n = size();
+    int n = size();
 
-	for (int i = 0; i < n; i++)
-	{
-		EditableAudioTrack *t = atEditable(i);
+    for (int i = 0; i < n; i++)
+    {
+            EditableAudioTrack *t = atEditable(i);
 
 
-		delete t;
-	}
+            delete t;
+    }
 
-	tracks.clear();
-	return true;
+    tracks.clear();
+    return true;
 }
 
 bool ActiveAudioTracks::insertTrack(int index, int poolIndex, ADM_edAudioTrack *x)
 {
-	if (!x)
-	{
-		ADM_warning("Cannot add track to active track! \n");
-		return false;
-	}
+    if (!x)
+    {
+            ADM_warning("Cannot add track to active track! \n");
+            return false;
+    }
 
-	EditableAudioTrack *e = new EditableAudioTrack;
+    EditableAudioTrack *e = new EditableAudioTrack;
 
-	e->poolIndex = poolIndex;
-	e->edTrack = x;
-	tracks.insert(index, e);
+    e->poolIndex = poolIndex;
+    e->edTrack = x;
+    tracks.insert(index, e);
 
-	return true;
+    return true;
 }
 
 void ActiveAudioTracks::removeTrack(int activeIndex)
 {
-	delete tracksactiveIndex;
-	tracks.removeAt(activeIndex);
+    delete tracksactiveIndex;
+    tracks.removeAt(activeIndex);
 }
+
+// EOF
\ No newline at end of file

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioPacket.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioPacket.cpp Changed

@@ -34,9 +34,6 @@
 #include "ADM_edit.hxx"
 #include "ADM_edAudioTrackFromVideo.h"
 
-#include "ADM_debugID.h"
-#define MODULE_NAME MODULE_AUDIO_EDITOR
-#include "ADM_debug.h"
 
 #include "ADM_vidMisc.h"
 
@@ -60,7 +57,7 @@
         // Try to switch segment
         if(_audioSeg+1>=parent->_segments.getNbSegments()) return false;
 
-        ADM_warning("Switching to segment %"PRIu32"\n",_audioSeg+1);
+        ADM_warning("Switching to segment %" PRIu32"\n",_audioSeg+1);
         _audioSeg++;
         _SEGMENT *seg=parent->_segments.getSegment(_audioSeg);
         ADM_audioStreamTrack *trk=getTrackAtVideoNumber(seg->_reference);
@@ -76,10 +73,10 @@
         // Go to beginning of the stream
         if(false==trk->stream->goToTime(seg->_refStartTimeUs))
           {
-            ADM_warning("Fail to seek audio to %"PRIu64"ms\n",seg->_refStartTimeUs/1000);
+            ADM_warning("Fail to seek audio to %" PRIu64"ms\n",seg->_refStartTimeUs/1000);
             return false;
           }
-        ADM_info("Switched ok to audio segment %"PRIu32", with a ref time=%s\n",
+        ADM_info("Switched ok to audio segment %" PRIu32", with a ref time=%s\n",
             _audioSeg,ADM_us2plain(seg->_refStartTimeUs));
         return true;
 
@@ -154,7 +151,7 @@
     {
         if(*odts<seg->_refStartTimeUs)
         {
-            ADM_warning("Audio packet is too early %"PRIu64" ms, this segment starts at %"PRIu64"ms\n",*odts,seg->_refStartTimeUs);
+            ADM_warning("Audio packet is too early %" PRIu64" ms, this segment starts at %" PRIu64"ms\n",*odts,seg->_refStartTimeUs);
             goto zgain;
         }
 #if 0
@@ -192,7 +189,7 @@
     ADM_info(" go to time %02.2f secs\n",((float)ustime)/1000000.);
     if(false==parent->_segments.convertLinearTimeToSeg(ustime,&seg,&segTime))
       {
-        ADM_warning("Cannot convert %"PRIu64" to linear time\n",ustime/1000);
+        ADM_warning("Cannot convert %" PRIu64" to linear time\n",ustime/1000);
         return false;
       }
     ADM_info("=> seg %d, rel time %02.2f secs\n",(int)seg,((float)segTime)/1000000.);
@@ -200,7 +197,7 @@
     ADM_audioStreamTrack *trk=getTrackAtVideoNumber(s->_reference);
     if(!trk)
       {
-        ADM_warning("No audio for segment %"PRIu32"\n",seg);
+        ADM_warning("No audio for segment %" PRIu32"\n",seg);
         return false;
       }
     uint64_t seekTime;

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioPcm.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioPcm.cpp Changed

@@ -32,9 +32,6 @@
 #include "fourcc.h"
 #include "ADM_edit.hxx"
 #include "ADM_edAudioTrackFromVideo.h"
-#include "ADM_debugID.h"
-#define MODULE_NAME MODULE_AUDIO_EDITOR
-#include "ADM_debug.h"
 #include "ADM_vidMisc.h"
 
 #ifdef _MSC_VER
@@ -105,12 +102,12 @@
     {
         if(labs((int64_t)lastDts-(int64_t)packetBufferDts)>ADM_ALLOWED_DRIFT_US)
         {
-            ADM_info("Composer::getPCMPacket Track %d,%"PRIx64" : drift %d, computed :%s",
+            ADM_info("Composer::getPCMPacket Track %d,%" PRIx64" : drift %d, computed :%s",
                         (int)myTrackNumber,(uint64_t)trk,(int)(lastDts-packetBufferDts),ADM_us2plain(lastDts));
             ADM_info(" got %s\n", ADM_us2plain(packetBufferDts));
             if(packetBufferDts<lastDts)
             {
-                printf("Composer::getPCMPacket Track %d:%"PRIx64" : Dropping packet %"PRIu32" last =%"PRIu32"\n",myTrackNumber,(uint64_t)trk,(uint32_t)(lastDts/1000),(uint32_t)(packetBufferDts/1000));
+                printf("Composer::getPCMPacket Track %d:%" PRIx64" : Dropping packet %" PRIu32" last =%" PRIu32"\n",myTrackNumber,(uint64_t)trk,(uint32_t)(lastDts/1000),(uint32_t)(packetBufferDts/1000));
                 drop=true;
             }else 
             {

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackExternal.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackExternal.cpp Changed

@@ -23,6 +23,7 @@
 #include "ADM_edAudioTrackExternal.h"
 #include "ADM_audioIdentify.h"
 #include "ADM_audioAccessFile.h"
+#include "ADM_audioAccessFileAACADTS.h"
 #include "ADM_vidMisc.h"
 
 #ifdef _MSC_VER
@@ -67,10 +68,10 @@
     \fn create
     \brief actually create the track, can fail
 */
-bool ADM_edAudioTrackExternal::create(void)
+bool ADM_edAudioTrackExternal::create(uint32_t extraLen, uint8_t *extraData)
 {
     ADM_info("Initializing audio track from external %s \n",sourceFile.c_str());
-    codec=getAudioCodec(wavHeader.encoding,&wavHeader,0,NULL);;
+    codec=getAudioCodec(wavHeader.encoding,&wavHeader,extraLen,extraData);;
     size=internalAccess->getLength();
     internalAudioStream=ADM_audioCreateStream(&wavHeader,internalAccess,true);
     return true;
@@ -133,24 +134,37 @@
         return NULL;
     }
     // Try to create an access for the file...
+    ADM_audioAccess *access=NULL;
     switch(hdr.encoding)
     {
+        case WAV_AAC:
+                access=new ADM_audioAccessFileAACADTS(name,offset);
+                break;
         case WAV_PCM:
         case WAV_AC3:
         case WAV_MP2:
         case WAV_MP3:
+                ADM_info("Found external audio track, encoding =%d offset=%d\n",(int)hdr.encoding,(int)offset);
+                // create access
+                access=new ADM_audioAccessFile(name,offset);
                 break;
         default:
                 ADM_warning("Unsupported external audio tracks \n");
                 return NULL;
                 break;
     }
-    ADM_info("Found external audio track, encoding =%d offset=%d\n",(int)hdr.encoding,(int)offset);
-    // create access
-    ADM_audioAccessFile *access=new ADM_audioAccessFile(name,offset);
+    if(!access)
+    {
+        ADM_warning("Cannot initialize access for audio track");
+        return NULL;
+    }
     // create ADM_edAudioTrack
     ADM_edAudioTrackExternal *external=new ADM_edAudioTrackExternal(name, &hdr,access);
-    if(!external->create())
+    uint32_t extraDataLen=0;
+    uint8_t  *extraData=NULL;
+    access->getExtraData(&extraDataLen,&extraData);
+    ADM_info("Trying to create external audio track with %d bytes of extraData %d\n",extraDataLen);
+    if(!external->create(extraDataLen,extraData))
     {
         delete external;
         external=NULL;
@@ -232,9 +246,12 @@
 {
         if(codec)
         {
+            ADM_info("Resetting audio track");
             codec->resetAfterSeek();
         }
         lastDts=ADM_NO_PTS;
+        packetBufferSize=0; // reset
+        packetBufferSamples=0;
         return internalAudioStream->goToTime(nbUs);
 }
 // EOF

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackFromVideo.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackFromVideo.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edCache.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edCache.cpp Changed

@@ -88,7 +88,7 @@
     int r,w;
     r=readIndex%_nbImage;
     w=(writeIndex)%_nbImage;
-    aprintf("Read: %"PRIu32" write :%"PRIu32"\n",readIndex,writeIndex);
+    aprintf("Read: %" PRIu32" write :%" PRIu32"\n",readIndex,writeIndex);
     if(r==w && readIndex!=writeIndex) //full
     {
         readIndex++; // free older
@@ -131,7 +131,7 @@
                 uint32_t prev=(writeIndex+_nbImage-1)%_nbImage;
                  ADM_assert(i==prev);
                  ADM_assert(_elemi.pts==ADM_NO_PTS);
-                 aprintf("Invalidate writeIndex %"PRIu32"\n",writeIndex);
+                 aprintf("Invalidate writeIndex %" PRIu32"\n",writeIndex);
                  writeIndex--;
                  return;
             }
@@ -152,7 +152,7 @@
 		{
             ADM_assert(_elemi.pts==ADM_NO_PTS);
 			_elemi.pts=image->Pts;
-            aprintf("validate Index %"PRIu32" with pts=%"PRIu64"ms\n",i,image->Pts);
+            aprintf("validate Index %" PRIu32" with pts=%" PRIu64"ms\n",i,image->Pts);
 			return true;
 		}
 
@@ -166,7 +166,7 @@
 */
 void EditorCache::dump( void)
 {
-    printf("ReadIndex:%"PRIu32", WriteIndex:%"PRIu32"\n",readIndex,writeIndex);
+    printf("ReadIndex:%" PRIu32", WriteIndex:%" PRIu32"\n",readIndex,writeIndex);
     for(int i=0;i<_nbImage;i++)
     {
       cacheElem *e=&(_elemi);
@@ -174,7 +174,7 @@
         {
             case ADM_NO_PTS:  printf("Not used %d\n",i);break;
             default:
-                printf("Edcache content%d: PTS : %s %"PRIu64" ms\n",i,
+                printf("Edcache content%d: PTS : %s %" PRIu64" ms\n",i,
                                                                     ADM_us2plain(e->image->Pts),e->image->Pts/1000);
                 break;
         }
@@ -216,7 +216,7 @@
                 return candidate;
         }
     }
-    aADM_warning("Cannot find image after %"PRIu64" ms in cache\n",pts/1000);
+    aADM_warning("Cannot find image after %" PRIu64" ms in cache\n",pts/1000);
     return NULL;
 }
 /**
@@ -234,11 +234,11 @@
         {
             index+=_nbImage-1;
             index%=_nbImage;
-            printf("GetBefore : Looking for %"PRIu64" ms get %"PRIu64" ms\n",pts/1000,_elemindex.image->Pts/1000);
+            printf("GetBefore : Looking for %" PRIu64" ms get %" PRIu64" ms\n",pts/1000,_elemindex.image->Pts/1000);
             return _elemindex.image;
         }
     }
-    aADM_warning("Cannot find image before %"PRIu64" ms in cache\n",pts/1000);
+    aADM_warning("Cannot find image before %" PRIu64" ms in cache\n",pts/1000);
     return NULL;
 }

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edIdentify.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edIdentify.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edPtsDts.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edPtsDts.cpp Changed

@@ -69,9 +69,9 @@
             {
                 if(dts3>got_dts &&dts2>got_dts && dts2>dts3)
                 {
-                    ADM_warning("Out of order dts at frame %d %"PRIu64",%"PRIu64",%"PRIu64"\n",i,got_dts,dts2,dts3);
+                    ADM_warning("Out of order dts at frame %d %" PRIu64",%" PRIu64",%" PRIu64"\n",i,got_dts,dts2,dts3);
                     dts2=got_dts+timeIncrementUs;
-                    ADM_info("Setting to %"PRIu64"\n",dts2);
+                    ADM_info("Setting to %" PRIu64"\n",dts2);
                     hdr->setPtsDts(i,pts2,dts2);
                 }
             }
@@ -95,9 +95,9 @@
                 //ADM_info("%d %"PRIu64" %"PRIu64" %"PRIu64"\n",i,got_dts,dts2,dts3);
                 if(dts3>got_dts &&dts2<got_dts )
                 {
-                    ADM_warning("Low dts : Out of order dts at frame %d %"PRIu64",%"PRIu64",%"PRIu64"\n",i,got_dts,dts2,dts3);
+                    ADM_warning("Low dts : Out of order dts at frame %d %" PRIu64",%" PRIu64",%" PRIu64"\n",i,got_dts,dts2,dts3);
                     dts2=got_dts+timeIncrementUs;
-                    ADM_info("Setting to %"PRIu64"\n",dts2);
+                    ADM_info("Setting to %" PRIu64"\n",dts2);
                     hdr->setPtsDts(i,pts2,dts2);
                 }
             }
@@ -210,13 +210,13 @@
         }
         if(maxDelta>=2*timeIncrementUs)
         {
-            ADM_info("Our best guess is at %"PRIu64"\n",neighbourmaxIndex);
+            ADM_info("Our best guess is at %" PRIu64"\n",neighbourmaxIndex);
             uint64_t pts,dts,pts2;
             pts2=neighbourmaxIndex+timeIncrementUs;
             hdr->getPtsDts(missingIndex,&pts,&dts); 
             if(pts2>dts)
             {
-                ADM_error("Our guessed PTS is too early, aborting (%"PRIu64"/%"PRIu64")\n",pts2,dts);
+                ADM_error("Our guessed PTS is too early, aborting (%" PRIu64"/%" PRIu64")\n",pts2,dts);
             }else
                 hdr->setPtsDts(missingIndex,pts2,dts);   
         }else   
@@ -270,7 +270,7 @@
             continue;
         }
     }
-    ADM_info("H264 AVC scheme: %"PRIu32"/%"PRIu32" failures.\n",fail,nbFrames/2);
+    ADM_info("H264 AVC scheme: %" PRIu32"/%" PRIu32" failures.\n",fail,nbFrames/2);
     if(fail) goto nextScheme;
     {
     ADM_info("Filling 2nd field PTS\n");
@@ -366,9 +366,9 @@
             nDts++;
     }
 next:
-        ADM_info("Out of %"PRIi32" frames, we have %"PRIi32" valid DTS and %"PRIi32" valid PTS\n",info.nb_frames,nDts,nPts);
-        ADM_info("We also have %"PRIi32" bframes\n",nbB);
-        ADM_info("We have %"PRIu32" fields and %"PRIu32" frames\n",nbFields,nbFrames);
+        ADM_info("Out of %" PRIi32" frames, we have %" PRIi32" valid DTS and %" PRIi32" valid PTS\n",info.nb_frames,nDts,nPts);
+        ADM_info("We also have %" PRIi32" bframes\n",nbB);
+        ADM_info("We have %" PRIu32" fields and %" PRIu32" frames\n",nbFields,nbFrames);
         if(nbFields>2)
         {
             ADM_info("Cannot recompute PTS/DTS for field encoded picture.\n");
@@ -421,7 +421,7 @@
         uint64_t pts,dts;
         if(true!=hdr->getPtsDts(i,&pts,&dts))
         {
-            printf("Editor GetPtsDts failed for frame %"PRIu32"\n",i);
+            printf("Editor GetPtsDts failed for frame %" PRIu32"\n",i);
             return false;
         }
         int k=0;
@@ -432,7 +432,7 @@
             case GOT_BOTH : // Got both
                 if(pts!=dts)
                             {
-                                    printf("Editor Pts!=Dts for frame %"PRIu32"\n",i);
+                                    printf("Editor Pts!=Dts for frame %" PRIu32"\n",i);
                             }
                 first=pts; // do nothing since we already have both...
                 continue;            
@@ -460,7 +460,7 @@
         // update
         if(true!=hdr->setPtsDts(i,pts,dts))
         {
-            printf("Editor SetPtsDts failed for frame %"PRIu32"\n",i);
+            printf("Editor SetPtsDts failed for frame %" PRIu32"\n",i);
             return false;
         }
     }

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edScriptGenerator.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edScriptGenerator.cpp Changed

@@ -7,89 +7,98 @@
 #include "GUI_ui.h"
 #include "ADM_muxerProto.h"
 #include "ADM_coreVideoFilterFunc.h"
-
+/**
+ * 
+ * @param editor
+ * @param scriptWriter
+ */
 ADM_ScriptGenerator::ADM_ScriptGenerator(IEditor *editor, IScriptWriter* scriptWriter)
 {
 	this->_editor = editor;
 	this->_scriptWriter = scriptWriter;
 }
-
-void ADM_ScriptGenerator::generateScript(std::iostream& stream)
+/**
+ * 
+ * @param stream
+ * @param type
+ */
+void ADM_ScriptGenerator::generateScript(std::iostream& stream,const GeneratorType &type)
 {
-        if (!this->_editor->getNbSegment())
+    if (!this->_editor->getNbSegment() && type==GENERATE_ALL)
 	{
         return;
 	}
-        init(stream);
-	
+    init(stream);	
 	this->_scriptWriter->closeVideo();
-
-	printf("Scripting video streams\n");
-
-	for (uint32_t i = 0; i < this->_editor->getVideoCount(); i++)
+    if(type==GENERATE_ALL)
     {
-        const char *nm = ADM_cleanupPath(this->_editor->getRefVideo(i)->_aviheader->getMyName());
-
-		if (i)
-		{
-			this->_scriptWriter->appendVideo(nm);
-		}
-		else
-		{
-			this->_scriptWriter->loadVideo(nm);
-		}
-
-        ADM_dealloc(nm);
-    }
+        printf("Scripting video streams\n");
 
-	printf("Scripting segments\n");
+        for (uint32_t i = 0; i < this->_editor->getVideoCount(); i++)
+        {
+            const char *nm = ADM_cleanupPath(this->_editor->getRefVideo(i)->_aviheader->getMyName());
 
-	this->_scriptWriter->clearSegments();
+            if (i)
+            {
+                this->_scriptWriter->appendVideo(nm);
+            }
+            else
+            {
+                this->_scriptWriter->loadVideo(nm);
+            }
 
-    for (uint32_t i = 0; i < this->_editor->getNbSegment(); i++)
-    {
-        _SEGMENT *seg = this->_editor->getSegment(i);
+            ADM_dealloc(nm);
+        }
 
-		this->_scriptWriter->addSegment(seg->_reference, seg->_refStartTimeUs, seg->_durationUs);
-    }
+        printf("Scripting segments\n");
 
-	// Markers
-	printf("Scripting markers\n");
-	this->_scriptWriter->setMarkers(this->_editor->getMarkerAPts(), this->_editor->getMarkerBPts());
+        this->_scriptWriter->clearSegments();
+
+        for (uint32_t i = 0; i < this->_editor->getNbSegment(); i++)
+        {
+            _SEGMENT *seg = this->_editor->getSegment(i);
 
-	// postproc
-	printf("Scripting post-processing\n");
+            this->_scriptWriter->addSegment(seg->_reference, seg->_refStartTimeUs, seg->_durationUs);
+        }
 
-	uint32_t pptype, ppstrength;
-	bool ppswap;
+        // Markers
+        printf("Scripting markers\n");
+        this->_scriptWriter->setMarkers(this->_editor->getMarkerAPts(), this->_editor->getMarkerBPts());
 
-	this->_editor->getPostProc(&pptype, &ppstrength, &ppswap);
+        // postproc
+        printf("Scripting post-processing\n");
 
-	if (pptype || ppstrength || ppswap)
-	{
-		this->_scriptWriter->setPostProcessing(pptype, ppstrength, ppswap);
-	}
+        uint32_t pptype, ppstrength;
+        bool ppswap;
 
-	// Video codec
-	printf("Scripting video encoder\n");
+        this->_editor->getPostProc(&pptype, &ppstrength, &ppswap);
 
-	this->_scriptWriter->setVideoEncoder(this->_editor->getCurrentVideoEncoder());
+        if (pptype || ppstrength || ppswap)
+        {
+            this->_scriptWriter->setPostProcessing(pptype, ppstrength, ppswap);
+        }
 
-	// Video filters....
-	printf("Scripting video filters\n");
+        // Video codec
+    }
+    printf("Scripting video encoder\n");
+    this->_scriptWriter->setVideoEncoder(this->_editor->getCurrentVideoEncoder());
+    if(type==GENERATE_ALL)
+    {
+        // Video filters....        
+        printf("Scripting video filters\n");
         saveVideoFilters();
   
 
-	printf("Scripting audio tracks\n");
+        printf("Scripting audio tracks\n");
 
-	this->_scriptWriter->clearAudioTracks();
-	ActiveAudioTracks* activeAudioTracks = this->_editor->getPoolOfActiveAudioTrack();
+        this->_scriptWriter->clearAudioTracks();
+        ActiveAudioTracks* activeAudioTracks = this->_editor->getPoolOfActiveAudioTrack();
         // Add external audio tracks to pool if needed
         // and set language 
         PoolOfAudioTracks *pool= this->_editor->getPoolOfAudioTrack();
         for (int i = 0; i < pool->size(); i++)
         {
-            
+
             if(pool->at(i)->getTrackType()==ADM_EDAUDIO_EXTERNAL)
             {
                  std::string name=pool->at(i)->castToExternal()->getMyName();
@@ -143,12 +152,10 @@
                             this->_scriptWriter->setAudioGain(i, mode, gain);
             }
         }
-
+    }
 	// -------- Muxer -----------------------
 	printf("Scripting muxer\n");
-
 	this->_scriptWriter->setMuxer(this->_editor->getCurrentMuxer());
-
 	end();
 }
 /**

avidemux_2.6.12.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_editIface.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_editIface.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp Changed

@@ -50,16 +50,28 @@
         ptsStart=dtsStart=startTime;
     }else   
     {
-        uint64_t delta=ptsStart;
-        video_body->getPtsDtsDelta(&delta);
+        // Do we have non droppable b frame ?
+        uint32_t bframeDelay;
+        if(true==video_body->getNonClosedGopDelay(ptsStart,&bframeDelay))
+        {
+            ADM_info("Some B frames are non droppable, increasing delat by %d us\n",bframeDelay);
+            videoDelay+=bframeDelay;
+        }
+        else
+        {
+            videoDelay=0;
+        }
+        
+        uint64_t delta=0;
+        video_body->getPtsDtsDelta(ptsStart,&delta);
 
-        ADM_info("PTS/DTS delta=%"PRIu64" us\n",delta);
+        ADM_info("PTS/DTS delta=%" PRIu64" us\n",delta);
         //videoDelay
         if(delta>ptsStart)
         {
-            videoDelay=delta-ptsStart;
+            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" ms\n",videoDelay/1000);
         }else
         {
             dtsStart=ptsStart-delta;
@@ -68,6 +80,8 @@
     }
     eofMet=false;
 
+  
+    
     this->startTimeDts=dtsStart;
     this->startTimePts=ptsStart;
     this->endTimePts=endTime;
@@ -75,7 +89,7 @@
     rewind();
     
     ADM_info(" Fixating start time by %d\n",abs((int)(startTime-startTimeDts)));
-    ADM_info(" Starting DTS=%"PRIu64", PTS=%"PRIu64" ms\n",startTimeDts/1000,startTimePts/1000);
+    ADM_info(" Starting DTS=%" PRIu64", PTS=%" PRIu64" ms\n",startTimeDts/1000,startTimePts/1000);
 }
 /**
 
@@ -107,8 +121,8 @@
     if(in==ADM_NO_PTS) return in;
     if(in>=startTimeDts) return in-startTimeDts;
     ADM_warning("Negative time!\n");
-    ADM_warning("Current time = %"PRIu64"\n",in);
-    ADM_warning("start time = %"PRIu64"\n",startTimeDts);
+    ADM_warning("Current time = %" PRIu64"\n",in);
+    ADM_warning("start time = %" PRIu64"\n",startTimeDts);
     return 0;
 }
 /**
@@ -152,7 +166,7 @@
           {
             if(image.demuxerPts<image.demuxerDts)
               {
-                ADM_warning("PTS<DTS : PTS=%"PRIu64" ms , DTS=%"PRIu64"ms\n",image.demuxerPts/1000,image.demuxerDts/1000);
+                ADM_warning("PTS<DTS : PTS=%" PRIu64" ms , DTS=%" PRIu64"ms\n",image.demuxerPts/1000,image.demuxerDts/1000);
 
               }

avidemux_2.6.12.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopyFromAnnexB.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopyFromAnnexB.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoProcess.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoProcess.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_osSupport/ADM_crashHook.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_osSupport/ADM_crashHook.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_osSupport/ADM_misc.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_osSupport/ADM_misc.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_previewNavigate.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_previewNavigate.cpp Changed

@@ -38,7 +38,6 @@
 #include "ADM_edit.hxx"
 #include "ADM_render/GUI_render.h"
 
-#include "ADM_debugID.h"
 #include "ADM_commonUI/GUI_ui.h"
 #include "ADM_preview.h"
 
@@ -69,7 +68,7 @@
 {
     if(!video_body->goToTimeVideo(timeframe)) 
     {
-        ADM_warning(" seeking for frame at %"PRIu64" ms failed\n",timeframe/1000LL);
+        ADM_warning(" seeking for frame at %" PRIu64" ms failed\n",timeframe/1000LL);
         return false;
     }
     return samePicture();
@@ -85,7 +84,7 @@
 {
     if(!video_body->goToIntraTimeVideo(timeframe)) 
     {
-        ADM_warning(" seeking for frame at %"PRIu64" ms failed\n",timeframe/1000LL);
+        ADM_warning(" seeking for frame at %" PRIu64" ms failed\n",timeframe/1000LL);
         return false;
     }
     return samePicture();
@@ -131,13 +130,13 @@
 bool admPreview::nextKeyFrame(void)
 {
     uint64_t pts=getCurrentPts();
-    ADM_info("Current PTS :%"PRId64" ms\n",pts/1000LL);
+    ADM_info("Current PTS :%" PRId64" ms\n",pts/1000LL);
     if(false==video_body->getNKFramePTS(&pts))
     {
         ADM_warning("Cannot find next keyframe\n");
         return false;
     }
-    ADM_info("next kf PTS :%"PRId64" ms\n",pts/1000LL);
+    ADM_info("next kf PTS :%" PRId64" ms\n",pts/1000LL);
     return seekToIntraPts(pts);
 }
 /**
@@ -147,13 +146,13 @@
 bool admPreview::previousKeyFrame(void)
 {
     uint64_t pts=getCurrentPts();
-    ADM_info("Current PTS :%"PRId64" ms\n",pts/1000LL);
+    ADM_info("Current PTS :%" PRId64" ms\n",pts/1000LL);
     if(false==video_body->getPKFramePTS(&pts))
     {
         ADM_warning("Cannot find previous keyframe\n");
         return false;
     }
-    ADM_info("next kf PTS :%"PRId64" ms\n",pts/1000LL);
+    ADM_info("next kf PTS :%" PRId64" ms\n",pts/1000LL);
     return seekToIntraPts(pts);
 }
 // EOF

avidemux_2.6.12.tar.gz/avidemux/common/ADM_render/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_render/CMakeLists.txt Changed

@@ -2,28 +2,44 @@
 
 IF(QT_LIBRARY_EXTENSION)
         SET(ADM_LIB ADM_render6_${QT_LIBRARY_EXTENSION})
+        SET(SIMPLE_RENDER GUI_simpleRender.cpp)
 ELSE(QT_LIBRARY_EXTENSION)
         SET(ADM_LIB ADM_render6_${UI_SUFFIX})
+        SET(SIMPLE_RENDER GUI_simpleRenderStub.cpp)
 ENDIF(QT_LIBRARY_EXTENSION)
 
 SET(${ADM_LIB}_SRCS
 GUI_render.cpp
-GUI_simpleRender.cpp
-GUI_sdlRender.cpp
-GUI_xvRender.cpp
-GUI_vdpauRender.cpp
-GUI_libvaRender.cpp
+${SIMPLE_RENDER}
 )
 
-IF (USE_OPENGL)
-	SET(${ADM_LIB}_SRCS ${${ADM_LIB}_SRCS} GUI_qtGlRender.cpp)
-ENDIF (USE_OPENGL)
 
-IF (APPLE)
-	IF(USE_SDL)
-		SET(${ADM_LIB}_SRCS ${${ADM_LIB}_SRCS} GUI_sdlRenderHelper.m)
-	ENDIF(USE_SDL)
-ENDIF (APPLE)
+IF(NOT ${UI_SUFFIX} STREQUAL "cli")
+        IF (USE_OPENGL)
+                INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ADM_openGL/include/)
+	        SET(${ADM_LIB}_SRCS ${${ADM_LIB}_SRCS} GUI_qtGlRender.cpp)
+        ENDIF (USE_OPENGL)
+        
+        IF (APPLE)
+	        IF(USE_SDL)
+		        SET(${ADM_LIB}_SRCS ${${ADM_LIB}_SRCS} GUI_sdlRenderHelper.m)
+	        ENDIF(USE_SDL)
+        ENDIF (APPLE)
+        IF (USE_XV)
+	        SET(${ADM_LIB}_SRCS ${${ADM_LIB}_SRCS} GUI_xvRender.cpp)
+        ENDIF (USE_XV)
+        IF (USE_SDL)
+	        SET(${ADM_LIB}_SRCS ${${ADM_LIB}_SRCS} GUI_sdlRender.cpp)
+        ENDIF (USE_SDL)
+        IF (USE_VDPAU)
+                ADD_CORE_INCLUDE(ADM_coreVdpau)
+	        SET(${ADM_LIB}_SRCS ${${ADM_LIB}_SRCS} GUI_vdpauRender.cpp)
+        ENDIF (USE_VDPAU)
+        IF (USE_LIBVA)
+                ADD_CORE_INCLUDE(ADM_coreLibVA)
+	        SET(${ADM_LIB}_SRCS ${${ADM_LIB}_SRCS} GUI_libvaRender.cpp)
+        ENDIF (USE_LIBVA)
+ENDIF() # Not cli
 
 add_compiler_export_flags()
 ADD_LIBRARY(${ADM_LIB} SHARED ${${ADM_LIB}_SRCS})

avidemux_2.6.12.tar.gz/avidemux/common/ADM_render/GUI_libvaRender.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_render/GUI_libvaRender.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_render/GUI_libvaRender.h -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_render/GUI_libvaRender.h Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_render/GUI_render.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_render/GUI_render.cpp Changed

@@ -24,22 +24,26 @@
 #include "GUI_render.h"
 #include "GUI_renderInternal.h"
 #include "GUI_accelRender.h"
-#include "GUI_simpleRender.h"
 #include "GUI_nullRender.h"
 #include "prefs.h"
+
+
+extern VideoRenderBase *spawnSimpleRender();
+
 #ifdef USE_XV
-#include "GUI_xvRender.h"
+extern VideoRenderBase *spawnXvRender();
 #endif
 
 #ifdef USE_SDL
-#include "GUI_sdlRender.h"
+extern VideoRenderBase *spawnSdlRender();
 #endif
 
 #ifdef USE_VDPAU
-#include "GUI_vdpauRender.h"
+extern VideoRenderBase *spawnVDPAURender();
 #endif
+
 #ifdef USE_LIBVA
-#include "GUI_libvaRender.h"
+extern VideoRenderBase *spawnLIBVARender();
 #endif
 
 #if defined (USE_OPENGL)
@@ -108,22 +112,17 @@
    RENDER_CHECK(UI_updateDrawWindowSize);
    HookFunc->UI_updateDrawWindowSize(win,w,h);
 }
-void MUI_rgbDraw(void *widg,uint32_t w, uint32_t h,uint8_t *ptr)
+static   ADM_RENDER_TYPE MUI_getPreferredRender(void)
 {
-    RENDER_CHECK(UI_rgbDraw);
-    HookFunc->UI_rgbDraw(widg, w,  h,ptr);
-  
+  RENDER_CHECK(UI_getPreferredRender);
+  return HookFunc->UI_getPreferredRender();
 }
 void *MUI_getDrawWidget(void)
 {
   RENDER_CHECK(UI_getDrawWidget);
   return HookFunc->UI_getDrawWidget();
 }
-static   ADM_RENDER_TYPE MUI_getPreferredRender(void)
-{
-  RENDER_CHECK(UI_getPreferredRender);
-  return HookFunc->UI_getPreferredRender();
-}
+
 //**************************************
 //**************************************
 //**************************************
@@ -177,13 +176,17 @@
 {
         bool create=false;
         enableDraw=false;
-        ADM_info("Render to %"PRIu32"x%"PRIu32" zoom=%d\n",w,h,zoom);
-        if(!renderer) create=true;
-        else
+        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);
+        // Check if something has changed...
+        
+        
+        if(renderer && w==phyW && h==phyH && zoom==lastZoom)
         {
-            if(w!=phyW || h!=phyH) create=true;
+            ADM_info("          No change, nothing to do\n");
+            return true;
         }
-        if(create)
+        
+        if(!renderer || (w!=phyW || h!=phyH)) 
         {
             if(renderer) 
             {
@@ -195,11 +198,12 @@
             phyH=h;
             lastZoom=zoom;
             spawnRenderer();
-        }else
+        }else // only zoom changed
         {
-            if(lastZoom!=zoom) renderer->changeZoom(zoom);
+              renderer->changeZoom(zoom);
         }
-        lastZoom=zoom;
+         // Resize widget to be the same as input after zoom
+         lastZoom=zoom;
          int mul;
          switch(zoom)
             {
@@ -298,8 +302,9 @@
                 { \
                     ADM_info(name" init ok\n"); \
                 }
-#define TRY_RENDERER(clss,name) TRY_RENDERER_INTERNAL(clss,new,name)
-#define TRY_RENDERER_FUNC(func,name) TRY_RENDERER_INTERNAL(func,,name)
+//#define TRY_RENDERER_CLASS(clss,name) TRY_RENDERER_INTERNAL(clss,new,name)
+//#define TRY_RENDERER_FUNC(func,name) TRY_RENDERER_INTERNAL(func,,name)
+#define TRY_RENDERER_SPAWN(spawn,name)  TRY_RENDERER_INTERNAL(spawn,,name)
 /**
  * 
  * @param renderName
@@ -325,7 +330,7 @@
                     renderer=NULL;
                 }else
                 {
-                    TRY_RENDERER_FUNC(RenderSpawnQtGl,"QtGl");
+                    TRY_RENDERER_SPAWN(RenderSpawnQtGl,"QtGl");
                 }
                 break;
             }
@@ -333,30 +338,30 @@
 
 #if defined(USE_VDPAU)
        case RENDER_VDPAU:
-                TRY_RENDERER(vdpauRender,"VDPAU")
+                TRY_RENDERER_SPAWN(spawnVDPAURender,"VDPAU")
                 break;
 #endif
 #if defined(USE_LIBVA)
        case RENDER_LIBVA:
-                TRY_RENDERER(libvaRender,"LIBVA")
+                TRY_RENDERER_SPAWN(spawnLIBVARender,"LIBVA")
                 break;
 #endif
 
 #if defined(USE_XV)
        case RENDER_XV:
-                TRY_RENDERER(XvRender,"Xv")
+                TRY_RENDERER_SPAWN(spawnXvRender,"Xv")
                 break;
 #endif
 
 #if  defined(USE_SDL)
     case RENDER_SDL:
-                TRY_RENDERER(sdlRender,"SDL")
+                TRY_RENDERER_SPAWN(spawnSdlRender,"SDL")
                 break;        
 #endif
         }
         if(!renderer)
         {
-            TRY_RENDERER(simpleRender,"simpleRenderer");
+            TRY_RENDERER_SPAWN(spawnSimpleRender,"simpleRenderer");
             ADM_assert(renderer);
         }
         return true;

avidemux_2.6.12.tar.gz/avidemux/common/ADM_render/GUI_sdlRender.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_render/GUI_sdlRender.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_render/GUI_simpleRender.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_render/GUI_simpleRender.cpp Changed

@@ -17,9 +17,18 @@
 #include "GUI_renderInternal.h"
 #include "GUI_accelRender.h"
 #include "GUI_simpleRender.h"
+#include "QPainter"
+#include "QPaintEngine"
 
-extern void MUI_rgbDraw(void *widg,uint32_t w, uint32_t h,uint8_t *ptr);
 extern void *MUI_getDrawWidget(void);
+
+
+VideoRenderBase *spawnSimpleRender()
+{
+    return new simpleRender();
+}
+
+
 /**
     \fn simpleRender
 */
@@ -27,12 +36,17 @@
 {
     ADM_info("creating simple render.\n");
     videoBuffer=NULL;
+    paintEngineType=-1;
+    videoWidget=NULL;
 }
 /**
     \fn simpleRender
 */
 simpleRender::~simpleRender()
 {
+    admScopedMutex autoLock(&lock);
+    videoWidget->setDrawer(NULL);
+    videoWidget->useExternalRedraw(true);
     ADM_info("Destroying simple render.\n");
     if(videoBuffer) delete  videoBuffer;
     videoBuffer=NULL;
@@ -51,7 +65,7 @@
 */
 bool simpleRender::refresh(void)
 {
-     MUI_rgbDraw(MUI_getDrawWidget(),displayWidth,displayHeight,videoBuffer);
+     videoWidget->repaint();
      return true;
 }
 /**
@@ -60,8 +74,10 @@
 bool simpleRender::displayImage(ADMImage *pic)
 {
     scaler->convertImage(pic,videoBuffer);
-    // Display RGB data
-    MUI_rgbDraw(MUI_getDrawWidget(),displayWidth,displayHeight,videoBuffer);
+    lock.lock();
+    myImage=QImage(videoBuffer,displayWidth,displayHeight,QImage::Format_RGB32).copy(0,0,displayWidth,displayHeight);
+    lock.unlock();
+    refresh();
     return true;
 }
 #if !(ADM_UI_TYPE_BUILD == ADM_UI_QT4)
@@ -114,5 +130,33 @@
     baseInit(w,h,zoom);
     ADM_info("init, simple render. w=%d, h=%d,zoom=%d\n",(int)w,(int)h,(int)zoom);
     allocateStuff();
+    videoWidget=(ADM_Qvideo *)info.widget;
+    videoWidget->useExternalRedraw(false);
+    videoWidget->setDrawer(this);
     return true;
 }
+
+/**
+ * \brief This is the callback called when the display wants to redraw
+ * @param widget
+ * @param ev
+ * @return 
+ */
+bool simpleRender::draw(QWidget *widget, QPaintEvent *ev)
+{
+    admScopedMutex autoLock(&lock); 
+    QPainter painter(widget);
+    if (painter.isActive())
+    {
+        const QRect rec=ev->rect();
+        int x=rec.x();
+        int y=rec.y();
+        int w=rec.width();
+        int h=rec.height();
+        painter.drawImage(x,y,myImage,x,y,w,h);
+    }else
+    {
+        ADM_warning("Painter inactive!\n");
+    }
+    return true;
+}
\ No newline at end of file

avidemux_2.6.12.tar.gz/avidemux/common/ADM_render/GUI_simpleRender.h -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_render/GUI_simpleRender.h Changed

@@ -13,19 +13,26 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef T_SIMPLE_RENDER_H
-#define T_SIMPLE_RENDER_H
+#pragma once
+#include <QWidget>
+#include <QImage>
+#include "ADM_threads.h"
+#include "../../qt4/ADM_userInterfaces/ADM_gui/T_preview.h"
 /**
     \fn class simpleRender
 */
-class simpleRender: public VideoRenderBase
+class simpleRender: public VideoRenderBase, public ADM_QvideoDrawer
 {
       protected:
                              GUI_WindowInfo info;
                              uint8_t *videoBuffer;
                              void    *handle;
+                             int     paintEngineType;
                              bool    cleanup(void);
                              bool    allocateStuff(void);
+                             QImage  myImage;
+                             ADM_Qvideo *videoWidget;
+                             admMutex lock;
       public:
                              simpleRender( void ) ;
                              ~simpleRender();
@@ -35,10 +42,7 @@
               virtual   bool changeZoom(renderZoom newZoom);
               virtual   bool refresh(void);
               virtual   bool usingUIRedraw(void) {return true;};
-                        const char *getName() {return "RGB";}
+                  const char *getName() {return "RGB";}
+                        bool draw(QWidget *widget, QPaintEvent *ev);
 };
-#endif
-
-
-

avidemux_2.6.13.tar.gz/avidemux/common/ADM_render/GUI_simpleRenderStub.cpp Added

@@ -0,0 +1,95 @@
+/**
+    \author mean fixounet@free.fr 2010
+*/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 "ADM_default.h"
+#include "DIA_coreToolkit.h"
+#include "GUI_render.h"
+#include "GUI_renderInternal.h"
+#include "GUI_accelRender.h"
+
+class simpleRender: public VideoRenderBase
+{
+      protected:
+      public:
+                             simpleRender( void ) ;
+                             ~simpleRender();
+              virtual	bool init( GUI_WindowInfo *  window, uint32_t w, uint32_t h,renderZoom zoom);
+              virtual	bool stop(void);				
+              virtual   bool displayImage(ADMImage *pic);
+              virtual   bool changeZoom(renderZoom newZoom);
+              virtual   bool refresh(void);
+              virtual   bool usingUIRedraw(void) {return false;};
+                  const char *getName() {return "Dummy";}
+};
+
+
+
+VideoRenderBase *spawnSimpleRender()
+{
+    return new simpleRender();
+}
+
+
+/**
+    \fn simpleRender
+*/
+simpleRender::simpleRender()
+{
+    ADM_info("creating dummy render.\n");
+}
+/**
+    \fn simpleRender
+*/
+simpleRender::~simpleRender()
+{
+    ADM_info("Destroying dummy render.\n");
+}
+
+/**
+    \fn stop
+*/
+bool simpleRender::stop(void)
+{
+    ADM_info("stopping dummy render.\n");
+    return true;
+}
+/**
+    \fn refresh
+*/
+bool simpleRender::refresh(void)
+{
+     return true;
+}
+/**
+    \fn displayImage
+*/
+bool simpleRender::displayImage(ADMImage *pic)
+{
+        return true;
+}
+/**
+    \fn changeZoom
+*/
+bool simpleRender::changeZoom(renderZoom newZoom)
+{
+        return true;
+}
+/**
+    \fn changeZoom
+*/
+bool simpleRender::init( GUI_WindowInfo *  window, uint32_t w, uint32_t h,renderZoom zoom)
+{
+    ADM_info("init, simple render. w=%d, h=%d,zoom=%d\n",(int)w,(int)h,(int)zoom);
+    return true;
+}
+

avidemux_2.6.12.tar.gz/avidemux/common/ADM_render/GUI_vdpauRender.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_render/GUI_vdpauRender.cpp Changed

@@ -20,20 +20,31 @@
 #include "libavcodec/avcodec.h"
 #include "libavcodec/vdpau.h"
 }
-
+#if 0
+#define aprintf printf
+#else
+#define aprintf(...) {}
+#endif
 
 #include "GUI_render.h"
 
 #include "GUI_accelRender.h"
 #include "GUI_vdpauRender.h"
-#include "ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpau.h"
-#include "ADM_videoCodec/include/ADM_ffmpeg_vdpau_internal.h"
+#include "ADM_coreVdpau.h"
+#include "ADM_videoCodec/private_inc/ADM_ffmpeg_vdpau_internal.h"
 static VdpOutputSurface     surface2={VDP_INVALID_HANDLE,VDP_INVALID_HANDLE};
 static VdpVideoSurface      input=VDP_INVALID_HANDLE;
 static VdpVideoMixer        mixer=VDP_INVALID_HANDLE;
 static int                  currentSurface=0;
 static VdpPresentationQueue queue=VDP_INVALID_HANDLE;
 //________________Wrapper around Xv_______________
+
+
+VideoRenderBase *spawnVDPAURender()
+{
+    return new vdpauRender;
+}
+
 /**
     \fn vdpauRender
 */
@@ -149,21 +160,25 @@
     // Blit pic into our video Surface
     VdpVideoSurface myInput=input;
     int next=currentSurface^1;
+    int ipitches3;
     uint32_t pitches3;
     uint8_t *planes3;
-    pic->GetPitches(pitches);
+    pic->GetPitches(ipitches);
     pic->GetReadPlanes(planes);
 
+    for(int i=0;i<3;i++) pitchesi=(uint32_t)ipitchesi;
+    
     // Put out stuff in input...
     // if input is already a VDPAU surface, no need to reupload it...
     if(pic->refType==ADM_HW_VDPAU)
     {
         // cookie is a render...
-        struct vdpau_render_state *rndr = (struct vdpau_render_state *)pic->refDescriptor.refCookie;
+        struct vdpau_render_state *rndr = (struct vdpau_render_state *)pic->refDescriptor.refHwImage;
         myInput=rndr->surface;
-        //printf("Skipping blit surface=%d\n",(int)myInput);
+        aprintf("VDPAU: This is already vdpau image, just passing along surface=%d\n",rndr->surface);
     }else
     {
+        aprintf("VDPAU: This is NOT a  vdpau image, converting\n");
         //printf("Blitting surface\n");
         if(VDP_STATUS_OK!=admVdpau::surfacePutBits( 
                 input,
@@ -216,7 +231,7 @@
         ADM_warning("Vdpau Refresh : Cannot display on presenation queue\n");
         return false;
     }
-    renderCompleteRedrawRequest();
+    //renderCompleteRedrawRequest();
     return true;
 }
 #endif

avidemux_2.6.12.tar.gz/avidemux/common/ADM_render/GUI_vdpauRender.h -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_render/GUI_vdpauRender.h Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_render/GUI_xvRender.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_render/GUI_xvRender.cpp Changed

@@ -1,9 +1,8 @@
 /***************************************************************************
     \file GUI_xvRender.cpp
     \author mean fixounet@free.fr, This file is strongly derivated from xine/mplayer/mpeg2dec
-
-    begin                : Tue Jan 1 2002
-    copyright            : (C) 2002 by mean
+    
+    copyright            : (C) 2002/2016 by mean
     email                : fixounet@free.fr
  ***************************************************************************/
 
@@ -23,7 +22,7 @@
 
 #define VERBOSE_XV
 
-#ifdef USE_XV
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <sys/ipc.h>
@@ -38,16 +37,16 @@
 #include "GUI_accelRender.h"
 #include "GUI_xvRender.h"
 
-static uint8_t 	GUI_XvList(Display * dis, uint32_t port, uint32_t * fmt);
-static uint8_t 	GUI_XvInit(GUI_WindowInfo * window, uint32_t w, uint32_t h);
-static void 	GUI_XvEnd( void );
-static uint8_t  GUI_XvDisplay(ADMImage *src, uint32_t w, uint32_t h,uint32_t destW,uint32_t destH);
-static uint8_t  GUI_XvRedraw( void );
-static uint8_t  getAtom(const char *string);
-static bool     xvDraw(uint32_t w,uint32_t h,uint32_t destW,uint32_t destH);
-//________________Wrapper around Xv_______________
+// Instantiator
+//
+VideoRenderBase *spawnXvRender()
+{
+    return new XvRender();
+}
+
 /**
     \fn XvRender
+ *  \brief Ctor
 */
 XvRender::XvRender( void )
 {
@@ -65,26 +64,49 @@
 */
 bool XvRender::init( GUI_WindowInfo * window, uint32_t w, uint32_t h,renderZoom zoom)
 {
-	ADM_info("XvideoXv start\n");
+    ADM_info("XvideoXv start\n");
     info=*window;
     baseInit(w,h,zoom);
-	return  GUI_XvInit( window,  w,  h);
+    return  lowLevelXvInit( window,  w,  h);
 }
 /**
     \fn stop
 */
 bool XvRender::stop(void)
 {
-	 GUI_XvEnd( );
-	 printf("XvideoXv end\n");
-	 return 1;
+     ADM_assert(xv_port);
+     ADM_assert(xv_display);
+
+
+    ADM_info("Xvideo Releasing Xv Port\n");
+    XLockDisplay (xv_display);
+    if(XvUngrabPort(xv_display,xv_port,0)!=Success)
+    {
+        ADM_warning("Xvideo Trouble releasing port...\n");
+    }
+    XUnlockDisplay (xv_display);
+    xvimage=NULL;
+    xv_display=NULL;
+    xv_port=0;
+    return true;
 }
 /**
     \fn displayImage
 */
-bool XvRender::displayImage(ADMImage *pic)
+bool XvRender::displayImage(ADMImage *src)
 {
-	return GUI_XvDisplay(pic, imageWidth, imageHeight,displayWidth,displayHeight);
+    if (xvimage)
+    {
+        XLockDisplay (xv_display);
+        int plane=xvimage->pitches0*imageHeight;
+        int plane2=xvimage->pitches1*(imageHeight>>1);
+        BitBlit((uint8_t *)xvimage->data, xvimage->pitches0,src->GetReadPtr(PLANAR_Y),src->GetPitch(PLANAR_Y),imageWidth,imageHeight);
+        BitBlit((uint8_t *)xvimage->data+plane,  xvimage->pitches1,src->GetReadPtr(PLANAR_U),src->GetPitch(PLANAR_U),imageWidth/2,imageHeight/2);
+        BitBlit((uint8_t *)xvimage->data+plane+plane2,  xvimage->pitches2,src->GetReadPtr(PLANAR_V),src->GetPitch(PLANAR_V),imageWidth/2,imageHeight/2);
+        XUnlockDisplay (xv_display);
+        xvDraw(imageWidth,imageHeight,displayWidth,displayHeight);
+    }
+    return 1;    
 }
 
 /**
@@ -107,325 +129,219 @@
     xvDraw(imageWidth,imageHeight,displayWidth,displayHeight);
     return true;
 }
-//________________Wrapper around Xv_______________
-
-static unsigned int xv_port;
-static uint32_t xv_format;
-static Display *xv_display;
-static XvImage *xvimage = NULL;
-static GC xv_gc;
-static XGCValues xv_xgc;
-static Window xv_win;
-static XShmSegmentInfo Shminfo;
-static uint8_t GUI_XvExpose( void );
 
 /**
-    \fn GUI_XvEnd
-    \brief Free all ressources allocated by xv
-*/
-void GUI_XvEnd( void )
-{
-	ADM_assert(xv_port);
- 	ADM_assert(xv_display);
-
-
-  	ADM_info("Xvideo Releasing Xv Port\n");
-  	XLockDisplay (xv_display);
-	if(XvUngrabPort(xv_display,xv_port,0)!=Success)
- 				printf("Xvideo Trouble releasing port...\n");
-	XUnlockDisplay (xv_display);
-
-
-     xvimage=NULL;
-     xv_display=NULL;
-     xv_port=0;
-
-}
-/**
     \fn xvDraw
 */
-bool xvDraw(uint32_t w,uint32_t h,uint32_t destW,uint32_t destH)
+bool XvRender::xvDraw(uint32_t w,uint32_t h,uint32_t destW,uint32_t destH)
 {
-        if(!xvimage) return false;
-        XLockDisplay (xv_display);
-#if 1
-        XvShmPutImage(xv_display, xv_port, xv_win, xv_gc, xvimage, 0, 0, w, h,	// src
-			0, 0, destW, destH,	// dst
-			False);
-#else
-        XvPutImage(xv_display, xv_port, xv_win, xv_gc, xvimage, 0, 0, w, h,	// src
-			0, 0, w, h	// dst
-			);
-#endif
-          XUnlockDisplay (xv_display);
-          XSync(xv_display, False);
-        return true;
+    if(!xvimage) return false;
+    XLockDisplay (xv_display);
+    XvShmPutImage(xv_display, xv_port, xv_win, xv_gc, xvimage, 0, 0, w, h, 0, 0, destW, destH,  False);
+    XUnlockDisplay (xv_display);
+    XSync(xv_display, False);
+    return true;
 }
 /**
-    \fn GUI_XvList
+    \fn lowLevelXvInit
 */
-uint8_t GUI_XvDisplay(ADMImage * src, uint32_t w, uint32_t h,uint32_t destW,uint32_t destH)
+#define WDN xv_display
+bool XvRender::lowLevelXvInit(GUI_WindowInfo * window, uint32_t w, uint32_t h)
 {
     
-    if (xvimage)
-      {
-          XLockDisplay (xv_display);
-          // Pack src into xvimage->data
-            int plane=w*h;
-          BitBlit((uint8_t *)xvimage->data, w,src->GetReadPtr(PLANAR_Y),src->GetPitch(PLANAR_Y),w,h);
-          BitBlit((uint8_t *)xvimage->data+plane, w/2,src->GetReadPtr(PLANAR_U),src->GetPitch(PLANAR_U),w/2,h/2);
-          BitBlit((uint8_t *)xvimage->data+(plane*5)/4, w/2,src->GetReadPtr(PLANAR_V),src->GetPitch(PLANAR_V),w/2,h/2);
-          XUnlockDisplay (xv_display);
-          xvDraw(w,h,destW,destH);
-      }
-    return 1;
-}
-/**
-    \fn GUI_XvList
-*/
-
-uint8_t GUI_XvInit(GUI_WindowInfo * window, uint32_t w, uint32_t h)
-{
-
-
-    unsigned int ver, rel, req, ev, err;
     unsigned int port, adaptors;
     static XvAdaptorInfo *ai;
     static XvAdaptorInfo *curai;
+    static XShmSegmentInfo Shminfo;
 
-#if 0
-    win = gtk_widget_get_parent_window(window);
-    xv_display = GDK_WINDOW_XDISPLAY(win);
-//      xv_win= RootWindow(xv_display,0);
-    xv_win = GDK_WINDOW_XWINDOW(GTK_WIDGET(window)->systemWindowId);
-#endif
 
     xv_display=(Display *)window->display;
     xv_win=window->systemWindowId;
-
-
-#define WDN xv_display
     xv_port = 0;
-
-    if (Success != XvQueryExtension(WDN, &ver, &rel, &req, &ev, &err))
-      {
-	  printf("Xvideo Query Extension failed\n");
-	  goto failed;
-      }
+    {
+        unsigned int ver, rel, req, ev, err;
+        if (Success != XvQueryExtension(WDN, &ver, &rel, &req, &ev, &err))
+        {
+            ADM_info("Xvideo Query Extension failed\n");
+            return false;
+        }
+    }
     /* check for Xvideo support */
     if (Success != XvQueryAdaptors(WDN,
-				   DefaultRootWindow(WDN), &adaptors, &ai))
-      {
-	  printf("Xvideo Query Adaptor failed\n");
-	  goto failed;
-      }
+                   DefaultRootWindow(WDN), &adaptors, &ai))
+    {
+        ADM_info("Xvideo Query Adaptor failed\n");
+        return false;
+    }
     curai = ai;
-    XvFormat *formats;
+
     // Dump infos
     port = 0;
-    for (uint16_t i = 0; (!port) && (i < adaptors); i++)
-      {
-/*
-XvPortID base_id;
-unsigned long num_ports;
-char type;
-char *name;
-unsigned long num_formats;
-XvFormat *formats;
-unsigned long num_adaptors;
-*/
-#ifdef VERBOSE_XV
-	  printf("Xvideo_______________________________\n");
-	  printf("Xvideo Adaptor 		: %d\n", i);
-	  printf("Xvideo Base ID		: %ld\n", curai->base_id);
-	  printf("Xvideo Nb Port	 	: %lu\n", curai->num_ports);
-	  printf("Xvideo Type			 	: %d,", curai->type);
-#define CHECK(x) if(curai->type & x) printf("|"#x);
-	  CHECK(XvInputMask);
-	  CHECK(XvOutputMask);
-	  CHECK(XvVideoMask);
-	  CHECK(XvStillMask);
-	  CHECK(XvImageMask);
-
-	  printf("\nXvideo Name			 	: %s\n",
-		 curai->name);
-	  printf("Xvideo Num Adap	 	: %lu\n", curai->num_adaptors);
-	  printf("Xvideo Num fmt	 	: %lu\n", curai->num_formats);
-#endif
-	  formats = curai->formats;
-
-	  //
-	  uint16_t k;
-
-	  for (k = 0; (k < curai->num_ports) && !port; k++)
-	    {
-		if (GUI_XvList(WDN, k + curai->base_id, &xv_format))
-		    port = k + curai->base_id;
-	    }
-
-
-	  curai++;
-      }
+    for (int  i = 0; (!port) && (i < adaptors); i++)
+    {
+        XvFormat *formats;
+        displayAdaptorInfo(i,curai);
+        formats = curai->formats;
+        for (int k = 0; (k < curai->num_ports) && !port; k++)
+        {
+          if (lookupYV12(WDN, k + curai->base_id, &xv_format))
+          {
+              port = k + curai->base_id;
+              break;
+          }
+        }
+        curai++;
+    }
     //
     if (!port)
-      {
-	  printf("Xvideo no port found\n");
-	  goto failed;
-      }
-#ifdef 	COLORSPACE_YV12
-    printf("Xvideo Xv YV12 found at port :%d, format : %"PRIi32"\n", port, xv_format);
-#else
-    printf("Xvideo Xv YUY2 found at port :%d, format : %"PRIi32"\n", port, xv_format);
-#endif
-
+    {
+      ADM_info("Xvideo no port found\n");
+      return false;
+    }
+    ADM_info("Xvideo Xv YV12 found at port :%d, format : %" PRIi32"\n", port, xv_format);
     if (Success != XvGrabPort(WDN, port, 0))
-	goto failed;
     {
+        ADM_warning("Grabbing port failed\n");
+        return false;
+    }
+    {
+    xv_port = port;
 
-	xv_port = port;
-/*
-   Display *display,
-   XvPortID port,
-   int id,
-   char* data,
-   int width,
-   int height,
-   XShmSegmentInfo *shminfo
-
-*/
-
-        XSetWindowAttributes xswa;
-        XWindowAttributes attribs;
-        static Atom xv_atom;
-        unsigned long xswamask;
-        int erCode;
-
-        /* check if colorkeying is needed */
-        xv_atom = getAtom( "XV_AUTOPAINT_COLORKEY" );
-        if(xv_atom!=None)
-        {
-                XvSetPortAttribute( xv_display, xv_port, xv_atom, 1 );
-        }
-        else printf("No autopaint \n");
-
-        /* if we have to deal with colorkeying ... */
-
-	xvimage = XvShmCreateImage(WDN, xv_port,
-				   xv_format, 0, w, h, &Shminfo);
-
-	Shminfo.shmid = shmget(IPC_PRIVATE, xvimage->data_size,
-			       IPC_CREAT | 0777);
-        if(Shminfo.shmid<=0)
-        {
-                printf("shmget failed\n");
-        }
-	Shminfo.shmaddr = (char *) shmat(Shminfo.shmid, 0, 0);
-	Shminfo.readOnly = False;
-        if(Shminfo.shmaddr==(char *)-1)
-        {
-                printf("Shmat failed\n");
-        }
-	xvimage->data = Shminfo.shmaddr;
-	XShmAttach(WDN, &Shminfo);
-	XSync(WDN, False);
-	erCode=shmctl(Shminfo.shmid, IPC_RMID, 0);
-        if(erCode)
-        {
-                printf("Shmctl failed :%d\n",erCode);
-        }
-	memset(xvimage->data, 0, xvimage->data_size);
+    XSetWindowAttributes xswa;
+    XWindowAttributes attribs;
+    static Atom xv_atom;
+    unsigned long xswamask;
+    int erCode;
 
-	xv_xgc.graphics_exposures = False;
+    /* check if colorkeying is needed */
+    xv_atom = getAtom( "XV_AUTOPAINT_COLORKEY" ,xv_display,xv_port);
+    if(xv_atom!=None)
+    {
+            XvSetPortAttribute( xv_display, xv_port, xv_atom, 1 );
+    }
+    else
+    {
+        ADM_warning("No autopaint \n");
+    }
 
-	xv_gc = XCreateGC(xv_display, xv_win, 0L, &xv_xgc);
+    /* if we have to deal with colorkeying ... */
 
-	//ADM_assert(BadWindow!=XSelectInput(xv_display, xv_win, ExposureMask | VisibilityChangeMask));
+    xvimage = XvShmCreateImage(WDN, xv_port,
+                   xv_format, 0, w, h, &Shminfo);
 
+    if(!xvimage)
+    {
+           ADM_warning("XvShmCreateImage failed\n");
+           return false;
     }
-    printf("Xvideo Xv init succeedeed\n");
-
-    return 1;
-  failed:
-    printf("Xvideo Xv init failed..\n");
-    return 0;
+    Shminfo.shmid = shmget(IPC_PRIVATE, xvimage->data_size,
+                   IPC_CREAT | 0777);
+    if(Shminfo.shmid<=0)
+    {
+            ADM_warning("shmget failed\n");
+            return false;
+    }
+    Shminfo.shmaddr = (char *) shmat(Shminfo.shmid, 0, 0);
+    Shminfo.readOnly = False;
+    if(Shminfo.shmaddr==(char *)-1)
+    {
+            ADM_warning("Shmat failed\n");
+            return false;
+    }
+    xvimage->data = Shminfo.shmaddr;
+    XShmAttach(WDN, &Shminfo);
+    XSync(WDN, False);
+    erCode=shmctl(Shminfo.shmid, IPC_RMID, 0);
+    if(erCode)
+    {
+            ADM_warning("Shmctl failed :%d\n",erCode);
+            return false;
+    }
+    memset(xvimage->data, 0, xvimage->data_size);
+    xv_xgc.graphics_exposures = False;
+    xv_gc = XCreateGC(xv_display, xv_win, 0L, &xv_xgc);
+    }
+    ADM_info("Xvideo Xv init succeedeed\n");
+    return true;
 }
 
 /**
-    \fn GUI_XvList
+    \fn lookupYV12
+ *  \brief search for YV12 compatible port, returns it in fmt
 */
-uint8_t GUI_XvList(Display * dis, uint32_t port, uint32_t * fmt)
+bool  XvRender::lookupYV12(Display * dis, uint32_t port, uint32_t * fmt)
 {
     XvImageFormatValues *formatValues;
     int imgfmt;
-    int k, f = 0;
+    int k;
+    bool found = false;
 
     formatValues = XvListImageFormats(dis, port, &imgfmt);
 // when "formatValues" is NULL, imgfmt should be zero, too
 //    if (formatValues)
-
 // this will run endless or segfault if the colorspace searched for isn't found
-//	for (k = 0; !f || (k < imgfmt); k++)
-	for (k = 0; !f && (k < imgfmt); k++)
-	  {
-#ifdef VERBOSE_XV
-	      printf("Xvideo%d/%d: %"PRIx32" %d --> %s\n", k,imgfmt,port, formatValuesk.id,  formatValuesk.guid);
-#endif
-
-	      if (!strcmp(formatValuesk.guid, "YV12"))
-		{
-		    f = 1;
-		    *fmt = formatValuesk.id;
-		}
-    }// else
-     //	f = 0; // f has already been initialized zero
-	if (formatValues) //checking if it's no NULL-pointer won't hurt
-	    XFree(formatValues);
-    return f;
+    for (k = 0; !found && (k < imgfmt); k++)
+    {
+        ADM_info("Xvideo%d/%d: %" PRIx32" %d --> %s\n", k,imgfmt,port, formatValuesk.id,  formatValuesk.guid);
+        if (!strcmp(formatValuesk.guid, "YV12"))
+        {
+            found = true;
+            *fmt = formatValuesk.id;
+        }
+    }
+    if (formatValues)           //checking if it's no NULL-pointer won't hurt
+        XFree(formatValues);
+    return found;
 }
 /**
     \fn getAtom
 */
-
-uint8_t getAtom(const char *string)
+Atom XvRender::getAtom(const char *string,Display *xv_display,unsigned int  xv_port)
 {
-  XvAttribute * attributes;
-  int attrib_count,i;
-  Atom xv_atom = None;
+XvAttribute * attributes;
+int attrib_count,i;
+Atom xv_atom = None;
 
-  attributes = XvQueryPortAttributes( xv_display, xv_port, &attrib_count );
-  if( attributes!=NULL )
-  {
+    attributes = XvQueryPortAttributes( xv_display, xv_port, &attrib_count );
+    if(! attributes )
+        return None;
+    
     for ( i = 0; i < attrib_count; ++i )
     {
-      if ( strcmp(attributesi.name, string ) == 0 )
+      if (! strcmp(attributesi.name, string ))
       {
         xv_atom = XInternAtom( xv_display, string, False );
-        break; // found what we want, break out
+        XFree( attributes );
+        return xv_atom;
       }
     }
     XFree( attributes );
-  }
-
-  return xv_atom;
-
-}
-/**
-    \fn GUI_XvBuildAtom
-*/
+    return None;
 
-void GUI_XvBuildAtom(Display * dis, Atom * atom, char *string)
-{
-    UNUSED_ARG(dis);
-    UNUSED_ARG(atom);
-    UNUSED_ARG(string);
 }
-
 /**
-    \fn GUI_XvRedraw
-*/
-uint8_t GUI_XvRedraw( void )
+ * 
+ * @param curai
+ */
+void XvRender::displayAdaptorInfo(int num, XvAdaptorInfo *curai)
 {
-	printf("Xv need redraw !\n");
-    return true;
-}
+#ifdef VERBOSE_XV
+        ADM_info("Xvideo_______________________________\n");
+        ADM_info("Xvideo Adaptor           : %d\n", num);
+        ADM_info("Xvideo Base ID           : %ld\n", curai->base_id);
+        ADM_info("Xvideo Nb Port           : %lu\n", curai->num_ports);
+        ADM_info("Xvideo Type              : %d ,", curai->type);
+  #define CHECK(x) if(curai->type & x) ADM_info("|"#x);
+        CHECK(XvInputMask);
+        CHECK(XvOutputMask);
+        CHECK(XvVideoMask);
+        CHECK(XvStillMask);
+        CHECK(XvImageMask);
+
+        ADM_info("\n");
+        ADM_info("Xvideo Name              : %s\n", curai->name);
+        ADM_info("Xvideo Num Adap          : %lu\n", curai->num_adaptors);
+        ADM_info("Xvideo Num fmt           : %lu\n", curai->num_formats);
 #endif
+}
+//

avidemux_2.6.12.tar.gz/avidemux/common/ADM_render/GUI_xvRender.h -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_render/GUI_xvRender.h Changed

@@ -14,28 +14,44 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-
-#ifndef T_XVRENDER_H
-#define T_XVRENDER_H
+#pragma once
 /**
     \fn class XvRender
 */
 class XvRender: public VideoRenderBase
 {
       protected:
-                            GUI_WindowInfo info;
+                        unsigned int xv_port;
+                        uint32_t xv_format;
+                        Display *xv_display;
+                        XvImage *xvimage;
+                        GC xv_gc;
+                        XGCValues xv_xgc;
+                        Window xv_win;
+
+      protected:
+                             GUI_WindowInfo info;
+                        bool    lowLevelXvInit( GUI_WindowInfo *  window, uint32_t w, uint32_t h);
+                        bool    xvDraw(uint32_t w,uint32_t h,uint32_t destW,uint32_t destH);
+                        bool    lookupYV12(Display * dis, uint32_t port, uint32_t * fmt);
+                        Atom    getAtom(const char *string,Display *xv_display,unsigned int xv_port);
+                        void    displayAdaptorInfo(int num,XvAdaptorInfo *curai);
+
+                        
+                        
       public:
                              XvRender( void ) ;
               virtual        ~XvRender();
               virtual	bool init( GUI_WindowInfo *  window, uint32_t w, uint32_t h,renderZoom zoom);
+              
               virtual	bool stop(void);				
               virtual   bool displayImage(ADMImage *pic);
               virtual   bool changeZoom(renderZoom newzoom);
               virtual   bool refresh(void);
               virtual   bool usingUIRedraw(void) {return false;}; // we can redraw by ourselves
-                        const char *getName() {return "XVideo";}
+                  const char *getName() {return "XVideo";}
 };
-#endif
+

avidemux_2.6.12.tar.gz/avidemux/common/ADM_script2/src/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_script2/src/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_slave.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_slave.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_toolkit/automation.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_toolkit/automation.cpp Changed

@@ -1,6 +1,6 @@
 /***************************************************************************
     \file    automation.cpp
-    \author  (C) 2002 by mean fixounet@free.fr
+    \author  (C) 2002/2016 by mean fixounet@free.fr
     \brief   This file reads the command line and do the corresponding command
 
  ***************************************************************************/
@@ -22,10 +22,6 @@
 #include "prefs.h"
 #include "A_functions.h"
 
-#include "ADM_debugID.h"
-#define MODULE_NAME  MODULE_COMMANDLINE
-#include "ADM_debug.h"
-
 #include "ADM_vidMisc.h"
 #include "ADM_videoEncoderApi.h"
 #include "DIA_factory.h"
@@ -53,12 +49,13 @@
 static int set_output_format(const char *str);
 static void set_reuse_2pass_log(char *p);
 static void setVar(char *in);
+extern void UI_closeGui();
 //_________________________________________________________________________
 
 
 int global_argc;
 char **global_argv;
-//extern uint8_t	ADM_saveRaw(const char *name );
+
 //_________________________________________________________________________
 
 typedef void (*one_arg_type)(char *arg);
@@ -101,9 +98,11 @@
     {"video-codec",            1, "set video codec (x264/...)",                                                (one_arg_type)call_videocodec},    
 };
 #define NB_AUTO (sizeof(reaction_table)/sizeof(AUTOMATON))
-//_________________________________________________________________________
 
-//void automation(int argc, char **argv)
+/**
+ * \fn automation
+ * @return 
+ */
 int automation(void )
 
 {
@@ -115,88 +114,92 @@
 static three_arg_type three;
 static two_arg_type two;
 
-        argc=global_argc;
-	argv = global_argv;
-
-          //the port change has to be done before the video load
-          for( int runParaSearch=2 ; runParaSearch < argc ; ){
-		      if(*argvrunParaSearch == '-' && *(argvrunParaSearch+1) == '-')
-			  {
-			      index = searchReactionTable(argvrunParaSearch+2);
-				  if(index != -1)
-				  {
-                      if(!strcmp(avs_port_change, argvrunParaSearch +2 ))
-				  	  {
-                          A_set_avisynth_port(argvrunParaSearch+1);
-                          break;
-				  	  }
-			          runParaSearch += reaction_tableindex.have_arg +1;
-			      }
-				  else
-				      runParaSearch += 1;
-		      }
-			  else
-			      runParaSearch += 1;
-		  }
-
-          printf("\n *** Automated : %"PRIu32" entries*************\n",(uint32_t)NB_AUTO);
-          // we need to process
-          argc-=1;
-          cur=1;
-          myargc=argc;
-          while(myargc>0)
+    argc=global_argc;
+    argv = global_argv;
+
+      //the port change has to be done before the video load
+      for( int runParaSearch=2 ; runParaSearch < argc ; ){
+          if(*argvrunParaSearch == '-' && *(argvrunParaSearch+1) == '-')
           {
-                      if(( *argvcur!='-') || (*(argvcur+1)!='-'))
-                      {
-                            if(cur==1)
-                            {
-                                loadCB(argvcur);
-                            }
-                            else
-                                printf("\n Found garbage %s\n",argvcur);
-                            cur+=1;myargc-=1;
-                            continue;
-                      }
-                      // else it begins with --
-                      index= searchReactionTable(argvcur+2);
-                      if(index==-1) // not found
+              index = searchReactionTable(argvrunParaSearch+2);
+              if(index != -1)
+              {
+                  if(!strcmp(avs_port_change, argvrunParaSearch +2 ))
+                  {
+                      A_set_avisynth_port(argvrunParaSearch+1);
+                      break;
+                  }
+                  runParaSearch += reaction_tableindex.have_arg +1;
+              }
+              else
+                  runParaSearch += 1;
+          }
+          else
+              runParaSearch += 1;
+      }
+
+    printf("\n *** Automated : %" PRIu32" entries*************\n",(uint32_t)NB_AUTO);
+    // we need to process
+    argc-=1;
+    cur=1;
+    myargc=argc;
+    while(myargc>0)
+    {
+                if(( *argvcur!='-') || (*(argvcur+1)!='-'))
+                {
+                      if(cur==1)
                       {
-                                                      printf("\n Unknown command :%s\n",argvcur );
-                                                      cur+=1;myargc-=1;
+                          loadCB(argvcur);
                       }
                       else
-                      {
-                          printf("%s-->%d\n", reaction_tableindex.string,reaction_tableindex.have_arg);
-                          one_arg_type call=reaction_tableindex.callback;
-                          switch(  reaction_tableindex.have_arg)
-                          {
-                              case 3:
-                                        three=(three_arg_type)call;
-                                        three( argvcur+1,argvcur+2,argvcur+3);
-                                        break;
-                              case 2:
-                                        two=(two_arg_type)call;
-                                        two( argvcur+1,argvcur+2);
-                                        break;
-                              case 1:
-                                        call(argvcur+1);
-                                        break;
-                              case 0:
-                                        call(NULL);
-                                        break;
-                              default:
-                                        ADM_assert(0);
-                                        break;
-                          }
-                          cur+=1+reaction_tableindex.have_arg;
-                          myargc-=1+reaction_tableindex.have_arg;
-                      }
-          } // end while
-          GUI_Verbose();
-          printf("\n ********** Automation ended***********\n");
-          return 0; // Do not call me anymore
+                          printf("\n Found garbage %s\n",argvcur);
+                      cur+=1;myargc-=1;
+                      continue;
+                }
+                // else it begins with --
+                index= searchReactionTable(argvcur+2);
+                if(index==-1) // not found
+                {
+                                                printf("\n Unknown command :%s\n",argvcur );
+                                                cur+=1;myargc-=1;
+                }
+                else
+                {
+                    printf("%s-->%d\n", reaction_tableindex.string,reaction_tableindex.have_arg);
+                    one_arg_type call=reaction_tableindex.callback;
+                    switch(  reaction_tableindex.have_arg)
+                    {
+                        case 3:
+                                  three=(three_arg_type)call;
+                                  three( argvcur+1,argvcur+2,argvcur+3);
+                                  break;
+                        case 2:
+                                  two=(two_arg_type)call;
+                                  two( argvcur+1,argvcur+2);
+                                  break;
+                        case 1:
+                                  call(argvcur+1);
+                                  break;
+                        case 0:
+                                  call(NULL);
+                                  break;
+                        default:
+                                  ADM_assert(0);
+                                  break;
+                    }
+                    cur+=1+reaction_tableindex.have_arg;
+                    myargc-=1+reaction_tableindex.have_arg;
+                }
+    } // end while
+    GUI_Verbose();
+    printf("\n ********** Automation ended***********\n");
+    return 0; // Do not call me anymore
 }
-//_________________________________________________________________________
+/**
+ * \fn searchReactionTable
+ * @param string
+ * @return 
+ */
 
 int searchReactionTable(char *string)
 {
@@ -207,67 +210,65 @@
     }
     return -1;
 }
-
+/**
+ * \fn call_scriptEngine
+ * @param scriptFile
+ */
 void call_scriptEngine(const char *scriptFile)
 {
-	char *root, *ext;
-	bool executed = false;
-
-	std::vector<IScriptEngine*> engines = getScriptEngines();
-	ADM_PathSplit(scriptFile, &root, &ext);
-
+    std::vector<IScriptEngine*> engines = getScriptEngines();
+    
+    std::string root,ext;
+    ADM_PathSplit(std::string(scriptFile),root,ext);
+  
 	if (engines.size() == 1)
 	{
 		A_parseScript(engines0, scriptFile);
-		executed = true;
-	}
-	else
-	{
-		for (int i = 0; i < engines.size(); i++)
-		{
-			if (enginesi->defaultFileExtension().compare(ext) == 0)
-			{
-				A_parseScript(enginesi, scriptFile);
-				executed = true;
-				break;
-			}
-		}
+	    A_Rewind();
+        return;
 	}
+	
+    for (int i = 0; i < engines.size(); i++)
+    {
+        if (!enginesi->defaultFileExtension().compare(ext))
+        {
+            A_parseScript(enginesi, scriptFile);
+            A_Rewind();
+            return;
+        }
+    }
 
-	if (!executed)
-	{
-		printf("Unable to appropriate script engine for script file\n");
-	}
+    ADM_warning("Unable to appropriate script engine for script file\n");	
 }
 /**
- * 
+ * \fn call_quit
  * @param p
  */
 void call_quit        (char *p) 
 { 
     UNUSED_ARG(p); 
-    exit(0);
+    UI_closeGui();
 }
 // The form is name=value
 // split it in two
 void setVar(char *in)
 {
-char *equal;
-        equal=strstr(in,"=");
-        if(!equal)
-        {
-                printf("Malformed set var  %s (name=value)\n",in);
-                return ;
-        }
-        if(in+strlen(in)==equal)
-        {
-                printf("No value after =  %s (name=value)\n",in);
-                return ;
-        }
-        *equal=0; // Remove =
+    char *equal;
+    equal=strstr(in,"=");
+    if(!equal)
+    {
+        ADM_warning("Malformed set var  %s (name=value)\n",in);
+        return ;
+    }
+    if(in+strlen(in)==equal)
+    {
+        ADM_warning("No value after =  %s (name=value)\n",in);
+        return ;
+    }
+    *equal=0; // Remove =
 
-        if(!scriptAddVar(in,equal+1))
-                printf("Warning setvar failed\n");
+    if(!scriptAddVar(in,equal+1))
+        ADM_warning("Warning setvar failed\n");
 
 }
 
@@ -278,7 +279,6 @@
 void call_audiocodec(char *p)
 {
      audioCodecSetByName( 0,p);    
-     
 }
 /**
  * 
@@ -300,8 +300,8 @@
 void call_slave(char *p)
 {
     uint32_t i;
-    sscanf(p,"%"PRIu32,&i);
-    printf("Slace on port  %"PRIu32"\n",i);
+    sscanf(p,"%" PRIu32,&i);
+    ADM_info("Slave on port  %" PRIu32"\n",i);
     if(!ADM_slaveConnect(i))
     {
             ADM_error("Cannot connect to master\n");
@@ -428,6 +428,9 @@
    }
 }
 /**
+ * 
+ * @param str
+ * @return 
  */
 int set_output_format(const char *str)
 {

avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoCodec/private_inc Added

avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoCodec/private_inc/ADM_codecLibVA.h Added

@@ -0,0 +1,53 @@
+/**
+        \file FFLIBVA
+ *      \brief wrapper around ffmpeg wrapper around libva
+ */
+
+#include "X11/Xlib.h"
+#include "va/va.h"
+
+#include <BVector.h>
+#include "ADM_coreLibVA.h"
+#include "ADM_threads.h"
+/**
+ * \class decoderFFLIBVA
+ */
+#define ADM_MAX_SURFACE 16+6+1
+
+typedef struct 
+{
+        BVector <ADM_vaSurface *>freeSurfaceQueue;
+        BVector <ADM_vaSurface *>allSurfaceQueue;
+}libvaContext;
+
+#define ADM_DEFAULT_SURFACE 8
+class decoderFFLIBVA:public ADM_acceleratedDecoderFF
+{
+friend class ADM_vaSurface;
+protected:
+protected:
+                    bool          alive;
+                    libvaContext  vaPool;
+                    VASurfaceID   initSurfaceIDADM_DEFAULT_SURFACE;
+
+protected:
+                    bool        initVAContext();
+public:                    
+                    bool        markSurfaceUsed(ADM_vaSurface *s);
+                    bool        markSurfaceUnused(ADM_vaSurface *s);
+                    bool        markSurfaceUnused(VASurfaceID id);
+public:     // Callbacks
+                    int         getBuffer(AVCodecContext *avctx, AVFrame *pic);
+                    void        releaseBuffer(ADM_vaSurface *vaSurface);
+                    bool        initFail(void) {alive=false;return true;}
+public:
+    virtual         bool        uncompress (ADMCompressedImage * in, ADMImage * out);
+                    bool        readBackBuffer(AVFrame *decodedFrame, ADMCompressedImage * in, ADMImage * out);    
+    virtual const   char        *getName(void)        {return "LIBVA";}
+                  ADM_vaSurface *lookupBySurfaceId(VASurfaceID id);
+                    
+public:
+            // public API
+                                decoderFFLIBVA (AVCodecContext *avctx,decoderFF *parent);
+                                ~decoderFFLIBVA();
+};

avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoCodec/private_inc/ADM_ffmpeg_vdpau_internal.h Added

@@ -0,0 +1,59 @@
+/***************************************************************************
+            \file              ADM_ffmpeg_vdpau.cpp  
+            \brief Decoder using half ffmpeg/half VDPAU
+
+    The ffmpeg part is to preformat inputs for VDPAU
+    VDPAU is loaded dynamically to be able to make a binary
+        and have something working even if the target machine
+        does not have vdpau
+
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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_hwAccel.h"
+#include <vector>
+/**
+ */
+struct AVVDPAUContext;
+/**
+ */
+typedef struct 
+{
+        std::vector <vdpau_render_state *>freeQueue;
+        std::vector <vdpau_render_state *>fullQueue;
+}vdpauContext;
+
+/**
+ *  \class decoderFFVDPAU
+ */
+
+class decoderFFVDPAU:public ADM_acceleratedDecoderFF
+{
+protected:
+                    bool            alive;
+                    vdpauContext    vdpau;
+                    AVVDPAUContext *avVdCtx;
+protected:
+                    bool        initVdpContext();
+public:     // Callbacks
+                    int         getBuffer(AVCodecContext *avctx, AVFrame *pic);
+                    void        releaseBuffer(struct vdpau_render_state *rdr);
+                    bool        initFail(void) {alive=false;return true;}
+public:
+            // public API
+                                decoderFFVDPAU (AVCodecContext *avctx,decoderFF *parent);
+                                ~decoderFFVDPAU();
+    virtual         bool        uncompress (ADMCompressedImage * in, ADMImage * out);
+                    bool        readBackBuffer(AVFrame *decodedFrame, ADMCompressedImage * in, ADMImage * out);    
+    virtual const   char        *getName(void)        {return "VDPAU";}
+                    
+};

avidemux_2.6.12.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp Changed

@@ -20,7 +20,6 @@
 #include "BVector.h"
 #include "ADM_default.h"
 
-#ifdef USE_LIBVA
 extern "C" {
 #include "libavcodec/avcodec.h"
 #include "libavutil/pixfmt.h"
@@ -34,10 +33,11 @@
 #include "ADM_render/GUI_render.h"
 #include "ADM_ffmpeg_libva_internal.h"
 #include "prefs.h"
-#include "ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA.h"
-#include "ADM_codecLibVA.h"
+#include "ADM_coreLibVA.h"
+#include "../private_inc/ADM_codecLibVA.h"
 #include "ADM_threads.h"
 #include "ADM_vidMisc.h"
+#include "prefs.h"
 
 
 static bool         libvaWorking=true;
@@ -53,8 +53,43 @@
 #define aprintf ADM_info
 #endif
 
+/**
+ * 
+ * @param instance
+ * @param cookie
+ * @return 
+ */
+static  bool libvaMarkSurfaceUsed(void *instance,void *cookie)
+{
+    decoderFFLIBVA *inst=(decoderFFLIBVA *)instance;
+    ADM_vaSurface *s=(ADM_vaSurface *)cookie ;
+    inst->markSurfaceUsed(s);
+    return true;
+}
+/**
+ * 
+ * @param instance
+ * @param cookie
+ * @return 
+ */
+static  bool libvaMarkSurfaceUnused(void *instance,void *cookie)
+{
+    decoderFFLIBVA *inst=(decoderFFLIBVA *)instance ;
+    ADM_vaSurface *s=(ADM_vaSurface *)cookie ;
+    inst->markSurfaceUnused(s);
+    return true;
+}
 
-
+/**
+    \fn vdpauRefDownload
+    \brief Convert a VASurface image to a regular image
+*/
+static bool libvaRefDownload(ADMImage *image, void *instance, void *cookie)
+{
+    decoderFFLIBVA *inst=(decoderFFLIBVA *)instance ;
+    ADM_vaSurface *s=(ADM_vaSurface *) cookie;
+    return        s->toAdmImage(image);
+}
 
 /**
     \fn libvaUsable
@@ -67,6 +102,21 @@
     if(!prefs->get(FEATURES_LIBVA,&v)) v=false;
     return v;
 }
+
+static ADM_vaSurface *allocateADMVaSurface(AVCodecContext *ctx)
+{
+    int widthToUse = (ctx->coded_width+ 1)  & ~1;
+    int heightToUse= (ctx->coded_height+3)  & ~3;
+    VASurfaceID surface=admLibVA::allocateSurface(widthToUse,heightToUse);
+    if(surface==VA_INVALID)
+    {
+            ADM_warning("Cannot allocate surface (%d x %d)\n",(int)widthToUse,(int)heightToUse);
+            return NULL;
+    }
+    ADM_vaSurface *img=new ADM_vaSurface(widthToUse,heightToUse);
+    img->surface=surface;
+    return img;
+}
 /**
     \fn libvaProbe
     \brief Try loading vaapi...
@@ -77,125 +127,205 @@
     void *draw;
     draw=UI_getDrawWidget();
     UI_getWindowInfo(draw,&xinfo );
-#ifdef USE_LIBVA
     if( admCoreCodecSupports(ADM_CORE_CODEC_FEATURE_LIBVA)==false)
     {
-        GUI_Error_HIG("Error","Core has been compiled without libva support, but the application has been compiled with it.\nInstallation mismatch");
+        GUI_Error_HIG("Error","Core has been compiled without LIBVA support, but the application has been compiled with it.\nInstallation mismatch");
         libvaWorking=false;
     }
 
     if(false==admLibVA::init(&xinfo)) return false;
     libvaWorking=true;
     return true;
-#endif
-    return false;
 }
 
-//    out->refDescriptor.refCookie=FFLIBVADecode;
-//    out->refDescriptor.refInstance=ADM_vaIMage;
 /**
     \fn markSurfaceUsed
     \brief mark the surfave as used. Can be called multiple time.
 */
-static bool libvaMarkSurfaceUsed(void *v, void * cookie)
+bool decoderFFLIBVA::markSurfaceUsed(ADM_vaSurface *s)
 {
-    ADM_vaSurface    *img=(ADM_vaSurface *)v;
-    decoderFFLIBVA *decoder=(decoderFFLIBVA *)cookie;
     imageMutex.lock();
-    img->refCount++;
+    s->refCount++;
     imageMutex.unlock();
     return true;
     
 }
+bool        decoderFFLIBVA::markSurfaceUnused(VASurfaceID id)
+{
+    aprintf("Freeing surface %x\n",(int)id);
+    ADM_vaSurface *s=lookupBySurfaceId(id);
+    ADM_assert(s);
+    return markSurfaceUnused(s);
+}
 /**
     \fn markSurfaceUnused
     \brief mark the surfave as unused by the caller. Can be called multiple time.
 */
-static bool libvaMarkSurfaceUnused(void *v, void * cookie)
+bool decoderFFLIBVA::markSurfaceUnused(ADM_vaSurface *img)
 {
-    ADM_vaSurface    *img=(ADM_vaSurface *)v;
-    decoderFFLIBVA *decoder=(decoderFFLIBVA *)cookie;
-    imageMutex.lock();
-    img->refCount--;
-    aprintf("Ref count is now %d\n",img->refCount);
-    if(!img->refCount)
-    {
-        decoder->reclaimImage(img);
-    }
-    imageMutex.unlock();
-    
+        
+   imageMutex.lock();
+   img->refCount--;
+   aprintf("Surface %x, Ref count is now %d\n",img->surface,img->refCount);
+   if(!img->refCount)
+   {
+        vaPool.freeSurfaceQueue.append(img);
+   }
+   imageMutex.unlock();
    return true;
 }
+ 
 /**
- * \fn reclaimImage
- * \brief must be called with mutex held
- * @param image
- * @param instance
- * @param cookie
- * @return 
- */
-bool    decoderFFLIBVA::reclaimImage(ADM_vaSurface *img)
+    \fn ADM_LIBVAgetBuffer
+    \brief trampoline to get a LIBVA surface
+*/
+int ADM_LIBVAgetBuffer(AVCodecContext *avctx, AVFrame *pic,int flags)
 {
-        freeSurfaceQueue.append(img);
-        return true;
+    decoderFF *ff=(decoderFF *)avctx->opaque;
+    decoderFFLIBVA *dec=(decoderFFLIBVA *)ff->getHwDecoder();
+    ADM_assert(dec);
+    return dec->getBuffer(avctx,pic);
 }
+
 /**
-    \fn vdpauRefDownload
-    \brief Convert a VDPAU image to a regular image
-*/
+ * \fn ADM_XVBAreleaseBuffer
+ * @param avctx
+ * @param pic
+ */
+void ADM_LIBVAreleaseBuffer(void *opaque, uint8_t *data)
+{
+   decoderFFLIBVA *dec=(decoderFFLIBVA *)opaque;
+   ADM_assert(dec);
+   VASurfaceID   surface=*(VASurfaceID *)(data);
+   dec->markSurfaceUnused(surface);
+}
 
-static bool libvaRefDownload(ADMImage *image, void *instance, void *cookie)
+/**
+ * 
+ * @param avctx
+ * @param pic
+ * @return 
+ */
+int decoderFFLIBVA::getBuffer(AVCodecContext *avctx, AVFrame *pic)
 {
-    ADM_vaSurface    *img=(ADM_vaSurface *)instance;
-    decoderFFLIBVA *decoder=(decoderFFLIBVA *)cookie;
-    return        img->toAdmImage(image);
+        
+    imageMutex.lock();
+    if(vaPool.freeSurfaceQueue.empty())
+    {
+        aprintf("Allocating new vaSurface\n");
+        ADM_vaSurface *img=allocateADMVaSurface(avctx);
+        if(!img)
+        {
+            imageMutex.unlock();
+            ADM_warning("Cannot allocate new vaSurface!\n");
+            return -1;
+        }
+        vaPool.freeSurfaceQueue.append(img);
+        vaPool.allSurfaceQueue.append(img);
+    }else
+    {
+        aprintf("Reusing vaSurface from pool\n");
+    }
+    ADM_vaSurface *s= vaPool.freeSurfaceQueue0;
+    vaPool.freeSurfaceQueue.popFront();
+    imageMutex.unlock();
+    s->refCount=0;
+    markSurfaceUsed(s); // 1 ref taken by lavcodec
+    
+    pic->buf0=av_buffer_create((uint8_t *)&(s->surface),  // Maybe a memleak here...
+                                     sizeof(s->surface),
+                                     ADM_LIBVAreleaseBuffer, 
+                                     (void *)this,
+                                     AV_BUFFER_FLAG_READONLY);
+    
+    aprintf("Alloc Buffer : 0x%llx, surfaceid=%x\n",s,(int)s->surface);
+    pic->data0=(uint8_t *)s;
+    pic->data3=(uint8_t *)(uintptr_t)s->surface;
+    pic->reordered_opaque= avctx->reordered_opaque;    
+    return 0;
 }
 
 /**
-    \fn vdpauCleanup
+    \fn libvaCleanup
 */
 bool libvaCleanup(void)
 {
    return admLibVA::cleanup();
 }
+
+
 /**
- * 
- * @param w
- * @param h
- * @param fcc
- * @param extraDataLen
- * @param extraData
- * @param bpp
+ * \fn lookupBySurfaceId
+ * @param 
+ * @return 
  */
-static enum AVPixelFormat ADM_LIBVA_getFormat( struct AVCodecContext * avctx , const AVPixelFormat * fmt)
+ADM_vaSurface *decoderFFLIBVA::lookupBySurfaceId(VASurfaceID id)
 {
-   const PixelFormat * cur = fmt;
-   while(*cur != AV_PIX_FMT_NONE)
-   {
-       if(*cur==AV_PIX_FMT_VAAPI_VLD) 
-       {
-           aprintf(">---------->Match\n");
-           return AV_PIX_FMT_VAAPI_VLD;
-       }
-       cur++;
-   }
-   ADM_warning(">---------->No LIBVA colorspace\n");
-   return AV_PIX_FMT_NONE;
-
+    aprintf("Looking up surface %x\n",(int)id);
+    imageMutex.lock();
+    int n=vaPool.allSurfaceQueue.size();
+    for(int i=0;i<n;i++)
+        if(vaPool.allSurfaceQueuei->surface==id)
+        {
+            imageMutex.unlock();
+            return vaPool.allSurfaceQueuei;
+        }
+    imageMutex.unlock();
+    ADM_warning("Lookup a non existing surface\n");
+    ADM_assert(0);
+    return NULL;
     
 }
-/**
- * 
- * @param fcc
- * @return 
- */
-bool        decoderFFLIBVA::fccSupported(uint32_t fcc)
+  
+
+
+
+
+extern "C"
+{
+
+static enum AVPixelFormat ADM_LIBVA_getFormat(struct AVCodecContext *avctx,  const enum AVPixelFormat *fmt)
 {
-    if(isH264Compatible(fcc)) return true;
-    //if(isMpeg12Compatible(fcc)) return true;
-    //        if(isVC1Compatible(fcc))
-    return false;
+    int i;
+    ADM_info("LIBVA: GetFormat\n");
+    AVCodecID id=AV_CODEC_ID_NONE;
+    AVPixelFormat c;
+    AVPixelFormat outPix;
+    for(i=0;fmti!=AV_PIX_FMT_NONE;i++)
+    {
+        c=fmti;
+        ADM_info("LIBVA: Evaluating %d\n",c);
+        if(c!=AV_PIX_FMT_VAAPI_VLD) continue;
+#define FMT_V_CHECK(x,y)      case AV_CODEC_ID_##x:   outPix=AV_PIX_FMT_VAAPI_VLD;id=avctx->codec_id;break;
+        switch(avctx->codec_id)
+        {
+            FMT_V_CHECK(H264,H264)
+            FMT_V_CHECK(MPEG1VIDEO,MPEG1)
+            FMT_V_CHECK(MPEG2VIDEO,MPEG2)
+            FMT_V_CHECK(WMV3,WMV3)
+            FMT_V_CHECK(VC1,VC1)
+            default: 
+                continue;
+                break;
+        }
+        break;
+    }
+    if(id==AV_CODEC_ID_NONE)
+    {
+        return AV_PIX_FMT_NONE;
+    }
+    // Finish intialization of LIBVA decoder
+    const AVHWAccel *accel=ADM_acceleratedDecoderFF::parseHwAccel(outPix,id,AV_PIX_FMT_VAAPI_VLD);
+    if(accel)
+    {
+        ADM_info("Found matching hw accelerator : %s\n",accel->name);
+        ADM_info("Successfully setup hw accel\n");
+        return AV_PIX_FMT_VAAPI_VLD;
+    }
+    return AV_PIX_FMT_NONE;
 }
+}
+
 /**
  * 
  * @param w
@@ -205,82 +335,62 @@
  * @param extraData
  * @param bpp
  */
-decoderFFLIBVA::decoderFFLIBVA(uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, 
-        uint8_t *extraData,uint32_t bpp)
-:decoderFF (w,h,fcc,extraDataLen,extraData,bpp)
+decoderFFLIBVA::decoderFFLIBVA(AVCodecContext *avctx,decoderFF *parent)
+: ADM_acceleratedDecoderFF(avctx,parent)
 {
     
-    VASurfaceID sidADM_MAX_SURFACE+1;
     
     alive=false;
-    va_context=NULL;
-    scratch=new ADMImageRef(w,h);
+    _context->slice_flags     = SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD;
     
-    // Allocate 17 surfaces, enough for the moment
-    nbSurface=ADM_MAX_SURFACE;
-    for(int i=0;i<nbSurface;i++)
+    for(int i=0;i<ADM_DEFAULT_SURFACE;i++)
+        initSurfaceIDi=VA_INVALID;
+    
+    for(int i=0;i<ADM_DEFAULT_SURFACE;i++)
     {
-        surfacesi=admLibVA::allocateSurface(w,h);
-        if(surfacesi==VA_INVALID)
+        ADM_vaSurface *admSurface=allocateADMVaSurface(avctx);
+        if(!admSurface)
         {
-            ADM_warning("Cannot allocate surface (%d x %d)\n",(int)w,(int)h);
-            nbSurface=i;
-            return;
+            ADM_warning("Cannot allocate dummy surface\n");
+            alive=false;
+            return ;
         }
-        ADM_vaSurface *img=new ADM_vaSurface(this,w,h);
-        img->surface=surfacesi;
-        freeSurfaceQueue.append(img);
-        allSurfaceQueue.append(img);
-        sidi=surfacesi;
+        aprintf("Created initial pool, %d : %x\n",i,admSurface->surface);
+        initSurfaceIDi=admSurface->surface;
+        vaPool.allSurfaceQueue.append(admSurface);
+        vaPool.freeSurfaceQueue.append(admSurface);
     }
-    ADM_info("Preallocated %d surfaces\n",nbSurface);
-    // Linearize surface
     
-    libva=admLibVA::createDecoder(w,h,nbSurface,sid);
-    if(VA_INVALID==libva)
+   
+    // create decoder
+    vaapi_context *va_context=new vaapi_context;
+    memset(va_context,0,sizeof(*va_context)); // dangerous...
+    
+    
+    
+    va_context->context_id=admLibVA::createDecoder(avctx->coded_width,avctx->coded_height,ADM_DEFAULT_SURFACE,initSurfaceID); // this is most likely wrong
+    if(va_context->context_id==VA_INVALID)
     {
-        ADM_warning("Cannot create libva decoder\n");
+        ADM_warning("Cannot create decoder\n");
+        delete va_context;
+        va_context=NULL;
+        alive=false;
         return;
     }
     
-    va_context=new vaapi_context;
-    memset(va_context,0,sizeof(*va_context)); // dangerous...
     
     if(!admLibVA::fillContext(va_context))
     {
         ADM_warning("Cannot get va context initialized for libavcodec\n");
+        alive=false;
         return ;
-    }
-    va_context->context_id=libva;
-   
+    }    
     
-    if(isH264Compatible(fcc))
-    {
-             WRAP_Open_TemplateLibVAByName(CODEC_ID_H264);
-    }else
-    {
-        if(isMpeg12Compatible(fcc))
-        {
-            WRAP_Open_TemplateLibVAByName(CODEC_ID_MPEG2VIDEO);
-        }
-        else
-        {
-            if(isVC1Compatible(fcc))
-            {
-                WRAP_Open_TemplateLibVAByName(CODEC_ID_VC1);
-            }
-            else
-            {
-                GUI_Error_HIG("Error","LibVA does not support this, configuration error"); 
-                ADM_assert(0);
-            }
-        }
-    }
-    nbSurface=0;
-   
-      b_age = ip_age0 = ip_age1 = 256*256*256*64;
-     alive=true;
-     ADM_warning("Libva decoder created.\n");
+    _context->hwaccel_context=va_context;
+    alive=true;
+    _context->get_buffer2     = ADM_LIBVAgetBuffer;
+    _context->draw_horiz_band = NULL;
+    ADM_info("Successfully setup LIBVA hw accel\n");             
 }
 
 /**
@@ -288,40 +398,19 @@
  */
 decoderFFLIBVA::~decoderFFLIBVA()
 {
-    if(_context) // duplicate ~decoderFF to make sure in transit buffers are 
-                 // released
-    {
-        avcodec_close (_context);
-        av_free(_context);
-        _context=NULL;
-    }
     imageMutex.lock();
-    int m=this->allSurfaceQueue.size();
-    int n=freeSurfaceQueue.size();
+    int m=vaPool.allSurfaceQueue.size();
+    int n=vaPool.freeSurfaceQueue.size();
     if(n!=m)
     {
         ADM_warning("Some surfaces are not reclaimed! (%d/%d)\n",n,m);
     }
     for(int i=0;i<n;i++)
     {
-        delete freeSurfaceQueuei;
+        delete vaPool.freeSurfaceQueuei;
     }
-    freeSurfaceQueue.clear();
+    vaPool.freeSurfaceQueue.clear();
     imageMutex.unlock();
-    
-    nbSurface=0;
-    if(libva!=VA_INVALID)
-        admLibVA::destroyDecoder(libva);
-    libva=VA_INVALID;
-
-    if(scratch) delete scratch;
-    scratch=NULL;    
-    
-    if(va_context)
-    {
-        delete va_context;
-        va_context=NULL;
-    }
 }
 /**
  * \fn uncompress
@@ -332,145 +421,138 @@
  */
 bool decoderFFLIBVA::uncompress (ADMCompressedImage * in, ADMImage * out)
 {
-    // First let ffmpeg prepare datas...
+      
+    aprintf("==> uncompress %s\n",_context->codec->long_name);
+    if(out->refType==ADM_HW_LIBVA)
+    {
+            ADM_vaSurface *img=(ADM_vaSurface *)out->refDescriptor.refHwImage;
+            markSurfaceUnused(img);
+            out->refType=ADM_HW_NONE;
+    }
 
-    aprintf("LIBVA>-------------uncompress>\n");
-    //printf("Incoming Pts=%s\n",ADM_us2plain(in->demuxerPts));
-    if(!decoderFF::uncompress (in, scratch))
+    if (!in->dataLength )	// Null frame, silently skipped
     {
-        ADM_warning("LibVA No data\n ");
+        out->_noPicture = 1;
+        out->Pts=ADM_COMPRESSED_NO_PTS;
+        out->refType=ADM_HW_NONE;
+        ADM_info("LibVa Nothing to decode -> no Picture\n");
         return false;
     }
-    //printf("Out PTs =%s\n",ADM_us2plain(out->Pts));
-    uint64_t p=(uint64_t )scratch->GetReadPtr(PLANAR_Y);
-    VASurfaceID id=(VASurfaceID)p;
-    out->Pts=scratch->Pts;
-    out->flags=scratch->flags;
+
+   // Put a safe value....
+    out->Pts=in->demuxerPts;
+    _context->reordered_opaque=in->demuxerPts;
+    int got_picture;
+    AVPacket pkt;
+    av_init_packet(&pkt);
+    pkt.data=in->data;
+    pkt.size=in->dataLength;
+    if(in->flags&AVI_KEY_FRAME)
+        pkt.flags=AV_PKT_FLAG_KEY;
+    else
+        pkt.flags=0;
     
-    ADM_vaSurface *img=lookupBySurfaceId(id);
+    AVFrame *frame=_parent->getFramePointer();
+    ADM_assert(frame);
+    int ret = avcodec_decode_video2 (_context, frame, &got_picture, &pkt);
     
+    if(ret<0)
+    {
+        char er2048={0};
+        av_make_error_string(er, sizeof(er)-1, ret);
+        ADM_warning("Error %d in lavcodec (%s)\n",ret,er);
+        out->refType=ADM_HW_NONE;
+        return false;
+    }
+    if(frame->pict_type==AV_PICTURE_TYPE_NONE)
+    {
+        out->_noPicture=true;
+        out->refType=ADM_HW_NONE;
+        out->Pts= (uint64_t)(frame->reordered_opaque);
+        ADM_info("LIBVA No picture \n");
+        return false;
+    }
+    return readBackBuffer(frame,in,out);  
+}
+/**
+ * 
+ * @param decodedFrame
+ * @param in
+ * @param out
+ * @return 
+ */
+bool     decoderFFLIBVA::readBackBuffer(AVFrame *decodedFrame, ADMCompressedImage * in, ADMImage * out)
+{
+    uint64_t pts_opaque=(uint64_t)(decodedFrame->reordered_opaque);
+    out->Pts= (uint64_t)(pts_opaque);        
+    out->flags=admFrameTypeFromLav(decodedFrame);
     out->refType=ADM_HW_LIBVA;
-    out->refDescriptor.refCookie=this;
-    out->refDescriptor.refInstance=img;
+    out->refDescriptor.refCodec=this;
+    ADM_vaSurface *img=(ADM_vaSurface *)(decodedFrame->data0);
+    out->refDescriptor.refHwImage=img; // the ADM_vaImage in disguise
+    markSurfaceUsed(img); // one ref for us too, it will be free when the image is cycled
+    aprintf("ReadBack: Got image=%x surfaceId=%x\n",(int)(uintptr_t)decodedFrame->data0,(int)img->surface);
     out->refDescriptor.refMarkUsed=libvaMarkSurfaceUsed;
     out->refDescriptor.refMarkUnused=libvaMarkSurfaceUnused;
     out->refDescriptor.refDownload=libvaRefDownload;
-    aprintf("uncompress : Got surface =0x%x\n",id);
-    //printf("Out Dts =%s,flags =%x\n",ADM_us2plain(out->Pts),out->flags);
     return true;
-    
 }
-/**
- * \fn lookupBySurfaceId
- * @param 
- * @return 
- */
-ADM_vaSurface *decoderFFLIBVA::lookupBySurfaceId(VASurfaceID id)
+
+//---
+
+class ADM_hwAccelEntryLibVA : public ADM_hwAccelEntry
 {
-    imageMutex.lock();
-    int n=allSurfaceQueue.size();
-    for(int i=0;i<n;i++)
-        if(allSurfaceQueuei->surface==id)
-        {
-            imageMutex.unlock();
-            return allSurfaceQueuei;
-        }
-    imageMutex.unlock();
-    ADM_warning("Lookup a non existing surface\n");
-    ADM_assert(0);
-    return NULL;
-    
-}
-    
-    
-    
+public: 
+                            ADM_hwAccelEntryLibVA();
+     virtual bool           canSupportThis(struct AVCodecContext *avctx,  const enum AVPixelFormat *fmt,enum AVPixelFormat &outputFormat);
+     virtual                ADM_acceleratedDecoderFF *spawn( struct AVCodecContext *avctx,  const enum AVPixelFormat *fmt );     
+     virtual                ~ADM_hwAccelEntryLibVA() {};
+};
 /**
-    \fn ADM_VDPAUgetBuffer
-    \brief trampoline to get a VDPAU surface
-*/
-int ADM_LIBVAgetBuffer(AVCodecContext *avctx, AVFrame *pic)
+ * 
+ */
+ADM_hwAccelEntryLibVA::ADM_hwAccelEntryLibVA()
 {
-    decoderFFLIBVA *dec=(decoderFFLIBVA *)avctx->opaque;
-    return dec->getBuffer(avctx,pic);
+    name="VAAPI";
 }
 /**
- * \fn ADM_XVBAreleaseBuffer
+ * 
  * @param avctx
- * @param pic
+ * @param fmt
+ * @param outputFormat
+ * @return 
  */
-void ADM_LIBVAreleaseBuffer(struct AVCodecContext *avctx, AVFrame *pic)
+bool           ADM_hwAccelEntryLibVA::canSupportThis(struct AVCodecContext *avctx,  const enum AVPixelFormat *fmt,enum AVPixelFormat &outputFormat)
 {
-   decoderFFLIBVA *dec=(decoderFFLIBVA *)avctx->opaque;
-   return dec->releaseBuffer(avctx,pic);
+    bool enabled=false;
+    prefs->get(FEATURES_LIBVA,&enabled);
+    if(!enabled)
+    {
+        ADM_info("LibVA not enabled\n");
+        return false;
+    }
+    enum AVPixelFormat ofmt=ADM_LIBVA_getFormat(avctx,fmt);
+    if(ofmt==AV_PIX_FMT_NONE)
+        return false;
+    outputFormat=ofmt;
+    ADM_info("This is supported by LIBVA\n");
+    return true;
 }
-
-
-
-/**
-    \fn releaseBuffer
-*/
-void decoderFFLIBVA::releaseBuffer(AVCodecContext *avctx, AVFrame *pic)
+ADM_acceleratedDecoderFF *ADM_hwAccelEntryLibVA::spawn( struct AVCodecContext *avctx,  const enum AVPixelFormat *fmt )
 {
-  uint64_t p=(uint64_t )pic->data0;
-  VASurfaceID s=(VASurfaceID)p;
-  decoderFFLIBVA *x=(decoderFFLIBVA *)avctx->opaque;
-    
-  ADM_vaSurface *i=lookupBySurfaceId(s);
-  
-  aprintf("Release Buffer : 0x%llx\n",s);
-  
-  for(int i=0; i<4; i++)
-  {
-    pic->datai= NULL;
-  }
-  
-  libvaMarkSurfaceUnused(i,this);
-  
+    decoderFF *ff=(decoderFF *)avctx->opaque;
+    return new decoderFFLIBVA(avctx,ff);
 }
+static ADM_hwAccelEntryLibVA libvaEntry;
 /**
-    \fn getBuffer
-    \brief returns a VDPAU render masquerading as a AVFrame
-*/
-int decoderFFLIBVA::getBuffer(AVCodecContext *avctx, AVFrame *pic)
+ * 
+ * @return 
+ */
+bool initLIBVADecoder(void)
 {
-    
-    decoderFFLIBVA *x=(decoderFFLIBVA *)avctx->opaque;
-    
-    imageMutex.lock();
-    ADM_assert(!freeSurfaceQueue.empty());
-    ADM_vaSurface *s= x->freeSurfaceQueue0;
-    x->freeSurfaceQueue.popFront();
-    imageMutex.unlock();
-    libvaMarkSurfaceUsed(s,this);
-    
-    aprintf("Alloc Buffer : 0x%llx\n",s);
-    uint8_t *p=(uint8_t *)s->surface;
-    pic->data0=p;
-    pic->data1=p;
-    pic->data2=p;
-    pic->data3=p;
-    pic->linesize0=0;
-    pic->linesize1=0;
-    pic->linesize2=0;
-    pic->linesize3=0;
-    pic->type=FF_BUFFER_TYPE_USER;
-    pic->reordered_opaque= avctx->reordered_opaque;
- // I dont really understand what it is used for ....
-    if(pic->reference)
-    {
-        ip_age0=ip_age1+1;
-        ip_age1=1;
-        b_age++;
-    }else
-    {
-        ip_age0++;
-        ip_age1++;
-        b_age=1;
-    }    
-    return 0;
+    ADM_info("Registering LIBVA hw decocer\n");
+    ADM_hwAccelManager::registerDecoder(&libvaEntry);
+    return true;
 }
 
-
-
-#endif
 // EOF

avidemux_2.6.12.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp Changed

@@ -1,9 +1,9 @@
 /***************************************************************************
             \file              ADM_ffmpeg_vdpau.cpp  
-            \brief Decoder using half ffmpeg/half VDPAU
+            \brief Decoder using half ffmpeg/half &vdpau
 
-    The ffmpeg part is to preformat inputs for VDPAU
-    VDPAU is loaded dynamically to be able to make a binary
+    The ffmpeg part is to preformat inputs for &vdpau
+    &vdpau is loaded dynamically to be able to make a binary
         and have something working even if the target machine
         does not have vdpau
     Some part, especially get/buffer and ip_age borrowed from xbmc
@@ -28,6 +28,7 @@
 extern "C" {
 #include "libavcodec/avcodec.h"
 #include "libavcodec/vdpau.h"
+#include "libavutil/buffer.h"
 }
 
 #include "ADM_codec.h"
@@ -35,11 +36,11 @@
 #include "DIA_coreToolkit.h"
 #include "ADM_dynamicLoading.h"
 #include "ADM_render/GUI_render.h"
-#include "ADM_ffmpeg_vdpau_internal.h"
+#include "../private_inc/ADM_ffmpeg_vdpau_internal.h"
 #include "prefs.h"
-#include "ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpau.h"
-#include "ADM_codecVdpau.h"
+#include "ADM_coreVdpau.h"
 #include "ADM_threads.h"
+#include "prefs.h"
 
 #if defined(__sun__)
 #include <alloca.h>
@@ -47,7 +48,12 @@
 
 static bool         vdpauWorking=false;
 static admMutex     surfaceMutex;
+
+#if 0
+#define aprintf printf
+#else
 #define aprintf(...) {}
+#endif
 
 typedef enum 
 {
@@ -57,6 +63,10 @@
     ADM_VDPAU_VC1=3
 }ADM_VDPAU_TYPE;
 
+#ifdef USE_VDPAU
+#include "ADM_ffmpeg_vdpau_utils.cpp"
+#endif
+
 
 /**
     \fn markSurfaceUsed
@@ -88,7 +98,7 @@
 }
 /**
     \fn vdpauRefDownload
-    \brief Convert a VDPAU image to a regular image
+    \brief Convert a &vdpau image to a regular image
 */
 
 static bool vdpauRefDownload(ADMImage *image, void *instance, void *cookie)
@@ -104,9 +114,12 @@
     surface=render->surface;
     uint8_t *planes3;
     uint32_t stride3;
+    int      istride3;
 
      image->GetWritePlanes(planes);
-     image->GetPitches(stride);
+     image->GetPitches(istride);
+     
+     for(int i=0;i<3;i++) stridei=(uint32_t)istridei;
 
     //ADM_info("Getting surface %d\n",(int)surface);
     // Copy back the decoded image to our output ADM_image
@@ -128,243 +141,193 @@
 }
 
 /**
-    \fn vdpauUsable
-    \brief Return true if  vdpau can be used...
-*/
-bool vdpauUsable(void)
-{
-    bool v=false;
-    if(!vdpauWorking) return false;
-    if(!prefs->get(FEATURES_VDPAU,&v)) v=false;
-    return v;
-}
-/**
-    \fn vdpauProbe
-    \brief Try loading vdpau...
-*/
-bool vdpauProbe(void)
-{
-    GUI_WindowInfo xinfo;
-    void *draw;
-    draw=UI_getDrawWidget();
-    UI_getWindowInfo(draw,&xinfo );
-#ifdef USE_VDPAU
-    if( admCoreCodecSupports(ADM_CORE_CODEC_FEATURE_VDPAU)==false)
-    {
-        GUI_Error_HIG("Error","Core has been compiled without vdpau support, but the application has been compiled with it.\nInstallation mismatch");
-        vdpauWorking=false;
-    }
-#endif
-    if(false==admVdpau::init(&xinfo)) return false;
-    vdpauWorking=true;
-    return true;
-}
-/**
-    \fn vdpauCleanup
-*/
-bool vdpauCleanup(void)
-{
-   return admVdpau::cleanup();
-}
-/**
-    \fn ADM_VDPAUgetBuffer
-    \brief trampoline to get a VDPAU surface
-*/
-int ADM_VDPAUgetBuffer(AVCodecContext *avctx, AVFrame *pic)
-{
-    decoderFFVDPAU *dec=(decoderFFVDPAU *)avctx->opaque;
-    return dec->getBuffer(avctx,pic);
-}
-/**
     \fn getBuffer
-    \brief returns a VDPAU render masquerading as a AVFrame
+    \brief returns a &vdpau render masquerading as a AVFrame
 */
 int decoderFFVDPAU::getBuffer(AVCodecContext *avctx, AVFrame *pic)
 {
-    vdpau_render_state * render;
-    if(VDPAU->freeQueue.size()==0)
+    vdpau_render_state * render=NULL;
+    if(vdpau.freeQueue.size()==0)
     {
-        aprintf("VDPAU No more available surface\n");
-        return -1;
-    }
-    // Get an image   
-    surfaceMutex.lock();
-    render=VDPAU->freeQueue.front();
-    render->refCount=0;
-    VDPAU->freeQueue.erase(VDPAU->freeQueue.begin());
-    surfaceMutex.unlock();
-    vdpauMarkSurfaceUsed(VDPAU,(void *)render);
-    render->state=0;
-    pic->data0=(uint8_t *)render;
-    pic->data1=(uint8_t *)render;
-    pic->data2=(uint8_t *)render;
-    pic->linesize0=0;
-    pic->linesize1=0;
-    pic->linesize2=0;
-    pic->type=FF_BUFFER_TYPE_USER;
-    render->state |= FF_VDPAU_STATE_USED_FOR_REFERENCE;
-    pic->reordered_opaque= avctx->reordered_opaque;
-    // I dont really understand what it is used for ....
-    if(pic->reference)
-    {
-        ip_age0=ip_age1+1;
-        ip_age1=1;
-        b_age++;
+        ADM_info("VDPAU No more available surface, creating a new one\n");
+        render=new vdpau_render_state;
+        memset(render,0,sizeof( vdpau_render_state));
+        int widthToUse = (avctx->coded_width+ 1)  & ~1;
+        int heightToUse= (avctx->coded_height+3)  & ~3;
+        if(VDP_STATUS_OK!=admVdpau::surfaceCreate(widthToUse,heightToUse,&(render->surface)))
+        {
+            ADM_error("Cannot create surface \n");
+            delete render;
+            alive=false;
+            return -1;
+        }
+        render->state=0;
+        vdpauMarkSurfaceUsed(&vdpau,(void *)render);
+        surfaceMutex.lock();
+        vdpau.fullQueue.push_back(render);
+        surfaceMutex.unlock();
     }else
     {
-        ip_age0++;
-        ip_age1++;
-        b_age=1;
+        surfaceMutex.lock();
+        render=vdpau.freeQueue.front();
+        ADM_assert(render);
+        vdpau.freeQueue.erase(vdpau.freeQueue.begin());
+        surfaceMutex.unlock();
     }
+    render->refCount=0;
+    render->state=0;  
+    vdpauMarkSurfaceUsed(&vdpau,(void *)render); // it is out of the queue, no need to lock it
+    // It only works because surface is the 1st field of render!
+    pic->buf0=av_buffer_create((uint8_t *)&(render->surface),  // Maybe a memleak here...
+                                     sizeof(render->surface),
+                                     ADM_VDPAUreleaseBuffer, 
+                                     (void *)this,
+                                     AV_BUFFER_FLAG_READONLY);
 
+    pic->data0=(uint8_t *)render;
+    pic->data3=(uint8_t *)(uintptr_t)render->surface;
+    pic->reordered_opaque= avctx->reordered_opaque;
+    aprintf("Alloc ===> Got buffer = %d\n",render->surface);
     return 0;
 }
 /**
     \fn releaseBuffer
 */
-void decoderFFVDPAU::releaseBuffer(AVCodecContext *avctx, AVFrame *pic)
+void decoderFFVDPAU::releaseBuffer(struct vdpau_render_state *rdr)
 {
-  vdpau_render_state * render;
-  int i;
-  
-  render=(vdpau_render_state*)pic->data0;
-  ADM_assert(render);
-  ADM_assert(render->refCount);
-  render->state &= ~FF_VDPAU_STATE_USED_FOR_REFERENCE;
-  for(i=0; i<4; i++){
-    pic->datai= NULL;
-  }
-  vdpauMarkSurfaceUnused(VDPAU,(void *)render);
+  ADM_assert(rdr);
+  ADM_assert(rdr->refCount);
+  rdr->state &= ~FF_VDPAU_STATE_USED_FOR_REFERENCE;
+  aprintf("Release ===> Release buffer = %d\n",rdr->surface);
+  vdpauMarkSurfaceUnused(&vdpau,(void *)rdr);
 }
-/**
-    \fn ADM_VDPAUreleaseBuffer
-*/
- void ADM_VDPAUreleaseBuffer(struct AVCodecContext *avctx, AVFrame *pic)
-{
-    decoderFFVDPAU *dec=(decoderFFVDPAU *)avctx->opaque;
-    dec->releaseBuffer(avctx,pic);
-}
-/**
-    \fn vdpauGetFormat
-    \brief Borrowed from mplayer
 
-*/
 extern "C"
 {
-static enum PixelFormat vdpauGetFormat(struct AVCodecContext *avctx,  const enum PixelFormat *fmt)
+
+static enum AVPixelFormat vdpauGetFormat(struct AVCodecContext *avctx,  const enum AVPixelFormat *fmt)
 {
     int i;
-
-    for(i=0;fmti!=PIX_FMT_NONE;i++)
-    {
-        PixelFormat c=fmti;
-        switch(c)
+    ADM_info("vdpau: GetFormat\n");
+    AVCodecID id=AV_CODEC_ID_NONE;
+    AVPixelFormat c;
+    AVPixelFormat outPix;
+    if(avctx->sw_pix_fmt==AV_PIX_FMT_YUV420P) // doont even try non yv12 for the moment
+        for(i=0;fmti!=AV_PIX_FMT_NONE;i++)
         {
-            case PIX_FMT_VDPAU_H264:
-            case PIX_FMT_VDPAU_MPEG1:
-            case PIX_FMT_VDPAU_MPEG2:
-            case PIX_FMT_VDPAU_WMV3:
-            case PIX_FMT_VDPAU_VC1:
-                        return c;
-            default:break;
-
+            c=fmti;
+            ADM_info("vdpau: Evaluating %d\n",c);
+            if(c!=AV_PIX_FMT_VDPAU) continue;        
+    #define FMT_V_CHECK(x,y)      case AV_CODEC_ID_##x:   outPix=AV_PIX_FMT_VDPAU_##y;id=avctx->codec_id;break;
+            switch(avctx->codec_id)
+            {
+                FMT_V_CHECK(H264,H264)
+                FMT_V_CHECK(MPEG1VIDEO,MPEG1)
+                FMT_V_CHECK(MPEG2VIDEO,MPEG2)
+                FMT_V_CHECK(WMV3,WMV3)
+                FMT_V_CHECK(VC1,VC1)
+                default: 
+                    continue;
+                    break;
+            }
+            break;
         }
+    if(id==AV_CODEC_ID_NONE)
+    {
+        ADM_info("No matching colrospace compatible hw accelerator found \n");
+        return AV_PIX_FMT_NONE;
     }
-    return PIX_FMT_NONE;
+    // Finish intialization of Vdpau decoder
+    const AVHWAccel *accel=ADM_acceleratedDecoderFF::parseHwAccel(outPix,id,AV_PIX_FMT_VDPAU);
+    if(accel)
+    {
+        ADM_info("Found matching hw accelerator : %s\n",accel->name);
+        ADM_info("Successfully setup hw accel\n");
+        return AV_PIX_FMT_VDPAU;
+    }
+    ADM_info("No matching hw accelerator Found \n");
+    return AV_PIX_FMT_NONE;
 }
 }
+
+/**
+ * 
+ * @return 
+ */
+bool decoderFFVDPAU::initVdpContext()
+{         
+        _context->slice_flags     = SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD;           
+        AVVDPAUContext *v= av_alloc_vdpaucontext();;
+        _context->hwaccel_context = v;
+        v->render=NULL;
+        v->decoder=VDP_INVALID_HANDLE; 
+        
+        if(0>av_vdpau_bind_context(_context, (VdpDevice)(uint64_t) admVdpau::getVdpDevice(),
+                          vdpGetProcAddressWrapper, AV_HWACCEL_FLAG_IGNORE_LEVEL))
+        {
+             ADM_error("Cannot bind\n");
+                return false;
+        }
+        ADM_info("Init VDP context ok\n");
+        return true;
+}
 /**
-    \fn decoderFFVDPAU
+    \fn decoderFF&VDPAU
 */
-decoderFFVDPAU::decoderFFVDPAU(uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, 
-        uint8_t *extraData,uint32_t bpp)
-:decoderFF (w,h,fcc,extraDataLen,extraData,bpp)
+decoderFFVDPAU::decoderFFVDPAU(struct AVCodecContext *avctx,decoderFF *parent) : ADM_acceleratedDecoderFF(avctx,parent)
 {
         alive=true;
-        scratch=NULL;
-     
-        vdpau=(void *)new vdpauContext;
-        VDPAU->vdpDecoder=VDP_INVALID_HANDLE;
+        avVdCtx=NULL;
         ADM_VDPAU_TYPE vdpauType=ADM_VDPAU_INVALID;
-        if(isH264Compatible(fcc))
-        {
-            vdpauType=ADM_VDPAU_H264;
-        }else if(isMpeg12Compatible(fcc))
-        {
-            vdpauType=ADM_VDPAU_MPEG2;
-        }else if(isVC1Compatible(fcc))
-        {
-            vdpauType=ADM_VDPAU_VC1;
-        }else ADM_assert(0);
-        int vdpDecoder;
-        switch(vdpauType)
+        AVCodecID codecID;
+        int vdpDecoder=0;
+        const char *name="";
+        VdpDevice dev=(VdpDevice)(uint64_t)admVdpau::getVdpDevice();
+        
+        switch(_context->codec_id)
         {
-            case ADM_VDPAU_VC1  : vdpDecoder=VDP_DECODER_PROFILE_VC1_ADVANCED;
-                                  WRAP_Open_TemplateVdpauByName("vc1_vdpau",CODEC_ID_VC1);
-                                  break;
-
-            case ADM_VDPAU_H264 : vdpDecoder=VDP_DECODER_PROFILE_H264_HIGH;
-                                  WRAP_Open_TemplateVdpauByName("h264_vdpau",CODEC_ID_H264);
-                                  break;
-            case ADM_VDPAU_MPEG2: 
-                                  vdpDecoder=VDP_DECODER_PROFILE_MPEG2_MAIN;
-                                  WRAP_Open_TemplateVdpauByName("mpegvideo_vdpau",CODEC_ID_MPEG2VIDEO);
-                                  break;
-            default: ADM_assert(0);break;
+            case AV_CODEC_ID_H264:
+                 vdpauType=ADM_VDPAU_H264;
+                 name="h264";
+                 vdpDecoder=VDP_DECODER_PROFILE_H264_HIGH;
+                 break;
+            case AV_CODEC_ID_VC1:
+                  vdpauType=ADM_VDPAU_VC1;
+                  name="vc1";
+                  vdpDecoder=VDP_DECODER_PROFILE_VC1_ADVANCED;
+                  break;
+            case AV_CODEC_ID_MPEG2VIDEO:
+                  vdpauType=ADM_VDPAU_MPEG2;
+                  vdpDecoder=VDP_DECODER_PROFILE_MPEG2_MAIN;
+                  name="mpegvideo";
+                  break;
+            default:
+                ADM_assert(0);
+                break;
         }
-        ADM_info("VDPAU Decoder created \n");
-        // Now instantiate our VDPAU surface & decoder
-        for(int i=0;i<NB_SURFACE;i++)
-            VDPAU->rendersi=NULL;
-       
-        int widthToUse=admVdpau::dimensionRoundUp(w);
-        int heightToUse=admVdpau::dimensionRoundUp(h);
- 
-        if(VDP_STATUS_OK!=admVdpau::decoderCreate(vdpDecoder, widthToUse,heightToUse,15,&(VDPAU->vdpDecoder)))
+
+     
+        if(!initVdpContext())
         {
-            ADM_error("Cannot create VDPAU decoder\n");
+            ADM_warning("Cannot setup context\n");
             alive=false;
-            return;
+            return ;
         }
-        // Create our surfaces...
-        for(int i=0;i<NB_SURFACE;i++)
-        {
-            VDPAU->rendersi=new vdpau_render_state;
-            memset(VDPAU->rendersi,0,sizeof( vdpau_render_state));
-            if(VDP_STATUS_OK!=admVdpau::surfaceCreate(widthToUse,heightToUse,&(VDPAU->rendersi->surface)))
-            {
-                ADM_error("Cannot create surface %d/%d\n",i,NB_SURFACE);
-                alive=false;
-                return;
-            }
-            VDPAU->freeQueue.push_back(VDPAU->rendersi);
-        }
-        scratch=new ADMImageRef(w,h);
-        b_age = ip_age0 = ip_age1 = 256*256*256*64;
-
+              
+        _context->get_buffer2     = ADM_VDPAUgetBuffer;
+        _context->draw_horiz_band = NULL;
+        ADM_info("Successfully setup hw accel\n");              
 }
 /**
     \fn ~            void    goOn( const AVFrame *d);
 */
 decoderFFVDPAU::~decoderFFVDPAU()
 {
-        ADM_info("VDPAU Cleaning up\n");
-        if(_context) // duplicate ~decoderFF to make sure in transit buffers are 
-        // released
-        {
-                avcodec_close (_context);
-
-                av_free(_context);
-                _context=NULL;
-        }
-        if(scratch)
-            delete scratch;
-        scratch=NULL;
         // Delete free only, the ones still used will be deleted later
-        int n=VDPAU->freeQueue.size();        
+        int n=vdpau.fullQueue.size();        
         for(int i=0;i<n;i++)
         {
-            vdpau_render_state *r=VDPAU->freeQueuei;
+            vdpau_render_state *r=vdpau.fullQueuei;
             if(r)
             {
                 if(r->surface)
@@ -374,96 +337,146 @@
                 }
                 delete r;
             }
-            VDPAU->freeQueue.clear();
+            vdpau.fullQueue.clear();
         }
-        if (VDPAU->vdpDecoder) {
-            ADM_info("VDPAU Destroying decoder\n");
-            if(VDP_STATUS_OK!=admVdpau::decoderDestroy(VDPAU->vdpDecoder))
-                ADM_error("Error destroying VDPAU decoder\n");
-        }
-        delete VDPAU;
-        vdpau=NULL;
 }
 /**
     \fn uncompress
 */
 bool decoderFFVDPAU::uncompress (ADMCompressedImage * in, ADMImage * out)
 {
-VdpStatus status;
     
-    // First let ffmpeg prepare datas...
-    vdpau_copy=out;
-    decode_status=false;
-
+    aprintf("==> uncompress %s\n",_context->codec->long_name);
     if(out->refType==ADM_HW_VDPAU)
     {
-            vdpauMarkSurfaceUnused(VDPAU,out->refDescriptor.refCookie);
+            vdpauMarkSurfaceUnused(&vdpau,out->refDescriptor.refHwImage);
             out->refType=ADM_HW_NONE;
     }
 
-    if(!decoderFF::uncompress (in, scratch))
+    if (!in->dataLength )	// Null frame, silently skipped
     {
-        aprintf("VDPAU No data from libavcodec\n");
-        return 0;
+        out->_noPicture = 1;
+        out->Pts=ADM_COMPRESSED_NO_PTS;
+        ADM_info("VDpau Nothing to decode -> no Picture\n");
+        return true;
     }
-    if(decode_status!=true)
+
+   // Put a safe value....
+    out->Pts=in->demuxerPts;
+    _context->reordered_opaque=in->demuxerPts;
+    int got_picture;
+    AVPacket pkt;
+    av_init_packet(&pkt);
+    pkt.data=in->data;
+    pkt.size=in->dataLength;
+    if(in->flags&AVI_KEY_FRAME)
+        pkt.flags=AV_PKT_FLAG_KEY;
+    else
+        pkt.flags=0;
+
+    AVFrame *frame=_parent->getFramePointer();
+    ADM_assert(frame);
+    int ret = avcodec_decode_video2 (_context, frame, &got_picture, &pkt);
+    
+    if(ret<0)
     {
-        printf("VDPAU error in renderDecode\n");
+        char er2048={0};
+        av_make_error_string(er, sizeof(er)-1, ret);
+        ADM_warning("Error %d in lavcodec (%s)\n",ret,er);
         return false;
     }
-    //ADM_info("Surface used %d\n",VDPAU->freeQueue.size());
-    if(decode_status)
+    if(frame->pict_type==AV_PICTURE_TYPE_NONE)
     {
-        struct vdpau_render_state *rndr = (struct vdpau_render_state *)scratch->GetReadPtr(PLANAR_Y);
-        out->refType=ADM_HW_VDPAU;
-        out->refDescriptor.refCookie=(void *)rndr;
-        out->refDescriptor.refInstance=VDPAU;
-        out->refDescriptor.refMarkUsed=vdpauMarkSurfaceUsed;
-        out->refDescriptor.refMarkUnused=vdpauMarkSurfaceUnused;
-        out->refDescriptor.refDownload=vdpauRefDownload;
-        vdpauMarkSurfaceUsed(VDPAU,(void *)rndr);
+        out->_noPicture=true;
+        out->Pts= (uint64_t)(frame->reordered_opaque);
+        ADM_info("VDPAU No picture \n");
+        return false;
     }
-    out->Pts=scratch->Pts;
-    out->flags=scratch->flags;
-    return (bool)decode_status;
+    return readBackBuffer(frame,in,out);
 }
-/**
-    \fn goOn
-    \brief Callback from ffmpeg when a pic is ready to be decoded
-*/
-void decoderFFVDPAU::goOn( const AVFrame *d,int type)
-{
-   VdpStatus status;
-   struct vdpau_render_state *rndr = (struct vdpau_render_state *)d->data0;
-   VdpVideoSurface  surface;
 
-    surface=rndr->surface;
-    vdpau_pts=d->reordered_opaque; // Retrieve our PTS
 
-     aprintf("VDPAU Decoding Using surface %d\n", surface);
-    status=admVdpau::decoderRender(VDPAU->vdpDecoder, surface,
-                            &rndr->info, rndr->bitstream_buffers_used, rndr->bitstream_buffers);
-    if(VDP_STATUS_OK!=status)
+ /**
+  * \fn readBackBuffer
+  * @param decodedFrame
+  * @param in
+  * @param out
+  * @return 
+  */   
+bool     decoderFFVDPAU::readBackBuffer(AVFrame *decodedFrame, ADMCompressedImage * in, ADMImage * out)
+{
+   // VdpSurface *surface=decodedFrame->data3;
+    struct vdpau_render_state *rndr = (struct vdpau_render_state *)decodedFrame->data0;
+    ADM_assert(rndr);
+    aprintf("Decoding ===> Got surface = %d\n",rndr->surface);
+    out->refType=ADM_HW_VDPAU;
+    out->refDescriptor.refHwImage=(void *)rndr;
+    out->refDescriptor.refCodec=&vdpau;
+    out->refDescriptor.refMarkUsed=vdpauMarkSurfaceUsed;
+    out->refDescriptor.refMarkUnused=vdpauMarkSurfaceUnused;
+    out->refDescriptor.refDownload=vdpauRefDownload;
+    vdpauMarkSurfaceUsed(&vdpau,(void *)rndr);
+    
+    uint64_t pts_opaque=(uint64_t)(decodedFrame->reordered_opaque);
+    out->Pts= (uint64_t)(pts_opaque);    
+    out->flags=admFrameTypeFromLav(decodedFrame);
+    return true;
+}
+
+class ADM_hwAccelEntryVdpau : public ADM_hwAccelEntry
+{
+public: 
+                            ADM_hwAccelEntryVdpau();
+     virtual bool           canSupportThis(struct AVCodecContext *avctx,  const enum AVPixelFormat *fmt,enum AVPixelFormat &outputFormat);
+     virtual                ADM_acceleratedDecoderFF *spawn( struct AVCodecContext *avctx,  const enum AVPixelFormat *fmt );     
+     virtual                ~ADM_hwAccelEntryVdpau() {};
+};
+/**
+ * 
+ */
+ADM_hwAccelEntryVdpau::ADM_hwAccelEntryVdpau()
+{
+    name="vdpau";
+}
+/**
+ * 
+ * @param avctx
+ * @param fmt
+ * @param outputFormat
+ * @return 
+ */
+bool           ADM_hwAccelEntryVdpau::canSupportThis(struct AVCodecContext *avctx,  const enum AVPixelFormat *fmt,enum AVPixelFormat &outputFormat)
+{
+    bool enabled=false;
+    prefs->get(FEATURES_VDPAU,&enabled);
+    if(!enabled)
     {
-        printf("VDPAU No data after decoderRender <%s>\n",admVdpau::getErrorString(status));
-        decode_status=false;
-        return ;
+        ADM_info("Vdpau not enabled\n");
+        return false;
     }
-    aprintf("VDPAU DecodeRender Ok***\n");
-    decode_status=true;
-    return;
+    
+    enum AVPixelFormat ofmt=vdpauGetFormat(avctx,fmt);
+    if(ofmt==AV_PIX_FMT_NONE)
+        return false;
+    outputFormat=ofmt;
+    ADM_info("This is supported by VDPAU\n");
+    return true;
 }
-
-
+ADM_acceleratedDecoderFF *ADM_hwAccelEntryVdpau::spawn( struct AVCodecContext *avctx,  const enum AVPixelFormat *fmt )
+{
+    decoderFF *ff=(decoderFF *)avctx->opaque;
+    return new decoderFFVDPAU(avctx,ff);
+}
+static ADM_hwAccelEntryVdpau vdpEntry;
 /**
-    \fn draw
-    \brief callback invoked by lavcodec when a pic is ready to be decoded
-*/
-void draw(struct AVCodecContext *s,    const AVFrame *src, int offset4,    int y, int type, int height)
+ * 
+ * @return 
+ */
+bool initVDPAUDecoder(void)
 {
-    decoderFFVDPAU *dec=(decoderFFVDPAU *)s->opaque;
-    dec->goOn(src,type);
+    ADM_info("Registering VDPAU hw decocer\n");
+    ADM_hwAccelManager::registerDecoder(&vdpEntry);
+    return true;
 }
-
 #endif
 // EOF

avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp Added

@@ -0,0 +1,140 @@
+/***************************************************************************
+            \file              ADM_ffmpeg_vdpau.cpp  
+            \brief Decoder using half ffmpeg/half VDPAU
+
+    The ffmpeg part is to preformat inputs for VDPAU
+    VDPAU is loaded dynamically to be able to make a binary
+        and have something working even if the target machine
+        does not have vdpau
+    Some part, especially get/buffer and ip_age borrowed from xbmc
+        as the api from ffmpeg is far from clear....
+
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+
+
+
+/**
+    \fn vdpauUsable
+    \brief Return true if  vdpau can be used...
+*/
+bool vdpauUsable(void)
+{
+    bool v=false;
+    if(!vdpauWorking) return false;
+    if(!prefs->get(FEATURES_VDPAU,&v)) v=false;
+    return v;
+}
+/**
+    \fn vdpauProbe
+    \brief Try loading vdpau...
+*/
+bool vdpauProbe(void)
+{
+    GUI_WindowInfo xinfo;
+    void *draw;
+    draw=UI_getDrawWidget();
+    UI_getWindowInfo(draw,&xinfo );
+#ifdef USE_VDPAU
+    if( admCoreCodecSupports(ADM_CORE_CODEC_FEATURE_VDPAU)==false)
+    {
+        GUI_Error_HIG("Error","Core has been compiled without VDPAU support, but the application has been compiled with it.\nInstallation mismatch");
+        vdpauWorking=false;
+    }
+#endif
+    if(false==admVdpau::init(&xinfo)) return false;
+    vdpauWorking=true;
+    return true;
+}
+/**
+    \fn vdpauCleanup
+*/
+bool vdpauCleanup(void)
+{
+   return admVdpau::cleanup();
+}
+/**
+    \fn ADM_VDPAUgetBuffer
+    \brief trampoline to get a VDPAU surface
+*/
+int ADM_VDPAUgetBuffer(AVCodecContext *avctx, AVFrame *pic,int flags)
+{
+    decoderFF *ff=(decoderFF *)avctx->opaque;
+    decoderFFVDPAU *dec=(decoderFFVDPAU *)ff->getHwDecoder();
+    ADM_assert(dec);
+    return dec->getBuffer(avctx,pic);
+}
+
+/**
+    \fn ADM_VDPAUreleaseBuffer
+ *  \param opaque is decoderFFVDPAU
+*   \param data   is surface
+ * 
+*/
+ void ADM_VDPAUreleaseBuffer(void *opaque, uint8_t *data)
+{
+    
+    decoderFFVDPAU *dec=(decoderFFVDPAU *)opaque;
+    ADM_assert(dec);
+    struct vdpau_render_state *rdr=( struct vdpau_render_state  *)data;
+    dec->releaseBuffer(rdr);
+}
+
+
+    
+    
+    /**
+     * \fn vdpGetProcAddressWrapper
+     * @param device
+     * @param function_id
+     * @param function_pointer
+     * @return 
+     */
+ extern "C"
+ {
+static VdpStatus vdpGetProcAddressWrapper(    VdpDevice device,    VdpFuncId function_id,       void * *  function_pointer)
+{
+    ADM_info("Calling vdpGetProcAddressWrapper for function %d\n",function_id);
+    VdpStatus r=VDP_STATUS_ERROR;
+    
+#define ADD_WRAPPER(x,y)     case VDP_FUNC_ID_##x: ADM_info("Wrapping "#x" "#y"\n"); *function_pointer= (void *)admVdpau::y;\
+                                        r=VDP_STATUS_OK;\
+                                        break;        
+    
+    switch(function_id)
+    {
+        ADD_WRAPPER(DECODER_CREATE,decoderCreate)
+        ADD_WRAPPER(DECODER_RENDER,decoderRender)
+        ADD_WRAPPER(DECODER_DESTROY,decoderDestroy)
+                
+        case VDP_FUNC_ID_VIDEO_SURFACE_QUERY_CAPABILITIES:
+        case VDP_FUNC_ID_DECODER_QUERY_CAPABILITIES:            
+        default:
+            VdpGetProcAddress *p=admVdpau::getProcAddress2();
+            ADM_assert(p);
+            r= p(device,function_id,function_pointer);
+    }
+    if(r==VDP_STATUS_OK)
+    {
+        ADM_info("Ok\n");
+    }else
+    {
+        ADM_warning("Failed with er=%d\n",(int)r);
+    }
+    return r;
+    
+}
+}
+
+
+// EOF

avidemux_2.6.12.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_videoCodec.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_videoCodec.cpp Changed

@@ -20,9 +20,6 @@
 #include "ADM_codec.h"
 #include "ADM_ffmp43.h"
 #include "fourcc.h"
-#include "ADM_codecVdpau.h"
-#include "ADM_codecXvba.h"
-#include "ADM_codecLibVA.h"
 #include "DIA_coreToolkit.h"
 
 #if defined(USE_VPX)
@@ -43,68 +40,10 @@
 decoders *ADM_getDecoder (uint32_t fcc, uint32_t w, uint32_t h, uint32_t extraLen, 
             uint8_t * extraData,uint32_t bpp)
 {
-  ADM_info("\nSearching decoder in plugins\n");
-  decoders *fromPlugin=tryCreatingVideoDecoder(w,h,fcc,extraLen,extraData,bpp);
-  if(fromPlugin) return fromPlugin;
-  
-#if defined(USE_VDPAU) 
-  ADM_info("Searching decoder in vdpau (%d x %d, extradataSize:%d)...\n",w,h,extraLen);
-  if (isH264Compatible (fcc) || isMpeg12Compatible(fcc) || 1*isVC1Compatible(fcc))
-    {
-        ADM_info("This is vdpau compatible\n");
-        if(true==vdpauUsable())
-        {
-            decoderFFVDPAU *dec=new decoderFFVDPAU (w,h,fcc,extraLen,extraData,bpp);
-            if(dec->initializedOk()==true)
-                return (decoders *) (dec);
-            else
-            {
-                GUI_Error_HIG("VDPAU","Cannot initialize VDPAU, make sure it is not already used by another application.\nSwitching to default decoder.");
-                delete dec;
-            }
-        }else ADM_info("Vdpau is not active\n");
-    }        
-#endif // VDPAU
-  
-
-#if defined(USE_XVBA) 
-  ADM_info("Searching decoder in xvba (%d x %d, extradataSize:%d)...\n",w,h,extraLen);
-  if (isH264Compatible (fcc) )
-    {
-        ADM_info("This is xvba compatible\n");
-        if(true==xvbaUsable())
-        {
-            decoderFFXVBA *dec=new decoderFFXVBA (w,h,fcc,extraLen,extraData,bpp);
-            if(dec->initializedOk()==true)
-                return (decoders *) (dec);
-            else
-            {
-                GUI_Error_HIG("XVBA","Cannot initialize XVBA, make sure it is not already used by another application.\nSwitching to default decoder.");
-                delete dec;
-            }
-        }else ADM_info("XVBA is not active\n");
-    }        
-#endif // XVBA  
-#if defined(USE_LIBVA) 
-  ADM_info("Searching decoder in libva (%d x %d, extradataSize:%d)...\n",w,h,extraLen);
-  if(decoderFFLIBVA::fccSupported(fcc))
-  {
-        ADM_info("This is libva compatible\n");
-        if(true==libvaUsable())
-        {
-            decoderFFLIBVA *dec=new decoderFFLIBVA (w,h,fcc,extraLen,extraData,bpp);
-            if(dec->initializedOk()==true)
-                return (decoders *) (dec);
-            else
-            {
-                GUI_Error_HIG("LIBVA","Cannot initialize LIBVA, make sure it is not already used by another application.\nSwitching to default decoder.");
-                delete dec;
-            }
-        }else ADM_info("LIBVA is not active\n");
-    }
-#endif // XVBA  
-  
-  
+    ADM_info("\nSearching decoder in plugins\n");
+    decoders *fromPlugin=tryCreatingVideoDecoder(w,h,fcc,extraLen,extraData,bpp);
+    if(fromPlugin) 
+        return fromPlugin;
     ADM_info("Searching decoder in coreVideoCodec(%d x %d, extradataSize:%d)...\n",w,h,extraLen);
     return ADM_coreCodecGetDecoder(fcc,w,h,extraLen,extraData,bpp);
 }

avidemux_2.6.12.tar.gz/avidemux/common/ADM_videoCodec/src/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoCodec/src/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_videoFilter2/include/ADM_videoFilterApi.h -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoFilter2/include/ADM_videoFilterApi.h Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_videoFilter2/include/ADM_videoFilters.h -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoFilter2/include/ADM_videoFilters.h Changed

avidemux_2.6.12.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_pluginLoad.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_pluginLoad.cpp Changed

@@ -31,27 +31,30 @@
 extern ADM_UI_TYPE UI_GetCurrentUI(void);
 
 
+#if (ADM_UI_TYPE_BUILD!=ADM_UI_CLI)
 #ifdef USE_LIBVA               
-#include "ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA.h"
+#include "ADM_coreLibVA.h"
 #endif        
 #ifdef USE_VDPAU               
-#include "ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpau.h"
+#include "ADM_coreVdpau.h"
 #endif        
-
+#endif
+extern ADM_vf_plugin *getFakePartialPlugin();
 
 ADM_vf_plugin::ADM_vf_plugin(const char *file) : ADM_LibWrapper()
 {
-	initialised = (loadLibrary(file) && getSymbols(10,
+	initialised = (loadLibrary(file) && getSymbols(11,
 		&create, "create",
 		&destroy, "destroy",
 		&getApiVersion, "getApiVersion",
 		&supportedUI, "supportedUI",
-                &neededFeatures,"neededFeatures",
+        &neededFeatures,"neededFeatures",
 		&getFilterVersion, "getFilterVersion",
 		&getDesc, "getDesc",
 		&getInternalName, "getInternalName",
 		&getDisplayName, "getDisplayName",
-        &getCategory,"getCategory"
+        &getCategory,"getCategory",
+        &partializable,"partializable"
         ));
 };
 
@@ -65,8 +68,8 @@
     for(int start=0;start<n-2;start++)
     for(int i=0;i<n-1;i++)
     {
-         ADM_vf_plugin *left=listi;
-         ADM_vf_plugin *right=listi+1;
+        ADM_vf_plugin *left=listi;
+        ADM_vf_plugin *right=listi+1;
 
         const char       *    leftName=left->getDisplayName();
         const char       *    rightName=right->getDisplayName();
@@ -91,14 +94,15 @@
 {
     for(int i=0;i<VF_MAX;i++)
     {
-        sortVideoCategoryByName(ADM_videoFilterPluginsListi,i);
+        if(i!=VF_HIDDEN)
+            sortVideoCategoryByName(ADM_videoFilterPluginsListi,i);
     }
     return true;
 
 }
 
 /**
- * 	\fn tryLoadingVideoFilterPlugin
+ *     \fn tryLoadingVideoFilterPlugin
  *  \brief try to load the plugin given as argument..
  */
 static uint8_t tryLoadingVideoFilterPlugin(const char *file,uint32_t featureMask)
@@ -152,7 +156,7 @@
     info->category=plugin->getCategory();
 
     printf("ADM_vf_plugin Plugin loaded version %d.%d.%d, name %s/%s\n",
-		major, minor, patch, info->internalName, info->displayName);
+        major, minor, patch, info->internalName, info->displayName);
     if(info->category>=VF_MAX)
     {
         ADM_error("This filter has an unknown caregory!\n");
@@ -206,7 +210,7 @@
 
         ADM_assert(filter>=0 && cat<VF_MAX && filter<ADM_videoFilterPluginsListcat.size());
 
-    	ADM_vf_plugin *a=ADM_videoFilterPluginsListcatfilter;
+        ADM_vf_plugin *a=ADM_videoFilterPluginsListcatfilter;
         a->getFilterVersion(major, minor, patch);
 
         *name=a->info.displayName;
@@ -238,14 +242,14 @@
     clearDirectoryContent(nbFile,files);  
 }
 /**
- * 	\fn ADM_ad_GetPluginVersion
+ *     \fn ADM_ad_GetPluginVersion
  *  \brief load all audio plugins
  */
 uint8_t ADM_vf_loadPlugins(const char *path,const char *subFolder)
 {
-	
+    
         uint32_t featureMask=0;
-
+#if (ADM_UI_TYPE_BUILD!=ADM_UI_CLI)
 #ifdef USE_LIBVA               
         if(admLibVA::isOperationnal()) featureMask|=ADM_FEATURE_LIBVA;
 #endif        
@@ -258,18 +262,22 @@
         if(hasOpenGl)
             featureMask|=ADM_FEATURE_OPENGL;
 #endif
-        
-	
-	printf("ADM_vf_plugin Scanning directory %s\n",path);
-
-        std::string myPath=std::string(path);
-        parseOneFolder(myPath.c_str(),featureMask);
-        myPath+=std::string("/")+std::string(subFolder);
-        parseOneFolder(myPath.c_str(),featureMask);
-        
-        
-        sortVideoFiltersByName();
-	return 1;
+#endif 
+    
+    printf("ADM_vf_plugin Scanning directory %s\n",path);
+
+   
+    
+    std::string myPath=std::string(path);
+    parseOneFolder(myPath.c_str(),featureMask);
+    myPath+=std::string("/")+std::string(subFolder);
+    parseOneFolder(myPath.c_str(),featureMask);
+    
+    
+    sortVideoFiltersByName();
+    if(!ADM_videoFilterPluginsListVF_HIDDEN.size())
+        ADM_videoFilterPluginsListVF_HIDDEN.append(getFakePartialPlugin());
+    return 1;
 }
 /**
     \fn ADM_vf_cleanup
@@ -283,6 +291,8 @@
         for(int i=0;i<nb;i++)
         {
             ADM_vf_plugin *a=ADM_videoFilterPluginsListcati;
+            if(a->tag==VF_PARTIAL_FILTER)
+                continue;
             if(a->nameOfLibrary)
             {
                 ADM_dealloc(a->nameOfLibrary);
@@ -297,7 +307,7 @@
 }
 
 /**
-    \fn ADM_vf_getPluginFromTag
+    \fn ADM_vf_getPluginFromInternalName
     \brief
 */
 static ADM_vf_plugin *ADM_vf_getPluginFromInternalName(const char *name)
@@ -313,7 +323,7 @@
             }
         }
     }
-    ADM_error("Cannot get video filter from name %s\n",name);
+    ADM_error("Cannot get video filter from name <%s>\n",name);
     ADM_assert(0);
     return NULL;
 }
@@ -342,7 +352,7 @@
 const char *ADM_vf_getInternalNameFromTag(uint32_t tag)
 {
   ADM_vf_plugin *plugin=ADM_vf_getPluginFromTag(tag);
-    return plugin->getInternalName();
+  return plugin->getInternalName();
 }
 /**
     \fn ADM_vf_getTagFromInternalName
@@ -354,4 +364,13 @@
     return plg->tag;
 
 }
+bool ADM_vf_canBePartialized(uint32_t tag)
+{
+  ADM_vf_plugin *plugin=ADM_vf_getPluginFromTag(tag);
+  if(!plugin->partializable)
+        return false;
+  return plugin->partializable();
+        
+}
+
 //EOF

avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_vidPartial.cpp Added

@@ -0,0 +1,456 @@
+/***************************************************************************
+  \name partialFilter
+  \brief only perform another filter operation on a limited time range, else bypass it
+  \author Mean 2016
+ 
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   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 "DIA_factory.h"
+#include "DIA_coreToolkit.h"
+#include "ADM_vidMisc.h"
+#include "partial.h"
+#include "partial_desc.cpp"
+
+extern ADM_coreVideoFilter *ADM_vf_createFromTag(uint32_t tag, ADM_coreVideoFilter *last, CONFcouple *couples);
+extern uint32_t    ADM_vf_getTagFromInternalName(const char *name);
+
+ADM_coreVideoFilter *createPartialFilter(const char *internalName,CONFcouple *couples);
+/**
+    \class partialFilter
+*/
+class partialFilter : public  ADM_coreVideoFilter
+{
+  public:
+    class  trampolineFilter : public  ADM_coreVideoFilter
+    {
+    public:
+                            trampolineFilter(ADM_coreVideoFilter *previous,CONFcouple *conf=NULL);
+       virtual             ~trampolineFilter();
+
+       virtual const char   *getConfiguration(void);                   /// Return  current configuration as a human readable string
+       virtual bool         getNextFrame(uint32_t *frameNumber,ADMImage *image);              /// Dont mix getFrame & getNextFrame !     
+       virtual FilterInfo  *getInfo(void);                             /// Return picture parameters after this filter
+       virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+       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
+    };
+  
+  
+protected:
+                trampolineFilter *trampoline;
+                ADM_coreVideoFilter *sonFilter;
+                partial      configuration;
+                bool         byPass;
+                char         description2048;
+                ADMImage     *intermediate;
+                bool         hasIntermediate;
+                uint32_t     intermediateFn;
+                
+                
+                bool        isInRange(uint64_t tme);
+                
+public:
+                            partialFilter(ADM_coreVideoFilter *previous,CONFcouple *conf);
+                            ~partialFilter();
+
+        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         getNextFrameForSon(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);   
+        virtual bool         goToTime(uint64_t usSeek);   /// Start graphical user interface
+        static  void         reconfigureCallback(void *cookie);
+                void         reconfigureSon();
+
+};
+
+// Add the hook to make it valid plugin
+DECLARE_VIDEO_FILTER(   partialFilter,   // Class
+                        1,0,0,              // Version
+                        ADM_UI_ALL,         // UI
+                        VF_TRANSFORM,            // Category
+                        "partial",            // internal name (must be uniq!)
+                        "Make a filter partial.",            // Display name
+                        "Limit the actions of some filters to a time range." // Description
+                    );
+
+// Now implements the interesting parts
+/**
+    \fn partialFilter
+    \brief constructor
+*/
+partialFilter::partialFilter(  ADM_coreVideoFilter *in,CONFcouple *setup) : ADM_coreVideoFilter(in,setup)
+{
+    trampoline=NULL;
+    sonFilter=NULL;
+    byPass=true;
+    
+    intermediate=new ADMImageDefault(in->getInfo()->width,in->getInfo()->height);
+    hasIntermediate=false;
+    
+    // Step 1 : Load configuration
+    if(!setup)
+        ADM_assert(0);
+    // Only keep 3 parameters 
+    char *filterName=NULL;
+    if(!setup->readAsString ("filterName",&filterName))
+      {
+        ADM_assert(0);
+      }
+    configuration.filterName=std::string(filterName);
+    ADM_dealloc(filterName);
+    if(!setup->readAsUint32("startBlack",&(configuration.startBlack)))
+      {
+        ADM_assert(0);
+      }
+    if(!setup->readAsUint32("endBlack",&(configuration.endBlack)))
+      {
+        ADM_assert(0);
+      }
+    // Ok, create trampoline & son
+    trampoline=new trampolineFilter(this,NULL);
+    // Create swallowed filter
+    // Get tag from name
+    uint32_t tag;
+    // get tag from name
+    int nbSonParam=setup->getSize()-3;
+    ADM_assert(nbSonParam>=0);
+
+    ADM_info("Creating partial filter for %s, with %d params\n",configuration.filterName.c_str(),nbSonParam);
+    tag=ADM_vf_getTagFromInternalName(configuration.filterName.c_str());
+    // spawn 
+    
+    CONFcouple newParams(nbSonParam);
+    for(int i=0;i<nbSonParam;i++)
+    {
+      char *key,*val;
+      setup->getInternalName (i+3,&key,&val);
+      newParams.setInternalName (key,val);
+    }
+    
+    sonFilter=ADM_vf_createFromTag(tag, trampoline, &newParams);
+    ADM_assert(sonFilter);
+    // son = new filer(trampoline)
+    // TODO FIXME
+    if(!configuration.startBlack)
+      byPass=false;
+    return;
+}
+/**
+    \fn partialFilter
+    \brief destructor
+*/
+partialFilter::~partialFilter()
+{
+    
+    if(intermediate) delete intermediate;
+    intermediate=NULL;
+    if(sonFilter) delete sonFilter;
+    sonFilter=NULL;
+    if(trampoline) delete trampoline;
+    trampoline=NULL;
+}
+
+/**
+ * \fn getNextFrameForSon
+ */
+bool         partialFilter::getNextFrameForSon(uint32_t *fn,ADMImage *image)
+{
+  if(!hasIntermediate)
+    {
+      ADM_warning("Partial filter requesting image, no image in store!!\n");
+      return false;
+    }
+     
+  *fn=intermediateFn;
+  image->duplicateFull(intermediate);
+  return true;
+}
+/**
+    \fn getFrame
+    \brief Get a processed frame
+*/
+bool partialFilter::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    hasIntermediate=false;
+    // 1 - Get image from previous filter
+    if(false==previousFilter->getNextFrame(fn,image))
+      {
+        ADM_warning("partial : Cannot get frame\n");
+        return false;
+      }
+    // 2 -Check if we are in range or not
+    if(!isInRange(image->Pts))
+    {
+        return true; // we have the image already
+    }
+    // 3- we are in range, prepare for trampolining
+    intermediate->duplicateFull(image);
+    hasIntermediate=true;
+    intermediateFn=*fn;
+    
+    // Switch to the son instead
+    if(false==sonFilter->getNextFrame(&intermediateFn,image))
+    {
+         ADM_warning("partial : Cannot get frame from partial filter\n");
+         return false;
+    }
+    return true;
+}
+
+/**
+ */
+bool partialFilter::isInRange(uint64_t tme)
+{
+   if(tme<(1000LL*configuration.startBlack) || (tme>configuration.endBlack*1000LL))
+   {
+     return false;
+   }
+   return true;
+}
+/**
+ */
+bool         partialFilter::goToTime(uint64_t usSeek)
+{
+  bool r=previousFilter->goToTime(usSeek);
+  sonFilter->goToTime(usSeek);
+  byPass=!isInRange(usSeek);
+  return r;
+}
+
+/**
+    \fn getCoupledConf
+    \brief Return our current configuration as couple name=value
+*/
+bool         partialFilter::getCoupledConf(CONFcouple **couples)
+{
+    *couples=NULL;
+    CONFcouple *newParam=NULL;
+    sonFilter->getCoupledConf(&newParam);
+    if(newParam)
+    {
+        *couples=new CONFcouple(newParam->getSize()+3);
+        (*couples)->writeAsString("filterName",configuration.filterName.c_str());
+        (*couples)->writeAsUint32("startBlack",configuration.startBlack);
+        (*couples)->writeAsUint32("endBlack",configuration.endBlack);
+
+        for(int i=0;i<newParam->getSize();i++)
+        {
+          char *key,*val;
+          newParam->getInternalName (i,&key,&val);
+          (*couples)->setInternalName(key,val);
+        }
+        delete newParam;
+        newParam=NULL;
+    }
+    return true;
+}
+
+void partialFilter::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, partial_param, &configuration);
+}
+
+/**
+    \fn getConfiguration
+    \brief Return current setting as a string
+*/
+const char *partialFilter::getConfiguration(void)
+{
+  sprintf(description,"Partial : %s -- ",ADM_us2plain(configuration.startBlack*1000));
+  strcat(description,ADM_us2plain(configuration.endBlack*1000));
+  strcat(description,sonFilter->getConfiguration());
+  return description;
+}
+/**
+ */
+void partialFilter::reconfigureCallback(void *cookie)
+{
+  partialFilter *p=(partialFilter *)cookie;
+  p->reconfigureSon();
+}
+/**
+ */
+void partialFilter::reconfigureSon(void)
+{
+  sonFilter->configure();
+}
+
+/**
+    \fn configure
+*/
+bool partialFilter::configure( void)
+{
+        uint32_t mx=9*3600*1000;
+        diaElemTimeStamp start(&(configuration.startBlack),QT_TRANSLATE_NOOP("partial","Start time (ms):"),0,mx);
+        diaElemTimeStamp end(&(configuration.endBlack),QT_TRANSLATE_NOOP("partial","End time (ms):"),0,mx);
+        diaElemButton    son(QT_TR_NOOP("Configure filter"), partialFilter::reconfigureCallback,this);
+
+        diaElem *elems3={&start,&end,&son};
+        return diaFactoryRun(QT_TRANSLATE_NOOP("Partial","Partial Filter"),3,elems);
+}
+
+/**
+ */
+ partialFilter::trampolineFilter::trampolineFilter(ADM_coreVideoFilter *previous,CONFcouple *conf) : ADM_coreVideoFilter(previous,conf)
+ {
+   
+ }
+ partialFilter::trampolineFilter::~trampolineFilter()
+{
+  
+}
+const char   * partialFilter::trampolineFilter::getConfiguration(void)
+{
+  return ""; // normally never used
+}
+
+FilterInfo  * partialFilter::trampolineFilter::getInfo(void)
+{
+  return previousFilter->getInfo();
+}
+bool          partialFilter::trampolineFilter::getCoupledConf(CONFcouple **couples) 
+{
+  return false; // never called
+}
+void          partialFilter::trampolineFilter::setCoupledConf(CONFcouple *couples)
+{
+    // never called
+}
+bool          partialFilter::trampolineFilter::configure()
+{
+    return true; // never called
+}
+uint64_t          partialFilter::trampolineFilter::getAbsoluteStartTime()
+{
+    return previousFilter->getAbsoluteStartTime(); // never called
+}
+
+bool         partialFilter::trampolineFilter::getNextFrame(uint32_t *frameNumber,ADMImage *image)
+{
+  partialFilter *p=(partialFilter *)previousFilter;
+  return p->getNextFrameForSon(frameNumber,image);
+}
+/************************************************/
+
+/**
+ * \fn createPartialFilter
+ * @param internalName
+ * @param couples
+ * @return 
+ */
+ADM_coreVideoFilter *createPartialFilter(const char *internalName,CONFcouple *couples,ADM_coreVideoFilter *source)
+{
+  int sonNbItems=couples->getSize();
+  CONFcouple tmp(3+sonNbItems);
+  
+  uint32_t start=1000;
+  uint32_t end=5000;
+  
+  tmp.writeAsString("filterName",internalName);
+  tmp.writeAsUint32 ("startBlack",start);
+  tmp.writeAsUint32 ("endBlack",end);
+  for(int i=0;i<sonNbItems;i++)
+  {
+      char *key,*val;
+      couples->getInternalName (i,&key,&val);
+      tmp.setInternalName (key,val);
+  }
+  ADM_coreVideoFilter *p=new partialFilter(source,&tmp);
+  if(!p->configure())
+  {
+      delete p;
+      p=NULL;
+      return NULL;
+  }
+  return p;  
+}
+
+namespace admPartial
+{
+    ADM_coreVideoFilter *create(ADM_coreVideoFilter *previous,CONFcouple *conf)
+    {
+      return new partialFilter(previous,conf);
+    }
+    void destroy(ADM_coreVideoFilter *c)
+    {
+      partialFilter *p=(partialFilter *)c;
+      delete p;
+      p=NULL;
+    }
+    int supportedUI()
+    {
+      return ADM_UI_ALL;
+    }
+    int               neededFeatures(void) {return 0;}
+    uint32_t          apiVersion() 
+    {
+      return VF_API_VERSION;
+    }
+    bool              getPluginVersion(uint32_t *major, uint32_t *minor, uint32_t *patch)
+    {
+        *major=1;
+        *minor=0;
+        *patch=0;
+        return true;
+    }
+    const char       *getString()
+    {
+      return "partial";
+    }
+    VF_CATEGORY       getCategory(void)
+    {
+      return VF_HIDDEN;
+    }
+    bool              partializable(void){return false;}    
+    
+}; // namespace
+
+class fakePartialPlugin : public ADM_vf_plugin
+{
+public:  
+  fakePartialPlugin() 
+  {
+        create=admPartial::create;
+        destroy=admPartial::destroy;
+        supportedUI=admPartial::supportedUI;
+        neededFeatures=admPartial::neededFeatures;
+        getApiVersion=admPartial::apiVersion;
+        getFilterVersion=admPartial::getPluginVersion;
+        getDesc=admPartial::getString;
+        getInternalName=admPartial::getString;
+        getDisplayName=admPartial::getString;
+        getCategory=admPartial::getCategory;
+        partializable=admPartial::partializable;
+
+        nameOfLibrary="";
+        tag=VF_PARTIAL_FILTER;
+        
+        info.internalName="partial";
+        info.displayName="partial";
+        info.desc="partial";
+        info.category=VF_HIDDEN;        
+  }
+  
+};
+
+static fakePartialPlugin fakePlugin;
+ADM_vf_plugin *getFakePartialPlugin()
+{
+  return &fakePlugin;
+}
+
+//EOF

avidemux_2.6.12.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_videoFilters.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_videoFilters.cpp Changed

@@ -11,6 +11,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
+
 #include "BVector.h"
 #include "ADM_default.h"
 #include "ADM_edit.hxx"
@@ -101,6 +102,43 @@
     ADM_VideoFilterstop+1=scratch;
     return ADM_vf_recreateChain();
 }
+/**
+ * 
+ */
+extern ADM_coreVideoFilter *createPartialFilter(const char *internalName,CONFcouple *couples,ADM_coreVideoFilter *source);
+bool ADM_vf_partialize(int index)
+{
+    ADM_info("Partializing filter at index %d\n",index);
+    //
+    ADM_assert(index<ADM_VideoFilters.size());
+    
+    
+    ADM_VideoFilterElement scratch=ADM_VideoFiltersindex;
+    const char *internalName=ADM_vf_getInternalNameFromTag(scratch.tag);
+    CONFcouple *conf=NULL;
+    if(!scratch.instance->getCoupledConf (&conf))
+      {
+        ADM_warning("Cannot get configuration\n");
+        return false;
+      }
+    // Create
+    ADM_coreVideoFilter *partialized=createPartialFilter(internalName,conf,scratch.instance->getSource());
+    if(!partialized)
+    {
+        return false;
+    }
+
+    //--
+    ADM_VideoFilterElement scratch2;
+    scratch2.instance=partialized;
+    scratch2.tag=VF_PARTIAL_FILTER;
+    scratch2.objectId=0;
+    ADM_VideoFiltersindex=scratch2;
+    delete scratch.instance;
+    scratch.instance=NULL;
+    //--
+    return ADM_vf_recreateChain();
+}
 
 /**
     \fn createVideoFilterChain
@@ -202,4 +240,6 @@
 
         return true;
 }
+
+
 // EOF

avidemux_2.6.12.tar.gz/avidemux/common/ADM_videoFilter2/src/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoFilter2/src/CMakeLists.txt Changed

avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoFilter2/src/partial.conf Added

avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoFilter2/src/partial.h Added

avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoFilter2/src/partial_desc.cpp Added

avidemux_2.6.13.tar.gz/avidemux/common/ADM_videoFilter2/src/partial_json.cpp Added

avidemux_2.6.12.tar.gz/avidemux/common/A_functions.h -> avidemux_2.6.13.tar.gz/avidemux/common/A_functions.h Changed

avidemux_2.6.12.tar.gz/avidemux/common/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux/common/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux/common/GUI_jobs.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/GUI_jobs.cpp Changed

avidemux_2.6.13.tar.gz/avidemux/common/adm_main.h Added

@@ -0,0 +1,109 @@
+
+#ifdef USE_SDL
+extern "C" {
+	#ifdef __HAIKU__
+	#include "SDL2/SDL.h"
+	#else
+	#include "SDL2/SDL.h"
+	#endif
+}
+
+#include "ADM_render/GUI_sdlRender.h"
+#endif
+extern uint8_t GUI_close(void);
+static bool setPrefsDefault(void);
+extern bool  vdpauProbe(void);
+extern bool  libvaProbe(void);
+
+extern void registerVideoFilters( void );
+extern void filterCleanUp( void );
+extern void register_Encoders( void )  ;
+
+extern uint8_t initGUI(const vector<IScriptEngine*>& engines);
+extern void destroyGUI(void);
+extern void initFileSelector(void);
+extern void getUIDescription(char*);
+extern uint8_t ADM_ad_loadPlugins(const char *path);
+extern uint8_t ADM_vf_loadPlugins(const char *path,const char *subFolder);
+extern uint8_t ADM_vd6_loadPlugins(const char *path);
+extern uint8_t ADM_av_loadPlugins(const char *path);
+extern uint8_t ADM_ae_loadPlugins(const char *path);
+extern uint8_t ADM_ve6_loadPlugins(const char *path,const char *subFolder);
+
+extern bool ADM_ad_cleanup(void);
+extern bool ADM_ae_cleanup(void);
+extern bool ADM_vf_cleanup(void);
+extern void ADM_ve6_cleanup(void);
+extern void ADM_vd6_cleanup(void);
+
+extern bool vdpauProbe(void);
+extern bool vdpauCleanup(void);
+
+extern bool xvbaProbe(void);
+extern bool xvbaCleanup(void);
+
+extern void loadPlugins(void);
+extern void InitFactory(void);
+extern void InitCoreToolkit(void);
+extern uint8_t  quotaInit(void);
+
+extern int UI_Init(int nargc,char **nargv);
+extern int UI_RunApp(void);
+extern bool UI_End(void);
+extern void cleanUp (void);
+
+extern ADM_UI_TYPE UI_GetCurrentUI(void);
+
+typedef bool (*initFunc_t)    (void);
+std::vector<initFunc_t> listOfHwInit;    
+
+#if !defined(NDEBUG) && defined(FIND_LEAKS)
+extern const char* new_progname;
+#endif
+
+void ADM_ExitCleanup(void);
+int startAvidemux(int argc, char *argv);
+
+
+#ifdef USE_VDPAU
+extern bool initVDPAUDecoder(void);
+#endif
+#ifdef USE_LIBVA
+extern bool initLIBVADecoder(void);
+#endif
+
+#define PROBE_HW_ACCEL(probe,name,initFunc) {   \
+    printf("Probing for "#name"...\n"); \
+    if(probe()==true)\
+    {\
+        printf(#name" available\n"); \
+        listOfHwInit.push_back(initFunc);\
+    }\
+      else \
+        printf(#name" not available\n");}
+
+#ifdef __APPLE__
+    const char *startDir="../lib";
+#else
+    const char *startDir=ADM_RELATIVE_LIB_DIR;
+#endif
+
+       
+#define loadPlugins(subdir, func)\
+{\
+     std::string folder=ADM_getPluginDir(subdir);\
+     func(folder.c_str());\
+}            
+
+#define loadPluginsEx(subdir, func)\
+{\
+     std::string folder=ADM_getPluginDir(subdir);\
+     func(folder.c_str(),getUISpecifSubfolder());\
+}            
+
+#define loadPluginsMyEx(subdir, func)\
+{\
+     char *p = ADM_getHomeRelativePath("plugins6",subdir); \
+     func(p,getUISpecifSubfolder());\
+     delete  p;p=NULL;\
+}

avidemux_2.6.12.tar.gz/avidemux/common/gui_action.names -> avidemux_2.6.13.tar.gz/avidemux/common/gui_action.names Changed

avidemux_2.6.12.tar.gz/avidemux/common/gui_autodrive.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/gui_autodrive.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/common/gui_main.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/gui_main.cpp Changed

@@ -83,7 +83,7 @@
 static void ReSync (void);
 static void A_RunScript(const char *a);
 void cleanUp (void);
-void        updateLoaded (void);
+void        updateLoaded (bool resetMarker=true);
 
 extern void GUI_OpenApplicationLog();
 extern void GUI_OpenApplicationDataFolder();
@@ -148,12 +148,16 @@
   // handle out of band actions
   // independant load not loaded
 //------------------------------------------------
-        if(action==ACT_RUN_SCRIPT)
-        {
-            GUI_FileSelRead("Select script/project to run", A_RunScript);
-            
-            return;
-        }
+    if(action==ACT_RUN_SCRIPT)
+    {
+        GUI_FileSelRead(QT_TRANSLATE_NOOP("adm","Select script/project to run"), A_RunScript);            
+        return;
+    }
+    if(action==ACT_SaveAsDefault)
+    {
+        A_saveDefaultSettings();
+        return;
+    }
 	if (action >= ACT_SCRIPT_ENGINE_FIRST && action < ACT_SCRIPT_ENGINE_LAST)
 	{
 		int engineIndex = (action - ACT_SCRIPT_ENGINE_FIRST) / 3;
@@ -164,11 +168,11 @@
 		switch (actionId)
 		{
 			case 0:
-				GUI_FileSelRead("Select script to run", RunScript);
+				GUI_FileSelRead(QT_TRANSLATE_NOOP("adm","Select script to run"), RunScript);
 				break;
 
 			case 1:
-				GUI_FileSelRead("Select script to debug", DebugScript);
+				GUI_FileSelRead(QT_TRANSLATE_NOOP("adm","Select script to debug"), DebugScript);
 				break;
 
 			case 2:
@@ -358,7 +362,7 @@
            IScriptEngine *engine=getPythonScriptEngine();
                 if(!engine)
                 {
-                    GUI_Error_HIG("No engine","tinyPy script is not enabled in this build");
+                    GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","No engine"),QT_TRANSLATE_NOOP("adm","tinyPy script is not enabled in this build"));
                     break;
                 }
                 char fileName1024;
@@ -523,7 +527,7 @@
             uint64_t b=video_body->getMarkerBPts();
             if(false==video_body->remove(a,b))
             {
-                GUI_Error_HIG("Cutting","Error while cutting out.");
+                GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Cutting"),QT_TRANSLATE_NOOP("adm","Error while cutting out."));
             }
             else
             {
@@ -712,40 +716,35 @@
     \brief update the UI after loading a file
 
 */
-void  updateLoaded ()
+void  updateLoaded (bool resetMarker)
 {
-  avifileinfo = new aviInfo;
-  if (!video_body->getVideoInfo (avifileinfo))
+    avifileinfo = new aviInfo;
+    if (!video_body->getVideoInfo (avifileinfo))
     {
-//      err1:
-      printf ("\n get info failed...cancelling load...\n");
-      delete avifileinfo;
-      avifileinfo = NULL;
-
-      return;
+        ADM_warning ("\n get info failed...cancelling load...\n");
+        delete avifileinfo;
+        avifileinfo = NULL;
+        return;
     }
-
-
-//  getFirstVideoFilter(); // reinit first filter
-
-  // now get audio information if exists
-  WAVHeader *wavinfo=NULL;
-  ADM_audioStream *stream=NULL;
-  video_body->getDefaultAudioTrack(&stream);
-  if(stream)
-        wavinfo=stream->getInfo();
-
-  if (!wavinfo)
+    // now get audio information if exists
+    WAVHeader *wavinfo=NULL;
+    ADM_audioStream *stream=NULL;
+    video_body->getDefaultAudioTrack(&stream);
+    if(stream)
+          wavinfo=stream->getInfo();
+
+    if (!wavinfo)
     {
-      printf ("\n *** NO AUDIO ***\n");
-      wavinfo = (WAVHeader *) NULL;
+        ADM_info ("\n *** NO AUDIO ***\n");
+        wavinfo = (WAVHeader *) NULL;
     }
 
   // Init renderer
     admPreview::setMainDimension(avifileinfo->width, avifileinfo->height,ZOOM_AUTO);
   // Draw first frame
     GUI_setAllFrameAndTime();
-    A_ResetMarkers();
+    if(resetMarker)
+        A_ResetMarkers();
     A_Rewind();
     UI_setAudioTrackCount( video_body->getNumberOfActiveAudioTracks() );
     ADM_info(" conf updated \n");
@@ -851,8 +850,7 @@
 		return false;
 	}
 
-	ret = engine->runScriptFile(std::string(longname), IScriptEngine::Normal);
-	A_Resync(); // total duration & stuff
+	ret = engine->runScriptFile(std::string(longname), IScriptEngine::Normal);    	
 
 	if (ret)
 	{
@@ -860,19 +858,30 @@
 	}
 
 	prefs->set_lastprojectfile(longname);
+    delete  longname;
+    longname=NULL;
+    
+    
 	UI_updateRecentProjectMenu();
-        // update main menu shift
-        EditableAudioTrack *ed=video_body->getDefaultEditableAudioTrack();
-        if(ed)
-        {
-            UI_setAudioCodec(ed->encoderIndex);
-            UI_setTimeShift(ed->audioEncodingConfig.shiftEnabled,ed->audioEncodingConfig.shiftInMs);
-        }
-	delete  longname;
+    // update main menu shift
+    EditableAudioTrack *ed=video_body->getDefaultEditableAudioTrack();
+    if(ed)
+    {
+        UI_setAudioCodec(ed->encoderIndex);
+        UI_setTimeShift(ed->audioEncodingConfig.shiftEnabled,ed->audioEncodingConfig.shiftInMs);
+    }	
 
 	return ret;
 }
-
+/**
+ * 
+ * @param name
+ * @return 
+ */
+bool A_runPythonScript(const std::string &name)
+{
+  return parseScript(getPythonScriptEngine(),name.c_str(),IScriptEngine::Normal);
+}
 bool A_parseScript(IScriptEngine *engine, const char *name)
 {
 	return parseScript(engine, name, IScriptEngine::Normal);
@@ -899,7 +908,51 @@
     ADM_fwrite(script.c_str(), script.length(), 1, file);
     ADM_fclose(file);
 }
+/**
+ * 
+ * @param engine
+ * @param name
+ */
+#define DEFAULT_SETTINGS_FILE ADM_getBaseDir()+std::string("/defaultSettings.py")
+void A_saveDefaultSettings()
+{
+    IScriptEngine *engine=getPythonScriptEngine();
+    ADM_assert(engine);
+    
+    std::string fileName=DEFAULT_SETTINGS_FILE;
+    
+    IScriptWriter *writer = engine->createScriptWriter();
+    ADM_ScriptGenerator generator(video_body, writer);
+    std::stringstream stream(std::stringstream::in | std::stringstream::out);
+
 
+    generator.generateScript(stream,ADM_ScriptGenerator::GENERATE_SETTINGS);
+    delete writer;
+	
+    std::string script = stream.str();
+    ADM_info("Generated settings=%s\n",script.c_str());
+    
+    FILE *file = ADM_fopen(fileName.c_str(), "wt");
+    ADM_fwrite(script.c_str(), script.length(), 1, file);
+    ADM_fclose(file);
+}
+/**
+ * \fn A_loadDefaultSettings
+ * @return 
+ */
+bool A_loadDefaultSettings(void)
+{
+  
+    std::string defaultSettings=DEFAULT_SETTINGS_FILE;
+    if(ADM_fileExist(defaultSettings.c_str()))
+    {        
+        if(ADM_fileSize(defaultSettings.c_str())>5)
+        {
+                return A_runPythonScript( defaultSettings);
+        }
+    }
+    return false;
+}
 /*
 	Unpack all frames without displaying them to check for error
 
@@ -1110,7 +1163,7 @@
 
 	ADM_edAudioTrackExternal *ext=create_edAudioExternal(filename);
 	if (!ext) {
-		GUI_Error_HIG("Error","Cannot use that file as audio track");
+		GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Error"),QT_TRANSLATE_NOOP("adm","Cannot use that file as audio track"));
 		return;
 	}
 	// add to the list of the known input files
@@ -1137,7 +1190,8 @@
 		}
 		if (assumedIdx == -1) {
 			// This should never happen, but who knows?
-			GUI_Error_HIG("Error","Audio file not found in list, even than it should be there. Create a bug report!");
+			GUI_Error_HIG (QT_TRANSLATE_NOOP("adm","Error"),
+			               QT_TRANSLATE_NOOP("adm","Audio file not found in list, even though it should be there. Create a bug report!"));
 			return;
 		}
 		printf("assumed Idx = %d\n", assumedIdx);
@@ -1160,17 +1214,20 @@
 void    A_setAudioLang(const char *trackIdxTxt, const char *langueName)
 {
 	if (!video_body->isFileOpen()) {
-		GUI_Error_HIG("Error","Unable to set the audio language: No video loaded yet!");
+		GUI_Error_HIG (QT_TRANSLATE_NOOP("adm","Error"),
+		               QT_TRANSLATE_NOOP("adm","Unable to set the audio language: No video loaded yet!"));
 		return;
 	}
 	int trackIdx = extractTrackIndex(trackIdxTxt);
 	if(trackIdx == -1) return;
 	ActiveAudioTracks* tracks = video_body->getPoolOfActiveAudioTrack();
 	if (tracks->size() == 0 ) {
-		GUI_Error_HIG("Error","Setting the language for the given track index is not possible: Video has no audio file!");
+		GUI_Error_HIG (QT_TRANSLATE_NOOP("adm","Error"),
+		               QT_TRANSLATE_NOOP("adm","Setting the language for the given track index is not possible: Video has no audio file!"));
 		return;
 	} else if (tracks->size() <= trackIdx) {
-		GUI_Error_HIG("Error","Setting the language for the given track index is not possible: Invalid track index!");
+		GUI_Error_HIG (QT_TRANSLATE_NOOP("adm","Error"),
+		               QT_TRANSLATE_NOOP("adm","Setting the language for the given track index is not possible: Invalid track index!"));
 		return;
 	}
 	tracks->atEdAudio(trackIdx)->setLanguage(langueName);
@@ -1190,7 +1247,10 @@
 uint8_t  DIA_job_select(char **jobname, char **filename);
 void A_addJob(void)
 {
-        char *name=NULL,*fullname,*base,*final=NULL;
+        char *name=NULL;
+        char *fullname;
+        const char *base;
+        char *final=NULL;
 
         if(!DIA_job_select(&name,&final)) return;
         if(!name || !final) return;
@@ -1442,6 +1502,7 @@
 {
                admPreview::stop();
                video_body->rewind();
+               video_body->rewind(); // do it twice, for interlaced content it may fail the 1st time
                admPreview::start();
                admPreview::samePicture();
                admPreview::samePicture();
@@ -1449,7 +1510,7 @@
 }
 void brokenAct(void)
 {
-    GUI_Error_HIG("Oops","This function is disabled or no longer valid");
+    GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Oops"),QT_TRANSLATE_NOOP("adm","This function is disabled or no longer valid"));
 }
 /**
  * \fn A_TimeShift

avidemux_2.6.12.tar.gz/avidemux/common/gui_navigate.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/gui_navigate.cpp Changed

@@ -51,29 +51,30 @@
 static int ignore_change=0;
     switch (action)
       {
+    
       case ACT_Scale:
         if (!ignore_change)
         {
           uint32_t nf;
           ignore_change++;
           nf = GUI_GetScale ();
-          ADM_info("Scale :%"PRIu32"\n",nf);
+          ADM_info("Scale :%" PRIu32"\n",nf);
           double tme=nf;
           tme*=video_body->getVideoDuration();
           tme/=ADM_SCALE_SIZE;
           uint64_t pts=(uint64_t)tme;
-          ADM_info("Scale Time:%"PRIu64" ms (total=%"PRIu64" ms)\n",pts/1000,video_body->getVideoDuration()/1000);
+          ADM_info("Scale Time:%" PRIu64" ms (total=%" PRIu64" ms)\n",pts/1000,video_body->getVideoDuration()/1000);
           ADM_info("Scale Time:%s ms \n",ADM_us2plain(pts));
            if(false==video_body->getPKFramePTS(&pts))
             {
-                ADM_warning("Cannot seek to %"PRIu64" ms\n",pts/1000);
+                ADM_warning("Cannot seek to %" PRIu64" ms\n",pts/1000);
                 ignore_change--;
                 break;
             }
              ADM_info("Seeking to  Time:%s ms \n",ADM_us2plain(pts));
             if(true!=admPreview::seekToIntraPts(pts))
             {
-                ADM_warning("Scale: Seeking to intra at %"PRIu64" ms failed\n",pts/1000);
+                ADM_warning("Scale: Seeking to intra at %" PRIu64" ms failed\n",pts/1000);
             }
             GUI_setCurrentFrameAndTime();
             ignore_change--;
@@ -96,6 +97,12 @@
       case ACT_PreviousFrame:
         GUI_PrevFrame();
         break;
+    case ACT_Forward1Mn:
+          GUI_SeekByTime(60*1000LL*1000LL);
+          break;
+        case ACT_Back1Mn:
+          GUI_SeekByTime(-60*1000LL*1000LL);
+          break;        
       case ACT_Forward4Seconds:
         GUI_SeekByTime(4000000LL);
         break;
@@ -459,7 +466,7 @@
     // We have to call the editor as the frames needed to decode the target frame may be hidden
     if(false==video_body->goToTimeVideo(time))
     {
-        GUI_Error_HIG("Seek", "Error seekting to %"PRIu64" ms",time/1000);
+        GUI_Error_HIG("Seek", "Error seeking to %" PRIu64" ms",time/1000);
     }
     admPreview::samePicture();
     GUI_setCurrentFrameAndTime();

avidemux_2.6.12.tar.gz/avidemux/common/gui_play.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/gui_play.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/common/gui_save.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/gui_save.cpp Changed

@@ -63,15 +63,16 @@
                     GUI_Error_HIG("Job",QT_TR_NOOP("Cannot reach database. Do you have Job control running ?"));
                 }else
                 {
-                    char *oFile=NULL;
+                    std::string oFile;
                     char *oText=NULL;
-                    diaElemFile wFile(1,&oFile,QT_TRANSLATE_NOOP("adm","Output file"),"");
+                    
+                    diaElemFile wFile(1,oFile,QT_TRANSLATE_NOOP("adm","Output file"),"");
                     diaElemText wText(&oText,QT_TRANSLATE_NOOP("adm","Job name"));
                     diaElem *elems2={&wText,&wFile};
 
                     if(  diaFactoryRun(QT_TRANSLATE_NOOP("adm","Queue job to jobList"),2,elems))
                     {
-                        A_queueJob(oText,oFile);
+                        A_queueJob(oText,oFile.c_str());
                     }
                     ADMJob::jobShutDown();
                 }
@@ -163,7 +164,8 @@
   DIA_workingBase *work;
 #define ONE_STRIKE (64*1024)
   uint8_t *buffer=NULL;
-
+  bool buffered=true;
+  
   ADM_audioWrite *saver=admCreateAudioWriter(stream);
   if(!saver)
   {
@@ -187,20 +189,22 @@
    duration/=1000000; // in seconds to have samples
    tgt_sample=(uint64_t)floor(duration);
    printf("saveAudioDuration:%f ms\n",duration/1000);
-   printf("saveAudioSamples:%"PRIu64" ms\n",tgt_sample);
+   printf("saveAudioSamples:%" PRIu64" ms\n",tgt_sample);
 
    cur_sample=0;
    written = 0;
    hold=0;
    buffer=new uint8_tONE_STRIKE*2;
 
+   buffered=saver->canBeBuffered();
+   
    while (1)
     {
     	if(!stream->getPacket(buffer+hold,&len,ONE_STRIKE,&sample,&dts)) break;
         hold+=len;
         written+=len;
         cur_sample+=sample;
-        if(hold>ONE_STRIKE) // flush
+        if(hold>ONE_STRIKE || !buffered) // flush
         {
             saver->write(hold,buffer);
             hold=0;
@@ -220,7 +224,7 @@
   delete saver;
   delete work;
   delete buffer;
-  ADM_info ("\n wanted %"PRIu64" samples, goto %"PRIu64" samples, written %"PRIu32" bytes\n", tgt_sample,cur_sample, written);
+  ADM_info ("\n wanted %" PRIu64" samples, goto %" PRIu64" samples, written %" PRIu32" bytes\n", tgt_sample,cur_sample, written);
   return true;
 }

avidemux_2.6.12.tar.gz/avidemux/common/gui_savenew.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/gui_savenew.cpp Changed

@@ -158,6 +158,7 @@
 #define BUFFER_SIZE 1920*1800*3
 ADM_coreVideoFilter  *last;
 bool skip=false;
+bool abort=false;
     int sze=chain->size();
     ADM_assert(sze);
     last=(*chain)sze-1; // Grab last filter
@@ -198,7 +199,11 @@
                 f/=videoDuration;
                 f*=bitstream.pts;
                 uint32_t percent=(uint32_t)f;
-                encoding->update(percent);
+                if(encoding->update(percent))
+                {
+                    abort=true;
+                    break;
+                }
             }
             nbFrames++;
         }
@@ -213,6 +218,13 @@
         // Destroy filter chain & create the new encoder
         destroyVideoFilterChain(chain);
         chain=NULL;
+        
+        if(abort)
+        {
+            ADM_warning("First pass was cancelled\n");
+            return NULL;
+        }
+        
     }
     chain=createVideoFilterChain(markerA,markerB);
 
@@ -295,7 +307,7 @@
         chain=createVideoFilterChain(markerA,markerB);
         if(!chain)
         {
-                GUI_Error_HIG("Video","Cannot instantiante video Chain");
+                GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Video"),QT_TRANSLATE_NOOP("adm","Cannot instantiate video chain"));
                 return NULL;
         }
         // 2- Create Encoder
@@ -307,7 +319,7 @@
         ADM_coreVideoEncoder *encoder=createVideoEncoderFromIndex(last,videoEncoderIndex,muxer->useGlobalHeader()); // FIXME GLOBAL HEADERS
         if(!encoder)
         {
-           GUI_Error_HIG("Video","Cannot create encoder");
+           GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Video"),QT_TRANSLATE_NOOP("adm","Cannot create encoder"));
            return NULL;
         }
         // 3 dual Pass ?
@@ -323,7 +335,7 @@
         }
         if(encoder->setup()==false)
         {
-            GUI_Error_HIG("Video","Cannot setup codec. Bitrate too low ?");
+            GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Video"),QT_TRANSLATE_NOOP("adm","Cannot setup codec. Bitrate too low?"));
             delete encoder;
             encoder=NULL;
             return NULL;
@@ -331,7 +343,7 @@
         video= new ADM_videoStreamProcess(encoder);
         if(!video)
         {
-                GUI_Error_HIG("Video","Cannot create encoder");
+                GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Video"),QT_TRANSLATE_NOOP("adm","Cannot create encoder"));
                 delete encoder;
                 return NULL;
         }
@@ -368,7 +380,7 @@
             }
             if(!access)
             {
-                    GUI_Error_HIG("Audio","Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)");
+                    GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Audio"),QT_TRANSLATE_NOOP("adm","Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)"));
                     return false;
             }
             audioAccessi=access;
@@ -398,9 +410,9 @@
     {
         if(false==video_body-> checkCutsAreOnIntra())
         {
-            if(!GUI_Question("The video is in copy mode but the cut points are not on keyframes.\n"
-                            "The video will be saved but there will corruption at cut point(s).\n"
-                             "Do you want to continue anyway ?"))
+            if(!GUI_Question(QT_TRANSLATE_NOOP("adm","The video is in copy mode but the cut points are not on keyframes.\n"
+                            "The video will be saved but there will be corruption at cut point(s).\n"
+                             "Do you want to continue anyway ?")))
             {
                 return false;
             }
@@ -409,7 +421,7 @@
 
     if(!(muxer=ADM_MuxerSpawnFromIndex(muxerIndex)))
     {
-        GUI_Error_HIG("Muxer","Cannot instantiante muxer");
+        GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Muxer"),QT_TRANSLATE_NOOP("adm","Cannot instantiate muxer"));
         return 0;
     }
      
@@ -435,7 +447,7 @@
    
     if(!muxer->open(fileName.c_str(),video,nbAudioTracks,audioAccess))
     {
-        GUI_Error_HIG("Muxer","Cannot open ");
+        GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Muxer"),QT_TRANSLATE_NOOP("adm","Cannot open "));
     }else
     {
         ret=muxer->save();

avidemux_2.6.12.tar.gz/avidemux/common/main.cpp -> avidemux_2.6.13.tar.gz/avidemux/common/main.cpp Changed

@@ -1,11 +1,7 @@
 /***************************************************************************
-                          main.cpp  -  description
-                             -------------------
-	Initialize the env.
-
-    begin                : Sat Feb 2 2002
-    copyright            : (C) 2002 by mean
-    email                : fixounet@free.fr
+ * \file    main.cpp
+ * \brief   Initialize the env.
+ * \author  mean/fixounet@free.fr (C) 2002/2016 by mean
  ***************************************************************************/
 
 /***************************************************************************
@@ -37,69 +33,8 @@
 #include "prefs.h"
 #include "audio_out.h"
 #include "ADM_assert.h"
+#include "adm_main.h"
 
-#ifdef USE_SDL
-extern "C" {
-	#ifdef __HAIKU__
-	#include "SDL2/SDL.h"
-	#else
-	#include "SDL2/SDL.h"
-	#endif
-}
-
-#include "ADM_render/GUI_sdlRender.h"
-#endif
-extern uint8_t GUI_close(void);
-static bool setPrefsDefault(void);
-extern bool  vdpauProbe(void);
-extern bool  libvaProbe(void);
-
-extern void registerVideoFilters( void );
-extern void filterCleanUp( void );
-extern void register_Encoders( void )  ;
-
-extern uint8_t initGUI(const vector<IScriptEngine*>& engines);
-extern void destroyGUI(void);
-extern void initFileSelector(void);
-extern void getUIDescription(char*);
-extern uint8_t ADM_ad_loadPlugins(const char *path);
-extern uint8_t ADM_vf_loadPlugins(const char *path,const char *subFolder);
-extern uint8_t ADM_vd6_loadPlugins(const char *path);
-extern uint8_t ADM_av_loadPlugins(const char *path);
-extern uint8_t ADM_ae_loadPlugins(const char *path);
-extern uint8_t ADM_ve6_loadPlugins(const char *path,const char *subFolder);
-
-extern bool ADM_ad_cleanup(void);
-extern bool ADM_ae_cleanup(void);
-extern bool ADM_vf_cleanup(void);
-extern void ADM_ve6_cleanup(void);
-
-extern bool vdpauProbe(void);
-extern bool vdpauCleanup(void);
-
-extern bool xvbaProbe(void);
-extern bool xvbaCleanup(void);
-
-extern void loadPlugins(void);
-extern void InitFactory(void);
-extern void InitCoreToolkit(void);
-extern uint8_t  quotaInit(void);
-
-extern int UI_Init(int nargc,char **nargv);
-extern int UI_RunApp(void);
-extern bool UI_End(void);
-extern void cleanUp (void);
-
-extern ADM_UI_TYPE UI_GetCurrentUI(void);
-static bool performOnExit=true;
-
-#if !defined(NDEBUG) && defined(FIND_LEAKS)
-extern const char* new_progname;
-#endif
-
-void onexit(void);
-int startAvidemux(int argc, char *argv);
-bool isPortableMode(int argc, char *argv);
 #ifdef main
 extern "C"
 {
@@ -109,7 +44,7 @@
 
 int main(int _argc, char *_argv)
 {
-	ADM_initBaseDir(isPortableMode(_argc, _argv));
+	ADM_initBaseDir(_argc, _argv);
 
 #if defined(_WIN32) && (ADM_UI_TYPE_BUILD == ADM_UI_GTK || ADM_UI_TYPE_BUILD == ADM_UI_QT4)
 	// redirect output before registering exception handler so error dumps are captured
@@ -169,8 +104,66 @@
     }
     return "unknown";
 }
+
+#ifdef USE_SDL
+static bool sdlProbe(void)
+{
+    char *drv=NULL;
+    printf("Probing for SDL...\n");
+    std::string sdlDriver=std::string("dummy");
+    if(prefs->get(FEATURES_SDLDRIVER,&drv))
+    {
+        if(drv)
+        {
+            if(strlen(drv))
+            {
+                sdlDriver=std::string(drv);
+            }
+            ADM_dezalloc(drv);
+        }
+    }
+    printf("Calling initSDL with driver=%s\n",sdlDriver.c_str());
+    initSdl(sdlDriver);
+    return true;
+}
+/**
+ * 
+ * @param argc
+ * @param argv
+ * @return 
+ */
+static bool fakeInitSdl()
+{
+    return true;
+}
+#endif        
+#if 0
+void run(const char *foo)
+{
+  std::string r,ext;
+  ADM_PathSplit(std::string(foo),r,ext);
+  printf("%s => %s  + <%s>\n",foo,r.c_str(),ext.c_str());
+}
+void testCase(void)
+{
+  run("/");
+  run("/foobar");
+  run("/foobar/meuh");
+  run("/foobar/meuh.ext");
+  run("/foobar/meuh.");
+  run("/foobar/meuh.ext.bar");
+  
+}
+#endif
+/**
+ * 
+ * @param argc
+ * @param argv
+ * @return 
+ */
 int startAvidemux(int argc, char *argv)
 {
+  
     printf("*************************\n");
     printf("  Avidemux v%s", ADM_VERSION);
 
@@ -226,22 +219,29 @@
 
     printf("Time: %s\n", ADM_epochToString(ADM_getSecondsSinceEpoch()));
 
-	for(int i = 0; i < argc; i++)
-	{
-		printf("%d: %s\n", i, argvi);
-	}
+    for(int i = 0; i < argc; i++)
+    {
+            printf("%d: %s\n", i, argvi);
+    }
 
 #ifndef __APPLE__
     ADM_InitMemcpy();
 #endif
-	printf("\nInitialising prefs\n");
-	initPrefs();
-	if(false==prefs->load()) // no prefs, set some sane default
+    printf("\nInitialising prefs\n");
+    initPrefs();
+    if(false==prefs->load()) // no prefs, set some sane default
     {
         setPrefsDefault();
     }
+    uint32_t cpuMask;
+     if(!prefs->get(FEATURES_CPU_CAPS,&cpuMask))
+    {
+       cpuMask=0xffffffff;   
+    }
+
     CpuCaps::init();
-    atexit(onexit);
+    CpuCaps::setMask(cpuMask);
+    
 
 #ifdef _WIN32
     win32_netInit();
@@ -257,148 +257,75 @@
     InitCoreToolkit();
     initFileSelector();
 
-	// Load .avidemuxrc
+    // Load .avidemuxrc
     quotaInit();
 
     ADM_lavFormatInit();
-	//***************Plugins *********************
-	// Load system wide audio decoder plugin
-#ifdef __APPLE__
-    const char *startDir="../lib";
-#else
-    const char *startDir=ADM_RELATIVE_LIB_DIR;
-#endif
-    char *adPlugins = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "audioDecoder");
-    char *avPlugins = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "audioDevices");
-    char *aePlugins = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "audioEncoders");
-    char *dmPlugins = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "demuxers");
-    char *mxPlugins = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "muxers");
-    char *vePlugins = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "videoEncoders");
-    char *vdPlugins = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "videoDecoders");
-    char *vfPlugins = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "videoFilters");
-    char *sePlugins = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "scriptEngines");
-
-    //***************Plugins *********************
-
-	if(!initGUI(initialiseScriptEngines(sePlugins, video_body,getUISpecifSubfolder())))
-	{
-		printf("\n Fatal : could not init GUI\n");
-		exit(-1);
-	}
-
-    delete  sePlugins;
+	
 
-#if defined( USE_VDPAU)
-  #if (ADM_UI_TYPE_BUILD!=ADM_UI_CLI)
-    printf("Probing for VDPAU...\n");
-    if(vdpauProbe()==true) printf("VDPAU available\n");
-        else printf("VDPAU not available\n");
-  #else
-    printf("Cannot use VDPAU in cli mode %d,%d\n",ADM_UI_TYPE_BUILD,ADM_UI_CLI);
-  #endif
-#endif
+    {
+        std::string scriptFolder=ADM_getPluginDir("scriptEngines");        
+        if(!initGUI(initialiseScriptEngines(scriptFolder.c_str(), video_body,getUISpecifSubfolder())))
+        {
+                printf("\n Fatal : could not init GUI\n");
+                exit(-1);
+        }
+    }
 
-#if defined( USE_XVBA)
-  #if (ADM_UI_TYPE_BUILD!=ADM_UI_CLI)
-    printf("Probing for XVBA...\n");
-    if(xvbaProbe()==true) printf("XVBA available\n");
-        else printf("XVBA not available\n");
-  #else
-    printf("Cannot use XVBA in cli mode %d,%d\n",ADM_UI_TYPE_BUILD,ADM_UI_CLI);
-  #endif
-#endif
+    
 
+        
+#if (ADM_UI_TYPE_BUILD!=ADM_UI_CLI)               
+#if defined( USE_VDPAU)
+    PROBE_HW_ACCEL(vdpauProbe,VDPAU,initVDPAUDecoder)
+#endif    
+            
 #if defined( USE_LIBVA)
-  #if (ADM_UI_TYPE_BUILD!=ADM_UI_CLI)
-    printf("Probing for LIBVA...\n");
-    if(libvaProbe()==true) printf("LIBVA available\n");
-        else printf("LIBVA not available\n");
-  #else
-    printf("Cannot use LIBVA in cli mode %d,%d\n",ADM_UI_TYPE_BUILD,ADM_UI_CLI);
-  #endif
+    PROBE_HW_ACCEL(libvaProbe,LIBVA,initLIBVADecoder)
 #endif    
-
+    
+#endif // !CLI
+    
 #ifdef USE_SDL
-    char *drv=NULL;
-    printf("Probing for SDL...\n");
-    std::string sdlDriver=std::string("dummy");
-    if(prefs->get(FEATURES_SDLDRIVER,&drv))
-    {
-        if(drv)
-        {
-            if(strlen(drv))
-            {
-                sdlDriver=std::string(drv);
-            }
-            ADM_dezalloc(drv);
-        }
-    }
-    printf("Calling initSDL with driver=%s\n",sdlDriver.c_str());
-    initSdl(sdlDriver);
+    PROBE_HW_ACCEL(sdlProbe,SDL,fakeInitSdl)               
 #endif        
     //
+           
+            
+   ADM_lavInit();         
+            
+    loadPlugins( "audioDecoder",   ADM_ad_loadPlugins);
+    loadPlugins( "audioDevices",   ADM_av_loadPlugins);
+    loadPlugins( "audioEncoders",  ADM_ae_loadPlugins);
+    loadPlugins( "demuxers",       ADM_dm_loadPlugins);
+    loadPlugins( "muxers",         ADM_mx_loadPlugins);
+    loadPlugins( "videoDecoders",  ADM_vd6_loadPlugins);
+     
+    loadPluginsEx( "videoEncoders",  ADM_ve6_loadPlugins);
+    loadPluginsEx( "videoFilters",   ADM_vf_loadPlugins);
+           
     
-    ADM_mx_loadPlugins(mxPlugins);
-    delete  mxPlugins;
-
-    ADM_ad_loadPlugins(adPlugins);
-    delete  adPlugins;
-
-    ADM_av_loadPlugins(avPlugins);
-    delete  avPlugins;
-
-    ADM_ae_loadPlugins(aePlugins);
-    delete  aePlugins;
-
-    ADM_dm_loadPlugins(dmPlugins);
-    delete  dmPlugins;
-
-    ADM_ve6_loadPlugins(vePlugins,getUISpecifSubfolder());
-    delete  vePlugins;
-
-    ADM_vf_loadPlugins(vfPlugins,getUISpecifSubfolder());
-    delete  vfPlugins;
-
-    ADM_vd6_loadPlugins(vdPlugins);
-    delete  vdPlugins;
-
-
-    // load local audio decoder plugins
-    adPlugins=ADM_getHomeRelativePath("plugins6","audioDecoder");
-    ADM_ad_loadPlugins(adPlugins);
-    delete  adPlugins;
-
-    // load local video filter plugins
-    vfPlugins=ADM_getHomeRelativePath("plugins6","videoFilter");
-    ADM_vf_loadPlugins(vfPlugins,getUISpecifSubfolder());
-    delete  vfPlugins;
-
-
-	
-
-    ADM_lavInit();
     AVDM_audioInit();
 
+    int n=listOfHwInit.size();
+    for(int i=0;i<n;i++)
+    {
+        listOfHwIniti();
+    }
     
-
     UI_RunApp();
     cleanUp();
 
     printf("Normal exit\n");
     return 0;
 }
-void disableExitHandler()
-{
-    performOnExit=false;
-}
 /**
  * 
  */
-void onexit( void )
+void ADM_ExitCleanup( void )
 {
     printf("Cleaning up\n");
-    if(!performOnExit)
-        return;
+    admPreview::destroy();
     if(video_body) 
         video_body->cleanup ();
     delete video_body;
@@ -420,15 +347,15 @@
     destroyGUI();
     destroyPrefs();
 
-    admPreview::destroy();
     UI_End();
+    ADM_vf_clearFilters();
 
     ADM_ad_cleanup();
     ADM_ae_cleanup();
-    ADM_mx_cleanup();
-    ADM_vf_clearFilters();
+    ADM_mx_cleanup();    
     ADM_vf_cleanup();
     ADM_dm_cleanup();
+    ADM_vd6_cleanup();
     ADM_ve6_cleanup();
 
     printf("--End of cleanup--\n");
@@ -457,31 +384,4 @@
 #endif
     return true;
 }
-/**
-    \fn isPortableMode
-    \brief returns true if we are in portable mode
-*/
-bool isPortableMode(int argc, char *argv)
-{
-	bool portableMode = false;
-    std::string mySelf=argv0;
-    // if the name ends by "_portable.exe" => portable
-    int match=mySelf.find("portable");
-    if(match!=-1)
-    {
-        ADM_info("Portable mode\n");
-        return true;
-    }
-
-	for (int i = 0; i < argc; i++)
-	{
-		if (strcmp(argvi, "--portable") == 0)
-		{
-			portableMode = true;
-			break;
-		}
-	}
-
-	return portableMode;
-}
 //EOF

avidemux_2.6.12.tar.gz/avidemux/gtk/ADM_userInterfaces/ADM_dialog/DIA_working.cpp -> avidemux_2.6.13.tar.gz/avidemux/gtk/ADM_userInterfaces/ADM_dialog/DIA_working.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/gtk/ADM_userInterfaces/ADM_gui2/GUI_bindings.cpp -> avidemux_2.6.13.tar.gz/avidemux/gtk/ADM_userInterfaces/ADM_gui2/GUI_bindings.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_UIs/src/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_UIs/src/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_UIs/src/FAC_readOnlyText.cpp -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_UIs/src/FAC_readOnlyText.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_UIs/src/T_filesel.cpp -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_UIs/src/T_filesel.cpp Changed

@@ -32,7 +32,7 @@
     
 public:
   
-  diaElemFile(uint32_t writeMode,char **filename,const char *toggleTitle,
+  diaElemFile(uint32_t writeMode,std::string &filename,const char *toggleTitle,
               const char *defaultSuffix = 0,const char *tip=NULL);
   virtual ~diaElemFile() ;
   void setMe(void *dialog, void *opaque,uint32_t line);
@@ -40,14 +40,14 @@
   
   void   changeFile(void);
   void   enable(uint32_t onoff);
-  int getRequiredLayout(void);
+  int    getRequiredLayout(void);
 };
 class diaElemDirSelect : public diaElemDirSelectBase
 {
 
 public:
   
-  diaElemDirSelect(char **filename,const char *toggleTitle,const char *tip=NULL);
+  diaElemDirSelect(std::string &filename,const char *toggleTitle,const char *tip=NULL);
   virtual ~diaElemDirSelect() ;
   void setMe(void *dialog, void *opaque,uint32_t line);
   void getMe(void);
@@ -60,7 +60,8 @@
 void ADM_Qfilesel::buttonPressed(QAbstractButton *s)
 { 
 	uint8_t r=0;
-	char bufferMAX_SEL+1,*txt;
+	char bufferMAX_SEL+1;
+        const char *txt="";
 	txt="";
 	switch(fileMode)
 	{
@@ -104,15 +105,15 @@
 	}
 	if(r)
 	{
-		edit->setText(QString::fromUtf8(buffer));
+            edit->setText(QString::fromUtf8(buffer));
 	}
 }
 
-ADM_Qfilesel::ADM_Qfilesel(const char *title,const char *entry,QGridLayout *layout,int line, ADM_fileMode mode, const char * defaultSuffix, const char* selectDesc) : 
+ADM_Qfilesel::ADM_Qfilesel(const char *title,std::string &init,QGridLayout *layout,int line, ADM_fileMode mode, const char * defaultSuffix, const char* selectDesc) : 
 	defaultSuffix (defaultSuffix), selectDesc (selectDesc)
 {          
 	fileMode=mode;
-	edit=new QLineEdit(QString::fromUtf8(entry));
+	edit=new QLineEdit(QString::fromUtf8(init.c_str()));
 	button=new QDialogButtonBox(QDialogButtonBox::Open,Qt::Horizontal);
 	text=new QLabel(QString::fromUtf8(title));
 
@@ -133,13 +134,13 @@
 #endif
 };
 
-diaElemFile::diaElemFile(uint32_t writemode,char **filename,const char *toggleTitle,
+diaElemFile::diaElemFile(uint32_t writemode, std::string &filename,const char *toggleTitle,
                          const char *defaultSuffix,const char *selectFileDesc)
   : diaElemFileBase()
     
 {
   this->defaultSuffix=defaultSuffix;
-  param=(void *)filename;
+  param=(void *)&filename;
   paramTitle=shortkey(toggleTitle);
 
   if (!selectFileDesc || *(selectFileDesc) == 0)
@@ -161,26 +162,23 @@
  QGridLayout *layout=(QGridLayout*) opaque;
  ADM_Qfilesel *fs;
   if(_write)
-      fs=new ADM_Qfilesel(paramTitle, *(const char**)param, layout, line,ADM_FILEMODE_WRITE, defaultSuffix, tip);
+      fs=new ADM_Qfilesel(paramTitle, *((std::string *)param), layout, line,ADM_FILEMODE_WRITE, defaultSuffix, tip);
   else
-      fs=new ADM_Qfilesel(paramTitle, *(const char**)param, layout, line,ADM_FILEMODE_READ, 0, tip);
+      fs=new ADM_Qfilesel(paramTitle, *((std::string *)param), layout, line,ADM_FILEMODE_READ, 0, tip);
   myWidget=(void *)fs; 
 }
 
 void diaElemFile::getMe(void)
 {
-  char **n=(char **)param;
-  if(*n) ADM_dealloc(*n);
-  
-  ADM_Qfilesel *fs=(ADM_Qfilesel *)myWidget;
-  QString s=(fs->edit)->text();
-  *n=ADM_strdup(s.toUtf8().constData());
+   std::string *n=( std::string *)param;
+   ADM_Qfilesel *fs=(ADM_Qfilesel *)myWidget;
+   QString s=(fs->edit)->text();
+   *n=std::string(s.toUtf8().constData());
 }
 
 void diaElemFile::enable(uint32_t onoff)
 {
 	ADM_Qfilesel *fs = (ADM_Qfilesel*)myWidget;
-
 	ADM_assert(fs);
 
 	fs->text->setEnabled(onoff);
@@ -192,10 +190,10 @@
 int diaElemFile::getRequiredLayout(void) { return FAC_QT_GRIDLAYOUT; }
 
 //****************************
-diaElemDirSelect::diaElemDirSelect(char **filename,const char *toggleTitle,const char *selectDirDesc) :
+diaElemDirSelect::diaElemDirSelect(std::string &filename,const char *toggleTitle,const char *selectDirDesc) :
 	diaElemDirSelectBase()
 {
-  param=(void *)filename;
+  param=(void *)&filename;
   paramTitle=shortkey(toggleTitle);
 
   if (!selectDirDesc || *(selectDirDesc) == 0)
@@ -214,18 +212,16 @@
 {
  QGridLayout *layout=(QGridLayout*) opaque;
   
-  ADM_Qfilesel *fs=new ADM_Qfilesel(paramTitle, *(char **)param, layout, line, ADM_FILEMODE_DIR, 0, tip);
+  ADM_Qfilesel *fs=new ADM_Qfilesel(paramTitle, *(std::string *)param, layout, line, ADM_FILEMODE_DIR, 0, tip);
   myWidget=(void *)fs; 
 }
 
 void diaElemDirSelect::getMe(void) 
 {
- char **n=(char **)param;
-  if(*n) ADM_dealloc(*n);
-  *n=NULL;
   ADM_Qfilesel *fs=(ADM_Qfilesel *)myWidget;
   QString s=(fs->edit)->text();
-  *n=ADM_strdup(s.toUtf8().constData());
+  std::string *n=( std::string *)param;
+  *n=std::string(s.toUtf8().constData());
 }
 
 void diaElemDirSelect::enable(uint32_t onoff)
@@ -245,7 +241,7 @@
 } // End of namespace
 //****************************Hoook*****************
 
-diaElem  *qt4CreateFile(uint32_t writeMode,char **filename,const char *toggleTitle,
+diaElem  *qt4CreateFile(uint32_t writeMode,std::string &filename,const char *toggleTitle,
         const char *defaultSuffix ,const char *tip)
 {
 	return new  ADM_Qt4Factory::diaElemFile(writeMode,filename,toggleTitle,defaultSuffix ,tip);
@@ -256,7 +252,7 @@
 	delete a;
 }
 
-diaElem  *qt4CreateDir(char **filename,const char *toggleTitle,const char *tip)
+diaElem  *qt4CreateDir(std::string &filename,const char *toggleTitle,const char *tip)
 {
 	return new  ADM_Qt4Factory::diaElemDirSelect(filename,toggleTitle,tip);
 }

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_UIs/src/T_filesel.h -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_UIs/src/T_filesel.h Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_jobs/include/T_jobs.h -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_jobs/include/T_jobs.h Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp Changed

@@ -30,7 +30,7 @@
 #if !defined(NDEBUG) && defined(FIND_LEAKS)
 extern const char* new_progname;
 #endif
-static bool isPortableMode(int argc, char *argv);
+
 /**
     \fn main
 */
@@ -46,7 +46,7 @@
 
     installSigHandler();
 
-    bool portableMode=isPortableMode(argc,argv);
+    
     printf("*************************\n");
     printf("  Avidemux v" VERSION);
 #if defined(ADM_SUBVERSION)
@@ -118,7 +118,7 @@
     quotaInit();
 
 
-    ADM_initBaseDir(portableMode);
+    ADM_initBaseDir(argc,argv);
     // Init jobs
     ADMJob::jobInit();
     jobRun(argc,argv);
@@ -136,31 +136,4 @@
     ADM_info("\nGoodbye...\n\n");
 }
 
-/**
-    \fn isPortableMode
-    \brief returns true if we are in portable mode
-*/
-bool isPortableMode(int argc, char *argv)
-{
-	bool portableMode = false;
-    std::string mySelf=argv0;
-    // if the name ends by "_portable.exe" => portable
-    int match=mySelf.find("portable");
-    if(match!=-1)
-    {
-        ADM_info("Portable mode\n");
-        return true;
-    }
-
-	for (int i = 0; i < argc; i++)
-	{
-		if (strcmp(argvi, "--portable") == 0)
-		{
-			portableMode = true;
-			break;
-		}
-	}
-
-	return portableMode;
-}
 //EOF

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_openGL/include/ADM_openGl.h -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_openGL/include/ADM_openGl.h Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_openGL/src/ADM_openGlDownloadTexture.cpp -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_openGL/src/ADM_openGlDownloadTexture.cpp Changed

@@ -54,11 +54,13 @@
 {
    static uint64_t __attribute__((used)) FUNNY_MANGLE(mask) = 0x00ff000000ff0000LL;
 
-    __asm__(" movq "Mangle(mask)", %%mm7\n" ::);
+    __asm__(" movq " Mangle(mask)", %%mm7\n" ::);
 }
-static inline void glYUV444_MMX(const uint8_t *src, uint8_t *dst, const int width)
+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"
@@ -84,12 +86,14 @@
                         "sub            $1,%2        \n"
                         "jnz             1b         \n"
                         
-                        :: "r"(src),"r"(dst),"r"(count)
+                        : "=r"(src),"=r"(dst),"=r"(count)
+                        : "0"(src),"1"(dst),"2"(count)
                         );
     if(width&7)
     {
-        for(int i=count*8;i<width;i++)
-            dsti  = srci*4+TEX_Y_OFFSET;
+        count=width/8;
+        for(int i=count*8;i<width2;i++)
+            dst2i  = src2i*4+TEX_Y_OFFSET;
     }
 }
 /**
@@ -100,9 +104,10 @@
  * @param dstV
  * @param width
  */
-static inline void glYUV444_MMX_Chroma(const uint8_t *src, uint8_t *dstY, uint8_t *dstU, uint8_t *dstV,const int width)
+ADM_NO_OPTIMIZE static inline void glYUV444_MMX_Chroma(const uint8_t *src2, uint8_t *dstY2, uint8_t *dstU2, uint8_t *dstV2,const int width)
 {
- 
+    const uint8_t *src=src2;
+    uint8_t *dstY=dstY2, *dstU=dstU2, *dstV=dstV2;
     int count=width/8;
                     __asm__(
                         "1:\n"
@@ -136,12 +141,14 @@
                         "sub            $1,%2        \n"
                         "jnz             1b         \n"
                         
-                        :: "r"(src),"r"(dstY),"r"(dstU),"r"(dstV),"r"(count)
+                        :  "=r"(src),"=r"(dstY),"=r"(dstU),"=r"(dstV),"=r"(count)
+                        :  "0"(src),"1"(dstY),"2"(dstU),"3"(dstV),"4"(count)
                         );
     if(width&7)
     {
+        count=width/8;
         for(int i=count*8;i<width;i++)
-            dstYi  = srci*4+TEX_Y_OFFSET;
+            dstY2i  = src2i*4+TEX_Y_OFFSET;
     }
 }
 /**

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_openGL/src/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_openGL/src/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.cpp -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.cpp Changed

@@ -140,7 +140,7 @@
 
 void DIA_encodingQt4::setFps(uint32_t fps)
 {
-      snprintf(stringMe,79,"%"PRIu32" fps",fps);
+      snprintf(stringMe,79,"%" PRIu32" fps",fps);
       WRITE(labelFps);
 }
 
@@ -186,7 +186,7 @@
 void DIA_encodingQt4::setFrameCount(uint32_t nb)
 {
           ADM_assert(ui);
-          snprintf(stringMe,79,"%"PRIu32,nb);
+          snprintf(stringMe,79,"%" PRIu32,nb);
           WRITE(labelFrame);
 
 }
@@ -234,7 +234,7 @@
 void DIA_encodingQt4::setBitrate(uint32_t br,uint32_t globalbr)
 {
           ADM_assert(ui);
-          snprintf(stringMe,79,"%"PRIu32" kB/s",br);
+          snprintf(stringMe,79,"%" PRIu32" kB/s",br);
           WRITE(labelVidBitrate);
 
 }
@@ -257,7 +257,7 @@
 void DIA_encodingQt4::setQuantIn(int size)
 {
           ADM_assert(ui);
-          sprintf(stringMe,"%"PRIu32,size);
+          sprintf(stringMe,"%" PRIu32,size);
           WRITE(labelQz);
 
 }
@@ -270,7 +270,7 @@
 {
           ADM_assert(ui);
           uint64_t mb=size>>20;
-          sprintf(stringMe,"%"PRIu32" MB",(int)mb);
+          sprintf(stringMe,"%" PRIu32" MB",(int)mb);
           WRITE(labelTotalSize);
 
 }
@@ -284,7 +284,7 @@
 {
           ADM_assert(ui);
           uint64_t mb=size>>20;
-          sprintf(stringMe,"%"PRIu32" MB",(int)mb);
+          sprintf(stringMe,"%" PRIu32" MB",(int)mb);
           WRITE(labelVideoSize);
 
 }
@@ -297,7 +297,7 @@
 {
           ADM_assert(ui);
           uint64_t mb=size>>20;
-          sprintf(stringMe,"%"PRIu32" MB",(int)mb);
+          sprintf(stringMe,"%" PRIu32" MB",(int)mb);
           WRITE(labelAudioSize);
 
 }
@@ -322,7 +322,7 @@
 void DIA_encodingQt4::setAverageQz(uint32_t nb)
 {
           ADM_assert(ui);
-          snprintf(stringMe,79,"%"PRIu32,nb);
+          snprintf(stringMe,79,"%" PRIu32,nb);
           WRITE(labelQz);
 }
 /**
@@ -333,7 +333,7 @@
 void DIA_encodingQt4::setAverageBitrateKbits(uint32_t kb)
 {
           ADM_assert(ui);
-          snprintf(stringMe,79,"%"PRIu32" kbits/s",kb);
+          snprintf(stringMe,79,"%" PRIu32" kbits/s",kb);
           WRITE(labelVidBitrate);
 }

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.cpp -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.cpp Changed

@@ -45,7 +45,7 @@
     
         //------------------------------------
     
-        FILLTEXT4(labeImageSize,QT_TRANSLATE_NOOP("qprops","%"PRIu32" x %"PRIu32), avifileinfo->width,avifileinfo->height);
+        FILLTEXT4(labeImageSize,QT_TRANSLATE_NOOP("qprops","%" PRIu32" x %" PRIu32), avifileinfo->width,avifileinfo->height);
         FILLTEXT(labelFrameRate, QT_TRANSLATE_NOOP("qprops","%2.3f fps"), (float) avifileinfo->fps1000 / 1000.F);
         FILLTEXT(label4CC, "%s",      fourCC::tostring(avifileinfo->fcc));
         uint64_t duration=video_body->getVideoDuration();
@@ -100,8 +100,8 @@
                 }
 
                 FILLQT_TRANSLATE_NOOP("qprops",labelChannels);
-                FILLTEXT(labelFrequency, QT_TRANSLATE_NOOP("qprops","%"PRIu32" Hz"), wavinfo->frequency);
-                FILLTEXT4(labelBitrate, QT_TRANSLATE_NOOP("qprops","%"PRIu32" Bps / %"PRIu32" kbps"), wavinfo->byterate,wavinfo->byterate * 8 / 1000);
+                FILLTEXT(labelFrequency, QT_TRANSLATE_NOOP("qprops","%" PRIu32" Hz"), wavinfo->frequency);
+                FILLTEXT4(labelBitrate, QT_TRANSLATE_NOOP("qprops","%" PRIu32" Bps / %" PRIu32" kbps"), wavinfo->byterate,wavinfo->byterate * 8 / 1000);
                 
                 sprintf(text, "%s", getStrFromAudioCodec(wavinfo->encoding));
                 FILLQT_TRANSLATE_NOOP("qprops",labelACodec);

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.cpp -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.cpp Changed

@@ -32,7 +32,6 @@
 {
     ADM_info("Stop Request\n");
     active=false;
-    delete ui;
 }
 //*******************************************
 
@@ -51,7 +50,7 @@
         virtual uint8_t  	update(uint32_t percent);
         virtual uint8_t 	update(uint32_t current,uint32_t total);
         virtual uint8_t  	isAlive (void );
-                void        closeDialog(void);
+                void            closeDialog(void);
         
 };
 //********************************************************
@@ -72,53 +71,62 @@
       lastper=0;
       _nextUpdate=0;
 }
+/**
+ * 
+ * @param percent
+ * @return 
+ */
 uint8_t DIA_workingQt4::update(uint32_t percent)
 {
-		#define GUI_UPDATE_RATE 1000
+#define GUI_UPDATE_RATE 1000
 
-        UI_purge();
+    UI_purge();
+    if(!_priv) 
+        return 1;
+    workWindow *wind=(workWindow *)_priv; ADM_assert(wind);
+    if(!wind->active)
+    {
+        return true;
+    }
+    if(!percent) 
+        return 0;
+    if(percent==lastper)
+    {
+        return 0;
+    }
 
-        if(!_priv) return 1;
-        if(!percent) return 0;
-        if(percent==lastper)
-        {
+    elapsed=_clock.getElapsedMS();
+    if(elapsed<_nextUpdate) 
+    {
+      return 0;
+    }
 
-            return 0;
-        }
+    _nextUpdate=elapsed+1000;
+    lastper=percent;
 
-        elapsed=_clock.getElapsedMS();
+    uint32_t hh,mm,ss,mms;
+    char string9;
 
-        if(elapsed<_nextUpdate) 
-        {
-          return 0;
-        }
+    ms2time(elapsed,&hh,&mm,&ss,&mms);
+    sprintf(string,"%02d:%02d:%02d",hh,mm,ss);
 
-        _nextUpdate=elapsed+1000;
-        lastper=percent;
 
-		uint32_t hh,mm,ss,mms;
-		char string9;
 
-		ms2time(elapsed,&hh,&mm,&ss,&mms);
-		sprintf(string,"%02d:%02d:%02d",hh,mm,ss);
+    if(percent>=1)
+    {
+        double totalTime=(100*elapsed)/percent;
+        double remaining=totalTime-elapsed;
+        if(remaining<0)
+            remaining=0;
+        uint32_t remainingMs=(uint32_t)remaining;
+        wind->ui->labelTimeLeft->setText(ms2timedisplay(remainingMs));
+    }
 
-        workWindow *wind=(workWindow *)_priv; ADM_assert(wind);
-        
-        if(percent>=1)
-        {
-            double totalTime=(100*elapsed)/percent;
-            double remaining=totalTime-elapsed;
-            if(remaining<0)
-                remaining=0;
-            uint32_t remainingMs=(uint32_t)remaining;
-            wind->ui->labelTimeLeft->setText(ms2timedisplay(remainingMs));
-        }
-        
-        
-        wind->ui->labelElapsed->setText(string);
-        wind->ui->progressBar->setValue(percent);
-       
-        return 0;
+
+    wind->ui->labelElapsed->setText(string);
+    wind->ui->progressBar->setValue(percent);
+
+    return 0;
 }
 
 uint8_t DIA_workingQt4::update(uint32_t cur, uint32_t total)

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.h -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.h Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/T_index_pg.cpp -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/T_index_pg.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp Changed

@@ -302,6 +302,35 @@
     setSelected(itag-1);
 }
 /**
+ * 
+ */
+void filtermainWindow::makePartial()
+{
+    ADM_info("Partial\n");
+    int filterIndex=getTagForActiveSelection();
+    if(-1==filterIndex)
+        return;
+    ADM_info("Partial %d\n",filterIndex);
+    // Check we can partialize it...
+    uint32_t tag=ADM_vf_getTag(filterIndex);
+    if(!ADM_vf_canBePartialized(tag))
+    {
+        GUI_Error_HIG("Partial","This filter cannot be made partial");
+        return;
+    }
+    // Get info about that filter..
+    if(ADM_vf_partialize(filterIndex))
+    {
+        ADM_info("Partializing done, rebuilding \n");
+        buildActiveFilterList ();
+        setSelected(filterIndex);
+    }else
+      {
+        ADM_info("CANCEL \n");
+      }
+}
+
+/**
         \fn     down( bool b)
         \brief  Move selected filter one place down
 */
@@ -466,24 +495,27 @@
     QAction *add = new  QAction(QString("Add"),this);
     availableList->setContextMenuPolicy(Qt::ActionsContextMenu);
     availableList->addAction(add );
-    connect(add,SIGNAL(activated()),this,SLOT(addSlot()));
+    connect(add,SIGNAL(triggered(bool )),this,SLOT(addSlot()));
     
     
     QAction *remove = new  QAction(QString("Remove"),this);
     QAction *configure = new  QAction(QString("Configure"),this);
     QAction *up = new  QAction(QString("Move up"),this);
     QAction *down = new  QAction(QString("Move down"),this);
+    QAction *partial = new  QAction(QString("Make partial"),this);
     
     activeList->setContextMenuPolicy(Qt::ActionsContextMenu);
     activeList->addAction(up);
     activeList->addAction(down);
     activeList->addAction(configure);
     activeList->addAction(remove);
+    activeList->addAction(partial);
     
     connect(remove,SIGNAL(triggered()),this,SLOT(removeAction()));
     connect(configure,SIGNAL(triggered()),this,SLOT(configureAction()));
     connect(up,SIGNAL(triggered()),this,SLOT(moveUp()));
     connect(down,SIGNAL(triggered()),this,SLOT(moveDown()));
+    connect(partial,SIGNAL(triggered()),this,SLOT(makePartial()));
 
  }
 /**

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.h -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.h Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_qslider.cpp -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_qslider.cpp Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_qslider.h -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_qslider.h Changed

@@ -1,12 +1,29 @@
-#ifndef ADM_Q_SLIDER_H
-#define ADM_Q_SLIDER_H
+
+/***************************************************************************
+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);
@@ -18,6 +35,9 @@
 	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);        
 };
 
-#endif
+

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp Changed

@@ -31,6 +31,7 @@
 #include "avi_vars.h"
 
 #include "ADM_render/GUI_renderInternal.h"
+#include "ADM_render/GUI_render.h"
 #include "ADM_coreVideoEncoderInternal.h"
 #include "ADM_muxerProto.h"
 #include "T_vumeter.h"
@@ -43,7 +44,8 @@
 using namespace std;
 
 #define ADM_SLIDER_REFRESH_PERIOD 500
-
+#define ADM_LARGE_SCALE     (10LL*1000LL)
+#define ADM_SCALE_INCREMENT (ADM_LARGE_SCALE/100LL)
 
 #if defined(USE_SDL) && ( !defined(_WIN32) && !defined(__APPLE__))
     #define SDL_ON_LINUX
@@ -95,7 +97,9 @@
 extern uint8_t AVDM_setVolume(int volume);
 extern bool ADM_QPreviewCleanup(void);
 extern void vdpauCleanup();
+extern bool A_loadDefaultSettings(void);;
 
+extern void ADM_ExitCleanup(void);
 
 static bool uiRunning=false;
 
@@ -111,14 +115,14 @@
 */
 typedef struct
 {
-	const char *name;
-	Action     action;
+    const char *name;
+    Action     action;
 }adm_qt4_translation;
 
 const adm_qt4_translation myTranslationTable=
 {
 #define PROCESS DECLARE_VAR
-	LIST_OF_BUTTONS
+    LIST_OF_BUTTONS
 #undef PROCESS
 };
 static Action searchTranslationTable(const char *name);
@@ -131,40 +135,40 @@
 class FileDropEvent : public QEvent
 {
 public:
-	QList<QUrl> files;
+    QList<QUrl> files;
 
-	FileDropEvent(QList<QUrl> files) : QEvent(QEvent::User)
-	{
-		this->files = files;
-	}
+    FileDropEvent(QList<QUrl> files) : QEvent(QEvent::User)
+    {
+        this->files = files;
+    }
 };
 
 void MainWindow::comboChanged(int z)
 {
-	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) ;
-	}
+    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) ;
+    }
 }
 /**
  * \fn sliderValueChanged
@@ -217,7 +221,7 @@
 void MainWindow::sliderMoved(int value)
 {
     //ADM_info("Moved\n");
-	SliderIsShifted = shiftKeyHeld;
+    SliderIsShifted = shiftKeyHeld;
 }
 /**
  * \fn sliderReleased
@@ -225,7 +229,7 @@
 void MainWindow::sliderReleased(void)
 {
   //ADM_info("Released\n");
-	SliderIsShifted = 0;
+    SliderIsShifted = 0;
     dragTimer.stop();
     dragState=dragState_Normal;
     sendAction(ACT_Scale);
@@ -239,6 +243,21 @@
   dragState=dragState_Active;
 //  ADM_info("Pressed\n");
 }
+/**
+ * \fn sliderWheel
+ */
+void MainWindow::sliderWheel(int way)
+{ 
+    if(way>0)
+    {
+        sendAction(ACT_NextKFrame);
+        return;
+    }
+    if(way<0)
+        sendAction(ACT_PreviousKFrame);
+    
+}
+
 void MainWindow::thumbSlider_valueEmitted(int value)
 {
         if (value > 0)
@@ -249,47 +268,47 @@
 
 void MainWindow::volumeChange( int u )
 {
-	if (_upd_in_progres || !ui.toolButtonAudioToggle->isChecked())
-		return;
+    if (_upd_in_progres || !ui.toolButtonAudioToggle->isChecked())
+        return;
 
-	_upd_in_progres++;
+    _upd_in_progres++;
 
-	int vol = ui.horizontalSlider_2->value();
+    int vol = ui.horizontalSlider_2->value();
 
-	AVDM_setVolume(vol);
-	_upd_in_progres--;
+    AVDM_setVolume(vol);
+    _upd_in_progres--;
 }
 
 void MainWindow::audioToggled(bool checked)
 {
-	if (checked)
-		AVDM_setVolume(ui.horizontalSlider_2->value());
-	else
-		AVDM_setVolume(0);
+    if (checked)
+        AVDM_setVolume(ui.horizontalSlider_2->value());
+    else
+        AVDM_setVolume(0);
 }
 
 void MainWindow::previewModeChanged(int  flop)
 {
-	sendAction(ACT_PreviewChanged);
+    sendAction(ACT_PreviewChanged);
 }
 
 void MainWindow::timeChangeFinished(void)
 {
-	this->setFocus(Qt::OtherFocusReason);
+    this->setFocus(Qt::OtherFocusReason);
 }
 
 void MainWindow::currentFrameChanged(void)
 {
-//	sendAction(ACT_JumpToFrame);
+//    sendAction(ACT_JumpToFrame);
 
-	this->setFocus(Qt::OtherFocusReason);
+    this->setFocus(Qt::OtherFocusReason);
 }
 
 void MainWindow::currentTimeChanged(void)
 {
-	sendAction(ACT_GotoTime);
+    sendAction(ACT_GotoTime);
 
-	this->setFocus(Qt::OtherFocusReason);
+    this->setFocus(Qt::OtherFocusReason);
 }
 
 /**
@@ -297,86 +316,89 @@
 */
 MainWindow::MainWindow(const vector<IScriptEngine*>& scriptEngines) : _scriptEngines(scriptEngines), QMainWindow()
 {
-	qtRegisterDialog(this);
-	ui.setupUi(this);
+    qtRegisterDialog(this);
+    ui.setupUi(this);
         dragState=dragState_Normal;
         refreshCapEnabled=false;
         prefs->get(FEATURES_CAP_REFRESH_ENABLED,&refreshCapEnabled);
         prefs->get(FEATURES_CAP_REFRESH_VALUE,&refreshCapValue);
 
 #if defined(__APPLE__) && defined(USE_SDL)
-	//ui.actionAbout_avidemux->setMenuRole(QAction::NoRole);
-	//ui.actionPreferences->setMenuRole(QAction::NoRole);
-	//ui.actionQuit->setMenuRole(QAction::NoRole);
+    //ui.actionAbout_avidemux->setMenuRole(QAction::NoRole);
+    //ui.actionPreferences->setMenuRole(QAction::NoRole);
+    //ui.actionQuit->setMenuRole(QAction::NoRole);
 #endif
         //
         connect( this,SIGNAL(actionSignal(Action )),this,SLOT(actionSlot(Action )));
         //
         connect( ui.checkDisplayOut,SIGNAL(stateChanged(int)),this,SLOT(previewModeChanged(int)));
 
-	/*
-	Connect our button to buttonPressed
-	*/
+    /*
+    Connect our button to buttonPressed
+    */
 #define PROCESS CONNECT_TB
-	LIST_OF_BUTTONS
+    LIST_OF_BUTTONS
 #undef PROCESS
 
-	//ACT_VideoCodecChanged
-	connect( ui.comboBoxVideo,SIGNAL(activated(int)),this,SLOT(comboChanged(int)));
-	connect( ui.comboBoxAudio,SIGNAL(activated(int)),this,SLOT(comboChanged(int)));
+    //ACT_VideoCodecChanged
+    connect( ui.comboBoxVideo,SIGNAL(activated(int)),this,SLOT(comboChanged(int)));
+    connect( ui.comboBoxAudio,SIGNAL(activated(int)),this,SLOT(comboChanged(int)));
 
-	// Slider
-	slider=ui.horizontalSlider;
-	slider->setMinimum(0);
-	slider->setMaximum(1000000000);
+    // Slider
+    slider=ui.horizontalSlider;
+        ADM_QSlider *qslider=(ADM_QSlider *)slider;
+    slider->setMinimum(0);
+    slider->setMaximum(ADM_LARGE_SCALE);
 #if 1
-        slider->setTickInterval(10000000);
+        slider->setTickInterval(ADM_SCALE_INCREMENT);
         slider->setTickPosition(QSlider::TicksBothSides);
 #endif
-	connect( slider,SIGNAL(valueChanged(int)),this,SLOT(sliderValueChanged(int)));
-	connect( slider,SIGNAL(sliderMoved(int)),this,SLOT(sliderMoved(int)));
-	connect( slider,SIGNAL(sliderReleased()),this,SLOT(sliderReleased()));
-    connect( slider,SIGNAL(sliderPressed()),this,SLOT(sliderPressed()));
-    connect( &dragTimer, SIGNAL(timeout()), this, SLOT(dragTimerTimeout()));
+    connect( slider,SIGNAL(valueChanged(int)),this,SLOT(sliderValueChanged(int)));
+    connect( slider,SIGNAL(sliderMoved(int)),this,SLOT(sliderMoved(int)));
+    connect( slider,SIGNAL(sliderReleased()),this,SLOT(sliderReleased()));
+        connect( slider,SIGNAL(sliderPressed()),this,SLOT(sliderPressed()));
+        connect( qslider,SIGNAL(sliderAction(int)),this,SLOT(sliderWheel(int)));
+        
+        connect( &dragTimer, SIGNAL(timeout()), this, SLOT(dragTimerTimeout()));
     
 
    // Thumb slider
-    ui.sliderPlaceHolder->installEventFilter(this);
-    thumbSlider = new ThumbSlider(ui.sliderPlaceHolder);
-    connect(thumbSlider, SIGNAL(valueEmitted(int)), this, SLOT(thumbSlider_valueEmitted(int)));
-
-	// Volume slider
-	QSlider *volSlider=ui.horizontalSlider_2;
-	volSlider->setMinimum(0);
-	volSlider->setMaximum(100);
-	connect(volSlider,SIGNAL(valueChanged(int)),this,SLOT(volumeChange(int)));
-	connect(ui.toolButtonAudioToggle,SIGNAL(clicked(bool)),this,SLOT(audioToggled(bool)));
-
-	// default state
-	bool b=0;
-	ui.pushButtonVideoConf->setEnabled(b);
-	ui.pushButtonVideoFilter->setEnabled(b);
-	ui.pushButtonAudioConf->setEnabled(b);
-	ui.pushButtonAudioFilter->setEnabled(b);
-
-	/* Time Shift */
-	connect(ui.checkBox_TimeShift,SIGNAL(stateChanged(int)),this,SLOT(checkChanged(int)));
-	connect(ui.spinBox_TimeValue,SIGNAL(valueChanged(int)),this,SLOT(timeChanged(int)));
-	connect(ui.spinBox_TimeValue, SIGNAL(editingFinished()), this, SLOT(timeChangeFinished()));
-
-	QRegExp timeRegExp("^0-9{2}:0-50-9:0-50-9\\.0-9{3}$");
-	QRegExpValidator *timeValidator = new QRegExpValidator(timeRegExp, this);
-	ui.currentTime->setValidator(timeValidator);
-	ui.currentTime->setInputMask("99:99:99.999");
-
-	//connect(ui.currentTime, SIGNAL(editingFinished()), this, SLOT(currentTimeChanged()));
+        ui.sliderPlaceHolder->installEventFilter(this);
+        thumbSlider = new ThumbSlider(ui.sliderPlaceHolder);
+        connect(thumbSlider, SIGNAL(valueEmitted(int)), this, SLOT(thumbSlider_valueEmitted(int)));
+
+    // Volume slider
+    QSlider *volSlider=ui.horizontalSlider_2;
+    volSlider->setMinimum(0);
+    volSlider->setMaximum(100);
+    connect(volSlider,SIGNAL(valueChanged(int)),this,SLOT(volumeChange(int)));
+    connect(ui.toolButtonAudioToggle,SIGNAL(clicked(bool)),this,SLOT(audioToggled(bool)));
+
+    // default state
+    bool b=0;
+    ui.pushButtonVideoConf->setEnabled(b);
+    ui.pushButtonVideoFilter->setEnabled(b);
+    ui.pushButtonAudioConf->setEnabled(b);
+    ui.pushButtonAudioFilter->setEnabled(b);
+
+    /* Time Shift */
+    connect(ui.checkBox_TimeShift,SIGNAL(stateChanged(int)),this,SLOT(checkChanged(int)));
+    connect(ui.spinBox_TimeValue,SIGNAL(valueChanged(int)),this,SLOT(timeChanged(int)));
+    connect(ui.spinBox_TimeValue, SIGNAL(editingFinished()), this, SLOT(timeChangeFinished()));
+
+    QRegExp timeRegExp("^0-9{2}:0-50-9:0-50-9\\.0-9{3}$");
+    QRegExpValidator *timeValidator = new QRegExpValidator(timeRegExp, this);
+    ui.currentTime->setValidator(timeValidator);
+    ui.currentTime->setInputMask("99:99:99.999");
+
+    //connect(ui.currentTime, SIGNAL(editingFinished()), this, SLOT(currentTimeChanged()));
 
     // Build file,... menu
-        addScriptEnginesToFileMenu(myMenuFile);
-	addScriptShellsToToolsMenu(myMenuTool);
-        buildMyMenu();
-	buildCustomMenu();
-	addScriptReferencesToHelpMenu();
+    addScriptEnginesToFileMenu(myMenuFile);
+    addScriptShellsToToolsMenu(myMenuTool);
+    buildMyMenu();
+    buildCustomMenu();
+    // Crash in some cases addScriptReferencesToHelpMenu();
 
     QString rFiles=QString::fromUtf8(QT_TRANSLATE_NOOP("adm","Recent Files"));
     QString rProjects=QString::fromUtf8(QT_TRANSLATE_NOOP("adm","Recent Projects"));
@@ -386,35 +408,35 @@
     ui.menuRecent->addMenu(recentFiles);
     ui.menuRecent->addMenu(recentProjects);
     connect(this->recentFiles, SIGNAL(triggered(QAction*)), this, SLOT(searchRecentFiles(QAction*)));
-	connect(this->recentProjects, SIGNAL(triggered(QAction*)), this, SLOT(searchRecentProjects(QAction*)));
+    connect(this->recentProjects, SIGNAL(triggered(QAction*)), this, SLOT(searchRecentProjects(QAction*)));
 
-	this->installEventFilter(this);
-	slider->installEventFilter(this);
+    this->installEventFilter(this);
+    slider->installEventFilter(this);
 
-	//ui.currentTime->installEventFilter(this);
+    //ui.currentTime->installEventFilter(this);
 
-	this->setFocus(Qt::OtherFocusReason);
+    this->setFocus(Qt::OtherFocusReason);
 
-	setAcceptDrops(true);
+    setAcceptDrops(true);
         setWindowIcon(QIcon(":/new/prefix1/pics/avidemux_icon_small.png"));
 
     // Hook also the toolbar
     connect(ui.toolBar,  SIGNAL(actionTriggered ( QAction *)),this,SLOT(searchToolBar(QAction *)));
     //connect(ui.toolBar_2,SIGNAL(actionTriggered ( QAction *)),this,SLOT(searchToolBar(QAction *)));
 
-	QWidget* dummy0 = new QWidget();
-	QWidget* dummy1 = new QWidget();
-	QWidget* dummy2 = new QWidget();
-	QWidget* dummy3 = new QWidget();
-	QWidget* dummy4 = new QWidget();
+    QWidget* dummy0 = new QWidget();
+    QWidget* dummy1 = new QWidget();
+    QWidget* dummy2 = new QWidget();
+    QWidget* dummy3 = new QWidget();
+    QWidget* dummy4 = new QWidget();
 
-	ui.codecWidget->setTitleBarWidget(dummy0);
-	ui.navigationWidget->setTitleBarWidget(dummy1);
-	ui.selectionWidget->setTitleBarWidget(dummy2);
-	ui.volumeWidget->setTitleBarWidget(dummy3);
-	ui.audioMetreWidget->setTitleBarWidget(dummy4);
+    ui.codecWidget->setTitleBarWidget(dummy0);
+    ui.navigationWidget->setTitleBarWidget(dummy1);
+    ui.selectionWidget->setTitleBarWidget(dummy2);
+    ui.volumeWidget->setTitleBarWidget(dummy3);
+    ui.audioMetreWidget->setTitleBarWidget(dummy4);
 
-	this->adjustSize();
+    this->adjustSize();
         QuiTaskBarProgress=createADMTaskBarProgress();
 }
 /**
@@ -486,6 +508,9 @@
                             a=insert->addAction(icon,qs);
                         }else
                             a=insert->addAction(qs);
+#if defined(__APPLE__)
+			a->setMenuRole(QAction::NoRole);
+#endif 
                         m->cookie=(void *)a;
                         if(m->shortCut)
                         {
@@ -523,10 +548,10 @@
 
     connect( ui.menuTools,SIGNAL(triggered(QAction*)),this,SLOT(searchToolMenu(QAction*)));
 
-	if (myMenuTool.size() > 0)
-	{
-		buildMenu(ui.menuTools, &myMenuTool0, myMenuTool.size());
-	}
+    if (myMenuTool.size() > 0)
+    {
+        buildMenu(ui.menuTools, &myMenuTool0, myMenuTool.size());
+    }
 
     connect( ui.menuGo,SIGNAL(triggered(QAction*)),this,SLOT(searchGoMenu(QAction*)));
     buildMenu(ui.menuGo, &myMenuGo0, myMenuGo.size());
@@ -557,7 +582,7 @@
 */
 void MainWindow::timeChanged(int)
 {
-	sendAction (ACT_TimeShift) ;
+    sendAction (ACT_TimeShift) ;
 }
 /**
     \fn searchMenu
@@ -598,86 +623,95 @@
 */
 void MainWindow::buttonPressed(void)
 {
-	// Receveid a key press Event, look into table..
+    // Receveid a key press Event, look into table..
     QObject *obj=sender();
     if(!obj) return;
     QString me(obj->objectName());
 
-	Action action=searchTranslationTable(qPrintable(me));
+    Action action=searchTranslationTable(qPrintable(me));
 
 
-	if(action!=ACT_DUMMY)
-		sendAction (action);
+    if(action!=ACT_DUMMY)
+        sendAction (action);
 
 }
 void MainWindow::toolButtonPressed(bool i)
 {
-	buttonPressed();
+    buttonPressed();
 }
 #ifdef ENABLE_EVENT_FILTER
 bool MainWindow::eventFilter(QObject* watched, QEvent* event)
 {
-	QKeyEvent *keyEvent;
-
-	switch (event->type())
-	{
-		case QEvent::KeyPress:
-			keyEvent = (QKeyEvent*)event;
-
-//			if (watched == slider)
-			{
-				switch (keyEvent->key())
-				{
-					case Qt::Key_Left:
-						if (keyEvent->modifiers() == Qt::ShiftModifier)
-							sendAction(ACT_Back1Second);
-						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) 
-							sendAction(ACT_Forward1Second);
-						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:
-						sendAction(ACT_NextKFrame);
-						return true;
-					case Qt::Key_Down:
-						sendAction(ACT_PreviousKFrame);
-						return true;
-					case Qt::Key_Shift:
-						shiftKeyHeld = 1;
-						break;
-
-					case Qt::Key_BracketLeft:
+    QKeyEvent *keyEvent;
+
+    switch (event->type())
+    {
+        case QEvent::KeyPress:
+            keyEvent = (QKeyEvent*)event;
+
+//            if (watched == slider)
+            {
+                switch (keyEvent->key())
+                {
+                    case Qt::Key_Left:
+                        if (keyEvent->modifiers() == Qt::ShiftModifier)
+                            sendAction(ACT_Back1Second);
+                        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) 
+                            sendAction(ACT_Forward1Second);
+                        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) 
+                                                    sendAction(ACT_Forward1Mn);
+                                                else
+                                                    sendAction(ACT_NextKFrame);
+                        return true;
+                    case Qt::Key_Down:
+                                                if (keyEvent->modifiers() == Qt::ControlModifier) 
+                                                    sendAction(ACT_Back1Mn);
+                                                else                                            
+                                                    sendAction(ACT_PreviousKFrame);
+                        return true;
+                    case Qt::Key_Shift:
+                        shiftKeyHeld = 1;
+                        break;
+
+                    case Qt::Key_PageUp:
                                                 if (keyEvent->modifiers() == Qt::ControlModifier)
+                                                        sendAction(ACT_MarkA);
+                                                else
                                                         sendAction(ACT_GotoMarkA);
                                                 return true;
+                    case Qt::Key_PageDown:
+                                                if (keyEvent->modifiers() == Qt::ControlModifier)
+                                                        sendAction(ACT_MarkB);
+                                                else
+                                                        sendAction(ACT_GotoMarkB);
+                        return true;
+                }
+            }
+            /* else */ if (keyEvent->key() == Qt::Key_Space)
+            {
+                sendAction(ACT_PlayAvi);
+                return true;
+            }
 
-					case Qt::Key_BracketRight:
-						if (keyEvent->modifiers() == Qt::ControlModifier)
-							sendAction(ACT_GotoMarkB);
-						return true;
-				}
-			}
-			/* else */ if (keyEvent->key() == Qt::Key_Space)
-			{
-				sendAction(ACT_PlayAvi);
-				return true;
-			}
-
-			break;
+            break;
         case QEvent::Resize:
             if (watched == ui.sliderPlaceHolder)
             {
@@ -686,79 +720,79 @@
             }
             break;
 
-		case QEvent::KeyRelease:
-			keyEvent = (QKeyEvent*)event;
+        case QEvent::KeyRelease:
+            keyEvent = (QKeyEvent*)event;
 
-			if (keyEvent->key() == Qt::Key_Shift)
-				shiftKeyHeld = 0;
+            if (keyEvent->key() == Qt::Key_Shift)
+                shiftKeyHeld = 0;
 
-			break;
-		case QEvent::User:
-			this->openFiles(((FileDropEvent*)event)->files);
-			break;
-	}
+            break;
+        case QEvent::User:
+            this->openFiles(((FileDropEvent*)event)->files);
+            break;
+    }
 
-	return QObject::eventFilter(watched, event);
+    return QObject::eventFilter(watched, event);
 }
 #endif
 void MainWindow::mousePressEvent(QMouseEvent* event)
 {
-	this->setFocus(Qt::OtherFocusReason);
+    this->setFocus(Qt::OtherFocusReason);
 }
 
 void MainWindow::dragEnterEvent(QDragEnterEvent *event)
 {
-	if (event->mimeData()->hasFormat("text/uri-list"))
-		event->acceptProposedAction();
+    if (event->mimeData()->hasFormat("text/uri-list"))
+        event->acceptProposedAction();
 }
 
 void MainWindow::dropEvent(QDropEvent *event)
 {
-	if (event->mimeData()->hasUrls())
-	{
-		QCoreApplication::postEvent(this, new FileDropEvent(event->mimeData()->urls()));
+    if (event->mimeData()->hasUrls())
+    {
+        QCoreApplication::postEvent(this, new FileDropEvent(event->mimeData()->urls()));
 
-		event->acceptProposedAction();
-	}
+        event->acceptProposedAction();
+    }
 }
 
 void MainWindow::openFiles(QList<QUrl> urlList)
 {
-	QFileInfo info;
+    QFileInfo info;
 
-	for (int fileIndex = 0; fileIndex < urlList.size(); fileIndex++)
-	{
-		QString fileName = urlListfileIndex.toLocalFile();
-		QFileInfo info(fileName);
+    for (int fileIndex = 0; fileIndex < urlList.size(); fileIndex++)
+    {
+        QString fileName = urlListfileIndex.toLocalFile();
+        QFileInfo info(fileName);
 
-		if (info.isFile())
-		{
-			if (avifileinfo)
-				A_appendVideo(fileName.toUtf8().constData());
-			else
-				A_openVideo(fileName.toUtf8().constData());
-		}
-	}
+        if (info.isFile())
+        {
+            if (avifileinfo)
+                A_appendVideo(fileName.toUtf8().constData());
+            else
+                A_openVideo(fileName.toUtf8().constData());
+        }
+    }
 }
 
 void MainWindow::previousIntraFrame(void)
 {
-	if (ui.spinBox_TimeValue->hasFocus())
-		ui.spinBox_TimeValue->stepDown();
-	else
-		sendAction(ACT_PreviousKFrame);
+    if (ui.spinBox_TimeValue->hasFocus())
+        ui.spinBox_TimeValue->stepDown();
+    else
+        sendAction(ACT_PreviousKFrame);
 }
 
 void MainWindow::nextIntraFrame(void)
 {
-	if (ui.spinBox_TimeValue->hasFocus())
-		ui.spinBox_TimeValue->stepUp();
-	else
-		sendAction(ACT_NextKFrame);
+    if (ui.spinBox_TimeValue->hasFocus())
+        ui.spinBox_TimeValue->stepUp();
+    else
+        sendAction(ACT_NextKFrame);
 }
-
 MainWindow::~MainWindow()
 {
+    renderDestroy(); // make sure render does not have back link to us
     delete thumbSlider;
     thumbSlider=NULL;
 }
@@ -781,7 +815,7 @@
  * \brief reset
  * @return 
  */
-bool  	UI_reset(void)
+bool      UI_reset(void)
 {
     UI_setVideoCodec(0);
     UI_setAudioCodec(0);
@@ -797,13 +831,13 @@
 int UI_Init(int nargc, char **nargv)
 {
         ADM_info("Starting QT4 GUI...\n");
-	initTranslator();
+    initTranslator();
 
-	global_argc=nargc;
-	global_argv=nargv;
-	ADM_renderLibInit(&UI_Hooks);
+    global_argc=nargc;
+    global_argv=nargv;
+    ADM_renderLibInit(&UI_Hooks);
         Q_INIT_RESOURCE(avidemux);
-	Q_INIT_RESOURCE(filter);
+    Q_INIT_RESOURCE(filter);
 
 #if defined(__APPLE__)
  printf("Setting qt plugin folder\n");
@@ -814,12 +848,14 @@
  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=new myQApplication (global_argc, global_argv);
+    myApplication->connect(myApplication, SIGNAL(lastWindowClosed()), myApplication, SLOT(quit()));
+        myApplication->connect(myApplication, SIGNAL(aboutToQuit()), myApplication, SLOT(cleanup()));
+        
 
-	loadTranslator();
+    loadTranslator();
 
-	return 1;
+    return 1;
 }
 
 uint8_t initGUI(const vector<IScriptEngine*>& scriptEngines)
@@ -865,7 +901,7 @@
     
     
     
-	return 1;
+    return 1;
 }
 /**
  * \fn UI_closeGui
@@ -875,8 +911,8 @@
         if(!uiRunning) return;
         uiRunning=false;
         
-	QuiMainWindows->close();
-	qtUnregisterDialog(QuiMainWindows);
+    QuiMainWindows->close();
+    qtUnregisterDialog(QuiMainWindows);
         
 }
 
@@ -898,7 +934,7 @@
 }
 void UI_refreshCustomMenu(void)
 {
-	((MainWindow*)QuiMainWindows)->buildCustomMenu();
+    ((MainWindow*)QuiMainWindows)->buildCustomMenu();
 }
 
 /**
@@ -952,10 +988,9 @@
     setupMenus();
     QuiTaskBarProgress->setParent(QuiMainWindows);
     ADM_setCrashHook(&saveCrashProject, &FatalFunctionQt);
-	
-          
-    ADM_info("Checking for crash... \n");
     
+    ADM_info("Load default settings if any... \n");          
+    A_loadDefaultSettings();
     myApplication->exec();
 #ifdef USE_OPENGL
     if(openGLStarted)
@@ -964,9 +999,9 @@
         UI_Qt4CleanGl();
     }
 #endif
-	destroyTranslator();
+    destroyTranslator();
 
-	delete QuiMainWindows;
+    delete QuiMainWindows;
     delete myApplication;
 
     QuiMainWindows = NULL;
@@ -980,15 +1015,15 @@
 */
 Action searchTranslationTable(const char *name)
 {
-	for(int i=0;i< SIZEOF_MY_TRANSLATION;i++)
-	{
-		if(!strcmp(name, myTranslationTablei.name))
-		{
-			return  myTranslationTablei.action;
-		}
-	}
-	printf("WARNING: Signal not found in translation table %s\n",name);
-	return ACT_DUMMY;
+    for(int i=0;i< SIZEOF_MY_TRANSLATION;i++)
+    {
+        if(!strcmp(name, myTranslationTablei.name))
+        {
+            return  myTranslationTablei.action;
+        }
+    }
+    printf("WARNING: Signal not found in translation table %s\n",name);
+    return ACT_DUMMY;
 }
 /**
     \fn     UI_updateRecentMenu( void )
@@ -1001,7 +1036,7 @@
 
 void UI_updateRecentProjectMenu()
 {
-	((MainWindow *)QuiMainWindows)->buildRecentProjectMenu();
+    ((MainWindow *)QuiMainWindows)->buildRecentProjectMenu();
 }
 
 /**
@@ -1010,88 +1045,88 @@
 */
 void setupMenus(void)
 {
-	uint32_t nbVid;
+    uint32_t nbVid;
     uint32_t maj,mn,pa;
-	const char *name;
+    const char *name;
 
-	nbVid=ADM_ve6_getNbEncoders();
-	printf("Found %d video encoder(s)\n",nbVid);
-	for(uint32_t i=1;i<nbVid;i++)
-	{
-		ADM_ve6_getEncoderInfo(i,&name,&maj,&mn,&pa);
-		WIDGET(comboBoxVideo)->addItem(name);
-	}
+    nbVid=ADM_ve6_getNbEncoders();
+    printf("Found %d video encoder(s)\n",nbVid);
+    for(uint32_t i=1;i<nbVid;i++)
+    {
+        ADM_ve6_getEncoderInfo(i,&name,&maj,&mn,&pa);
+        WIDGET(comboBoxVideo)->addItem(name);
+    }
 
-	// And A codec
+    // And A codec
 
-	uint32_t nbAud;
+    uint32_t nbAud;
 
     nbAud=audioEncoderGetNumberOfEncoders();
-	printf("Found %d audio encoder(s)\n",nbAud);
-	for(uint32_t i=1;i<nbAud;i++)
-	{
-		name=audioEncoderGetDisplayName(i);
-		WIDGET(comboBoxAudio)->addItem(name);
-	}
-
-	/*   Fill in output format window */
-	uint32_t nbFormat=ADM_mx_getNbMuxers();
-
-	printf("Found %d format(s)\n",nbFormat);
-	for(uint32_t i=0;i<nbFormat;i++)
-	{
+    printf("Found %d audio encoder(s)\n",nbAud);
+    for(uint32_t i=1;i<nbAud;i++)
+    {
+        name=audioEncoderGetDisplayName(i);
+        WIDGET(comboBoxAudio)->addItem(name);
+    }
+
+    /*   Fill in output format window */
+    uint32_t nbFormat=ADM_mx_getNbMuxers();
+
+    printf("Found %d format(s)\n",nbFormat);
+    for(uint32_t i=0;i<nbFormat;i++)
+    {
         const char *name=ADM_mx_getDisplayName(i);
-		WIDGET(comboBoxFormat)->addItem(name);
-	}
+        WIDGET(comboBoxFormat)->addItem(name);
+    }
 
 }
 /*
     Return % of scale (between 0 and 1)
 */
-double 	UI_readScale( void )
+double     UI_readScale( void )
 {
-	double v;
-	if(!slider) v=0;
-	v= (double)(slider->value());
-	v/=10000000;
-	return v;
+    double v;
+    if(!slider) v=0;
+    v= (double)(slider->value());
+    v/=ADM_SCALE_INCREMENT;
+    return v;
 }
 void UI_setScale( double val )
 {
-	if(_upd_in_progres) return;
-	_upd_in_progres++;
-	slider->setValue( (int)(val * 10000000));
-	_upd_in_progres--;
+    if(_upd_in_progres) return;
+    _upd_in_progres++;
+    slider->setValue( (int)(val * ADM_SCALE_INCREMENT));
+    _upd_in_progres--;
 }
 
 int UI_readCurFrame(void)
 {
-	return 0;
+    return 0;
 }
 
 int UI_readCurTime(uint16_t &hh, uint16_t &mm, uint16_t &ss, uint16_t &ms)
 {
-	int success = 0;
+    int success = 0;
 
-	QString timeText = WIDGET(currentTime)->text();
-	int pos;
+    QString timeText = WIDGET(currentTime)->text();
+    int pos;
 
-	if (WIDGET(currentTime)->validator()->validate(timeText, pos) == QValidator::Acceptable)
-	{
-		uint32_t frame;
+    if (WIDGET(currentTime)->validator()->validate(timeText, pos) == QValidator::Acceptable)
+    {
+        uint32_t frame;
 
-		hh = (uint16_t)timeText.left(2).toUInt();
-		mm = (uint16_t)timeText.mid(3, 2).toUInt();
-		ss = (uint16_t)timeText.mid(6, 2).toUInt();
-		ms = (uint16_t)timeText.right(3).toUInt();
+        hh = (uint16_t)timeText.left(2).toUInt();
+        mm = (uint16_t)timeText.mid(3, 2).toUInt();
+        ss = (uint16_t)timeText.mid(6, 2).toUInt();
+        ms = (uint16_t)timeText.right(3).toUInt();
 
-		time2frame(&frame, currentFps, hh, mm, ss, ms);
+        time2frame(&frame, currentFps, hh, mm, ss, ms);
 
-		if (frame <= frameCount)
-			success = 1;
-	}
+        if (frame <= frameCount)
+            success = 1;
+    }
 
-	return success;
+    return success;
 }
 
 
@@ -1104,26 +1139,26 @@
 */
 void UI_setTitle(const char *name)
 {
-	char *title;
-	const char* defaultTitle = "Avidemux";
+    char *title;
+    const char* defaultTitle = "Avidemux";
 
-	if (name && (*name) )
-	{
-		title = new charstrlen(defaultTitle) + strlen(name) + 3 + 1;
+    if (name && (*name) )
+    {
+        title = new charstrlen(defaultTitle) + strlen(name) + 3 + 1;
 
-		strcpy(title, name);
-		strcat(title, " - ");
-		strcat(title, defaultTitle);
-	}
-	else
-	{
-		title = new charstrlen(defaultTitle) + 1;
+        strcpy(title, name);
+        strcat(title, " - ");
+        strcat(title, defaultTitle);
+    }
+    else
+    {
+        title = new charstrlen(defaultTitle) + 1;
 
-		strcpy(title, defaultTitle);
-	}
+        strcpy(title, defaultTitle);
+    }
 
-	QuiMainWindows->setWindowTitle(QString::fromUtf8(title));
-	delete  title;
+    QuiMainWindows->setWindowTitle(QString::fromUtf8(title));
+    delete  title;
 }
 
 /**
@@ -1133,28 +1168,28 @@
 
 void UI_setFrameType( uint32_t frametype,uint32_t qp)
 {
-	char string100;
-	char	c='?';
+    char string100;
+    char    c='?';
     const char *f="???";
-	switch(frametype&AVI_FRAME_TYPE_MASK)
-	{
-	case AVI_KEY_FRAME: c='I';break;
-	case AVI_B_FRAME: c='B';break;
-	case 0: c='P';break;
-	default:c='?';break;
-
-	}
+    switch(frametype&AVI_FRAME_TYPE_MASK)
+    {
+    case AVI_KEY_FRAME: c='I';break;
+    case AVI_B_FRAME: c='B';break;
+    case 0: c='P';break;
+    default:c='?';break;
+
+    }
     switch(frametype&AVI_STRUCTURE_TYPE_MASK)
-	{
-	case AVI_TOP_FIELD+AVI_FIELD_STRUCTURE: f="TFF";break;
+    {
+    case AVI_TOP_FIELD+AVI_FIELD_STRUCTURE: f="TFF";break;
     case AVI_BOTTOM_FIELD+AVI_FIELD_STRUCTURE: f="BFF";break;
     case AVI_FRAME_STRUCTURE: f="FRM";break;
-	default:f="???";
+    default:f="???";
 
                     break;
-	}
-	sprintf(string,QT_TR_NOOP("%c-%s (%02d)"),c,f,qp);
-	WIDGET(label_8)->setText(string);
+    }
+    sprintf(string,QT_TR_NOOP("%c-%s (%02d)"),c,f,qp);
+    WIDGET(label_8)->setText(string);
 
 }
 /**
@@ -1189,12 +1224,12 @@
 */
 void UI_updateTimeCount(uint32_t curFrame,uint32_t fps)
 {
-	char text80;
-	uint32_t mm,hh,ss,ms;
+    char text80;
+    uint32_t mm,hh,ss,ms;
 
-	frame2time(curFrame,fps, &hh, &mm, &ss, &ms);
-	sprintf(text, "%02d:%02d:%02d.%03d", hh, mm, ss, ms);
-	WIDGET(currentTime)->setText(text);
+    frame2time(curFrame,fps, &hh, &mm, &ss, &ms);
+    sprintf(text, "%02d:%02d:%02d.%03d", hh, mm, ss, ms);
+    WIDGET(currentTime)->setText(text);
 }
 
 
@@ -1210,8 +1245,8 @@
  uint32_t shorty=(uint32_t)(curTime/1000);
 
     ms2time(shorty,&hh,&mm,&ss,&ms);
-  	sprintf(text, "%02d:%02d:%02d.%03d", hh, mm, ss, ms);
-	WIDGET(currentTime)->setText(text);
+      sprintf(text, "%02d:%02d:%02d.%03d", hh, mm, ss, ms);
+    WIDGET(currentTime)->setText(text);
 
 }
 
@@ -1226,7 +1261,7 @@
  uint32_t shorty=(uint32_t)(curTime/1000);
 
     ms2time(shorty,&hh,&mm,&ss,&ms);
-  	sprintf(text, "/%02d:%02d:%02d.%03d", hh, mm, ss, ms);
+      sprintf(text, "/%02d:%02d:%02d.%03d", hh, mm, ss, ms);
     WIDGET(totalTime)->setText(text);
     slider->setTotalDuration(curTime);
 }
@@ -1236,7 +1271,7 @@
 */
 void UI_setMarkers(uint64_t a, uint64_t b)
 {
-	char text80;
+    char text80;
     uint64_t absoluteA=a,absoluteB=b;
     uint32_t hh,mm,ss,ms;
     uint32_t timems;
@@ -1245,26 +1280,26 @@
 
     timems=(uint32_t)(a);
     ms2time(timems,&hh,&mm,&ss,&ms);
-	snprintf(text,79,"%02"PRIu32":%02"PRIu32":%02"PRIu32".%02"PRIu32,hh,mm,ss,ms);
-	WIDGET(pushButtonJumpToMarkerA)->setText(text);
+    snprintf(text,79,"%02" PRIu32":%02" PRIu32":%02" PRIu32".%02" PRIu32,hh,mm,ss,ms);
+    WIDGET(pushButtonJumpToMarkerA)->setText(text);
 
-	timems=(uint32_t)(b);
+    timems=(uint32_t)(b);
     ms2time(timems,&hh,&mm,&ss,&ms);
-	snprintf(text,79,"%02"PRIu32":%02"PRIu32":%02"PRIu32".%02"PRIu32,hh,mm,ss,ms);
-	WIDGET(pushButtonJumpToMarkerB)->setText(text);
+    snprintf(text,79,"%02" PRIu32":%02" PRIu32":%02" PRIu32".%02" PRIu32,hh,mm,ss,ms);
+    WIDGET(pushButtonJumpToMarkerB)->setText(text);
 
-	slider->setMarkers(absoluteA, absoluteB);
+    slider->setMarkers(absoluteA, absoluteB);
 }
 
 /**
     \fn     UI_getCurrentVCodec(void)
     \brief  Returns the current selected video code in menu, i.e its number (0 being the first)
 */
-int 	UI_getCurrentVCodec(void)
+int     UI_getCurrentVCodec(void)
 {
-	int i=WIDGET(comboBoxVideo)->currentIndex();
-	if(i<0) i=0;
-	return i;
+    int i=WIDGET(comboBoxVideo)->currentIndex();
+    if(i<0) i=0;
+    return i;
 }
 /**
     \fn     UI_setVideoCodec( int i)
@@ -1273,22 +1308,22 @@
 
 void UI_setVideoCodec( int i)
 {
-	int b=!!i;
-	WIDGET(comboBoxVideo)->setCurrentIndex(i);
+    int b=!!i;
+    WIDGET(comboBoxVideo)->setCurrentIndex(i);
 
-	WIDGET(pushButtonVideoConf)->setEnabled(b);
-	WIDGET(pushButtonVideoFilter)->setEnabled(b);
+    WIDGET(pushButtonVideoConf)->setEnabled(b);
+    WIDGET(pushButtonVideoFilter)->setEnabled(b);
 }
 /**
     \fn     UI_getCurrentACodec(void)
     \brief  Returns the current selected audio code in menu, i.e its number (0 being the first)
 */
 
-int 	UI_getCurrentACodec(void)
+int     UI_getCurrentACodec(void)
 {
-	int i=WIDGET(comboBoxAudio)->currentIndex();
-	if(i<0) i=0;
-	return i;
+    int i=WIDGET(comboBoxAudio)->currentIndex();
+    if(i<0) i=0;
+    return i;
 }
 /**
     \fn     UI_setAudioCodec( int i)
@@ -1306,19 +1341,19 @@
     \brief  Returns the current selected output format
 */
 
-int 	UI_GetCurrentFormat( void )
+int     UI_GetCurrentFormat( void )
 {
-	int i=WIDGET(comboBoxFormat)->currentIndex();
-	if(i<0) i=0;
-	return (int)i;
+    int i=WIDGET(comboBoxFormat)->currentIndex();
+    if(i<0) i=0;
+    return (int)i;
 }
 /**
     \fn     UI_SetCurrentFormat( ADM_OUT_FORMAT fmt )
     \brief  Select  output format
 */
-void 	UI_SetCurrentFormat( uint32_t fmt )
+void     UI_SetCurrentFormat( uint32_t fmt )
 {
-	WIDGET(comboBoxFormat)->setCurrentIndex((int)fmt);
+    WIDGET(comboBoxFormat)->setCurrentIndex((int)fmt);
 }
 
 /**
@@ -1327,12 +1362,12 @@
 */
 bool UI_getTimeShift(int *onoff,int *value)
 {
-	if(WIDGET(checkBox_TimeShift)->checkState()==Qt::Checked)
-		*onoff=1;
-	else
-		*onoff=0;
-	*value=WIDGET(spinBox_TimeValue)->value();
-	return 1;
+    if(WIDGET(checkBox_TimeShift)->checkState()==Qt::Checked)
+        *onoff=1;
+    else
+        *onoff=0;
+    *value=WIDGET(spinBox_TimeValue)->value();
+    return 1;
 }
 /**
       \fn UI_setTimeShift
@@ -1341,12 +1376,12 @@
 
 bool UI_setTimeShift(int onoff,int value)
 {
-	if (onoff && value)
-		WIDGET(checkBox_TimeShift)->setCheckState(Qt::Checked);
-	else
-		WIDGET(checkBox_TimeShift)->setCheckState(Qt::Unchecked);
-	WIDGET(spinBox_TimeValue)->setValue(value);
-	return 1;
+    if (onoff && value)
+        WIDGET(checkBox_TimeShift)->setCheckState(Qt::Checked);
+    else
+        WIDGET(checkBox_TimeShift)->setCheckState(Qt::Unchecked);
+    WIDGET(spinBox_TimeValue)->setValue(value);
+    return 1;
 }
 /**
     \fn UI_setVUMeter
@@ -1393,7 +1428,7 @@
 */
 void UI_iconify( void )
 {
-	QuiMainWindows->hide();
+    QuiMainWindows->hide();
 
 }
 /**
@@ -1417,9 +1452,6 @@
 /**
  * \fn dtor
  */
-#ifdef SDL_ON_LINUX
-extern void disableExitHandler();
-#endif
 myQApplication::~myQApplication()
 {
     
@@ -1427,8 +1459,7 @@
     renderDestroy();
     ADM_warning("Cleaning preview...\n");
     admPreview::cleanUp();
-    ADM_warning("Cleaning video body...\n");
-    if(video_body) video_body->cleanup (); // Delete decoder related to X11 context before purging X11 context
+    ADM_ExitCleanup();    
     
 #if defined( USE_VDPAU)
   #if (ADM_UI_TYPE_BUILD!=ADM_UI_CLI)
@@ -1442,7 +1473,6 @@
     
 #ifdef SDL_ON_LINUX
     ADM_warning("This is SDL on linux, exiting brutally to avoid lock.\n");
-    disableExitHandler();
     ::exit(0); // 
 #endif    
     ADM_warning("Exiting app\n");

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.h -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.h Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp Changed

@@ -47,10 +47,9 @@
 #include "DIA_coreToolkit.h"
     
 void UI_QT4VideoWidget(QFrame *host);
-static QFrame *hostFrame=NULL;
 static uint8_t *lastImage=NULL;
 extern QWidget *QuiMainWindows;
-int paintEngineType = -1;
+
 
 
 void DIA_previewInit(uint32_t width, uint32_t height) {}
@@ -66,7 +65,6 @@
   They are translated to RGB32 by the colorconv instance.
 
 */
-static uint8_t *rgbDataBuffer=NULL;
 static uint32_t displayW=0,displayH=0;
 
 //****************************************************************************************************
@@ -77,8 +75,6 @@
 */
 bool ADM_QPreviewCleanup(void)
 {
-    if(rgbDataBuffer) delete  rgbDataBuffer;
-    rgbDataBuffer=NULL;
     return true;
 }
 /**
@@ -88,10 +84,10 @@
 #ifdef __HAIKU__
 ADM_Qvideo::ADM_Qvideo(QWidget *z) : QWidget(z)  {}
 #else
-ADM_Qvideo::ADM_Qvideo(QWidget *z) : QWidget(z) 
-{    
+ADM_Qvideo::ADM_Qvideo(QFrame *z) : QWidget(z) 
+{       
+    useExternalRedraw(true);
 #if QT_VERSION < QT_VERSION_CHECK(5,0,0) 
-    setAttribute( Qt::WA_PaintOnScreen, true );
    // Put a transparent background
     //setAutoFillBackground(true);
     QPalette p =  palette();
@@ -99,68 +95,56 @@
     color.setAlpha(0);
     p.setColor( QPalette::Window, color );
     setPalette( p );
-   
-#else
-    
-    
 #endif
+    
+    drawer=NULL;
+    doOnce=false;
+    _width=_height=0;
+    hostFrame=z;
 
 } //{setAutoFillBackground(false);}
 #endif // Haiku
+
+
 ADM_Qvideo::~ADM_Qvideo() 
 {
     printf("QvideoDestroying QVideo\n");
     callBackQtWindowDestroyed();
     
 }
+
 /**
  * 
  * @param ev
  */
 void ADM_Qvideo::paintEvent(QPaintEvent *ev)
-{	
-    //printf("Draw! \n");
-     if (paintEngineType == -1)
-     {
+{	    
+    printf("Paint event\n");
+    if(drawer)
+    {
+         drawer->draw(this,ev);
+         return;
+    }
+    if(!doOnce)
+    {
+        printf("QVideo Using default redraw-------------->\n");
         QPainter painter(this);
-
-        if (painter.isActive())
-                paintEngineType = painter.paintEngine()->type();
-
-        painter.end();
-      }
-
-    if (!displayW || !displayH || !rgbDataBuffer )
-            return;
-
-    if (renderExposeEventFromUI())
+        QColor blackColor(Qt::black);
+        QImage allBlack(width(),height(),QImage::Format_RGB32);
+        allBlack.fill(blackColor);
+        painter.drawImage(0,0,allBlack);
+        printf("<--------------QVideo/ Using default redraw\n");
+        doOnce=true;
+    }else
     {
-            QImage image(rgbDataBuffer,displayW,displayH,QImage::Format_RGB32);
-            QPainter painter(this);
-            if (painter.isActive())
-            {
-                //painter.drawImage(QPoint(0,0),image);
-                const QRect rec=ev->rect();
-                int x=rec.x();
-                int y=rec.y();
-                int w=rec.width();
-                int h=rec.height();
-                painter.drawImage(x,y,image,x,y,w,h);
-                painter.end();
-            }else
-            {
-                printf("Painter inactive!\n");
-            }
+        renderExposeEventFromUI();
     }
 }
 
 ADM_Qvideo *videoWindow=NULL;
-//****************************************************************************************************
 void UI_QT4VideoWidget(QFrame *host)
 {
    videoWindow=new ADM_Qvideo(host);
-   hostFrame=host;
-   videoWindow->resize(hostFrame->size());
    videoWindow->show();
    
 }
@@ -172,42 +156,20 @@
 {
   return (void *) videoWindow;
 }
-/**
-    \brief Display to widget in RGB32
-*/
-void UI_rgbDraw(void *widg,uint32_t w, uint32_t h,uint8_t *ptr)
-{
-      memcpy(rgbDataBuffer,ptr,w*h*4);
-      videoWindow->repaint();
-    
-}
 
 /**
       \brief Resize the window
 */
 void  UI_updateDrawWindowSize(void *win,uint32_t w,uint32_t h)
 {
-	if(displayW == w && displayH == h && rgbDataBuffer)
-		return;
 
-	if(rgbDataBuffer)
-		delete rgbDataBuffer;
-
-	rgbDataBuffer = new uint8_tw * h * 4; // 32 bits / color
 	displayW = w;
 	displayH = h;
 
-	hostFrame->setMinimumSize(displayW, displayH);
-	videoWindow->setMinimumSize(displayW, displayH);	
-
-	hostFrame->resize(displayW, displayH);
-	videoWindow->resize(displayW, displayH);
-
-	hostFrame->setMaximumSize(displayW, displayH);
-	videoWindow->setMaximumSize(displayW, displayH);	
-	UI_purge();
-
-	QuiMainWindows->adjustSize();
+    videoWindow->setADMSize(w,h);    
+    QuiMainWindows->resize(w+218,h+100);
+#if 0
+	
 	UI_purge();
 
 // Trolltech need to get their act together.  Resizing doesn't work well or the same on all platforms.
@@ -218,6 +180,7 @@
 	// resizing doesn't work unless called twice on Windows and Linux.
 	QuiMainWindows->adjustSize();
 #endif
+#endif
 
 	UI_purge();
 
@@ -234,31 +197,44 @@
     xinfo->systemWindowId = 0;
 
 #if defined(_WIN32)
-	xinfo->display=(void *)videoWindow->winId();
+    xinfo->display=(void *)videoWindow->winId();
         xinfo->systemWindowId=videoWindow->winId();
 #elif defined(__APPLE__)
-	#if defined(ADM_CPU_X86_64)
-		xinfo->display = (void*)videoWindow->winId();
-                xinfo->systemWindowId=videoWindow->winId();
-	#else
-		xinfo->display = HIViewGetWindow(HIViewRef(widget->winId()));
-                xinfo->systemWindowId= HIViewGetWindow(HIViewRef(widget->winId()));
-	#endif
-#else
+    #if defined(ADM_CPU_X86_64)
+        xinfo->display = (void*)videoWindow->winId();
+        xinfo->systemWindowId=videoWindow->winId();
+    #else
+        xinfo->display = HIViewGetWindow(HIViewRef(widget->winId()));
+        xinfo->systemWindowId= HIViewGetWindow(HIViewRef(widget->winId()));
+    #endif
+#else // linux        
         #if QT_VERSION < QT_VERSION_CHECK(5,0,0) 
                 const QX11Info &info=videoWindow->x11Info();
                 xinfo->display=info.display();
         #else
-                xinfo->display=XOpenDisplay(NULL);
+            {
+                static void *myDisplay=NULL;
+                if(!myDisplay)
+                  myDisplay=XOpenDisplay(NULL);
+                xinfo->display=myDisplay;
+            }
         #endif
         xinfo->systemWindowId=videoWindow->winId();
 #endif
-        QPoint localPoint(0,0);
-        QPoint windowPoint = videoWindow->mapToGlobal(localPoint);        
-	xinfo->x = windowPoint.x();
-	xinfo->y = windowPoint.y();
-	xinfo->width  = displayW;
-	xinfo->height = displayH;
+    QPoint localPoint(0,0);
+    QPoint windowPoint = videoWindow->mapToGlobal(localPoint);        
+    xinfo->x = windowPoint.x();
+    xinfo->y = windowPoint.y();
+    xinfo->width  = displayW;
+    xinfo->height = displayH;
+}
+/**
+ * \brief DEPRECATED
+ * @return 
+ */
+void UI_rgbDraw(void *widg,uint32_t w, uint32_t h,uint8_t *ptr)
+{     
+      videoWindow->repaint();    
 }

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.h -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.h Changed

@@ -3,16 +3,59 @@
 
 #include <QPaintEvent>
 #include <QWidget>
+#include <QFrame>
+
+/**
+ * 
+ */
+class ADM_QvideoDrawer
+{
+public:  
+    virtual ~ADM_QvideoDrawer() {}
+    virtual bool    draw(QWidget *widget, QPaintEvent *ev)=0;
+};
+
 /**
     \class ADM_Qvideo
 */
 class  ADM_Qvideo : public QWidget
 {
 	Q_OBJECT
-
+        ADM_QvideoDrawer *drawer;
+        bool             doOnce;
+        QFrame           *hostFrame;
+protected:
+        int _width,_height;
 public:
-	ADM_Qvideo(QWidget *z);
+	ADM_Qvideo(QFrame *z);
 	~ADM_Qvideo();
 	void paintEvent(QPaintEvent *ev);
+        void setDrawer(ADM_QvideoDrawer *d)
+        {
+            drawer=d;    
+        }
+        // This disables internal double buffer of Qt
+        // Set it to false if the native Qt redraw system is used
+        void useExternalRedraw(bool external)
+        {
+                setAttribute( Qt::WA_PaintOnScreen, external );
+        }
+        void  setADMSize(int width,int height)
+        {
+             _width=width;
+             _height=height;
+             hostFrame->setFixedSize(_width,_height);
+             hostFrame->adjustSize();
+             hostFrame->updateGeometry();
+             setFixedSize(_width,_height);             
+             this->adjustSize();
+             this->updateGeometry();
+        }
+        QSize sizeHint() const 
+        {
+            if(!_width || !_height) return QWidget::sizeHint();
+            return QSize(_width,_height);
+        }
+
 };
 #endif	// T_preview_h

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/avidemux.qrc -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/avidemux.qrc Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp Changed

@@ -26,305 +26,297 @@
 
 namespace ADM_QT4_fileSel
 {
-	
-	
+
+
 /**
-	  \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_FileSelWrite (const char *label, char **name, uint32_t access) 
+          \brief Ask for a file for reading (access=0) or writing (access=1)
+        */
 static	void GUI_FileSelSelectWriteInternal(const char *label, const char *ext, char **name)
-	{
-		
-                *name = NULL;		
-                QString str ;
-                QString fileName,dot=QString(".");
-                QString filterFile=QString("All files (*.*)");
-                bool doFilter = !!(ext && strlen(ext));
-                QFileDialog::Options opts;
-                int extSize=1;
-                
-                if(doFilter)
-                {
-                    extSize+=strlen(ext);
-                }
-                //printf("Do filer=%d\n",(int)doFilter);
-                std::string lastFolder;
-                admCoreUtils::getLastWriteFolder(lastFolder);
-                if (lastFolder.size())
-		{
-                        QString outputPath = QFileInfo(QString::fromUtf8(lastFolder.c_str())).path();
-
-                        char *tmpinputname = NULL;
-                        QString inputBaseName = QString("");
-                        std::string lastRead;
-                        admCoreUtils::getLastReadFolder(lastRead);
-                        if (lastRead.size())
-                        {
-                            inputBaseName = QFileInfo(QString::fromUtf8(lastRead.c_str())).completeBaseName();
-                        }
-
-                        QString outputExt = QString("");
-                        if (doFilter)
-                        {
-                            outputExt = dot+QString(ext);
-                        }
-                        QString separator = QString("/");
-                        str = outputPath+separator+inputBaseName+outputExt;
-
-                	/* LASTDIR may have gone; then do nothing and use current dir instead (implied) */
-			if (!QDir(outputPath).exists())
-                                str.clear();
-		}
-		
-                if(doFilter)
-                {
-                    filterFile=QString(ext)+QString(" files (*.")+QString(ext)+QString(")");
-                }
-                fileName = QFileDialog::getSaveFileName(NULL, 
-                                        label,  // caption
-                                        str,    // folder
-                                        filterFile,   // filter
-                                        NULL,QFileDialog::DontConfirmOverwrite);   // selected filter
-                                        
-                
-		if (fileName.isNull() ) return;
-                
-                *name=(char *)ADM_alloc(  strlen(fileName.toUtf8().constData())+extSize);
-                strcpy(*name,fileName.toUtf8().constData());
-                
-                // Check if we need to add an extension....
-                if(doFilter)
-                {                     
-                        if(!strstr(*name,"."))
-                        {
-                            strcat(*name,"."); strcat(*name,ext);
-
-                            fileName=fileName+QString(".")+QString(ext);
-                        }
-                }
-                QFile newFile(fileName);
-                if(newFile.exists())
-                {
-                    QFileInfo fileInfo(newFile);
-                    QString q=QString("Overwrite file ")+fileInfo.fileName()+QString("?");
-                    if(!GUI_Question(q.toUtf8().constData()))
-                    {
-                        ADM_dezalloc(*name);
-                        *name=NULL;
-                        return;
-                    }
-                }
-                admCoreUtils::setLastWriteFolder( std::string(fileName.toUtf8().constData()));
-	}
-
-	
+{
+    *name = NULL;		
+    QString str ;
+    QString fileName,dot=QString(".");
+    QString filterFile=QString("All files (*.*)");
+    bool doFilter = !!(ext && strlen(ext));
+    QFileDialog::Options opts;
+    int extSize=1;
+
+    if(doFilter)
+    {
+        extSize+=strlen(ext);
+    }
+    //printf("Do filer=%d\n",(int)doFilter);
+    std::string lastFolder;
+    admCoreUtils::getLastWriteFolder(lastFolder);
+    if (lastFolder.size())
+    {
+        QString outputPath = QFileInfo(QString::fromUtf8(lastFolder.c_str())).path();
+
+        char *tmpinputname = NULL;
+        QString inputBaseName = QString("");
+        std::string lastRead;
+        admCoreUtils::getLastReadFolder(lastRead);
+        if (lastRead.size())
+        {
+            inputBaseName = QFileInfo(QString::fromUtf8(lastRead.c_str())).completeBaseName();
+        }
+
+        QString outputExt = QString("");
+        if (doFilter)
+        {
+            outputExt = dot+QString(ext);
+        }
+        QString separator = QString("/");
+        str = outputPath+separator+inputBaseName+outputExt;
+
+        /* LASTDIR may have gone; then do nothing and use current dir instead (implied) */
+        if (!QDir(outputPath).exists())
+                str.clear();
+    }
+
+    if(doFilter)
+    {
+        filterFile=QString(ext)+QString(" files (*.")+QString(ext)+QString(")");
+    }
+    fileName = QFileDialog::getSaveFileName(NULL, 
+                    label,  // caption
+                    str,    // folder
+                    filterFile,   // filter
+                    NULL,QFileDialog::DontConfirmOverwrite);   // selected filter
+
+
+    if (fileName.isNull() ) return;
+
+    *name=(char *)ADM_alloc(  strlen(fileName.toUtf8().constData())+extSize);
+    strcpy(*name,fileName.toUtf8().constData());
+
+    // Check if we need to add an extension....
+    if(doFilter)
+    {                     
+        if(!strstr(*name,"."))
+        {
+            strcat(*name,"."); strcat(*name,ext);
+
+            fileName=fileName+QString(".")+QString(ext);
+        }
+    }
+    QFile newFile(fileName);
+    if(newFile.exists())
+    {
+        QFileInfo fileInfo(newFile);
+        QString q=QString("Overwrite file ")+fileInfo.fileName()+QString("?");
+        if(!GUI_Question(q.toUtf8().constData()))
+        {
+            ADM_dezalloc(*name);
+            *name=NULL;
+            return;
+        }
+    }
+    admCoreUtils::setLastWriteFolder( 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_FileSelWrite (const char *label, char **name, uint32_t access) 
+          \brief Ask for a file for reading (access=0) or writing (access=1)
+        */
 static	void GUI_FileSelSelectReadInternal(const char *label, const char *ext, char **name)
-	{
-		
-                *name = NULL;		
-                QString str ;
-                QString fileName,dot=QString(".");
-                QString filterFile=QString("All files (*.*)");
-                bool doFilter = !!(ext && strlen(ext));
-                QFileDialog::Options opts;
-              
-                //printf("Do filer=%d\n",(int)doFilter);
-                std::string lastFolder;
-                admCoreUtils::getLastReadFolder(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) */
-			if (!QDir(str).exists())
-                                str.clear();
-		}
-		
-                if(doFilter)
-                {
-                    filterFile=QString(ext)+QString(" files (*.")+QString(ext)+QString(")");
-                }
-                fileName = QFileDialog::getOpenFileName(NULL, 
-                                        label,  // caption
-                                        str,    // folder
-                                        filterFile,   // filter
-                                        NULL,   // selected filter
-                                        opts);
-                
-		if (fileName.isNull() ) return;
-                
-                *name=ADM_strdup(fileName.toUtf8().constData());
-                admCoreUtils::setLastReadFolder(std::string(fileName.toUtf8().constData()));
-	}        
-        
-        void GUI_FileSelRead(const char *label, char **name)
-	{
-		GUI_FileSelSelectReadInternal(label, "",name);
-	}
-
-	void GUI_FileSelWrite(const char *label, char **name)
-	{
-		GUI_FileSelSelectWriteInternal(label,"",name);
-	}
-
-	void GUI_FileSelRead(const char *label, SELFILE_CB cb)
-	{
-		char *name;
-
-		GUI_FileSelRead(label, &name);
-
-		if (name)
-		{
-			cb(name); 
-			ADM_dealloc(name);
-		}
-	}        
-        /**
-         * \fn GUI_FileSelWrite
-         * @param label
-         * @param cb
-         */
-	void GUI_FileSelWrite(const char *label, SELFILE_CB cb)
-	{
-		char *name;
-
-		GUI_FileSelWrite(label, &name);
-
-		if (name)
-		{
-			cb(name); 
-			ADM_dealloc(name);
-		}
-	}
-
-	/**
-		  \fn FileSel_SelectWrite
-		  \brief select file, write mode
-		  @param title window title
-		  @param target where to store result
-		  @param max Max buffer size in bytes
-		  @param source Original value
-		  @return 1 on success, 0 on failure
-	*/
-	uint8_t FileSel_SelectWrite(const char *title, char *target, uint32_t max, const char *source)
-	{
-		QString fileName;
-		QFileDialog::Options options = 0;
-
-
-		fileName=QFileDialog::getSaveFileName(NULL, title, source, NULL, NULL, options);
-
-		if (!fileName.isNull())
-		{
-			const char *s = fileName.toUtf8().constData();
-			strncpy(target, s, max);
-
-			return 1;
-		}
-
-		return 0;
-	}
-
-	/**
-		  \fn FileSel_SelectRead
-		  \brief select file, read mode
-		  @param title window title
-		  @param target where to store result
-		  @param max Max buffer size in bytes
-		  @param source Original value
-		  @return 1 on success, 0 on failure
-	*/
-	uint8_t FileSel_SelectRead(const char *title, char *target, uint32_t max, const char *source)
-	{
-		QString fileName;
-		QFileDialog::Options options = 0;
-
-
-		fileName = QFileDialog::getOpenFileName(NULL, title, source, NULL, NULL, options);
-
-		if (!fileName.isNull())
-		{
-			const char *s = fileName.toUtf8().constData();
-			strncpy(target, s, max);
-
-			return 1;
-		}
-
-		return 0;
-	}
-
-	/**
-		  \fn FileSel_SelectDir
-		  \brief select directory
-		  @param title window title
-		  @param target where to store result
-		  @param max Max buffer size in bytes
-		  @param source Original value
-		  @return 1 on success, 0 on failure
-	*/
-	uint8_t FileSel_SelectDir(const char *title, char *target, uint32_t max, const char *source)
-	{
-		QString fileName;
-		QFileDialog::Options options = QFileDialog::ShowDirsOnly;
-
-
-		fileName = QFileDialog::getExistingDirectory(NULL, title, source, options);
-
-		if (!fileName.isNull())
-		{
-			const char *s = fileName.toUtf8().constData();
-			strncpy(target, s, max);
-
-			return 1;
-		}
-
-		return 0;
-	}
-        void GUI_FileSelWriteExtension(const char *label, const char *extension,SELFILE_CB cb)
-	{
-            char *name;
-            //printf("Extension is : %s\n",extension);
-            GUI_FileSelSelectWriteInternal(label, extension, &name);
-            if(name)
-            {
-                cb(name);
+{
+        *name = NULL;		
+        QString str ;
+        QString fileName,dot=QString(".");
+        QString filterFile=QString("All files (*.*)");
+        bool doFilter = !!(ext && strlen(ext));
+        QFileDialog::Options opts;
+
+        //printf("Do filer=%d\n",(int)doFilter);
+        std::string lastFolder;
+        admCoreUtils::getLastReadFolder(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) */
+                if (!QDir(str).exists())
+                        str.clear();
+        }
+
+        if(doFilter)
+        {
+            filterFile=QString(ext)+QString(" files (*.")+QString(ext)+QString(")");
+        }
+        fileName = QFileDialog::getOpenFileName(NULL, 
+                                label,  // caption
+                                str,    // folder
+                                filterFile,   // filter
+                                NULL,   // selected filter
+                                opts);
+
+        if (fileName.isNull() ) return;
+
+        *name=ADM_strdup(fileName.toUtf8().constData());
+        admCoreUtils::setLastReadFolder(std::string(fileName.toUtf8().constData()));
+}        
+
+void GUI_FileSelRead(const char *label, char **name)
+{
+        GUI_FileSelSelectReadInternal(label, "",name);
+}
+
+void GUI_FileSelWrite(const char *label, char **name)
+{
+        GUI_FileSelSelectWriteInternal(label,"",name);
+}
+
+void GUI_FileSelRead(const char *label, SELFILE_CB cb)
+{
+        char *name;
+
+        GUI_FileSelRead(label, &name);
+
+        if (name)
+        {
+                cb(name); 
                 ADM_dealloc(name);
-            }
         }
-        void GUI_FileSelReadExtension(const char *label, const char *extension,SELFILE_CB cb)
-	{
-            char *name;
-            //printf("Extension is : %s\n",extension);
-            GUI_FileSelSelectReadInternal(label, extension, &name);
-            if(name)
-            {
-                cb(name);
+}        
+/**
+ * \fn GUI_FileSelWrite
+ * @param label
+ * @param cb
+ */
+void GUI_FileSelWrite(const char *label, SELFILE_CB cb)
+{
+        char *name;
+
+        GUI_FileSelWrite(label, &name);
+
+        if (name)
+        {
+                cb(name); 
                 ADM_dealloc(name);
-            }
-        }        
-	/**
-		 * 
-	*/
-	void init(void)
-	{
-		// Nothing special to do for QT4 fileselector
-	}
+        }
+}
+
+/**
+          \fn FileSel_SelectWrite
+          \brief select file, write mode
+          @param title window title
+          @param target where to store result
+          @param max Max buffer size in bytes
+          @param source Original value
+          @return 1 on success, 0 on failure
+*/
+uint8_t FileSel_SelectWrite(const char *title, char *target, uint32_t max, const char *source)
+{
+        QString fileName;
+        QFileDialog::Options options = 0;
+
+        fileName=QFileDialog::getSaveFileName(NULL, title, source, NULL, NULL, options);
+
+        if (!fileName.isNull())
+        {
+            strncpy(target, fileName.toUtf8().constData(), max);
+            targetmax-1=0;
+            return 1;
+        }
+        return 0;
+}
+
+/**
+          \fn FileSel_SelectRead
+          \brief select file, read mode
+          @param title window title
+          @param target where to store result
+          @param max Max buffer size in bytes
+          @param source Original value
+          @return 1 on success, 0 on failure
+*/
+uint8_t FileSel_SelectRead(const char *title, char *target, uint32_t max, const char *source)
+{
+        QString fileName;
+        QFileDialog::Options options = 0;
+
+        fileName = QFileDialog::getOpenFileName(NULL, title, source, NULL, NULL, options);
+
+        if (!fileName.isNull())
+        {
+                strncpy(target, fileName.toUtf8().constData(), max);
+                targetmax-1=0;
+                return 1;
+        }
+        return 0;
+}
+
+/**
+          \fn FileSel_SelectDir
+          \brief select directory
+          @param title window title
+          @param target where to store result
+          @param max Max buffer size in bytes
+          @param source Original value
+          @return 1 on success, 0 on failure
+*/
+uint8_t FileSel_SelectDir(const char *title, char *target, uint32_t max, const char *source)
+{
+        QString fileName;
+        QFileDialog::Options options = QFileDialog::ShowDirsOnly;
+
+
+        fileName = QFileDialog::getExistingDirectory(NULL, title, source, options);
+
+        if (!fileName.isNull())
+        {
+                const char *s = fileName.toUtf8().constData();
+                strncpy(target, s, max);
+
+                return 1;
+        }
+
+        return 0;
+}
+void GUI_FileSelWriteExtension(const char *label, const char *extension,SELFILE_CB cb)
+{
+    char *name;
+    //printf("Extension is : %s\n",extension);
+    GUI_FileSelSelectWriteInternal(label, extension, &name);
+    if(name)
+    {
+        cb(name);
+        ADM_dealloc(name);
+    }
+}
+void GUI_FileSelReadExtension(const char *label, const char *extension,SELFILE_CB cb)
+{
+    char *name;
+    //printf("Extension is : %s\n",extension);
+    GUI_FileSelSelectReadInternal(label, extension, &name);
+    if(name)
+    {
+        cb(name);
+        ADM_dealloc(name);
+    }
+}        
+/**
+         * 
+*/
+void init(void)
+{
+        // Nothing special to do for QT4 fileselector
+}
 } // End of nameSpace
 
 static DIA_FILESEL_DESC_T Qt4FileSelDesc =
 {
-	ADM_QT4_fileSel::init,
-	ADM_QT4_fileSel::GUI_FileSelRead,
-	ADM_QT4_fileSel::GUI_FileSelWrite,
-	ADM_QT4_fileSel::GUI_FileSelRead,
-	ADM_QT4_fileSel::GUI_FileSelWrite,
-	ADM_QT4_fileSel::FileSel_SelectRead,
-	ADM_QT4_fileSel::FileSel_SelectWrite,
-	ADM_QT4_fileSel::FileSel_SelectDir,
+        ADM_QT4_fileSel::init,
+        ADM_QT4_fileSel::GUI_FileSelRead,
+        ADM_QT4_fileSel::GUI_FileSelWrite,
+        ADM_QT4_fileSel::GUI_FileSelRead,
+        ADM_QT4_fileSel::GUI_FileSelWrite,
+        ADM_QT4_fileSel::FileSel_SelectRead,
+        ADM_QT4_fileSel::FileSel_SelectWrite,
+        ADM_QT4_fileSel::FileSel_SelectDir,
         ADM_QT4_fileSel::GUI_FileSelWriteExtension,
         ADM_QT4_fileSel::GUI_FileSelReadExtension
 };
@@ -332,6 +324,6 @@
 // Hook our functions
 void initFileSelector(void)
 {
-	DIA_fileSelInit(&Qt4FileSelDesc);
+        DIA_fileSelInit(&Qt4FileSelDesc);
 }

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/gui2.ui -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/gui2.ui Changed

@@ -7,8 +7,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>766</width>
-    <height>757</height>
+    <width>858</width>
+    <height>863</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -43,7 +43,16 @@
       <property name="spacing">
        <number>6</number>
       </property>
-      <property name="margin">
+      <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>
       <item>
@@ -99,8 +108,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>766</width>
-     <height>29</height>
+     <width>858</width>
+     <height>30</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuHelp">
@@ -207,7 +216,7 @@
     <set>Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea</set>
    </property>
    <property name="windowTitle">
-    <string>Codec Options</string>
+    <string>Codec O&amp;ptions</string>
    </property>
    <attribute name="dockWidgetArea">
     <number>1</number>
@@ -265,7 +274,16 @@
          <property name="spacing">
           <number>0</number>
          </property>
-         <property name="margin">
+         <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>
          <item>
@@ -289,7 +307,16 @@
            <property name="spacing">
             <number>6</number>
            </property>
-           <property name="margin">
+           <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>
            <item>
@@ -389,7 +416,16 @@
          <property name="spacing">
           <number>0</number>
          </property>
-         <property name="margin">
+         <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>
          <item>
@@ -416,7 +452,16 @@
            <property name="sizeConstraint">
             <enum>QLayout::SetDefaultConstraint</enum>
            </property>
-           <property name="margin">
+           <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>
            <item>
@@ -540,7 +585,16 @@
          <property name="spacing">
           <number>0</number>
          </property>
-         <property name="margin">
+         <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>
          <item>
@@ -567,7 +621,16 @@
            <property name="sizeConstraint">
             <enum>QLayout::SetDefaultConstraint</enum>
            </property>
-           <property name="margin">
+           <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>
            <item>
@@ -625,7 +688,16 @@
              <property name="sizeConstraint">
               <enum>QLayout::SetDefaultConstraint</enum>
              </property>
-             <property name="margin">
+             <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>
              <item>
@@ -812,7 +884,7 @@
     <set>Qt::BottomDockWidgetArea</set>
    </property>
    <property name="windowTitle">
-    <string>Navigation</string>
+    <string>&amp;Navigation</string>
    </property>
    <attribute name="dockWidgetArea">
     <number>8</number>
@@ -872,11 +944,29 @@
          <property name="spacing">
           <number>0</number>
          </property>
-         <property name="margin">
+         <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>
          <item>
           <widget class="QToolButton" name="toolButtonPlay">
+           <property name="toolTip">
+            <string>Play SPACE</string>
+           </property>
+           <property name="statusTip">
+            <string>Play</string>
+           </property>
+           <property name="whatsThis">
+            <string/>
+           </property>
            <property name="text">
             <string>...</string>
            </property>
@@ -897,6 +987,9 @@
          </item>
          <item>
           <widget class="QToolButton" name="toolButtonStop">
+           <property name="toolTip">
+            <string>Stop SPACE</string>
+           </property>
            <property name="text">
             <string>...</string>
            </property>
@@ -917,6 +1010,9 @@
          </item>
          <item>
           <widget class="QToolButton" name="toolButtonPreviousFrame">
+           <property name="toolTip">
+            <string>Go to previous frame LEFT</string>
+           </property>
            <property name="text">
             <string>...</string>
            </property>
@@ -937,6 +1033,9 @@
          </item>
          <item>
           <widget class="QToolButton" name="toolButtonNextFrame">
+           <property name="toolTip">
+            <string>Go to next frame RIGHT</string>
+           </property>
            <property name="text">
             <string>...</string>
            </property>
@@ -957,6 +1056,9 @@
          </item>
          <item>
           <widget class="QToolButton" name="toolButtonPreviousIntraFrame">
+           <property name="toolTip">
+            <string>Go to previous keyframe DOWN</string>
+           </property>
            <property name="text">
             <string>...</string>
            </property>
@@ -977,6 +1079,9 @@
          </item>
          <item>
           <widget class="QToolButton" name="toolButtonNextIntraFrame">
+           <property name="toolTip">
+            <string>Go to next keyframe UP</string>
+           </property>
            <property name="text">
             <string>...</string>
            </property>
@@ -997,6 +1102,9 @@
          </item>
          <item>
           <widget class="QToolButton" name="toolButtonSetMarkerA">
+           <property name="toolTip">
+            <string>Set start marker CTRL+PAGEUP</string>
+           </property>
            <property name="text">
             <string>...</string>
            </property>
@@ -1017,6 +1125,9 @@
          </item>
          <item>
           <widget class="QToolButton" name="toolButtonSetMarkerB">
+           <property name="toolTip">
+            <string>Set end marker CTRL+PAGEDOWN</string>
+           </property>
            <property name="text">
             <string>...</string>
            </property>
@@ -1037,6 +1148,12 @@
          </item>
          <item>
           <widget class="QToolButton" name="toolButtonPreviousBlackFrame">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="toolTip">
+            <string>Search previous black frame</string>
+           </property>
            <property name="text">
             <string>...</string>
            </property>
@@ -1057,6 +1174,9 @@
          </item>
          <item>
           <widget class="QToolButton" name="toolButtonNextBlackFrame">
+           <property name="toolTip">
+            <string>Search next black frame</string>
+           </property>
            <property name="text">
             <string>...</string>
            </property>
@@ -1077,6 +1197,9 @@
          </item>
          <item>
           <widget class="QToolButton" name="toolButtonFirstFrame">
+           <property name="toolTip">
+            <string>Go to first frame HOME</string>
+           </property>
            <property name="text">
             <string>...</string>
            </property>
@@ -1097,6 +1220,9 @@
          </item>
          <item>
           <widget class="QToolButton" name="toolButtonLastFrame">
+           <property name="toolTip">
+            <string>Go to last frame END</string>
+           </property>
            <property name="text">
             <string>...</string>
            </property>
@@ -1116,6 +1242,55 @@
           </widget>
          </item>
          <item>
+          <widget class="QToolButton" name="toolButtonBackOneMinute">
+           <property name="toolTip">
+            <string>Backward one minute CTRL+DOWN</string>
+           </property>
+           <property name="text">
+            <string>...</string>
+           </property>
+           <property name="icon">
+            <iconset resource="avidemux.qrc">
+             <normaloff>:/new/prefix1/pics/backward1mn.png</normaloff>:/new/prefix1/pics/backward1mn.png</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
+           <property name="autoRaise">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="toolButtonForwardOneMinute">
+           <property name="toolTip">
+            <string>Forward one minute CTRL+UP</string>
+           </property>
+           <property name="accessibleDescription">
+            <string>Forward one minute</string>
+           </property>
+           <property name="text">
+            <string>...</string>
+           </property>
+           <property name="icon">
+            <iconset resource="avidemux.qrc">
+             <normaloff>:/new/prefix1/pics/forward1mn.png</normaloff>:/new/prefix1/pics/forward1mn.png</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
+           <property name="autoRaise">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
           <spacer name="horizontalSpacer_3">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -1138,7 +1313,16 @@
          <property name="spacing">
           <number>6</number>
          </property>
-         <property name="margin">
+         <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>
          <item>
@@ -1158,7 +1342,7 @@
            </property>
            <property name="maximumSize">
             <size>
-             <width>84</width>
+             <width>100</width>
              <height>16777215</height>
             </size>
            </property>
@@ -1168,6 +1352,9 @@
            <property name="maxLength">
             <number>12</number>
            </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
            <property name="readOnly">
             <bool>true</bool>
            </property>
@@ -1261,14 +1448,14 @@
    <property name="minimumSize">
     <size>
      <width>192</width>
-     <height>143</height>
+     <height>163</height>
     </size>
    </property>
    <property name="features">
     <set>QDockWidget::NoDockWidgetFeatures</set>
    </property>
    <property name="windowTitle">
-    <string>Selection</string>
+    <string>Se&amp;lection</string>
    </property>
    <attribute name="dockWidgetArea">
     <number>8</number>
@@ -1354,6 +1541,9 @@
          </item>
          <item row="1" column="2">
           <widget class="QPushButton" name="pushButtonJumpToMarkerA">
+           <property name="toolTip">
+            <string>Go to marker A PAGE UP</string>
+           </property>
            <property name="text">
             <string>000000</string>
            </property>
@@ -1361,6 +1551,9 @@
          </item>
          <item row="2" column="2">
           <widget class="QPushButton" name="pushButtonJumpToMarkerB">
+           <property name="toolTip">
+            <string>Go to Marker B PAGE DOWN</string>
+           </property>
            <property name="text">
             <string>000000</string>
            </property>
@@ -1369,7 +1562,7 @@
          <item row="3" column="1">
           <widget class="QCheckBox" name="checkDisplayOut">
            <property name="toolTip">
-            <string>Display processed video on playback</string>
+            <string>Display output video on playback</string>
            </property>
            <property name="text">
             <string/>
@@ -1404,7 +1597,7 @@
     <set>Qt::BottomDockWidgetArea</set>
    </property>
    <property name="windowTitle">
-    <string>Volume</string>
+    <string>Vol&amp;ume</string>
    </property>
    <attribute name="dockWidgetArea">
     <number>8</number>
@@ -1504,7 +1697,7 @@
     <set>Qt::BottomDockWidgetArea</set>
    </property>
    <property name="windowTitle">
-    <string>Audio Metre</string>
+    <string>Audio &amp;Metre</string>
    </property>
    <attribute name="dockWidgetArea">
     <number>8</number>

avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/pics/backward1mn.png Added

avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/pics/forward1mn.png Added

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/translation_table.h -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/translation_table.h Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_shell/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_shell/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux/qt4/ADM_userInterfaces/ui_support.cpp -> avidemux_2.6.13.tar.gz/avidemux/qt4/ADM_userInterfaces/ui_support.cpp Changed

@@ -21,8 +21,8 @@
 extern QWidget *QuiMainWindows;
 
 #define MAX_UNLOADED_MSG_LENGTH 400
-static QTranslator qtTranslator;
-static QTranslator avidemuxTranslator;
+static QTranslator *qtTranslator;
+static QTranslator *avidemuxTranslator;
 static QMap<QString, char*> *map = NULL;
 static bool translatorLoaded = false;
 
@@ -79,70 +79,76 @@
 void loadTranslator(void)
 {
 	
-        char *lang=NULL;
-        bool autoSelect=true;
-        if(prefs->get(DEFAULT_LANGUAGE,&lang))
+    char *lang=NULL;
+    bool autoSelect=true;
+    if(prefs->get(DEFAULT_LANGUAGE,&lang))
+    {
+        if(lang && strlen(lang)>0 && strcmp(lang,"auto"))
+            autoSelect=false;
+    }
+    if(autoSelect)
+    {
+        ADM_info("Using system language\n");
+        if(lang)
         {
-            if(lang && strlen(lang)>0 && strcmp(lang,"auto"))
-                autoSelect=false;
+            ADM_dealloc(lang);
+            lang=NULL;
         }
-        if(autoSelect)
-        {
-            ADM_info("Using system language\n");
-            lang=ADM_strdup(QLocale::system().name().toUtf8().constData());
-        }else
-        {
-            ADM_info("Language forced \n");
-        }
-        ADM_info("Initializing language %s\n",lang);
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0) 
-        std::string flavor="/qt4";
+        lang=ADM_strdup(QLocale::system().name().toUtf8().constData());
+    }else
+    {
+        ADM_info("Language forced \n");
+    }
+    ADM_info("Initializing language %s\n",lang);
+    #if QT_VERSION < QT_VERSION_CHECK(5,0,0) 
+        const std::string flavor="qt4";
 #else        
-        std::string flavor="/qt5";
+        const std::string flavor="qt5";
 #endif
-        std::string partialPath=std::string(flavor)+std::string("/i18n/");
-                
-                
-#ifdef __APPLE__
-	QString appdir = QCoreApplication::applicationDirPath() + "/../share/avidemux6/"+QString(partialPath.c_str());
-                
-#elif defined(_WIN32)
-	QString appdir = QCoreApplication::applicationDirPath() + QString(partialPath.c_str());
-#else
-	QString appdir = ADM_getInstallRelativePath("share","avidemux6",partialPath.c_str());
-#endif
-        QString languageFile=QString(lang);
+    std::string i18nFolder=ADM_getI8NDir(flavor);        
+    ADM_info("Translation folder is <%s>\n",i18nFolder.c_str());
+    QString appdir = QString(i18nFolder.c_str());    
+    QString languageFile;
+    if(lang)
+    {
+        languageFile=QString(lang);
+        ADM_dealloc(lang);
+    }
     int nbLoaded=0;
-	nbLoaded+=loadTranslation(&qtTranslator, appdir + "qt_" + languageFile);
-	nbLoaded+=loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + languageFile);
-	translatorLoaded = true;
+    qtTranslator=new QTranslator();
+    avidemuxTranslator=new QTranslator();
+    nbLoaded+=loadTranslation(qtTranslator, appdir + "qt_" + languageFile);
+    nbLoaded+=loadTranslation(avidemuxTranslator, appdir + "avidemux_" + languageFile);
+    translatorLoaded = true;
     if(!nbLoaded) // Nothing to translate..
+    {
+        ADM_info("No translation loaded.\n");
         return;
+    }
     ADM_info("Updating translations...\n");
-	// Re-translate existing map (to take care of global strings already allocated)
-        if(!map)
-            map = new QMap<QString, char*>;
-	QMapIterator<QString, char*> mapIterator(*map);
+    // Re-translate existing map (to take care of global strings already allocated)
+    if(!map)
+        map = new QMap<QString, char*>;
+    QMapIterator<QString, char*> mapIterator(*map);
 
-	while (mapIterator.hasNext())
-	{
-		mapIterator.next();
+    while (mapIterator.hasNext())
+    {
+            mapIterator.next();
 
-		QByteArray translatedMessage = QApplication::translate("", mapIterator.key().toLatin1().constData()).toUtf8();
-		char *buffer = mapIterator.value();
-		int copyLength = translatedMessage.length() + 1;
+            QByteArray translatedMessage = QApplication::translate("", mapIterator.key().toLatin1().constData()).toUtf8();
+            char *buffer = mapIterator.value();
+            int copyLength = translatedMessage.length() + 1;
 
-		if (copyLength > MAX_UNLOADED_MSG_LENGTH + 1)
-		{
-			copyLength = MAX_UNLOADED_MSG_LENGTH;
-			bufferMAX_UNLOADED_MSG_LENGTH = '\0';
-		}
+            if (copyLength > MAX_UNLOADED_MSG_LENGTH + 1)
+            {
+                    copyLength = MAX_UNLOADED_MSG_LENGTH;
+                    bufferMAX_UNLOADED_MSG_LENGTH = '\0';
+            }
 
-		memcpy(buffer, translatedMessage.constData(), copyLength);
-	}
+            memcpy(buffer, translatedMessage.constData(), copyLength);
+    }
 
-	ADM_info("Locale Test: &Edit -> %s\n\n", HIDE_STRING_FROM_QT("MainWindow", "&Edit").toUtf8().data());
-        
+    ADM_info("Locale Test: &Edit -> %s\n\n", HIDE_STRING_FROM_QT("MainWindow", "&Edit").toUtf8().data());        
 }
 
 void destroyTranslator(void)
@@ -183,9 +189,9 @@
 
 extern int paintEngineType;
 
-const char* getNativeRendererDesc(void)
+const char* getNativeRendererDesc(int engine)
 {
-	switch (paintEngineType)
+	switch (engine)
 	{
 		case QPaintEngine::X11:
 			return QT_TRANSLATE_NOOP("uisupport","X11");

avidemux_2.6.12.tar.gz/avidemux/qt4/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux/qt4/CMakeLists.txt Changed

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
-
+SET(AVIDEMUX_API_VERSION 2.6)
 SET(ADM_PROJECT Avidemux_qt4)
 
 MESSAGE("")
@@ -8,7 +8,38 @@
 MESSAGE("#########################################")
 MESSAGE("")
 
-include(../commonCmakeApplication.cmake)
+MESSAGE(STATUS "Checking for avidemux development files ..")
+
+IF(NOT FAKEROOT)
+	SET(AVIDEMUX_FAKEROOT "")
+else(NOT FAKEROOT)
+	SET(AVIDEMUX_FAKEROOT "${FAKEROOT}/")
+endif(NOT FAKEROOT)
+
+
+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)
 
@@ -36,7 +67,7 @@
 SET(CONFIG_HEADER_TYPE ADM_BUILD_QT4)
 SET(UI_SUFFIX ${QT_EXTENSION})
 
-CONFIGURE_FILE("${AVIDEMUX_TOP_SOURCE_DIR}/cmake/config.h.cmake" "${CMAKE_BINARY_DIR}/config/${QT_EXTENSION}/config.h")
+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}/")
@@ -203,4 +234,11 @@
 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 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)
+
+
 MESSAGE("")

avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/avidemux_ca.ts -> avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/avidemux_ca.ts Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ca_ES">
+<TS version="2.1" language="ca_ES">
 <context>
     <name></name>
     <message>
@@ -3863,6 +3863,21 @@
     </message>
 </context>
 <context>
+    <name>ADM_Qt4CoreUIToolkit::DIA_processingQt4</name>
+    <message>
+        <source>_Resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The processing is paused.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_Qt4Factory::ADM_Qbitrate</name>
     <message>
         <source>Constant Bitrate</source>
@@ -3953,6 +3968,13 @@
     </message>
 </context>
 <context>
+    <name>ADM_ffDvEncoder</name>
+    <message>
+        <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_ogmWrite</name>
     <message>
         <source>None</source>
@@ -4606,7 +4628,7 @@
     <name>DIA_encodingQt4</name>
     <message>
         <source>Shutting down</source>
-        <translation type="unfinished">En procés d&apos;apagada</translation>
+        <translation type="obsolete">En procés d&apos;apagada</translation>
     </message>
     <message>
         <source>The encoding is paused. Do you want to resume or abort?</source>
@@ -4620,6 +4642,14 @@
         <source>Abort</source>
         <translation type="unfinished">Cancel·la</translation>
     </message>
+    <message>
+        <source>Privileges Required</source>
+        <translation type="unfinished">Calen privilegis</translation>
+    </message>
+    <message>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation type="unfinished">Calen privilegis de root per realitzar aquesta operació.</translation>
+    </message>
 </context>
 <context>
     <name>DVD</name>
@@ -4644,6 +4674,13 @@
     </message>
 </context>
 <context>
+    <name>DcaEnc</name>
+    <message>
+        <source>DcaEnc Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Decimate</name>
     <message>
         <source>Discard closer</source>
@@ -4729,7 +4766,7 @@
     </message>
     <message>
         <source>Audio Filters</source>
-        <translation type="unfinished">Filtres d&apos;àudio</translation>
+        <translation type="obsolete">Filtres d&apos;àudio</translation>
     </message>
     <message>
         <source>Track 2</source>
@@ -4751,6 +4788,10 @@
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Filters</source>
+        <translation type="unfinished">Filtres</translation>
+    </message>
 </context>
 <context>
     <name>DialogOcr</name>
@@ -4800,6 +4841,41 @@
     </message>
 </context>
 <context>
+    <name>DialogProcessing</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished">Diàleg</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel·la</translation>
+    </message>
+    <message>
+        <source>TimeLeft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>00:00:00</source>
+        <translation type="unfinished">00:00:00</translation>
+    </message>
+    <message>
+        <source>ProcessImages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished">0</translation>
+    </message>
+    <message>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DialogProgress</name>
     <message>
         <source>1/1</source>
@@ -5974,10 +6050,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;b&gt;Selection&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6021,6 +6093,18 @@
         <source>Ctrl+Alt+M</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display processed video on playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play filtered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Video</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MjpegEncoder</name>
@@ -6604,6 +6688,13 @@
     </message>
 </context>
 <context>
+    <name>Webmmuxer</name>
+    <message>
+        <source>Saving Webm</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XvidConfigDialog</name>
     <message>
         <source>&lt;default&gt;</source>
@@ -7099,18 +7190,22 @@
         <source>&amp;License</source>
         <translation type="unfinished">&amp;Llicència</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>© 2001 - 2010  Mean</source>
         <translation type="obsolete">© 2001 - 2010  Mean</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>© 2001 - 2012  Mean</source>
-        <translation type="unfinished">© 2001 - 2010  Mean {2001 ?} {2012 ?}</translation>
+        <translation type="obsolete">© 2001 - 2010  Mean {2001 ?} {2012 ?}</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished">Accepta</translation>
     </message>
+    <message>
+        <source>© 2001 - 2016  Mean</source>
+        <translation type="unfinished">© 2001 - 2010  Mean {2001 ?} {2012 ?} {2001 ?} {2016 ?}</translation>
+    </message>
 </context>
 <context>
     <name>addBorders</name>
@@ -7370,7 +7465,7 @@
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished">Vídeo</translation>
+        <translation type="obsolete">Vídeo</translation>
     </message>
     <message>
         <source>CPU</source>
@@ -7773,10 +7868,6 @@
         <translation type="unfinished">Info sobre els connectors</translation>
     </message>
     <message>
-        <source>Decode video using VDPAU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7793,14 +7884,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MS Windows GDI (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MS Windows DirectX (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>No audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7853,11 +7936,11 @@
     </message>
     <message>
         <source>Select AVI File...</source>
-        <translation type="unfinished">Seleccioneu un fitxer d&apos;AVI</translation>
+        <translation type="obsolete">Seleccioneu un fitxer d&apos;AVI</translation>
     </message>
     <message>
         <source>Select AVI File to Append...</source>
-        <translation type="unfinished">Seleccioneu un fitxer d&apos;AVI per afegir</translation>
+        <translation type="obsolete">Seleccioneu un fitxer d&apos;AVI per afegir</translation>
     </message>
     <message>
         <source>Are you sure?</source>
@@ -8221,23 +8304,23 @@
     </message>
     <message>
         <source>The filter is already partial</source>
-        <translation type="unfinished">El filtre ja és parcial</translation>
+        <translation type="obsolete">El filtre ja és parcial</translation>
     </message>
     <message>
         <source>Partial Start Frame:</source>
-        <translation type="unfinished">Fotogr. inicial per al filtre parcial:</translation>
+        <translation type="obsolete">Fotogr. inicial per al filtre parcial:</translation>
     </message>
     <message>
         <source>Partial End Frame:</source>
-        <translation type="unfinished">Fotogr. final per al filtre parcial:</translation>
+        <translation type="obsolete">Fotogr. final per al filtre parcial:</translation>
     </message>
     <message>
         <source>Configure child</source>
-        <translation type="unfinished">Configura el filtre parcial</translation>
+        <translation type="obsolete">Configura el filtre parcial</translation>
     </message>
     <message>
         <source>Partial Video Filter</source>
-        <translation type="unfinished">Filtre parcial de vídeo</translation>
+        <translation type="obsolete">Filtre parcial de vídeo</translation>
     </message>
     <message>
         <source>_Interlaced</source>
@@ -8475,6 +8558,76 @@
         <source>This script has already been successfully executed.</source>
         <translation type="unfinished">Aquests script ja s&apos;ha executat amb èxit.</translation>
     </message>
+    <message>
+        <source>Gain</source>
+        <translation type="unfinished">Guany</translation>
+    </message>
+    <message>
+        <source>Mixer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using VDPAU (NVIDIA)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using XVBA (AMD)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you use Hw decoding, it is better to use the matching display driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LIBVA (best)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sdl driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HW Accel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You cannot remove *all* the video
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File to Append...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid audio index given</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving</source>
+        <translation type="unfinished">S&apos;està desant</translation>
+    </message>
 </context>
 <context>
     <name>aften</name>
@@ -8524,14 +8677,6 @@
 <context>
     <name>ass</name>
     <message>
-        <source>SSA.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardcode ass/ssa subtitles using libass.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Subtitle file (ASS/SSA):</source>
         <translation type="unfinished">Fitxer de _subtítols (ASS/SSA):</translation>
     </message>
@@ -8559,6 +8704,14 @@
         <source>ASS</source>
         <translation type="unfinished">ASS</translation>
     </message>
+    <message>
+        <source>SSA/ASS/SRT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>autoWizard</name>
@@ -8615,6 +8768,21 @@
     </message>
 </context>
 <context>
+    <name>black</name>
+    <message>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace a section by black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace by Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>blacken</name>
     <message>
         <source>_Left border:</source>
@@ -9032,6 +9200,13 @@
     </message>
 </context>
 <context>
+    <name>dcaenc</name>
+    <message>
+        <source>_Bitrate:</source>
+        <translation type="unfinished">Taxa de _bits: </translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <source>Decomb decimate</source>
@@ -9051,7 +9226,7 @@
     </message>
     <message>
         <source>Discard longer dupe (animÃ©s)</source>
-        <translation type="unfinished">Descarta dupls. grans (animés)</translation>
+        <translation type="obsolete">Descarta dupls. grans (animés)</translation>
     </message>
     <message>
         <source>Pulldown dupe removal</source>
@@ -9093,12 +9268,27 @@
         <source>Decomb Decimate</source>
         <translation type="unfinished">Decomb Decimate</translation>
     </message>
+    <message>
+        <source>Discard longer dupe (animés)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>delogo</name>
     <message>
         <source>MPlayer delogo</source>
-        <translation type="unfinished">MPlayer delogo</translation>
+        <translation type="obsolete">MPlayer delogo</translation>
+    </message>
+    <message>
+        <source>Blend a logo by interpolating its surrounding box.</source>
+        <translation type="obsolete">Torna transparent un logo interpolant una caixa circumdant.</translation>
+    </message>
+</context>
+<context>
+    <name>delogo2</name>
+    <message>
+        <source>MPlayer delogo2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blend a logo by interpolating its surrounding box.</source>
@@ -9370,16 +9560,24 @@
 &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 type="unfinished"></translation>
     </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished">Avançat</translation>
+    </message>
 </context>
 <context>
     <name>encodingWindow</name>
     <message>
         <source>Privileges Required</source>
-        <translation type="unfinished">Calen privilegis</translation>
+        <translation type="obsolete">Calen privilegis</translation>
     </message>
     <message>
         <source>Root privileges are required to perform this operation.</source>
-        <translation type="unfinished">Calen privilegis de root per realitzar aquesta operació.</translation>
+        <translation type="obsolete">Calen privilegis de root per realitzar aquesta operació.</translation>
     </message>
     <message>
         <source>Pause / Abort</source>
@@ -9476,7 +9674,7 @@
     </message>
     <message>
         <source>Fade in/out.</source>
-        <translation type="unfinished">Fosa en blanc/en negre </translation>
+        <translation type="obsolete">Fosa en blanc/en negre </translation>
     </message>
     <message>
         <source>Out</source>
@@ -9510,6 +9708,21 @@
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Fade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fade to black in/out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fade to</name>
+    <message>
+        <source>Fade</source>
+        <translation type="unfinished">Fade</translation>
+    </message>
 </context>
 <context>
     <name>ffmpeg2</name>
@@ -9921,6 +10134,49 @@
     </message>
 </context>
 <context>
+    <name>ffnvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>filtermainWindow</name>
     <message>
         <source>The filter is already partial</source>
@@ -9954,6 +10210,14 @@
         <source>Partial Video Filter</source>
         <translation type="obsolete">Filtre parcial de vídeo</translation>
     </message>
+    <message>
+        <source>Load video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>flux</name>
@@ -10765,11 +11029,11 @@
     </message>
     <message>
         <source>C&amp;onfigure</source>
-        <translation type="unfinished">C&amp;onfigura</translation>
+        <translation type="obsolete">C&amp;onfigura</translation>
     </message>
     <message>
         <source>P&amp;artial</source>
-        <translation type="unfinished">P&amp;arcial</translation>
+        <translation type="obsolete">P&amp;arcial</translation>
     </message>
     <message>
         <source>Open Script</source>
@@ -10793,7 +11057,7 @@
     </message>
     <message>
         <source>Down</source>
-        <translation type="unfinished">Avall</translation>
+        <translation type="obsolete">Avall</translation>
     </message>
     <message>
         <source>Move Filter Up</source>
@@ -10801,7 +11065,7 @@
     </message>
     <message>
         <source>Up</source>
-        <translation type="unfinished">Amunt</translation>
+        <translation type="obsolete">Amunt</translation>
     </message>
     <message>
         <source>Remove Filter</source>
@@ -10809,7 +11073,7 @@
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished">Suprimeix</translation>
+        <translation type="obsolete">Suprimeix</translation>
     </message>
     <message>
         <source>Add Filter</source>
@@ -10817,7 +11081,7 @@
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished">Afegeix</translation>
+        <translation type="obsolete">Afegeix</translation>
     </message>
     <message>
         <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
@@ -11100,6 +11364,49 @@
     </message>
 </context>
 <context>
+    <name>nvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>oggHeader</name>
     <message>
         <source>Take second track ?</source>
@@ -11531,7 +11838,7 @@
     </message>
     <message>
         <source>90Â°</source>
-        <translation type="unfinished">90°</translation>
+        <translation type="obsolete">90°</translation>
     </message>
     <message>
         <source>180 degrees</source>
@@ -11539,7 +11846,7 @@
     </message>
     <message>
         <source>180Â°</source>
-        <translation type="unfinished">180°</translation>
+        <translation type="obsolete">180°</translation>
     </message>
     <message>
         <source>270 degrees</source>
@@ -11547,12 +11854,24 @@
     </message>
     <message>
         <source>270Â°</source>
-        <translation type="unfinished">270°</translation>
+        <translation type="obsolete">270°</translation>
     </message>
     <message>
         <source>_Angle:</source>
         <translation type="unfinished">_Angle: </translation>
     </message>
+    <message>
+        <source>90°</source>
+        <translation type="unfinished">90°</translation>
+    </message>
+    <message>
+        <source>180°</source>
+        <translation type="unfinished">180°</translation>
+    </message>
+    <message>
+        <source>270°</source>
+        <translation type="unfinished">270°</translation>
+    </message>
 </context>
 <context>
     <name>rotateFilter</name>
@@ -11596,11 +11915,11 @@
 <context>
     <name>rotateGl</name>
     <message>
-        <source>Angle (Â°):</source>
+        <source>glRotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>glRotate</source>
+        <source>Angle (°):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -11970,6 +12289,17 @@
     </message>
 </context>
 <context>
+    <name>vsWindow</name>
+    <message>
+        <source>Open VapourSynth File 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VS File Files (*.vpy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <source>Processing</source>
@@ -13010,6 +13340,53 @@
     </message>
 </context>
 <context>
+    <name>x265Dialog</name>
+    <message>
+        <source>Target Bitrate:</source>
+        <translation type="unfinished">Taxa de bits sortida:</translation>
+    </message>
+    <message>
+        <source>kbit/s</source>
+        <translation type="unfinished">kbit/s</translation>
+    </message>
+    <message>
+        <source>Quantiser:</source>
+        <translation type="unfinished">Quantificador:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="unfinished">Qualitat: </translation>
+    </message>
+    <message>
+        <source>Target Video Size:</source>
+        <translation type="unfinished">Mida vídeo sortida:</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished">MB</translation>
+    </message>
+    <message>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished">Taxa de bits mitjana:</translation>
+    </message>
+    <message>
+        <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 type="unfinished">L&apos;Optimització ramificada de macrobloc requereix l&apos;activació de la Quantificació adptativa a la variància.  La Quantificació adaptativa a la variància s&apos;activarà automàticament.
+
+Voleu continuar?</translation>
+    </message>
+    <message>
+        <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 type="unfinished">L&apos;Optimització ramificada de macrobloc requereix l&apos;activació de la Quantificació adptativa a la variància.  L&apos;Optimització ramificada de macrobloc es desactivarà automàticament.
+
+Voleu continuar?</translation>
+    </message>
+</context>
+<context>
     <name>xvid4</name>
     <message>
         <source>None</source>
@@ -13127,6 +13504,46 @@
         <source>Xvid4 MPEG-4 ASP configuration</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>1:1 (PC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio:</source>
+        <translation type="unfinished">Relació d&apos;aspecte:</translation>
+    </message>
+    <message>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio</source>
+        <translation type="unfinished">Relació d&apos;aspecte</translation>
+    </message>
 </context>
 <context>
     <name>yadifFilter</name>

avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/avidemux_cs.ts -> avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/avidemux_cs.ts Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="cs_CZ">
+<TS version="2.1" language="cs_CZ">
 <context>
     <name></name>
     <message>
@@ -7767,6 +7767,21 @@
     </message>
 </context>
 <context>
+    <name>ADM_Qt4CoreUIToolkit::DIA_processingQt4</name>
+    <message>
+        <source>_Resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The processing is paused.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_Qt4Factory::ADM_Qbitrate</name>
     <message>
         <source>Constant Bitrate</source>
@@ -7872,6 +7887,13 @@
     </message>
 </context>
 <context>
+    <name>ADM_ffDvEncoder</name>
+    <message>
+        <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_ogmWrite</name>
     <message>
         <source>None</source>
@@ -8568,7 +8590,7 @@
     <name>DIA_encodingQt4</name>
     <message>
         <source>Shutting down</source>
-        <translation type="unfinished">Vypínání</translation>
+        <translation type="obsolete">Vypínání</translation>
     </message>
     <message>
         <source>The encoding is paused. Do you want to resume or abort?</source>
@@ -8582,6 +8604,14 @@
         <source>Abort</source>
         <translation type="unfinished">Ukončit</translation>
     </message>
+    <message>
+        <source>Privileges Required</source>
+        <translation type="unfinished">Uživatelská práva</translation>
+    </message>
+    <message>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation type="unfinished">K této akci jsou vyžadována práva roota.</translation>
+    </message>
 </context>
 <context>
     <name>DIA_progressIndexing</name>
@@ -8617,6 +8647,13 @@
     </message>
 </context>
 <context>
+    <name>DcaEnc</name>
+    <message>
+        <source>DcaEnc Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Decimate</name>
     <message>
         <source>Discard closer</source>
@@ -9278,7 +9315,7 @@
     </message>
     <message>
         <source>Audio Filters</source>
-        <translation type="unfinished">Audio filtry</translation>
+        <translation type="obsolete">Audio filtry</translation>
     </message>
     <message>
         <source>Track 2</source>
@@ -9300,6 +9337,10 @@
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Filters</source>
+        <translation type="unfinished">Filtry</translation>
+    </message>
 </context>
 <context>
     <name>DialogEq2</name>
@@ -9388,6 +9429,41 @@
     </message>
 </context>
 <context>
+    <name>DialogProcessing</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished">Dialog</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Zrušit</translation>
+    </message>
+    <message>
+        <source>TimeLeft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>00:00:00</source>
+        <translation type="unfinished">00:00:00</translation>
+    </message>
+    <message>
+        <source>ProcessImages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished">0</translation>
+    </message>
+    <message>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DialogProgress</name>
     <message>
         <source>1/1</source>
@@ -10561,10 +10637,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;b&gt;Selection&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10620,6 +10692,18 @@
         <source>Ctrl+Alt+M</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display processed video on playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play filtered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Video</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MjpegEncoder</name>
@@ -11233,6 +11317,13 @@
     </message>
 </context>
 <context>
+    <name>Webmmuxer</name>
+    <message>
+        <source>Saving Webm</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XvidConfigDialog</name>
     <message>
         <source>&lt;default&gt;</source>
@@ -11720,15 +11811,15 @@
         <source>Multi-platform Video Editor</source>
         <translation type="unfinished">Multiplatformní video editor</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>© 2001 - 2012  Mean</source>
-        <translation type="unfinished">© 2001 - 2010  Mean {2001 ?} {2012 ?}</translation>
+        <translation type="obsolete">© 2001 - 2010  Mean {2001 ?} {2012 ?}</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>© 2001 - 2010  Mean</source>
         <translation type="obsolete">© 2001 - 2010  Mean</translation>
     </message>
@@ -11740,6 +11831,10 @@
         <source>&amp;License</source>
         <translation type="unfinished">&amp;Licence</translation>
     </message>
+    <message>
+        <source>© 2001 - 2016  Mean</source>
+        <translation type="unfinished">© 2001 - 2010  Mean {2001 ?} {2016 ?}</translation>
+    </message>
 </context>
 <context>
     <name>addBorders</name>
@@ -11991,7 +12086,7 @@
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished">Video</translation>
+        <translation type="obsolete">Video</translation>
     </message>
     <message>
         <source>CPU</source>
@@ -12398,10 +12493,6 @@
         <translation type="unfinished">Informace o zásuvných modulech</translation>
     </message>
     <message>
-        <source>Decode video using VDPAU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12422,14 +12513,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MS Windows GDI (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MS Windows DirectX (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>No audio track</source>
         <translation type="unfinished">Chybí zvuková stopa</translation>
     </message>
@@ -12484,11 +12567,11 @@
     </message>
     <message>
         <source>Select AVI File...</source>
-        <translation type="unfinished">Zvolte AVI soubor...</translation>
+        <translation type="obsolete">Zvolte AVI soubor...</translation>
     </message>
     <message>
         <source>Select AVI File to Append...</source>
-        <translation type="unfinished">Vyberte AVI soubor k připojení...</translation>
+        <translation type="obsolete">Vyberte AVI soubor k připojení...</translation>
     </message>
     <message>
         <source>Are you sure?</source>
@@ -12932,23 +13015,23 @@
     </message>
     <message>
         <source>The filter is already partial</source>
-        <translation type="unfinished">Filtr již je částečný</translation>
+        <translation type="obsolete">Filtr již je částečný</translation>
     </message>
     <message>
         <source>Partial Start Frame:</source>
-        <translation type="unfinished">Počáteční snímek:</translation>
+        <translation type="obsolete">Počáteční snímek:</translation>
     </message>
     <message>
         <source>Partial End Frame:</source>
-        <translation type="unfinished">Konečný snímek:</translation>
+        <translation type="obsolete">Konečný snímek:</translation>
     </message>
     <message>
         <source>Configure child</source>
-        <translation type="unfinished">Nastavit filtr</translation>
+        <translation type="obsolete">Nastavit filtr</translation>
     </message>
     <message>
         <source>Partial Video Filter</source>
-        <translation type="unfinished">Částečný video filtr</translation>
+        <translation type="obsolete">Částečný video filtr</translation>
     </message>
     <message>
         <source>_Interlaced</source>
@@ -13186,6 +13269,76 @@
         <source>This script has already been successfully executed.</source>
         <translation type="unfinished">Tento skript již byl úspěšně vykonán.</translation>
     </message>
+    <message>
+        <source>Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mixer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using VDPAU (NVIDIA)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using XVBA (AMD)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you use Hw decoding, it is better to use the matching display driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LIBVA (best)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sdl driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HW Accel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You cannot remove *all* the video
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File to Append...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid audio index given</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving</source>
+        <translation type="unfinished">Ukládání</translation>
+    </message>
 </context>
 <context>
     <name>aften</name>
@@ -13239,14 +13392,6 @@
 <context>
     <name>ass</name>
     <message>
-        <source>SSA.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardcode ass/ssa subtitles using libass.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Subtitle file (ASS/SSA):</source>
         <translation type="unfinished">_Soubor s titulky (ASS/SSA):</translation>
     </message>
@@ -13274,6 +13419,14 @@
         <source>ASS</source>
         <translation type="unfinished">ASS</translation>
     </message>
+    <message>
+        <source>SSA/ASS/SRT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>autoWizard</name>
@@ -13330,6 +13483,21 @@
     </message>
 </context>
 <context>
+    <name>black</name>
+    <message>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace a section by black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace by Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>blacken</name>
     <message>
         <source>_Left border:</source>
@@ -13745,6 +13913,13 @@
     </message>
 </context>
 <context>
+    <name>dcaenc</name>
+    <message>
+        <source>_Bitrate:</source>
+        <translation type="unfinished">_Datový tok:</translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <source>Decomb decimate</source>
@@ -13764,7 +13939,7 @@
     </message>
     <message>
         <source>Discard longer dupe (animÃ©s)</source>
-        <translation type="unfinished">Zahodit delší dukplikáty (kreslené filmy)</translation>
+        <translation type="obsolete">Zahodit delší dukplikáty (kreslené filmy)</translation>
     </message>
     <message>
         <source>Pulldown dupe removal</source>
@@ -13806,12 +13981,27 @@
         <source>Decomb Decimate</source>
         <translation type="unfinished">Decomb Decimate</translation>
     </message>
+    <message>
+        <source>Discard longer dupe (animés)</source>
+        <translation type="unfinished">Zahodit delší duplikáty (animé)</translation>
+    </message>
 </context>
 <context>
     <name>delogo</name>
     <message>
         <source>MPlayer delogo</source>
-        <translation type="unfinished">MPlayer delogo</translation>
+        <translation type="obsolete">MPlayer delogo</translation>
+    </message>
+    <message>
+        <source>Blend a logo by interpolating its surrounding box.</source>
+        <translation type="obsolete">Vymaže logo interpolací jeho okolí.</translation>
+    </message>
+</context>
+<context>
+    <name>delogo2</name>
+    <message>
+        <source>MPlayer delogo2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blend a logo by interpolating its surrounding box.</source>
@@ -14083,6 +14273,14 @@
 &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 type="unfinished"></translation>
     </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished">Hlavní</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished">Pokročilé</translation>
+    </message>
 </context>
 <context>
     <name>encodingWindow</name>
@@ -14100,11 +14298,11 @@
     </message>
     <message>
         <source>Privileges Required</source>
-        <translation type="unfinished">Uživatelská práva</translation>
+        <translation type="obsolete">Uživatelská práva</translation>
     </message>
     <message>
         <source>Root privileges are required to perform this operation.</source>
-        <translation type="unfinished">K této akci jsou vyžadována práva roota.</translation>
+        <translation type="obsolete">K této akci jsou vyžadována práva roota.</translation>
     </message>
     <message>
         <source>Shutting down</source>
@@ -14189,7 +14387,7 @@
     </message>
     <message>
         <source>Fade in/out.</source>
-        <translation type="unfinished">Postupný náběh/do ztracena.</translation>
+        <translation type="obsolete">Postupný náběh/do ztracena.</translation>
     </message>
     <message>
         <source>Out</source>
@@ -14223,6 +14421,21 @@
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Fade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fade to black in/out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fade to</name>
+    <message>
+        <source>Fade</source>
+        <translation type="unfinished">Fade</translation>
+    </message>
 </context>
 <context>
     <name>ffmpeg2</name>
@@ -14634,6 +14847,49 @@
     </message>
 </context>
 <context>
+    <name>ffnvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished">Nastavení libavcodec MPEG-4</translation>
+    </message>
+</context>
+<context>
     <name>filtermainWindow</name>
     <message>
         <source>The filter is already partial</source>
@@ -14667,6 +14923,14 @@
         <source>Partial Video Filter</source>
         <translation type="obsolete">Částečný video filtr</translation>
     </message>
+    <message>
+        <source>Load video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>flux</name>
@@ -15454,11 +15718,11 @@
     </message>
     <message>
         <source>C&amp;onfigure</source>
-        <translation type="unfinished">N&amp;astavit</translation>
+        <translation type="obsolete">N&amp;astavit</translation>
     </message>
     <message>
         <source>P&amp;artial</source>
-        <translation type="unfinished">Čá&amp;stečný</translation>
+        <translation type="obsolete">Čá&amp;stečný</translation>
     </message>
     <message>
         <source>Open Script</source>
@@ -15482,7 +15746,7 @@
     </message>
     <message>
         <source>Down</source>
-        <translation type="unfinished">Dolů</translation>
+        <translation type="obsolete">Dolů</translation>
     </message>
     <message>
         <source>Move Filter Up</source>
@@ -15490,7 +15754,7 @@
     </message>
     <message>
         <source>Up</source>
-        <translation type="unfinished">Nahoru</translation>
+        <translation type="obsolete">Nahoru</translation>
     </message>
     <message>
         <source>Remove Filter</source>
@@ -15498,7 +15762,7 @@
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished">Odstranit</translation>
+        <translation type="obsolete">Odstranit</translation>
     </message>
     <message>
         <source>Add Filter</source>
@@ -15506,7 +15770,7 @@
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished">Přidat</translation>
+        <translation type="obsolete">Přidat</translation>
     </message>
     <message>
         <source>Transform</source>
@@ -15821,6 +16085,49 @@
     </message>
 </context>
 <context>
+    <name>nvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>oggHeader</name>
     <message>
         <source>Take second track ?</source>
@@ -16322,7 +16629,7 @@
     </message>
     <message>
         <source>90Â°</source>
-        <translation type="unfinished">90Â°</translation>
+        <translation type="obsolete">90Â°</translation>
     </message>
     <message>
         <source>180 degrees</source>
@@ -16330,7 +16637,7 @@
     </message>
     <message>
         <source>180Â°</source>
-        <translation type="unfinished">180Â°</translation>
+        <translation type="obsolete">180Â°</translation>
     </message>
     <message>
         <source>270 degrees</source>
@@ -16338,12 +16645,24 @@
     </message>
     <message>
         <source>270Â°</source>
-        <translation type="unfinished">270Â°</translation>
+        <translation type="obsolete">270Â°</translation>
     </message>
     <message>
         <source>_Angle:</source>
         <translation type="unfinished">Ú_hel:</translation>
     </message>
+    <message>
+        <source>90°</source>
+        <translation type="unfinished">90°</translation>
+    </message>
+    <message>
+        <source>180°</source>
+        <translation type="unfinished">180°</translation>
+    </message>
+    <message>
+        <source>270°</source>
+        <translation type="unfinished">270°</translation>
+    </message>
 </context>
 <context>
     <name>rotateFilter</name>
@@ -16383,11 +16702,11 @@
 <context>
     <name>rotateGl</name>
     <message>
-        <source>Angle (Â°):</source>
+        <source>glRotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>glRotate</source>
+        <source>Angle (°):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -16750,6 +17069,17 @@
     </message>
 </context>
 <context>
+    <name>vsWindow</name>
+    <message>
+        <source>Open VapourSynth File 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VS File Files (*.vpy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <source>Processing</source>
@@ -17734,6 +18064,53 @@
     </message>
 </context>
 <context>
+    <name>x265Dialog</name>
+    <message>
+        <source>Target Bitrate:</source>
+        <translation type="unfinished">Cílový datový tok:</translation>
+    </message>
+    <message>
+        <source>kbit/s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quantiser:</source>
+        <translation type="unfinished">Kvantizér:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="unfinished">Kvalita:</translation>
+    </message>
+    <message>
+        <source>Target Video Size:</source>
+        <translation type="unfinished">Cílová velikost videa:</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished">MB</translation>
+    </message>
+    <message>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished">Průměrný datový tok:</translation>
+    </message>
+    <message>
+        <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 type="unfinished">Optimalizace stromu makrobloků vyžaduje zapnutou adaptivní kvantizaci. Ta bude automaticky povolena.
+
+Chcete pokračovat?</translation>
+    </message>
+    <message>
+        <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 type="unfinished">Optimalizace stromu makrobloků vyžaduje zapnutou adaptivní kvantizaci. Optimalizace stromu makrobloků bude automaticky vypnuta.
+
+Chcete pokračovat?</translation>
+    </message>
+</context>
+<context>
     <name>xvid4</name>
     <message>
         <source>None</source>
@@ -17851,6 +18228,46 @@
         <source>Xvid4 MPEG-4 ASP configuration</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>1:1 (PC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished">Mi_n. kvantizér:</translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished">Ma_x. kvantizér:</translation>
+    </message>
+    <message>
+        <source>Aspect Ratio:</source>
+        <translation type="unfinished">Poměr stran pixelu:</translation>
+    </message>
+    <message>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio</source>
+        <translation type="unfinished">Poměr stran</translation>
+    </message>
 </context>
 <context>
     <name>yadifFilter</name>

avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/avidemux_da_DK.ts Added

@@ -0,0 +1,4762 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE TS>
+<TS version="2.0" language="da_DK">
+<context>
+    <name>ADM_Composer</name>
+    <message>
+        <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>Noget timinginformation er ukorrekt.
+Det sker ved nogle optager-software.
+Hvis du genkoder video bør vi droppe disse informationer,
+ ellers kan det forårsage mistede billeder/hakkende video.
+Hvis du blot kopiér videoen uden genkodning,
+ bør du beholde dem.
+Drop timinginformationer?</translation>
+    </message>
+    <message>
+        <source>Cannot find a demuxer for %s</source>
+        <translation>Kan ikke finde en demuxer for %s</translation>
+    </message>
+    <message>
+        <source>Attempt to open %s failed!</source>
+        <translation>Forsøg på at åbne %s fejlede!</translation>
+    </message>
+    <message>
+        <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
+1.) "resize" / "add border" / "crop" each stream to the same resolution
+2.) concatinate them together</source>
+        <translation>Du kan endnu ikke mikse forskellige videodimensioner. Det vil ikke løse problemet at bruge det delvise videofilter senere. Det kan gøres som her:
+1.) "ændr størrelse" / "tilføj kanter" / "beskær" hver strøm til samme opløsning
+2.) sæt dem sammen</translation>
+    </message>
+</context>
+<context>
+    <name>ADM_Qt4CoreUIToolkit</name>
+    <message>
+        <source>Alert</source>
+        <translation>Besked</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
+        <source>Confirmation</source>
+        <translation>Bekræftelse</translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation>Spørgsmål</translation>
+    </message>
+    <message>
+        <source>Question?</source>
+        <translation>Spørgsmål?</translation>
+    </message>
+</context>
+<context>
+    <name>ADM_Qt4Factory::ADM_Qbitrate</name>
+    <message>
+        <source>Constant Bitrate</source>
+        <translation>Konstant bithastighed</translation>
+    </message>
+    <message>
+        <source>Constant Quantiser</source>
+        <translation>Konstant quantiser</translation>
+    </message>
+    <message>
+        <source>Same Quantiser as Input</source>
+        <translation>Samme quantiser som input</translation>
+    </message>
+    <message>
+        <source>Constant Rate Factor</source>
+        <translation>Konstant ratefaktor</translation>
+    </message>
+    <message>
+        <source>Two Pass - Video Size</source>
+        <translation>To gennemløb - videostørrelse</translation>
+    </message>
+    <message>
+        <source>Two Pass - Average Bitrate</source>
+        <translation>To gennemløb - gennemsnitlig bithastighed</translation>
+    </message>
+    <message>
+        <source>Encoding mode</source>
+        <translation>Kodningstilstand</translation>
+    </message>
+    <message>
+        <source>Bitrate</source>
+        <translation>Bithastighed</translation>
+    </message>
+    <message>
+        <source>Target bitrate (kb/s)</source>
+        <translation>Ønsket bithastighed (Kb/s/KB/s)</translation>
+    </message>
+    <message>
+        <source>Quantizer</source>
+        <translation>Quantiser</translation>
+    </message>
+    <message>
+        <source>Target video size (MB)</source>
+        <translation>Ønsket videostørrelse (MB)</translation>
+    </message>
+    <message>
+        <source>Average bitrate (kb/s)</source>
+        <translation>Gennemsnitlig bithastighed (Kb/s/KB/s)</translation>
+    </message>
+    <message>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+</context>
+<context>
+    <name>ADM_qt4Factory::ADM_QthreadCount</name>
+    <message>
+        <source>Disabled</source>
+        <translation>Deaktiveret</translation>
+    </message>
+    <message>
+        <source>Auto-detect</source>
+        <translation>Automatisk registrering</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation>Brugerdefineret</translation>
+    </message>
+</context>
+<context>
+    <name>ADM_qtray</name>
+    <message>
+        <source>Open Avidemux</source>
+        <translation>Åbn Avidemux</translation>
+    </message>
+</context>
+<context>
+    <name>CalculatorDialog</name>
+    <message>
+        <source>Calculator</source>
+        <translation>Lommeregner</translation>
+    </message>
+    <message>
+        <source>Target</source>
+        <translation>Ønsket</translation>
+    </message>
+    <message>
+        <source>00:00:00</source>
+        <translation>00:00:00</translation>
+    </message>
+    <message>
+        <source>AVI</source>
+        <translation>AVI</translation>
+    </message>
+    <message>
+        <source>OGM</source>
+        <translation>OGM</translation>
+    </message>
+    <message>
+        <source>MPEG</source>
+        <translation>MPEG</translation>
+    </message>
+    <message>
+        <source>Medium:</source>
+        <translation>Medium:</translation>
+    </message>
+    <message>
+        <source>Format:</source>
+        <translation>Format:</translation>
+    </message>
+    <message>
+        <source>Duration:</source>
+        <translation>Varighed:</translation>
+    </message>
+    <message>
+        <source>1 x 80 minute CD</source>
+        <translation>1 x 80 minutter CD</translation>
+    </message>
+    <message>
+        <source>2 x 80 minute CD</source>
+        <translation>2 x 80 minutter CD</translation>
+    </message>
+    <message>
+        <source>1 x 74 minute CD</source>
+        <translation>1 x 74 minutter CD</translation>
+    </message>
+    <message>
+        <source>2 x 74 minute CD</source>
+        <translation>2 x 74 minutter CD</translation>
+    </message>
+    <message>
+        <source>DVD-5</source>
+        <translation>DVD-5</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation>Brugerdefineret</translation>
+    </message>
+    <message>
+        <source>Custom Size:</source>
+        <translation>Brugerdefineret størrelse:</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <source>Audio Bitrate</source>
+        <translation>Lyd bithastighed</translation>
+    </message>
+    <message>
+        <source>Track 1:</source>
+        <translation>Spor 1:</translation>
+    </message>
+    <message>
+        <source>kbps</source>
+        <translation>Kbps/KBps</translation>
+    </message>
+    <message>
+        <source>Track 2:</source>
+        <translation>Spor 2:</translation>
+    </message>
+    <message>
+        <source>Result</source>
+        <translation>Resultat</translation>
+    </message>
+    <message>
+        <source>Audio Size:</source>
+        <translation>Lydstørrelse:</translation>
+    </message>
+    <message>
+        <source>Video Size:</source>
+        <translation>Videostørrelse:</translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <source>Total Size:</source>
+        <translation>Total størrelse:</translation>
+    </message>
+    <message>
+        <source>Bits Per Pixel:</source>
+        <translation>Bit pr. pixel:</translation>
+    </message>
+    <message>
+        <source>Video Bitrate:</source>
+        <translation>Video bithastighed:</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annullér</translation>
+    </message>
+</context>
+<context>
+    <name>DIA_encodingQt4</name>
+    <message>
+        <source>Shutting down</source>
+        <translation>Lukker ned</translation>
+    </message>
+    <message>
+        <source>The encoding is paused. Do you want to resume or abort?</source>
+        <translation>Kodningen er sat på pause. Vil du genoptage eller afbryde?</translation>
+    </message>
+    <message>
+        <source>Resume</source>
+        <translation>Genoptag</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Afbryd</translation>
+    </message>
+</context>
+<context>
+    <name>Dialog</name>
+    <message>
+        <source>Indexing</source>
+        <translation>Indekserer</translation>
+    </message>
+    <message>
+        <source>Time Left : Infinity</source>
+        <translation>Resterende tid: uendeligt</translation>
+    </message>
+    <message>
+        <source># Images :</source>
+        <translation>Antal billeder:</translation>
+    </message>
+</context>
+<context>
+    <name>DialogAudioTracks</name>
+    <message>
+        <source>Audio Tracks Configuration</source>
+        <translation>Konfiguration af lydspor</translation>
+    </message>
+    <message>
+        <source>Track 1</source>
+        <translation>Spor 1</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Aktiv</translation>
+    </message>
+    <message>
+        <source>Configure</source>
+        <translation>Konfigurér</translation>
+    </message>
+    <message>
+        <source>Audio Filters</source>
+        <translation>Lydfiltre</translation>
+    </message>
+    <message>
+        <source>Track 2</source>
+        <translation>Spor 2</translation>
+    </message>
+    <message>
+        <source>Track 3</source>
+        <translation>Spor 3</translation>
+    </message>
+    <message>
+        <source>Track 4</source>
+        <translation>Spor 4</translation>
+    </message>
+</context>
+<context>
+    <name>DialogOcr</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <source>Calibrate</source>
+        <translation>Kalibrér</translation>
+    </message>
+    <message>
+        <source>Skip All</source>
+        <translation>Spring alle over</translation>
+    </message>
+    <message>
+        <source>Skip Glyph</source>
+        <translation>Spring over Glyph</translation>
+    </message>
+    <message>
+        <source>Ignore</source>
+        <translation>Ignorér</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Luk</translation>
+    </message>
+    <message>
+        <source>00:00:00/000</source>
+        <translation>00:00:00/000</translation>
+    </message>
+    <message>
+        <source>Timecode:</source>
+        <translation>Tidskode:</translation>
+    </message>
+    <message>
+        <source>0/0</source>
+        <translation>0/0</translation>
+    </message>
+    <message>
+        <source>Nb Lines :</source>
+        <translation>Antal linjer:</translation>
+    </message>
+</context>
+<context>
+    <name>DialogProgress</name>
+    <message>
+        <source>Progress</source>
+        <translation>Forløb</translation>
+    </message>
+    <message>
+        <source>Current job</source>
+        <translation>Aktuelle job</translation>
+    </message>
+    <message>
+        <source>1/1</source>
+        <translation>1/1</translation>
+    </message>
+    <message>
+        <source>File being written </source>
+        <translation>Fil skrives </translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>GUIPlayback</name>
+    <message>
+        <source>Trouble initializing audio device</source>
+        <translation>Problem ved initialisering af lydenhed</translation>
+    </message>
+</context>
+<context>
+    <name>MP4Header</name>
+    <message>
+        <source>Problem reading SVQ3 headers</source>
+        <translation>Problem ved læsning af SVQ3-hoveder</translation>
+    </message>
+    <message>
+        <source>No stts table</source>
+        <translation>Ingen STTS-tabel</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Avidemux</source>
+        <translation>Avidemux</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Hjælp</translation>
+    </message>
+    <message>
+        <source>Vi&amp;deo</source>
+        <translation>Vi&amp;deo</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;Redigér</translation>
+    </message>
+    <message>
+        <source>&amp;View</source>
+        <translation>&amp;Vis</translation>
+    </message>
+    <message>
+        <source>&amp;Toolbars</source>
+        <translation>&amp;Værktøjslinjer</translation>
+    </message>
+    <message>
+        <source>&amp;Auto</source>
+        <translation>&amp;Auto</translation>
+    </message>
+    <message>
+        <source>&amp;Custom</source>
+        <translation>&amp;Brugerdefineret</translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation>&amp;Gå</translation>
+    </message>
+    <message>
+        <source>&amp;Tools</source>
+        <translation>&amp;Værktøjer</translation>
+    </message>
+    <message>
+        <source>&amp;Audio</source>
+        <translation>&amp;Lyd</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;Fil</translation>
+    </message>
+    <message>
+        <source>&amp;Recent</source>
+        <translation>&amp;Seneste</translation>
+    </message>
+    <message>
+        <source>Codec Options</source>
+        <translation>Codec valgmuligheder</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
+        <translation>&lt;b&gt;Video-dekoder&lt;b&gt;</translation>
+    </message>
+    <message>
+        <source>XXXX</source>
+        <translation>XXXX</translation>
+    </message>
+    <message>
+        <source>Configure</source>
+        <translation>Konfigurér</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Video Output&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Video-output&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Kopi</translation>
+    </message>
+    <message>
+        <source>Filters</source>
+        <translation>Filtre</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Lyd-output&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>   (0 track(s))</source>
+        <translation>   (0 spor)</translation>
+    </message>
+    <message>
+        <source>&amp;Shift:</source>
+        <translation>&amp;Forskyd:</translation>
+    </message>
+    <message>
+        <source>ms</source>
+        <translation>ms</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Output format&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Navigation</source>
+        <translation>Navigation</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <source>Time:</source>
+        <translation>Tid:</translation>
+    </message>
+    <message>
+        <source>00:00:00.000</source>
+        <translation>00:00:00,000</translation>
+    </message>
+    <message>
+        <source>/ 00:00:00.000</source>
+        <translation>/ 00:00:00,000</translation>
+    </message>
+    <message>
+        <source>Frame type:</source>
+        <translation>Billedtype:</translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation>?</translation>
+    </message>
+    <message>
+        <source>Selection</source>
+        <translation>Markering</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Selection&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Markering&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>A:</source>
+        <translation>A:</translation>
+    </message>
+    <message>
+        <source>B:</source>
+        <translation>B:</translation>
+    </message>
+    <message>
+        <source>000000</source>
+        <translation>000000</translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation>Lydstyrke</translation>
+    </message>
+    <message>
+        <source>Audio Metre</source>
+        <translation>Lydmeter</translation>
+    </message>
+    <message>
+        <source>&amp;Open...</source>
+        <translation>&amp;Åbn...</translation>
+    </message>
+    <message>
+        <source>&amp;Information...</source>
+        <translation>&amp;Information...</translation>
+    </message>
+    <message>
+        <source>Alt+Return</source>
+        <translation>Alt+Retur</translation>
+    </message>
+    <message>
+        <source>Save &amp;Video...</source>
+        <translation>Gem &amp;video...</translation>
+    </message>
+    <message>
+        <source>Save Video</source>
+        <translation>Gem video</translation>
+    </message>
+    <message>
+        <source>&amp;Load/Run Project...</source>
+        <translation>&amp;Indlæs/kør projekt...</translation>
+    </message>
+    <message>
+        <source>Load/Run Project</source>
+        <translation>Indlæs/kør projekt</translation>
+    </message>
+    <message>
+        <source>Save &amp;Project</source>
+        <translation>Gem &amp;projekt</translation>
+    </message>
+    <message>
+        <source>Save Project</source>
+        <translation>Gem projekt</translation>
+    </message>
+    <message>
+        <source>&amp;Calculator...</source>
+        <translation>&amp;Lommeregner...</translation>
+    </message>
+    <message>
+        <source>F7</source>
+        <translation>F7</translation>
+    </message>
+    <message>
+        <source>&amp;Input</source>
+        <translation>&amp;Input</translation>
+    </message>
+    <message>
+        <source>&amp;Output</source>
+        <translation>&amp;Output</translation>
+    </message>
+    <message>
+        <source>&amp;Codec Options</source>
+        <translation>&amp;Codec valgmuligheder</translation>
+    </message>
+    <message>
+        <source>Ctrl+Alt+C</source>
+        <translation>Ctrl+Alt+C</translation>
+    </message>
+    <message>
+        <source>&amp;Navigation</source>
+        <translation>&amp;Navigation</translation>
+    </message>
+    <message>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
+    </message>
+    <message>
+        <source>&amp;Selection</source>
+        <translation>&amp;Markering</translation>
+    </message>
+    <message>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
+    </message>
+    <message>
+        <source>&amp;Volume</source>
+        <translation>&amp;Lydstyrke</translation>
+    </message>
+    <message>
+        <source>Ctrl+Alt+V</source>
+        <translation>Ctrl+Alt+V</translation>
+    </message>
+    <message>
+        <source>&amp;Audio Metre</source>
+        <translation>&amp;Lydmeter</translation>
+    </message>
+    <message>
+        <source>Ctrl+Alt+M</source>
+        <translation>Ctrl+Alt+M</translation>
+    </message>
+    <message>
+        <source>&amp;Separate</source>
+        <translation>&amp;Separér</translation>
+    </message>
+    <message>
+        <source>&amp;Top</source>
+        <translation>&amp;Top</translation>
+    </message>
+    <message>
+        <source>Si&amp;de</source>
+        <translation>Si&amp;de</translation>
+    </message>
+</context>
+<context>
+    <name>OpenDMLHeader</name>
+    <message>
+        <source>Malformed header</source>
+        <translation>Forkert udformet hovede</translation>
+    </message>
+    <message>
+        <source>Unpacking bitstream</source>
+        <translation>Udpakker bitstrøm</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Question</source>
+        <translation>Spørgsmål</translation>
+    </message>
+</context>
+<context>
+    <name>SpiderMonkeyShell</name>
+    <message>
+        <source>Shell</source>
+        <translation>Skal</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Ryd</translation>
+    </message>
+    <message>
+        <source>Evaluate</source>
+        <translation>Evaluér</translation>
+    </message>
+    <message>
+        <source>Ctrl+Return</source>
+        <translation>Ctrl+Retur</translation>
+    </message>
+</context>
+<context>
+    <name>Telecide</name>
+    <message>
+        <source>No strategy</source>
+        <translation>Ingen strategi</translation>
+    </message>
+    <message>
+        <source>3:2 pulldown</source>
+        <translation>3:2 nedtrækning</translation>
+    </message>
+    <message>
+        <source>PAL/SECAM</source>
+        <translation>PAL/SECAM</translation>
+    </message>
+    <message>
+        <source>NTSC converted from PAL</source>
+        <translation>NTSC konverteret fra PAL</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation>Øverst</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation>Nederst</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Aldrig</translation>
+    </message>
+    <message>
+        <source>If still combed</source>
+        <translation>Hvis fortsat børstet</translation>
+    </message>
+    <message>
+        <source>Always</source>
+        <translation>Altid</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Ingen</translation>
+    </message>
+    <message>
+        <source>None but compute</source>
+        <translation>Ingen men udregn</translation>
+    </message>
+    <message>
+        <source>Postproc on best match</source>
+        <translation>Efterbehandling på bedste match</translation>
+    </message>
+    <message>
+        <source>Postproc and show zones (debug)</source>
+        <translation>Efterbehandling og vis zoner (fejlfind)</translation>
+    </message>
+    <message>
+        <source>Process image (not fields)</source>
+        <translation>Behandl billede (ikke feltet)</translation>
+    </message>
+    <message>
+        <source>Process image (not fields), debug</source>
+        <translation>Behandl billede (ikke felter), fejlfind</translation>
+    </message>
+    <message>
+        <source>_Strategy:</source>
+        <translation>_Strategi:</translation>
+    </message>
+    <message>
+        <source>_Field order:</source>
+        <translation>_Felt rækkefølge:</translation>
+    </message>
+    <message>
+        <source>_Postprocessing:</source>
+        <translation>_Efterbehandling:</translation>
+    </message>
+    <message>
+        <source>_Try backward:</source>
+        <translation>_Forsøg baglæns:</translation>
+    </message>
+    <message>
+        <source>_Direct threshold:</source>
+        <translation>_Direkte tærskel:</translation>
+    </message>
+    <message>
+        <source>_Backward threshold:</source>
+        <translation>_Baglæns tærskel:</translation>
+    </message>
+    <message>
+        <source>_Noise threshold:</source>
+        <translation>_Støj tærskel:</translation>
+    </message>
+    <message>
+        <source>Postp_rocessing threshold:</source>
+        <translation>_Efterbehandling tærskel:</translation>
+    </message>
+    <message>
+        <source>_Use chroma to decide</source>
+        <translation>_Brug kroma til at bestemme</translation>
+    </message>
+    <message>
+        <source>Sho_w info</source>
+        <translation>_Vis info</translation>
+    </message>
+    <message>
+        <source>Debu_g</source>
+        <translation>_Fejlfind</translation>
+    </message>
+    <message>
+        <source>Bl_end</source>
+        <translation>_Bland</translation>
+    </message>
+    <message>
+        <source>Decomb Telecide</source>
+        <translation>Afbørst telecide</translation>
+    </message>
+</context>
+<context>
+    <name>Ui_licenseWindow</name>
+    <message>
+        <source>&lt;!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"&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="text/css"&gt;&lt;!-- /* Style Definitions */ p.licenseStyle, li.licenseStyle, div.licenseStyle        {margin:0cm;        margin-bottom:.0001pt;        font-size:12.0pt;        font-family:"Times New Roman";} /* 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="EN-GB" style='text-justify-trim:punctuation'&gt;  &lt;div class="Section1"&gt;    &lt;p class="licenseStyle" style='text-autospace:none'&gt;    &lt;span style='font-size:10.0pt; font-family:Arial'&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="licenseStyle" style='text-autospace:none'&gt;    &lt;b&gt;&lt;span style='font-size:10.0pt; font-family:Arial'&gt;    &lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class="licenseStyle" align="center" style=    'text-align:center;text-autospace:none'&gt;&lt;b&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt;GNU GENERAL PUBLIC    LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class="licenseStyle" align="center" style=    'text-align:center;text-autospace:none'&gt;&lt;b&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt;Version 2, June    1991&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style='text-autospace:none'&gt;    &lt;span style='font-size:10.0pt; font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" align="center" style=    'text-align:center;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt;Copyright (C) 1989, 1991    Free Software Foundation, Inc.&lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" align="center" style=    'text-align:center;text-autospace:none'&gt;&lt;span lang="FR" style=    'font-size:10.0pt;font-family:Arial'&gt;59 Temple Place, Suite    330, Boston, MA  02111-1307  USA&lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" align="center" style=    'text-align:center;text-autospace:none'&gt;&lt;span lang="FR" style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style='text-autospace:none'&gt;    &lt;span style='font-size:10.0pt; font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" align="center" style=    'text-align:center;text-autospace:none'&gt;&lt;b&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt;Preamble&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style='text-autospace:none'&gt;    &lt;span style='font-size:10.0pt; font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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'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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt;Also, for each author'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' reputations.&lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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's free use or not    licensed at all.&lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt;The precise terms and    conditions for copying, distribution and modification    follow.&lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style='text-autospace:none'&gt;    &lt;span style='font-size:10.0pt; font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style='text-autospace:none'&gt;    &lt;span style='font-size:10.0pt; font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" align="center" style=    'text-align:center;text-autospace:none'&gt;&lt;b&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt;GNU GENERAL PUBLIC    LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class="licenseStyle" align="center" style=    'text-align:center;text-autospace:none'&gt;&lt;b&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt;TERMS AND CONDITIONS FOR    COPYING, DISTRIBUTION AND MODIFICATION&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style='text-autospace:none'&gt;    &lt;span style='font-size:10.0pt; font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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 "Program", below, refers    to any such program or work, and a "work based on the Program"    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 "modification".)  Each licensee    is addressed as "you".&lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt;1. You may copy and    distribute verbatim copies of the Program'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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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' 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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt;Each version is given a    distinguishing version number.  If the Program specifies a    version number of this License which applies to it and "any    later version", 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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style='text-autospace:none'&gt;    &lt;span style='font-size:10.0pt; font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" align="center" style=    'text-align:center;text-autospace:none'&gt;&lt;b&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt;NO WARRANTY&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style='text-autospace:none'&gt;    &lt;span style='font-size:10.0pt; font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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 "AS IS" 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="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style=    'text-align:justify;text-autospace:none'&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&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="licenseStyle" style='text-autospace:none'&gt;    &lt;span style='font-size:10.0pt; font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class="licenseStyle" align="center" style=    'text-align:center;text-autospace:none'&gt;&lt;b&gt;&lt;span style=    'font-size:10.0pt;font-family:Arial'&gt;END OF TERMS AND    CONDITIONS&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class="licenseStyle" style='text-autospace:none'&gt;    &lt;span style='font-size:10.0pt; font-family:Arial'&gt; &lt;/span&gt;&lt;/p&gt;  &lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation/>
+    </message>
+</context>
+<context>
+    <name>Ui_vobsubWindow</name>
+    <message>
+        <source>Select Idx File</source>
+        <translation>Vælg Idx-fil</translation>
+    </message>
+</context>
+<context>
+    <name>aboutDialog</name>
+    <message>
+        <source>About Avidemux</source>
+        <translation>Om Avidemux</translation>
+    </message>
+    <message>
+        <source>Avidemux </source>
+        <translation>Avidemux </translation>
+    </message>
+    <message>
+        <source>Multi-platform Video Editor</source>
+        <translation>Multi-platform videoredigering</translation>
+    </message>
+    <message utf8="true">
+        <source>© 2001 - 2012  Mean</source>
+        <translation>© 2001 - 2012  Mean</translation>
+    </message>
+    <message>
+        <source>http://www.avidemux.org</source>
+        <translation>http://www.avidemux.org</translation>
+    </message>
+    <message>
+        <source>&amp;License</source>
+        <translation>&amp;Licens</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
+    <name>addBorders</name>
+    <message>
+        <source>_Left border:</source>
+        <translation>_Venstre kant:</translation>
+    </message>
+    <message>
+        <source>_Right border:</source>
+        <translation>_Højre kant:</translation>
+    </message>
+    <message>
+        <source>_Top border:</source>
+        <translation>_Øverste kant:</translation>
+    </message>
+    <message>
+        <source>_Bottom border:</source>
+        <translation>_Nederste kant:</translation>
+    </message>
+    <message>
+        <source>Add Borders</source>
+        <translation>Tilføj kanter</translation>
+    </message>
+    <message>
+        <source>Incorrect parameters</source>
+        <translation>Ukorrekte parametre</translation>
+    </message>
+    <message>
+        <source>All parameters must be even and within range.</source>
+        <translation>Alle parametre skal være lige eller indenfor område.</translation>
+    </message>
+</context>
+<context>
+    <name>adm</name>
+    <message>
+        <source>Open</source>
+        <translation>Åbn</translation>
+    </message>
+    <message>
+        <source>Append</source>
+        <translation>Føj til slutning</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Gem</translation>
+    </message>
+    <message>
+        <source>Queue</source>
+        <translation>Sæt i kø</translation>
+    </message>
+    <message>
+        <source>Save as Image</source>
+        <translation>Gem som billede</translation>
+    </message>
+    <message>
+        <source>Save as BMP</source>
+        <translation>Gem som BMP</translation>
+    </message>
+    <message>
+        <source>Save as JPEG</source>
+        <translation>Gem som JPEG</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Luk</translation>
+    </message>
+    <message>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>Information</translation>
+    </message>
+    <message>
+        <source>Connect to avsproxy</source>
+        <translation>Opret forbindelse til avsproxy</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation>Afslut</translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation>Fortryd</translation>
+    </message>
+    <message>
+        <source>Reset Edit</source>
+        <translation>Nulstil redigering</translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation>Klip</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Kopiér</translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation>Indsæt</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Slet</translation>
+    </message>
+    <message>
+        <source>Set Marker A</source>
+        <translation>Angiv markør A</translation>
+    </message>
+    <message>
+        <source>Set Marker B</source>
+        <translation>Angiv markør B</translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation>Præferencer</translation>
+    </message>
+    <message>
+        <source>Decoder Option</source>
+        <translation>Dekoder-valgmuligheder</translation>
+    </message>
+    <message>
+        <source>PostProcessing</source>
+        <translation>Efterbehandling</translation>
+    </message>
+    <message>
+        <source>Filters</source>
+        <translation>Filtre</translation>
+    </message>
+    <message>
+        <source>Select Track</source>
+        <translation>Vælg spor</translation>
+    </message>
+    <message>
+        <source>Save audio</source>
+        <translation>Gem lyd</translation>
+    </message>
+    <message>
+        <source>Build Option</source>
+        <translation>Byg-valgmuligheder</translation>
+    </message>
+    <message>
+        <source>Plugins</source>
+        <translation>Plugins</translation>
+    </message>
+    <message>
+        <source>&amp;Advanced</source>
+        <translation>&amp;Avanceret</translation>
+    </message>
+    <message>
+        <source>Open Application &amp;Log</source>
+        <translation>Åbn program&amp;log</translation>
+    </message>
+    <message>
+        <source>Open Application Data &amp;Folder</source>
+        <translation>Åbn programdata&amp;mappe</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation>Om</translation>
+    </message>
+    <message>
+        <source>Play/Stop</source>
+        <translation>Afspil/stop</translation>
+    </message>
+    <message>
+        <source>Previous Frame</source>
+        <translation>Forrige billede</translation>
+    </message>
+    <message>
+        <source>Next Frame</source>
+        <translation>Næste billede</translation>
+    </message>
+    <message>
+        <source>Previous Intra Frame</source>
+        <translation>Forrige Intra-billede</translation>
+    </message>
+    <message>
+        <source>Next Intra Frame</source>
+        <translation>Næste Intra-billede</translation>
+    </message>
+    <message>
+        <source>Previous Black Frame</source>
+        <translation>Forrige sorte billede</translation>
+    </message>
+    <message>
+        <source>Next Black Frame</source>
+        <translation>Næste sorte billede</translation>
+    </message>
+    <message>
+        <source>First Frame</source>
+        <translation>Første billede</translation>
+    </message>
+    <message>
+        <source>Last Frame</source>
+        <translation>Sidste billede</translation>
+    </message>
+    <message>
+        <source>Go To Marker A</source>
+        <translation>Gå til markør A</translation>
+    </message>
+    <message>
+        <source>Go To Marker B</source>
+        <translation>Gå til markør B</translation>
+    </message>
+    <message>
+        <source>Go To Time</source>
+        <translation>Gå til tid</translation>
+    </message>
+    <message>
+        <source>R_esampling (Hz):</source>
+        <translation>_Gensampling (Hz):</translation>
+    </message>
+    <message>
+        <source>Resampling frequency (Hz)</source>
+        <translation>Gensamplingsfrekvens (Hz)</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Ingen</translation>
+    </message>
+    <message>
+        <source>Film to PAL</source>
+        <translation>Film til PAL</translation>
+    </message>
+    <message>
+        <source>PAL to Film</source>
+        <translation>PAL til Film</translation>
+    </message>
+    <message>
+        <source>_Frame rate change:</source>
+        <translation>_Billedhastighed ændring:</translation>
+    </message>
+    <message>
+        <source>No change</source>
+        <translation>Ingen ændring</translation>
+    </message>
+    <message>
+        <source>Mono</source>
+        <translation>Mono</translation>
+    </message>
+    <message>
+        <source>Stereo</source>
+        <translation>Stereo</translation>
+    </message>
+    <message>
+        <source>Stereo+surround</source>
+        <translation>Stereo+surround</translation>
+    </message>
+    <message>
+        <source>Stereo+center</source>
+        <translation>Stereo+center</translation>
+    </message>
+    <message>
+        <source>Stereo+center+surround</source>
+        <translation>Stereo+center+surround</translation>
+    </message>
+    <message>
+        <source>Stereo front+stereo rear</source>
+        <translation>Stereo front+stereo bag</translation>
+    </message>
+    <message>
+        <source>5 channels</source>
+        <translation>5 kanaler</translation>
+    </message>
+    <message>
+        <source>5.1</source>
+        <translation>5.1</translation>
+    </message>
+    <message>
+        <source>Dolby Pro Logic</source>
+        <translation>Dolby Pro Logic</translation>
+    </message>
+    <message>
+        <source>Dolby Pro Logic II</source>
+        <translation>Dolby Pro Logic II</translation>
+    </message>
+    <message>
+        <source>DRC</source>
+        <translation>DRC</translation>
+    </message>
+    <message>
+        <source>Automatic (max -3 dB)</source>
+        <translation>Automatisk (maks. -3 dB)</translation>
+    </message>
+    <message>
+        <source>Manual (dB)</source>
+        <translation>Manuel (dB)</translation>
+    </message>
+    <message>
+        <source>_Gain mode:</source>
+        <translation>_Forstærkningstilstand:</translation>
+    </message>
+    <message>
+        <source>G_ain value:</source>
+        <translation>G_ain-værdi:</translation>
+    </message>
+    <message>
+        <source>_Mixer:</source>
+        <translation>_Mixer:</translation>
+    </message>
+    <message>
+        <source>Remix:</source>
+        <translation>Remix:</translation>
+    </message>
+    <message>
+        <source>Shift audio:</source>
+        <translation>Forskyd lyd:</translation>
+    </message>
+    <message>
+        <source>Shift Value (ms):</source>
+        <translation>Forskydningsværdi (ms):</translation>
+    </message>
+    <message>
+        <source>Audio Filters</source>
+        <translation>Lydfiltre</translation>
+    </message>
+    <message>
+        <source>Fontconfig</source>
+        <translation>Skrifttype-konfig</translation>
+    </message>
+    <message>
+        <source>FreeType 2</source>
+        <translation>FreeType 2</translation>
+    </message>
+    <message>
+        <source>Gettext</source>
+        <translation>Gettext</translation>
+    </message>
+    <message>
+        <source>SDL</source>
+        <translation>SDL</translation>
+    </message>
+    <message>
+        <source>XVideo</source>
+        <translation>XVideo</translation>
+    </message>
+    <message>
+        <source>VDPAU</source>
+        <translation>VDPAU</translation>
+    </message>
+    <message>
+        <source>x86</source>
+        <translation>x86</translation>
+    </message>
+    <message>
+        <source>x86-64</source>
+        <translation>x86-64</translation>
+    </message>
+    <message>
+        <source>Libraries</source>
+        <translation>Biblioteker</translation>
+    </message>
+    <message>
+        <source>CPU</source>
+        <translation>CPU</translation>
+    </message>
+    <message>
+        <source>Built-in Support</source>
+        <translation>Indbygget understøttelse</translation>
+    </message>
+    <message>
+        <source>_Job name:</source>
+        <translation>_Jobnavn:</translation>
+    </message>
+    <message>
+        <source>Output _File:</source>
+        <translation>Output-_fil:</translation>
+    </message>
+    <message>
+        <source>Select Video To Write</source>
+        <translation>Vælg video som skal skrives</translation>
+    </message>
+    <message>
+        <source>Save Job</source>
+        <translation>Gem job</translation>
+    </message>
+    <message>
+        <source>Audio Plugins</source>
+        <translation>Lyd-plugins</translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation>Lyd</translation>
+    </message>
+    <message>
+        <source>Video Encoder Plugins</source>
+        <translation>Video-koder-plugins</translation>
+    </message>
+    <message>
+        <source>Video Encoder</source>
+        <translation>Video-koder</translation>
+    </message>
+    <message>
+        <source>Video Decoder Plugins</source>
+        <translation>Video-dekoder-plugins</translation>
+    </message>
+    <message>
+        <source>Video Decoder</source>
+        <translation>Video-dekoder</translation>
+    </message>
+    <message>
+        <source>Audio Device Plugins</source>
+        <translation>Lydenhed-plugins</translation>
+    </message>
+    <message>
+        <source>Audio Device</source>
+        <translation>Lydenhed</translation>
+    </message>
+    <message>
+        <source>Audio Encoder Plugins</source>
+        <translation>Lyd-koder-plugins</translation>
+    </message>
+    <message>
+        <source>Audio Encoders</source>
+        <translation>Lyd-kodere</translation>
+    </message>
+    <message>
+        <source>Demuxer Plugins</source>
+        <translation>Demuxer-plugins</translation>
+    </message>
+    <message>
+        <source>Demuxers</source>
+        <translation>Demuxere</translation>
+    </message>
+    <message>
+        <source>Muxer Plugins</source>
+        <translation>Muxer-plugins</translation>
+    </message>
+    <message>
+        <source>Muxers</source>
+        <translation>Muxere</translation>
+    </message>
+    <message>
+        <source>Plugins Info</source>
+        <translation>Pluginsinfo</translation>
+    </message>
+    <message>
+        <source>Decode video using VDPAU</source>
+        <translation>Dekod video ved brug af VDPAU</translation>
+    </message>
+    <message>
+        <source>Enable openGl support</source>
+        <translation>Aktivér understøttelse af OpenGL</translation>
+    </message>
+    <message>
+        <source>_Use systray while encoding</source>
+        <translation>_Brug systembakke under kodning</translation>
+    </message>
+    <message>
+        <source>_Accept non-standard audio frequency for DVD</source>
+        <translation>_Acceptér ikke-standard lydfrekvens for DVD</translation>
+    </message>
+    <message>
+        <source>Create _OpenDML files</source>
+        <translation>Opret _OpenDML-filer</translation>
+    </message>
+    <message>
+        <source>SIMD</source>
+        <translation>SIMD</translation>
+    </message>
+    <message>
+        <source>Enable all SIMD</source>
+        <translation>Aktivér alle SIMD</translation>
+    </message>
+    <message>
+        <source>Enable MMX</source>
+        <translation>Aktivér MMX</translation>
+    </message>
+    <message>
+        <source>Enable MMXEXT</source>
+        <translation>Aktivér MMXEXT</translation>
+    </message>
+    <message>
+        <source>Enable 3DNOW</source>
+        <translation>Aktivér 3DNOW</translation>
+    </message>
+    <message>
+        <source>Enable 3DNOWEXT</source>
+        <translation>Aktivér 3DNOWEXT</translation>
+    </message>
+    <message>
+        <source>Enable SSE</source>
+        <translation>Aktivér SSE</translation>
+    </message>
+    <message>
+        <source>Enable SSE2</source>
+        <translation>Aktivér SSE2</translation>
+    </message>
+    <message>
+        <source>Enable SSE3</source>
+        <translation>Aktivér SSE3</translation>
+    </message>
+    <message>
+        <source>Enable SSSE3</source>
+        <translation>Aktivér SSSE3</translation>
+    </message>
+    <message>
+        <source>_lavc threads:</source>
+        <translation>_lavc-tråde:</translation>
+    </message>
+    <message>
+        <source>Multi-threading</source>
+        <translation>Multi-trådning</translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation>Høj</translation>
+    </message>
+    <message>
+        <source>Above normal</source>
+        <translation>Over normal</translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation>Normal</translation>
+    </message>
+    <message>
+        <source>Below normal</source>
+        <translation>Under normal</translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation>Lav</translation>
+    </message>
+    <message>
+        <source>_Encoding priority:</source>
+        <translation>_Kodningsprioritet:</translation>
+    </message>
+    <message>
+        <source>_Indexing/unpacking priority:</source>
+        <translation>_Indekserings-/udpakningsprioritet:</translation>
+    </message>
+    <message>
+        <source>_Playback priority:</source>
+        <translation>_Afspilningsprioritet:</translation>
+    </message>
+    <message>
+        <source>Prioritisation</source>
+        <translation>Prioritering</translation>
+    </message>
+    <message>
+        <source>_Split MPEG files every (MB):</source>
+        <translation>_Opdel MPEG-filer hver (MB):</translation>
+    </message>
+    <message>
+        <source>_Use alternative tag for MP3 in .mp4</source>
+        <translation>_Brug alternativt tag for MP3 i .mp4</translation>
+    </message>
+    <message>
+        <source>XVideo (best)</source>
+        <translation>XVideo (bedste)</translation>
+    </message>
+    <message>
+        <source>VDPAU (best)</source>
+        <translation>VDPAU (bedste)</translation>
+    </message>
+    <message>
+        <source>OpenGL (best)</source>
+        <translation>OpenGL (bedste)</translation>
+    </message>
+    <message>
+        <source>MS Windows GDI (SDL)</source>
+        <translation>MS Windows GDI (SDL)</translation>
+    </message>
+    <message>
+        <source>MS Windows DirectX (SDL)</source>
+        <translation>MS Windows DirectX (SDL)</translation>
+    </message>
+    <message>
+        <source>SDL (good)</source>
+        <translation>SDL (god)</translation>
+    </message>
+    <message>
+        <source>Video _display:</source>
+        <translation>Video_skærm:</translation>
+    </message>
+    <message>
+        <source>No alerts</source>
+        <translation>Ingen beskeder</translation>
+    </message>
+    <message>
+        <source>Display only error alerts</source>
+        <translation>Vis kun fejlbeskeder</translation>
+    </message>
+    <message>
+        <source>Display all alerts</source>
+        <translation>Vis alle beskeder</translation>
+    </message>
+    <message>
+        <source>_Message level:</source>
+        <translation>_Meddelelsesniveau:</translation>
+    </message>
+    <message>
+        <source>PCM</source>
+        <translation>PCM</translation>
+    </message>
+    <message>
+        <source>Master</source>
+        <translation>Master</translation>
+    </message>
+    <message>
+        <source>_Volume control:</source>
+        <translation>_Lydstyrkekontrol:</translation>
+    </message>
+    <message>
+        <source>No downmixing</source>
+        <translation>Ingen nedmiksning</translation>
+    </message>
+    <message>
+        <source>Pro Logic</source>
+        <translation>Pro Logic</translation>
+    </message>
+    <message>
+        <source>Pro Logic II</source>
+        <translation>Pro Logic II</translation>
+    </message>
+    <message>
+        <source>_Local playback downmixing:</source>
+        <translation>_Lokal playback downmixing:</translation>
+    </message>
+    <message>
+        <source>_AudioDevice</source>
+        <translation>_Lydenhed</translation>
+    </message>
+    <message>
+        <source>_Horizontal deblocking</source>
+        <translation>_Vandret deblocking</translation>
+    </message>
+    <message>
+        <source>_Vertical deblocking</source>
+        <translation>_Lodret deblocking</translation>
+    </message>
+    <message>
+        <source>De_ringing</source>
+        <translation>De_ringing</translation>
+    </message>
+    <message>
+        <source>_Strength:</source>
+        <translation>_Styrke:</translation>
+    </message>
+    <message>
+        <source>Default Postprocessing</source>
+        <translation>Standard efterbehandling</translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation>Brugerflade</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation>Output</translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation>Video</translation>
+    </message>
+    <message>
+        <source>Threading</source>
+        <translation>Trådning</translation>
+    </message>
+    <message>
+        <source>No audio track</source>
+        <translation>Ingen lydspor</translation>
+    </message>
+    <message>
+        <source>An audio track is necessary to create such file</source>
+        <translation>Et lydspor er nødvendigt for at kunne oprette sådan en fil</translation>
+    </message>
+    <message>
+        <source>Codec Error</source>
+        <translation>Codec fejl</translation>
+    </message>
+    <message>
+        <source>Cannot select the MPEG-4 SP codec.</source>
+        <translation>Kan ikke vælge MPEG-4 SP-codec'et.</translation>
+    </message>
+    <message>
+        <source>No AAC audio encoder plugin found.</source>
+        <translation>Intet ACC-lydkoder-plugin fundet.</translation>
+    </message>
+    <message>
+        <source>The MP3 codec does not allow disabling reservoir.
+Install lame plugin</source>
+        <translation>MP3-codec'et tillader ikke deaktivering af reservoir.
+Installér LAME-plugin</translation>
+    </message>
+    <message>
+        <source>You don't have LAME!.
+It is needed to create FLV  video.</source>
+        <translation>Du har ikke LAME!.
+Det er nødvendigt for at kunne oprette FLV-video.</translation>
+    </message>
+    <message>
+        <source>Cannot select FLV1  codec.</source>
+        <translation>Kan ikke vælge FLV1-codec.</translation>
+    </message>
+    <message>
+        <source>Cannot select mpeg4 sp codec.</source>
+        <translation>Kan ikke vælge MPEG-4 SP-codec.</translation>
+    </message>
+    <message>
+        <source>You don't have FAAC!.
+It is needed to create PSP compatible video.</source>
+        <translation>Du har ikke FAAC!.
+Det er nødvendigt for at kunne oprette PSP-kompatibel video.</translation>
+    </message>
+    <message>
+        <source>Select script to save</source>
+        <translation>Vælg script som skal gemmes</translation>
+    </message>
+    <message>
+        <source>Not coded in this version</source>
+        <translation>Ikke kodet i denne version</translation>
+    </message>
+    <message>
+        <source>Select AVI File...</source>
+        <translation>Vælg AVI-fil...</translation>
+    </message>
+    <message>
+        <source>Select AVI File to Append...</source>
+        <translation>Vælg AVI-fil som skal tilføjes til slutning...</translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation>Er du sikker?</translation>
+    </message>
+    <message>
+        <source>Permission error</source>
+        <translation>Tilladelsesfejl</translation>
+    </message>
+    <message>
+        <source>Cannot open "%s".</source>
+        <translation>Kan ikke åbne "%s".</translation>
+    </message>
+    <message>
+        <source>File error</source>
+        <translation>Fil fejl</translation>
+    </message>
+    <message>
+        <source>"%s" does not exist.</source>
+        <translation>"%s" findes ikke.</translation>
+    </message>
+    <message>
+        <source>Cannot open project using the video loader.</source>
+        <translation>Kan ikke åbne projekt ved brug af video-indlæseren.</translation>
+    </message>
+    <message>
+        <source>Try 'File' -&gt; 'Load/Run Project...'</source>
+        <translation>Prøv 'Fil' -&gt; 'Indlæs/kør projekt...'</translation>
+    </message>
+    <message>
+        <source>Could not open the file</source>
+        <translation>Kunne ikke åbne filen</translation>
+    </message>
+    <message>
+        <source>Multiple Audio Tracks</source>
+        <translation>Flere lydspor</translation>
+    </message>
+    <message>
+        <source>The file you just loaded contains several audio tracks.
+Go to Audio-&gt;MainTrack to select the active one.</source>
+        <translation>Filen du lige har indlæst indeholder flere lydspor.
+Gå til Lyd-&gt;Hovedspor for at vælge det aktive.</translation>
+    </message>
+    <message>
+        <source>Something failed when appending</source>
+        <translation>Noget fejlede ved tilføjelse til slutning</translation>
+    </message>
+    <message>
+        <source>Something bad happened (II)</source>
+        <translation>Noget gik galt (II)</translation>
+    </message>
+    <message>
+        <source>Checking video</source>
+        <translation>Tjekker video</translation>
+    </message>
+    <message>
+        <source>No error found</source>
+        <translation>Ingen fejl fundet</translation>
+    </message>
+    <message>
+        <source>Errors found in %u frames</source>
+        <translation>Fejl fundet i %u billeder</translation>
+    </message>
+    <message>
+        <source>Marker A &gt; B</source>
+        <translation>Markør A &gt; B</translation>
+    </message>
+    <message>
+        <source>Cannot delete the selection.</source>
+        <translation>Kan ikke slette markeringen.</translation>
+    </message>
+    <message>
+        <source>You can't remove all frames</source>
+        <translation>Du kan ikke fjerne alle billeder</translation>
+    </message>
+    <message>
+        <source>Something bad happened</source>
+        <translation>Noget gik galt</translation>
+    </message>
+    <message>
+        <source>_Track from video:</source>
+        <translation>_Spor fra video:</translation>
+    </message>
+    <message>
+        <source>Main Audio Track</source>
+        <translation>Hovedlydspor</translation>
+    </message>
+    <message>
+        <source>AvsProxy</source>
+        <translation>AvsProxy</translation>
+    </message>
+    <message>
+        <source>Failed to connect to avsproxy.
+Is it running ?</source>
+        <translation>Kunne ikke oprette forbindelse til avsproxy.
+Kører den?</translation>
+    </message>
+    <message>
+        <source>avsproxy</source>
+        <translation>avsproxy</translation>
+    </message>
+    <message>
+        <source>Frame type:</source>
+        <translation>Billedtype:</translation>
+    </message>
+    <message>
+        <source>Frame size:</source>
+        <translation>Billedstørrelse:</translation>
+    </message>
+    <message>
+        <source>Frame Hex Dump</source>
+        <translation>Billede hex-dump</translation>
+    </message>
+    <message>
+        <source>TimeStamp:</source>
+        <translation>Tidsstempel:</translation>
+    </message>
+    <message>
+        <source>Go to Time</source>
+        <translation>Gå til tid</translation>
+    </message>
+    <message>
+        <source>_Filter strength:</source>
+        <translation>_Filterstyrke:</translation>
+    </message>
+    <message>
+        <source>_Swap U and V</source>
+        <translation>_Byt om på U og V</translation>
+    </message>
+    <message>
+        <source>_Deringing</source>
+        <translation>_Deringing</translation>
+    </message>
+    <message>
+        <source>Output file</source>
+        <translation>Output-fil</translation>
+    </message>
+    <message>
+        <source>Job name</source>
+        <translation>Jobnavn</translation>
+    </message>
+    <message>
+        <source>Queue job to jobList</source>
+        <translation>Sæt i kø, i jobliste</translation>
+    </message>
+    <message>
+        <source>Select Workbench to Save</source>
+        <translation>Vælg den arbejdsbænk som skal gemmes</translation>
+    </message>
+    <message>
+        <source>Select File to Save Audio</source>
+        <translation>Vælg fil som lyden skal gemmes til</translation>
+    </message>
+    <message>
+        <source>Select JPEG Sequence to Save</source>
+        <translation>Vælg den JPEG-sekvens som skal gemmes</translation>
+    </message>
+    <message>
+        <source>Select BMP to Save</source>
+        <translation>Vælg den BMP som skal gemmes</translation>
+    </message>
+    <message>
+        <source>Select JPEG to Save</source>
+        <translation>Vælg den JPEG som skal gemmes</translation>
+    </message>
+    <message>
+        <source>Select File to Save</source>
+        <translation>Vælg den fil som skal gemmes</translation>
+    </message>
+    <message>
+        <source>Saving audio</source>
+        <translation>Gemmer lyd</translation>
+    </message>
+    <message>
+        <source>Jpeg</source>
+        <translation>JPEG</translation>
+    </message>
+    <message>
+        <source>Fail to save as jpeg</source>
+        <translation>Kunne ikke gemme som JPEG</translation>
+    </message>
+    <message>
+        <source>Saving as set of jpegs</source>
+        <translation>Gemmer som sæt af JPEG'er</translation>
+    </message>
+    <message>
+        <source>Cannot decode frame</source>
+        <translation>Kan ikke dekode billede</translation>
+    </message>
+    <message>
+        <source>Aborting.</source>
+        <translation>Afbryder.</translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation>Færdig</translation>
+    </message>
+    <message>
+        <source>Saved %d images.</source>
+        <translation>Gemte %d billeder.</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fejl</translation>
+    </message>
+    <message>
+        <source>Could not save all images.</source>
+        <translation>Kunne ikke gemme alle billeder.</translation>
+    </message>
+    <message>
+        <source>BMP op failed</source>
+        <translation>BMP op mislykkedes</translation>
+    </message>
+    <message>
+        <source>Saving %s as a BMP file failed.</source>
+        <translation>Kunne ikke gemme %s som en BMP-fil.</translation>
+    </message>
+    <message>
+        <source>File %s has been successfully saved.</source>
+        <translation>Filen %s blev gemt med succes.</translation>
+    </message>
+    <message>
+        <source>Failed</source>
+        <translation>Mislykkedes</translation>
+    </message>
+    <message>
+        <source>File %s was NOT saved correctly.</source>
+        <translation>Filen %s blev IKKE gemt korrekt.</translation>
+    </message>
+    <message>
+        <source>Recent Files</source>
+        <translation>Seneste filer</translation>
+    </message>
+    <message>
+        <source>Recent Projects</source>
+        <translation>Seneste projekter</translation>
+    </message>
+    <message>
+        <source>Quantization</source>
+        <translation>Quantisation</translation>
+    </message>
+    <message>
+        <source>Advanced Simple Profile</source>
+        <translation>Avanceret simpel profil</translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation>Medium</translation>
+    </message>
+    <message>
+        <source>The filter is already partial</source>
+        <translation>Filteret er allerede delvist</translation>
+    </message>
+    <message>
+        <source>Partial Start Frame:</source>
+        <translation>Delvist startbillede:</translation>
+    </message>
+    <message>
+        <source>Partial End Frame:</source>
+        <translation>Delvist slutbillede:</translation>
+    </message>
+    <message>
+        <source>Configure child</source>
+        <translation>Konfigurér barn</translation>
+    </message>
+    <message>
+        <source>Partial Video Filter</source>
+        <translation>Delvist videofilter</translation>
+    </message>
+    <message>
+        <source>_Interlaced</source>
+        <translation>_Sammenflettet</translation>
+    </message>
+    <message>
+        <source>Ca_rtoon mode</source>
+        <translation>_Tegneserie-tilstand</translation>
+    </message>
+    <message>
+        <source>_Greyscale</source>
+        <translation>_Gråtone</translation>
+    </message>
+    <message>
+        <source>Turbo mode</source>
+        <translation>Turbo-tilstand</translation>
+    </message>
+    <message>
+        <source>C_hroma optimizer</source>
+        <translation>_Kroma optimering</translation>
+    </message>
+    <message>
+        <source>Main</source>
+        <translation>Hoved</translation>
+    </message>
+    <message>
+        <source>Very Low</source>
+        <translation>Meget lav</translation>
+    </message>
+    <message>
+        <source>Very High</source>
+        <translation>Meget høj</translation>
+    </message>
+    <message>
+        <source>Ultra High</source>
+        <translation>Ultra høj</translation>
+    </message>
+    <message>
+        <source>Motion Search Precision</source>
+        <translation>Bevægelsessøgning præcision</translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation>Fra</translation>
+    </message>
+    <message>
+        <source>Mode Decision</source>
+        <translation>Tilstand beslutning</translation>
+    </message>
+    <message>
+        <source>Limited Search</source>
+        <translation>Begrænset søgning</translation>
+    </message>
+    <message>
+        <source>Medium Search</source>
+        <translation>Medium søgning</translation>
+    </message>
+    <message>
+        <source>Wide Search</source>
+        <translation>Bred søgning</translation>
+    </message>
+    <message>
+        <source>VHQ Mode</source>
+        <translation>VHQ-tilstand</translation>
+    </message>
+    <message>
+        <source>Max B Frames</source>
+        <translation>Maks. B-billeder</translation>
+    </message>
+    <message>
+        <source>Quarter Pixel</source>
+        <translation>Kvart pixel</translation>
+    </message>
+    <message>
+        <source>GMC</source>
+        <translation>GMC</translation>
+    </message>
+    <message>
+        <source>BVHQ</source>
+        <translation>BVHQ</translation>
+    </message>
+    <message>
+        <source>4MV</source>
+        <translation>4MV</translation>
+    </message>
+    <message>
+        <source>Chroma ME</source>
+        <translation>Kroma ME</translation>
+    </message>
+    <message>
+        <source>HQ AC</source>
+        <translation>HQ AC</translation>
+    </message>
+    <message>
+        <source>More Search</source>
+        <translation>Mere søgning</translation>
+    </message>
+    <message>
+        <source>Min Gop Size</source>
+        <translation>Min. Gop-størrelse</translation>
+    </message>
+    <message>
+        <source>Max Gop Size</source>
+        <translation>Maks. Gop-størrelse</translation>
+    </message>
+    <message>
+        <source>GOP Size</source>
+        <translation>Gop-størrelse</translation>
+    </message>
+    <message>
+        <source>Motion</source>
+        <translation>Bevægelse</translation>
+    </message>
+    <message>
+        <source>H263</source>
+        <translation>H263</translation>
+    </message>
+    <message>
+        <source>Mpeg</source>
+        <translation>MPEG</translation>
+    </message>
+    <message>
+        <source>Quantization Matrix</source>
+        <translation>Quantisation matriks</translation>
+    </message>
+    <message>
+        <source>Trellis Quantization</source>
+        <translation>Trellis-quantisation</translation>
+    </message>
+    <message>
+        <source>Two Pass Tuning</source>
+        <translation>To gennemløb tuning</translation>
+    </message>
+    <message>
+        <source>Key Frame Boost(%)</source>
+        <translation>Nøglebillede boost(%)</translation>
+    </message>
+    <message>
+        <source>I-frames closer than...</source>
+        <translation>I-billeder tættere end...</translation>
+    </message>
+    <message>
+        <source>.. are reduced by(%)</source>
+        <translation>.. er reduceret med(%)</translation>
+    </message>
+    <message>
+        <source>Max Overflow Improvement(%)</source>
+        <translation>Maks. overløb forbedring(%)</translation>
+    </message>
+    <message>
+        <source>Max Overglow Degradation(%)</source>
+        <translation>Maks. overglød degradering(%)</translation>
+    </message>
+    <message>
+        <source>Curve Compression</source>
+        <translation>Kurvekomprimering</translation>
+    </message>
+    <message>
+        <source>High Bitrate Scenes (%)</source>
+        <translation>Scener med høj bithastighed (%)</translation>
+    </message>
+    <message>
+        <source>Low Bitrate Scenes (%)</source>
+        <translation>Scener med lav bithastighed (%)</translation>
+    </message>
+    <message>
+        <source>Overflow Control Strength</source>
+        <translation>Overløb kontrolstyrke</translation>
+    </message>
+    <message>
+        <source>Two Pass</source>
+        <translation>To gennemløb</translation>
+    </message>
+    <message>
+        <source>Xvid4 Configuration</source>
+        <translation>Xvid4-konfiguration</translation>
+    </message>
+    <message>
+        <source>Ready</source>
+        <translation>Klar</translation>
+    </message>
+    <message>
+        <source>Succeeded</source>
+        <translation>Succes</translation>
+    </message>
+    <message>
+        <source>Deleted</source>
+        <translation>Slettet</translation>
+    </message>
+    <message>
+        <source>Running</source>
+        <translation>Kører</translation>
+    </message>
+    <message>
+        <source>Job Name</source>
+        <translation>Jobnavn</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Status</translation>
+    </message>
+    <message>
+        <source>Start Time</source>
+        <translation>Starttid</translation>
+    </message>
+    <message>
+        <source>End Time</source>
+        <translation>Sluttid</translation>
+    </message>
+    <message>
+        <source>Sure!</source>
+        <translation>Klart!</translation>
+    </message>
+    <message>
+        <source>Delete job</source>
+        <translation>Slet job</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete %s job?</source>
+        <translation>Er du sikker på at du vil slette %s job?</translation>
+    </message>
+    <message>
+        <source>Delete *all* job</source>
+        <translation>Slet *alle* jobs</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete ALL jobs?</source>
+        <translation>Er du sikker på at du vil slette ALLE jobs?</translation>
+    </message>
+    <message>
+        <source>Already done</source>
+        <translation>Allerede færdig</translation>
+    </message>
+    <message>
+        <source>This script has already been successfully executed.</source>
+        <translation>Dette script er allerede blevet udført med succes.</translation>
+    </message>
+</context>
+<context>
+    <name>aften</name>
+    <message>
+        <source>_Bitrate:</source>
+        <translation>_Bithastighed:</translation>
+    </message>
+    <message>
+        <source>Aften Configuration</source>
+        <translation>Aften-konfiguration</translation>
+    </message>
+</context>
+<context>
+    <name>asharp</name>
+    <message>
+        <source>Asharp</source>
+        <translation>Askarp</translation>
+    </message>
+    <message>
+        <source>Adaptative sharpener by MarcFD.</source>
+        <translation>Adaptiv skarp af MarcFD.</translation>
+    </message>
+</context>
+<context>
+    <name>ass</name>
+    <message>
+        <source>SSA.</source>
+        <translation>SSA.</translation>
+    </message>
+    <message>
+        <source>Hardcode ass/ssa subtitles using libass.</source>
+        <translation>Hårdkod ASS/SSA-undertekster ved brug af libass.</translation>
+    </message>
+    <message>
+        <source>_Subtitle file (ASS/SSA):</source>
+        <translation>_Undertekst-fil (ASS/SSA):</translation>
+    </message>
+    <message>
+        <source>Select Subtitle file</source>
+        <translation>Vælg undertekst-fil</translation>
+    </message>
+    <message>
+        <source>_Line spacing:</source>
+        <translation>_Linjemellemrum:</translation>
+    </message>
+    <message>
+        <source>_Font scale:</source>
+        <translation>_Skrifttypeskalering:</translation>
+    </message>
+    <message>
+        <source>_Top margin:</source>
+        <translation>_Øverste margin:</translation>
+    </message>
+    <message>
+        <source>Botto_m margin</source>
+        <translation>_Nederste margin</translation>
+    </message>
+    <message>
+        <source>ASS</source>
+        <translation>ASS</translation>
+    </message>
+</context>
+<context>
+    <name>avsfilter</name>
+    <message>
+        <source>_wine app file:</source>
+        <translation>_wine-programfil:</translation>
+    </message>
+    <message>
+        <source>Select wine filenamewine/cedega/etc.</source>
+        <translation>Vælg wine filnavnwine/cedega/osv.</translation>
+    </message>
+    <message>
+        <source>_loader file:</source>
+        <translation>_indlæser-fil:</translation>
+    </message>
+    <message>
+        <source>Select loader filenameavsload.exe</source>
+        <translation>Vælg indlæser filnavnavsload.exe</translation>
+    </message>
+    <message>
+        <source>_avs file:</source>
+        <translation>_AVS-fil:</translation>
+    </message>
+    <message>
+        <source>Select avs filename*.avs</source>
+        <translation>Vælg avs filnavn*.avs</translation>
+    </message>
+    <message>
+        <source>_pipe timeout:</source>
+        <translation>_pipe timeout:</translation>
+    </message>
+    <message>
+        <source>AvsFilter config</source>
+        <translation>AvsFilter-konfig</translation>
+    </message>
+</context>
+<context>
+    <name>blacken</name>
+    <message>
+        <source>_Left border:</source>
+        <translation>_Venstre kant:</translation>
+    </message>
+    <message>
+        <source>_Right border:</source>
+        <translation>_Højre kant:</translation>
+    </message>
+    <message>
+        <source>_Top border:</source>
+        <translation>_Øverste kant:</translation>
+    </message>
+    <message>
+        <source>_Bottom border:</source>
+        <translation>_Nederste kant:</translation>
+    </message>
+    <message>
+        <source>Blacken Borders</source>
+        <translation>Mørke kanter</translation>
+    </message>
+    <message>
+        <source>Incorrect parameters</source>
+        <translation>Ukorrekte parametre</translation>
+    </message>
+    <message>
+        <source>All parameters must be even and within range.</source>
+        <translation>Alle parametre skal være lige eller indenfor område.</translation>
+    </message>
+</context>
+<context>
+    <name>changeFps</name>
+    <message>
+        <source>Custom</source>
+        <translation>Brugerdefineret</translation>
+    </message>
+    <message>
+        <source>25  (PAL)</source>
+        <translation>25  (PAL)</translation>
+    </message>
+    <message>
+        <source>23.976 (Film)</source>
+        <translation>23,976 (film)</translation>
+    </message>
+    <message>
+        <source>29.97 (NTSC)</source>
+        <translation>29,97 (NTSC)</translation>
+    </message>
+    <message>
+        <source>50 (Pal)</source>
+        <translation>50 (PAL)</translation>
+    </message>
+    <message>
+        <source>59.93  (NTSC)</source>
+        <translation>59,93 (NTSC)</translation>
+    </message>
+    <message>
+        <source>Source Fps:</source>
+        <translation>Kilde billeder/sekund:</translation>
+    </message>
+    <message>
+        <source>Source frame rate:</source>
+        <translation>Kilde billedhastighed:</translation>
+    </message>
+    <message>
+        <source>Destination Fps:</source>
+        <translation>Destination billeder/sekund:</translation>
+    </message>
+    <message>
+        <source>Destination frame rate:</source>
+        <translation>Destination billedhastighed:</translation>
+    </message>
+    <message>
+        <source>Change fps</source>
+        <translation>Skift billeder/sekund</translation>
+    </message>
+    <message>
+        <source>Invalid fps</source>
+        <translation>Ugyldig billeder/sekund</translation>
+    </message>
+</context>
+<context>
+    <name>changefps</name>
+    <message>
+        <source>Change FPS</source>
+        <translation>Skift billeder/sekund</translation>
+    </message>
+    <message>
+        <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
+        <translation>Gør videoen hurtigere/langsommere i stil med ændring af billeder/sekund. Dette filtre ændre varighed.</translation>
+    </message>
+</context>
+<context>
+    <name>chromashift</name>
+    <message>
+        <source>Shift chroma U/V to fix badly synced luma/chroma.</source>
+        <translation>Forskyd kroma U/V for at rette dårligt synkroniseret luma/kroma.</translation>
+    </message>
+    <message>
+        <source>ChromaShift</source>
+        <translation>KromaForskydning</translation>
+    </message>
+</context>
+<context>
+    <name>coloryuv</name>
+    <message>
+        <source>Avisynth color filter.</source>
+        <translation>Avisynth farvefilter.</translation>
+    </message>
+    <message>
+        <source>Color management filter.</source>
+        <translation>Farvehåndteringsfilter.</translation>
+    </message>
+    <message>
+        <source>AutoWhite</source>
+        <translation>Auto hvid</translation>
+    </message>
+    <message>
+        <source>AutoGain</source>
+        <translation>Auto forstærkning</translation>
+    </message>
+    <message>
+        <source>Clip to Tv Range (16-235)</source>
+        <translation>Klip til TV-område (16-235)</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Ingen</translation>
+    </message>
+    <message>
+        <source>PC-&gt;TV</source>
+        <translation>PC-&gt;TV</translation>
+    </message>
+    <message>
+        <source>TV-&gt;PC</source>
+        <translation>TV-&gt;PC</translation>
+    </message>
+    <message>
+        <source>Levels:</source>
+        <translation>Niveauer:</translation>
+    </message>
+    <message>
+        <source>Y gain</source>
+        <translation>Y-forstærkning</translation>
+    </message>
+    <message>
+        <source>Y Brightness</source>
+        <translation>Y-lysstyrke</translation>
+    </message>
+    <message>
+        <source>Y Gamma</source>
+        <translation>Y-gamma</translation>
+    </message>
+    <message>
+        <source>Y Contrast</source>
+        <translation>Y-kontrast</translation>
+    </message>
+    <message>
+        <source>U gain</source>
+        <translation>U-forstærkning</translation>
+    </message>
+    <message>
+        <source>U Brightness</source>
+        <translation>U-lysstyrke</translation>
+    </message>
+    <message>
+        <source>U Contrast</source>
+        <translation>U-kontrast</translation>
+    </message>
+    <message>
+        <source>V gain</source>
+        <translation>V-forstærkning</translation>
+    </message>
+    <message>
+        <source>V Brightness</source>
+        <translation>V-lysstyrke</translation>
+    </message>
+    <message>
+        <source>V Contrast</source>
+        <translation>V-kontrast</translation>
+    </message>
+    <message>
+        <source>Flags</source>
+        <translation>Flag</translation>
+    </message>
+    <message>
+        <source>Y</source>
+        <translation>Y</translation>
+    </message>
+    <message>
+        <source>U</source>
+        <translation>U</translation>
+    </message>
+    <message>
+        <source>V</source>
+        <translation>V</translation>
+    </message>
+    <message>
+        <source>colorYuv</source>
+        <translation>colorYuv</translation>
+    </message>
+</context>
+<context>
+    <name>contrast</name>
+    <message>
+        <source>U :</source>
+        <translation>U:</translation>
+    </message>
+    <message>
+        <source>V :</source>
+        <translation>V:</translation>
+    </message>
+    <message>
+        <source>L :</source>
+        <translation>L:</translation>
+    </message>
+    <message>
+        <source>Offset :</source>
+        <translation>Forskydning:</translation>
+    </message>
+    <message>
+        <source>Coef :</source>
+        <translation>Ko. ef.:</translation>
+    </message>
+    <message>
+        <source>Adjust contrast, brightness and colors.</source>
+        <translation>Justér kontrast, lysstyrke og farver.</translation>
+    </message>
+    <message>
+        <source>Contrast</source>
+        <translation>Kontrast</translation>
+    </message>
+</context>
+<context>
+    <name>convolution</name>
+    <message>
+        <source>_Process luma</source>
+        <translation>_Behandl luma</translation>
+    </message>
+    <message>
+        <source>Process luma plane</source>
+        <translation>Behandl luma-plan</translation>
+    </message>
+    <message>
+        <source>P_rocess chroma</source>
+        <translation>B_ehandl kroma</translation>
+    </message>
+    <message>
+        <source>Fast Convolution</source>
+        <translation>Hurtig foldning</translation>
+    </message>
+</context>
+<context>
+    <name>crash</name>
+    <message>
+        <source>Load it</source>
+        <translation>Indlæs den</translation>
+    </message>
+    <message>
+        <source>Crash file</source>
+        <translation>Nedbrud-fil</translation>
+    </message>
+    <message>
+        <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>Jeg her registreret en nedbrudsfil.
+Vil du indlæse den?
+(lige meget hvad vil den blive slettet, du skal gemme den hvis du vil beholde den)</translation>
+    </message>
+</context>
+<context>
+    <name>crop</name>
+    <message>
+        <source>crop</source>
+        <translation>beskær</translation>
+    </message>
+    <message>
+        <source>crop filter</source>
+        <translation>beskæringsfilter</translation>
+    </message>
+    <message>
+        <source>Warning Cropping too much width ! Width reseted !
+</source>
+        <translation>Advarsel! Klipper for meget bredde! Bredde nulstillet!
+</translation>
+    </message>
+    <message>
+        <source>Warning Cropping too much height ! Height reseted !
+</source>
+        <translation>Advarsel! Klipper for meget højde! Højde nulstillet!
+</translation>
+    </message>
+</context>
+<context>
+    <name>decimate</name>
+    <message>
+        <source>Decomb decimate</source>
+        <translation>Afbørst decimate</translation>
+    </message>
+    <message>
+        <source>Donald Graft decimate. Remove duplicate after telecide.</source>
+        <translation>Donald Graft decimate. Fjern duplikater efter telecide.</translation>
+    </message>
+    <message>
+        <source>Discard closer</source>
+        <translation>Forkast tættere</translation>
+    </message>
+    <message>
+        <source>Replace (interpolate)</source>
+        <translation>Erstat (interpolér)</translation>
+    </message>
+    <message>
+        <source>Discard longer dupe (animÃ©s)</source>
+        <translation>Forkast længere duplet (animÃ©s)</translation>
+    </message>
+    <message>
+        <source>Pulldown dupe removal</source>
+        <translation>Pulldown duplet fjernelse</translation>
+    </message>
+    <message>
+        <source>Fastest (no chroma, partial luma)</source>
+        <translation>Hurtigst (ingen kroma, delvis luma)</translation>
+    </message>
+    <message>
+        <source>Medium (full luma, no chroma)</source>
+        <translation>Medium (fuld luma, ingen kroma)</translation>
+    </message>
+    <message>
+        <source>_Mode:</source>
+        <translation>_Tilstand:</translation>
+    </message>
+    <message>
+        <source>_Quality:</source>
+        <translation>_Kvalitet:</translation>
+    </message>
+    <message>
+        <source>_Threshold 1:</source>
+        <translation>_Tærskel 1:</translation>
+    </message>
+    <message>
+        <source>T_hreshold 2:</source>
+        <translation>T_ærskel 2:</translation>
+    </message>
+    <message>
+        <source>C_ycle:</source>
+        <translation>_Cyklus:</translation>
+    </message>
+    <message>
+        <source>Sho_w</source>
+        <translation>_Vis</translation>
+    </message>
+    <message>
+        <source>Decomb Decimate</source>
+        <translation>Afbørst decimate</translation>
+    </message>
+</context>
+<context>
+    <name>delogo</name>
+    <message>
+        <source>MPlayer delogo</source>
+        <translation>MPlayer logo fjerner</translation>
+    </message>
+    <message>
+        <source>Blend a logo by interpolating its surrounding box.</source>
+        <translation>Bland et logo ved at bruge dens omgivende boks.</translation>
+    </message>
+</context>
+<context>
+    <name>dgbob</name>
+    <message>
+        <source>dgbob</source>
+        <translation>dgbob</translation>
+    </message>
+    <message>
+        <source>Donald Graft Bob.</source>
+        <translation>Donald Graft Bob.</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation>Øverst</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation>Nederst</translation>
+    </message>
+    <message>
+        <source>Keep nb of frames and fps</source>
+        <translation>Bevar antal billeder og billeder/sekund</translation>
+    </message>
+    <message>
+        <source>Double nb of frames and fps</source>
+        <translation>Dobbelt antal billeder og billeder/sekund</translation>
+    </message>
+    <message>
+        <source>Double nb of frames (slow motion)</source>
+        <translation>Dobbelt antal billeder (slowmotion)</translation>
+    </message>
+    <message>
+        <source>_Top Field First:</source>
+        <translation>_Øverste felt først:</translation>
+    </message>
+    <message>
+        <source>_Mode:</source>
+        <translation>_Tilstand:</translation>
+    </message>
+    <message>
+        <source>_Threshold:</source>
+        <translation>_Tærskel:</translation>
+    </message>
+    <message>
+        <source>_Extra</source>
+        <translation>_Ekstra</translation>
+    </message>
+    <message>
+        <source>Extra check, avoid using it</source>
+        <translation>Ekstra tjek, undgå at bruge den</translation>
+    </message>
+    <message>
+        <source>DGBob</source>
+        <translation>DGBob</translation>
+    </message>
+</context>
+<context>
+    <name>encodingDialog</name>
+    <message>
+        <source>Encoding...</source>
+        <translation>Kodning...</translation>
+    </message>
+    <message>
+        <source>Phase:</source>
+        <translation>Fase:</translation>
+    </message>
+    <message>
+        <source>Video Codec:</source>
+        <translation>Video-codec:</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Ingen</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>Ukendt</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&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="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&gt;Beholder:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&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="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&gt;Lyd-codec:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <source>00:00:00</source>
+        <translation>00:00:00</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&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="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&gt;Forløbet:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&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="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&gt;Resterende tid:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&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="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&gt;Billeder/sekund:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>0 MB</source>
+        <translation>0 MB</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&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="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&gt;Total størrelse:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&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="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&gt;Lydstørrelse:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&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="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&gt;Videostørrelse:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&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="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&gt;Behandlet billeder:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>0 kB/s</source>
+        <translation>0 kB/s</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&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="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&gt;Gennemsnitlig bithastighed:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&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="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-weight:400; font-style:normal; text-decoration:none;"&gt;
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-size:8pt; font-weight:600;"&gt;Quantiser:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Shut down computer when finished</source>
+        <translation>Luk computer når fuldført</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation>Prioritet:</translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation>Høj</translation>
+    </message>
+    <message>
+        <source>Above Normal</source>
+        <translation>Over normal</translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation>Normal</translation>
+    </message>
+    <message>
+        <source>Below Normal</source>
+        <translation>Under normal</translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation>Lav</translation>
+    </message>
+    <message>
+        <source>Pause / Abort</source>
+        <translation>Pause / afbryd</translation>
+    </message>
+</context>
+<context>
+    <name>encodingWindow</name>
+    <message>
+        <source>Privileges Required</source>
+        <translation>Rettigheder kræves</translation>
+    </message>
+    <message>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation>Root-rettigheder kræves for at udføre denne handling.</translation>
+    </message>
+</context>
+<context>
+    <name>eq2</name>
+    <message>
+        <source>MPlayer eq2</source>
+        <translation>MPlayer eq2</translation>
+    </message>
+    <message>
+        <source>Adjust contrast, brightness, saturation and gamma.</source>
+        <translation>Justér kontrast, lysstyrke, mætning og gamma.</translation>
+    </message>
+</context>
+<context>
+    <name>fade</name>
+    <message>
+        <source>Fade</source>
+        <translation>Overgang</translation>
+    </message>
+    <message>
+        <source>Fade in/out.</source>
+        <translation>Overgang ind/ud.</translation>
+    </message>
+    <message>
+        <source>Out</source>
+        <translation>Ud</translation>
+    </message>
+    <message>
+        <source>Fade out</source>
+        <translation>Overgang ud</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation>Ind</translation>
+    </message>
+    <message>
+        <source>Fade in</source>
+        <translation>Overgang ind</translation>
+    </message>
+    <message>
+        <source>_Fade type:</source>
+        <translation>_Overgangstype:</translation>
+    </message>
+    <message>
+        <source>_Start time (ms):</source>
+        <translation>_Starttid (ms):</translation>
+    </message>
+    <message>
+        <source>_End time (ms):</source>
+        <translation>_Sluttid (ms):</translation>
+    </message>
+    <message>
+        <source>Fade to black</source>
+        <translation>Overgang til sort</translation>
+    </message>
+</context>
+<context>
+    <name>ffmpeg2</name>
+    <message>
+        <source>Normal (4:3)</source>
+        <translation>Normal (4:3)</translation>
+    </message>
+    <message>
+        <source>Wide (16:9)</source>
+        <translation>Bred (16:9)</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>Standard</translation>
+    </message>
+    <message>
+        <source>Tmpgenc</source>
+        <translation>Tmpgenc</translation>
+    </message>
+    <message>
+        <source>Animes</source>
+        <translation>Animes</translation>
+    </message>
+    <message>
+        <source>KVCD</source>
+        <translation>KVCD</translation>
+    </message>
+    <message>
+        <source>MB comparison</source>
+        <translation>MB sammenligning</translation>
+    </message>
+    <message>
+        <source>Fewest bits (vhq)</source>
+        <translation>Færreste bit (vhq)</translation>
+    </message>
+    <message>
+        <source>Rate distortion</source>
+        <translation>Rateforvrængning</translation>
+    </message>
+    <message>
+        <source>One thread</source>
+        <translation>En tråd</translation>
+    </message>
+    <message>
+        <source>Two threads)</source>
+        <translation>To tråde</translation>
+    </message>
+    <message>
+        <source>Three threads</source>
+        <translation>Tre tråde</translation>
+    </message>
+    <message>
+        <source>Auto (#cpu)</source>
+        <translation>Auto (#cpu)</translation>
+    </message>
+    <message>
+        <source>Progressive</source>
+        <translation>Progressiv</translation>
+    </message>
+    <message>
+        <source>Interlaced</source>
+        <translation>Sammenflettet</translation>
+    </message>
+    <message>
+        <source>Top Field First</source>
+        <translation>Øverste felt først</translation>
+    </message>
+    <message>
+        <source>Bottom Field First</source>
+        <translation>Nederste felt først</translation>
+    </message>
+    <message>
+        <source>Threading</source>
+        <translation>Trådning</translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation>Mi_n. quantiser:</translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation>Ma_ks. quantiser:</translation>
+    </message>
+    <message>
+        <source>Max. quantizer _difference:</source>
+        <translation>Maks. quantiser _forskel:</translation>
+    </message>
+    <message>
+        <source>VBV Buffer Size:</source>
+        <translation>VBV-bufferstørrelse:</translation>
+    </message>
+    <message>
+        <source>Max bitrate (kb/s):</source>
+        <translation>Maks. bithastighed (Kb/s/KB/s):</translation>
+    </message>
+    <message>
+        <source>_Trellis quantization</source>
+        <translation>_Trellis quantisating</translation>
+    </message>
+    <message>
+        <source>_Number of B frames:</source>
+        <translation>_Antal B-billeder:</translation>
+    </message>
+    <message>
+        <source>_Macroblock decision:</source>
+        <translation>_Macroblok beslutning:</translation>
+    </message>
+    <message>
+        <source>Aspect ratio:</source>
+        <translation>Højde-bredde-forhold:</translation>
+    </message>
+    <message>
+        <source>Matrices:</source>
+        <translation>Matrikser:</translation>
+    </message>
+    <message>
+        <source>_Filesize tolerance (kb):</source>
+        <translation>_Filstørrelse tolerance (kb/Kb/KB/kB):</translation>
+    </message>
+    <message>
+        <source>_Quantizer compression:</source>
+        <translation>_Quantiser komprimering:</translation>
+    </message>
+    <message>
+        <source>Quantizer _blur:</source>
+        <translation>Quantiser _sløring:</translation>
+    </message>
+    <message>
+        <source>_Gop Size:</source>
+        <translation>_Gop-størrelse:</translation>
+    </message>
+    <message>
+        <source>_Interlaced:</source>
+        <translation>_Sammenflettet:</translation>
+    </message>
+    <message>
+        <source>Field Order:</source>
+        <translation>Felt rækkefølge:</translation>
+    </message>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Grundlæggende indstillinger</translation>
+    </message>
+    <message>
+        <source>Adv. Settings</source>
+        <translation>Avancerede indstillinger</translation>
+    </message>
+    <message>
+        <source>Interlacing</source>
+        <translation>Sammenfletning</translation>
+    </message>
+    <message>
+        <source>Quantization</source>
+        <translation>Quantisation</translation>
+    </message>
+    <message>
+        <source>Rate Control</source>
+        <translation>Ratekontrol</translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-2 configuration</source>
+        <translation>libavcodec MPEG-2-konfiguration</translation>
+    </message>
+</context>
+<context>
+    <name>ffmpeg4</name>
+    <message>
+        <source>None</source>
+        <translation>Ingen</translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation>Fuld</translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation>Log</translation>
+    </message>
+    <message>
+        <source>Phods</source>
+        <translation>Phods</translation>
+    </message>
+    <message>
+        <source>EPZS</source>
+        <translation>EPZS</translation>
+    </message>
+    <message>
+        <source>X1</source>
+        <translation>X1</translation>
+    </message>
+    <message>
+        <source>H.263</source>
+        <translation>H.263</translation>
+    </message>
+    <message>
+        <source>MPEG</source>
+        <translation>MPEG</translation>
+    </message>
+    <message>
+        <source>MB comparison</source>
+        <translation>MB sammenligning</translation>
+    </message>
+    <message>
+        <source>Fewest bits (vhq)</source>
+        <translation>Færreste bit (vhq)</translation>
+    </message>
+    <message>
+        <source>Rate distortion</source>
+        <translation>Rateforvrængning</translation>
+    </message>
+    <message>
+        <source>One thread</source>
+        <translation>En tråd</translation>
+    </message>
+    <message>
+        <source>Two threads)</source>
+        <translation>To tråde</translation>
+    </message>
+    <message>
+        <source>Three threads</source>
+        <translation>Tre tråde</translation>
+    </message>
+    <message>
+        <source>Auto (#cpu)</source>
+        <translation>Auto (#cpu)</translation>
+    </message>
+    <message>
+        <source>Matrices</source>
+        <translation>Matrikser</translation>
+    </message>
+    <message>
+        <source>Threading</source>
+        <translation>Trådning</translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation>Mi_n. quantiser:</translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation>Ma_ks. quantiser:</translation>
+    </message>
+    <message>
+        <source>Max. quantizer _difference:</source>
+        <translation>Maks. quantiser forskelle:</translation>
+    </message>
+    <message>
+        <source>4_MV</source>
+        <translation>4_MV</translation>
+    </message>
+    <message>
+        <source>_Trellis quantization</source>
+        <translation>_Trellis-quantisation</translation>
+    </message>
+    <message>
+        <source>_Quarter pixel</source>
+        <translation>_Kvart pixel</translation>
+    </message>
+    <message>
+        <source>_GMC</source>
+        <translation>_GMC</translation>
+    </message>
+    <message>
+        <source>_Number of B frames:</source>
+        <translation>_Antal B-billeder:</translation>
+    </message>
+    <message>
+        <source>_Quantization type:</source>
+        <translation>_Quantisationstype:</translation>
+    </message>
+    <message>
+        <source>_Macroblock decision:</source>
+        <translation>_Macroblok beslutning:</translation>
+    </message>
+    <message>
+        <source>_Filesize tolerance (kb):</source>
+        <translation>_Filstørrelse tolerance (kb/Kb/KB/kB):</translation>
+    </message>
+    <message>
+        <source>_Quantizer compression:</source>
+        <translation>_Quantiser komprimering:</translation>
+    </message>
+    <message>
+        <source>Quantizer _blur:</source>
+        <translation>Quantiser _sløring:</translation>
+    </message>
+    <message>
+        <source>_Gop Size:</source>
+        <translation>_Gop-størrelse:</translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation>Brugerflade</translation>
+    </message>
+    <message>
+        <source>Advanced Simple Profile</source>
+        <translation>Avanceret simpel profil</translation>
+    </message>
+    <message>
+        <source>Motion Estimation</source>
+        <translation>Bevægelsesestimering</translation>
+    </message>
+    <message>
+        <source>Quantization</source>
+        <translation>Quantisation</translation>
+    </message>
+    <message>
+        <source>Rate Control</source>
+        <translation>Ratekontrol</translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation>libavcodec MPEG-4-konfiguration</translation>
+    </message>
+</context>
+<context>
+    <name>ffmsmpeg4</name>
+    <message>
+        <source>None</source>
+        <translation>Ingen</translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation>Fuld</translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation>Log</translation>
+    </message>
+    <message>
+        <source>Phods</source>
+        <translation>Phods</translation>
+    </message>
+    <message>
+        <source>EPZS</source>
+        <translation>EPZS</translation>
+    </message>
+    <message>
+        <source>X1</source>
+        <translation>X1</translation>
+    </message>
+    <message>
+        <source>H.263</source>
+        <translation>H.263</translation>
+    </message>
+    <message>
+        <source>MPEG</source>
+        <translation>MPEG</translation>
+    </message>
+    <message>
+        <source>MB comparison</source>
+        <translation>MB sammenligning</translation>
+    </message>
+    <message>
+        <source>Fewest bits (vhq)</source>
+        <translation>Færreste bit (vhq)</translation>
+    </message>
+    <message>
+        <source>Rate distortion</source>
+        <translation>Rateforvrængning</translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation>Mi_n. quantiser:</translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation>Ma_ks. quantiser:</translation>
+    </message>
+    <message>
+        <source>Max. quantizer _difference:</source>
+        <translation>Maks. quantiser _forskelle:</translation>
+    </message>
+    <message>
+        <source>_Trellis quantization</source>
+        <translation>_Trellis-quantisation</translation>
+    </message>
+    <message>
+        <source>_Filesize tolerance (kb):</source>
+        <translation>_Filstørrelse tolerance (kb/Kb/KB/kB):</translation>
+    </message>
+    <message>
+        <source>_Quantizer compression:</source>
+        <translation>_Quantiser komprimering:</translation>
+    </message>
+    <message>
+        <source>Quantizer _blur:</source>
+        <translation>Quantiser _sløring:</translation>
+    </message>
+    <message>
+        <source>_Gop Size:</source>
+        <translation>_Gop-størrelse:</translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation>Brugerflade</translation>
+    </message>
+    <message>
+        <source>Quantization</source>
+        <translation>Quantisation</translation>
+    </message>
+    <message>
+        <source>Rate Control</source>
+        <translation>Ratekontrol</translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation>libavcodec MPEG-4-konfiguration</translation>
+    </message>
+</context>
+<context>
+    <name>flux</name>
+    <message>
+        <source>Spatio-temporal cleaner by Ross Thomas.</source>
+        <translation>Spatio-temporal renser af Ross Thomas.</translation>
+    </message>
+    <message>
+        <source>_Temporal threshold:</source>
+        <translation>_Temporal tærskel:</translation>
+    </message>
+    <message>
+        <source>_Spatial threshold:</source>
+        <translation>_Spatial tærskel:</translation>
+    </message>
+    <message>
+        <source>FluxSmooth</source>
+        <translation>FluxGlat</translation>
+    </message>
+</context>
+<context>
+    <name>flv1</name>
+    <message>
+        <source>None</source>
+        <translation>Ingen</translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation>Fuld</translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation>Log</translation>
+    </message>
+    <message>
+        <source>Phods</source>
+        <translation>Phods</translation>
+    </message>
+    <message>
+        <source>EPZS</source>
+        <translation>EPZS</translation>
+    </message>
+    <message>
+        <source>X1</source>
+        <translation>X1</translation>
+    </message>
+    <message>
+        <source>H.263</source>
+        <translation>H.263</translation>
+    </message>
+    <message>
+        <source>MPEG</source>
+        <translation>MPEG</translation>
+    </message>
+    <message>
+        <source>MB comparison</source>
+        <translation>MB sammenligning</translation>
+    </message>
+    <message>
+        <source>Fewest bits (vhq)</source>
+        <translation>Færreste bit (vhq)</translation>
+    </message>
+    <message>
+        <source>Rate distortion</source>
+        <translation>Rateforvrængning</translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation>Mi_n. quantiser:</translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation>Ma_ks. quantiser:</translation>
+    </message>
+    <message>
+        <source>Max. quantizer _difference:</source>
+        <translation>Maks. quantiser _forskelle:</translation>
+    </message>
+    <message>
+        <source>_Trellis quantization</source>
+        <translation>_Trellis-quantisation</translation>
+    </message>
+    <message>
+        <source>_Filesize tolerance (kb):</source>
+        <translation>_Filstørrelse tolerance (kb/Kb/KB/kB):</translation>
+    </message>
+    <message>
+        <source>_Quantizer compression:</source>
+        <translation>_Quantiser komprimering:</translation>
+    </message>
+    <message>
+        <source>Quantizer _blur:</source>
+        <translation>Quantiser _sløring:</translation>
+    </message>
+    <message>
+        <source>_Gop Size:</source>
+        <translation>_Gop-størrelse:</translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation>Brugerflade</translation>
+    </message>
+    <message>
+        <source>Quantization</source>
+        <translation>Quantisation</translation>
+    </message>
+    <message>
+        <source>Rate Control</source>
+        <translation>Ratekontrol</translation>
+    </message>
+    <message>
+        <source>libavcodec FLV1 configuration</source>
+        <translation>libavcodec FLV1-konfiguration</translation>
+    </message>
+</context>
+<context>
+    <name>gaussian</name>
+    <message>
+        <source>Gaussian convolution.</source>
+        <translation>Gaussisk foldning.</translation>
+    </message>
+    <message>
+        <source>3x3 convolution filter :gaussian.</source>
+        <translation>3x3 foldningsfilter: gaussisk.</translation>
+    </message>
+</context>
+<context>
+    <name>hflip</name>
+    <message>
+        <source>Horizontal Flip</source>
+        <translation>Vend vandret</translation>
+    </message>
+    <message>
+        <source>Horizontally flip the image.</source>
+        <translation>Vend billedet vandret.</translation>
+    </message>
+</context>
+<context>
+    <name>histogram</name>
+    <message>
+        <source>No data</source>
+        <translation>Ingen data</translation>
+    </message>
+    <message>
+        <source>Max. bitrate:</source>
+        <translation>Maks. bithastighed:</translation>
+    </message>
+    <message>
+        <source>Average bitrate:</source>
+        <translation>Gennemsnitlig bithastighed:</translation>
+    </message>
+    <message>
+        <source>Number of I frames:</source>
+        <translation>Antal I-billeder:</translation>
+    </message>
+    <message>
+        <source>Number of P frames:</source>
+        <translation>Antal P-billeder:</translation>
+    </message>
+    <message>
+        <source>Number of B frames:</source>
+        <translation>Antal B-billeder:</translation>
+    </message>
+    <message>
+        <source>Max. B frames:</source>
+        <translation>Maks. B-billeder:</translation>
+    </message>
+    <message>
+        <source>Bitrate Histogram</source>
+        <translation>Bithastighed histogram</translation>
+    </message>
+</context>
+<context>
+    <name>hue</name>
+    <message>
+        <source>Mplayer Hue</source>
+        <translation>MPlayer farvetone</translation>
+    </message>
+    <message>
+        <source>Adjust hue and saturation.</source>
+        <translation>Justér farvetone og mætning.</translation>
+    </message>
+</context>
+<context>
+    <name>huff</name>
+    <message>
+        <source>HUFFYUV</source>
+        <translation>HUFFYUV</translation>
+    </message>
+    <message>
+        <source>FF HUFFYUV</source>
+        <translation>FF HUFFYUV</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation>Type:</translation>
+    </message>
+    <message>
+        <source>HuffYUV Configuration</source>
+        <translation>HuffYUV-konfiguration</translation>
+    </message>
+</context>
+<context>
+    <name>indexing</name>
+    <message>
+        <source>Continue indexing</source>
+        <translation>Fortsæt indeksering</translation>
+    </message>
+    <message>
+        <source>Abort Requested</source>
+        <translation>Afbrydelse anmodet</translation>
+    </message>
+    <message>
+        <source>Do you want to abort indexing ?</source>
+        <translation>Vil du afbryde indeksering?</translation>
+    </message>
+    <message>
+        <source>Time Left :%02d:%02d:%02d</source>
+        <translation>Resterende tid: %02d:%02d:%02d</translation>
+    </message>
+</context>
+<context>
+    <name>jobs</name>
+    <message>
+        <source>Avidemux Jobs</source>
+        <translation>Avidemux jobs</translation>
+    </message>
+    <message>
+        <source>Run all pending jobs</source>
+        <translation>Kør alle afventende jobs</translation>
+    </message>
+    <message>
+        <source>Run jobs</source>
+        <translation>Kør jobs</translation>
+    </message>
+    <message>
+        <source>Delete already executed jobs</source>
+        <translation>Slet allerede udførte jobs</translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation>Ryd op</translation>
+    </message>
+    <message>
+        <source>If you use VDPAU you cannot use CLI version</source>
+        <translation>Hvis du bruger VDPAU kan du ikke bruge CLI-version</translation>
+    </message>
+    <message>
+        <source>use QT4 version</source>
+        <translation>brug QT4-version</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation>Afslut</translation>
+    </message>
+    <message>
+        <source>Oops</source>
+        <translation>Ups</translation>
+    </message>
+    <message>
+        <source>Something very wrong happened when building joblist.</source>
+        <translation>Noget gik helt galt under bygning af jobliste.</translation>
+    </message>
+    <message>
+        <source>There are no jobs stored</source>
+        <translation>Der er ingen gemte jobs</translation>
+    </message>
+</context>
+<context>
+    <name>jobsDialog</name>
+    <message>
+        <source>Jobs</source>
+        <translation>Jobs</translation>
+    </message>
+    <message>
+        <source>Delete Sel. Job</source>
+        <translation>Slet valgte job</translation>
+    </message>
+    <message>
+        <source>Delete All Jobs</source>
+        <translation>Slet alle jobs</translation>
+    </message>
+    <message>
+        <source>Run All Jobs</source>
+        <translation>Kør alle jobs</translation>
+    </message>
+    <message>
+        <source>Run Selected Job</source>
+        <translation>Kør valgte job</translation>
+    </message>
+</context>
+<context>
+    <name>jpeg</name>
+    <message>
+        <source>YUV422</source>
+        <translation>YUV422</translation>
+    </message>
+    <message>
+        <source>YUV420</source>
+        <translation>YUV420</translation>
+    </message>
+    <message>
+        <source>_Quantizer:</source>
+        <translation>_Quantiser:</translation>
+    </message>
+    <message>
+        <source>_ColorSpace:</source>
+        <translation>_Farverum:</translation>
+    </message>
+    <message>
+        <source>Mjpeg Configuration</source>
+        <translation>MJPEG-konfiguration</translation>
+    </message>
+</context>
+<context>
+    <name>kerneldeint</name>
+    <message>
+        <source>Kernel Deint.</source>
+        <translation>Kerne-afsammenfletter.</translation>
+    </message>
+    <message>
+        <source>Port of Donald Graft Kernel Deinterlacer.</source>
+        <translation>Port af Donald Graft kerne-sammenfletter.</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation>Øverst</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation>Nederst</translation>
+    </message>
+    <message>
+        <source>_Field order:</source>
+        <translation>_Felt rækkefølge:</translation>
+    </message>
+    <message>
+        <source>_Threshold:</source>
+        <translation>_Tærskel:</translation>
+    </message>
+    <message>
+        <source>Smaller means more deinterlacing</source>
+        <translation>Mindre betyder mere afsammenfletning</translation>
+    </message>
+    <message>
+        <source>_Sharp</source>
+        <translation>_Skarp</translation>
+    </message>
+    <message>
+        <source>_Sharper engine:</source>
+        <translation>_Skarp-motor:</translation>
+    </message>
+    <message>
+        <source>T_woway</source>
+        <translation>_Tovejs</translation>
+    </message>
+    <message>
+        <source>Extrapolate better (better not to use it)</source>
+        <translation>Ekstrapolér bedre (bedst ikke at bruge den)</translation>
+    </message>
+    <message>
+        <source>_Map</source>
+        <translation>_Kortlæg</translation>
+    </message>
+    <message>
+        <source>Show interlaced areas (for test!)</source>
+        <translation>Vis sammenflettede områder (til test!)</translation>
+    </message>
+    <message>
+        <source>KernelDeint</source>
+        <translation>Kerne-afsammenflet</translation>
+    </message>
+</context>
+<context>
+    <name>lame</name>
+    <message>
+        <source>CBR</source>
+        <translation>CBR</translation>
+    </message>
+    <message>
+        <source>ABR</source>
+        <translation>ABR</translation>
+    </message>
+    <message>
+        <source>Bit_rate mode:</source>
+        <translation>Bit_hastighed-tilstand:</translation>
+    </message>
+    <message>
+        <source>_Bitrate:</source>
+        <translation>_Bithastighed:</translation>
+    </message>
+    <message>
+        <source>_Quality:</source>
+        <translation>_Kvalitet:</translation>
+    </message>
+    <message>
+        <source>_Disable reservoir:</source>
+        <translation>_Deaktivér reservoir:</translation>
+    </message>
+    <message>
+        <source>LAME Configuration</source>
+        <translation>Konfiguration af LAME</translation>
+    </message>
+</context>
+<context>
+    <name>largemedian</name>
+    <message>
+        <source>Large Median (5x5).</source>
+        <translation>Stor median (5x5).</translation>
+    </message>
+    <message>
+        <source>Median filter on 5x5 matrix.</source>
+        <translation>Medianfilter på 5x5 matriks.</translation>
+    </message>
+    <message>
+        <source>_Process luma</source>
+        <translation>_Behandl luma</translation>
+    </message>
+    <message>
+        <source>Process luma plane</source>
+        <translation>Behandl luma-plan</translation>
+    </message>
+    <message>
+        <source>P_rocess chroma</source>
+        <translation>B_ehandl kroma</translation>
+    </message>
+    <message>
+        <source>Fast Convolution</source>
+        <translation>Hurtig foldning</translation>
+    </message>
+</context>
+<context>
+    <name>lavdeint</name>
+    <message>
+        <source>Libavdec Deinterlacers</source>
+        <translation>Libavdec-afsammenflettere</translation>
+    </message>
+    <message>
+        <source>Lavcodec deinterlacer family.</source>
+        <translation>Libavdec-afsammenfletterfamilie.</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Ingen</translation>
+    </message>
+    <message>
+        <source>Linear blend</source>
+        <translation>Linær bland</translation>
+    </message>
+    <message>
+        <source>Linear interpolate</source>
+        <translation>Linær interpolér</translation>
+    </message>
+    <message>
+        <source>Cubic interpolate</source>
+        <translation>Kubisk interpolér</translation>
+    </message>
+    <message>
+        <source>Median interpolate</source>
+        <translation>Median interpolér</translation>
+    </message>
+    <message>
+        <source>FFmpeg deint</source>
+        <translation>FFmpeg-afsammenflet</translation>
+    </message>
+    <message>
+        <source>_Deinterlacing:</source>
+        <translation>_Afsammenfletning:</translation>
+    </message>
+    <message>
+        <source>_Autolevel</source>
+        <translation>_Autoniveau</translation>
+    </message>
+    <message>
+        <source>libavcodec deinterlacer</source>
+        <translation>libavcodec-afsammenfletter</translation>
+    </message>
+</context>
+<context>
+    <name>licenseDialog</name>
+    <message>
+        <source>License</source>
+        <translation>Licens</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
+    <name>logo</name>
+    <message>
+        <source>_Logo (jpg file):</source>
+        <translation>_Logo (JPEG-fil):</translation>
+    </message>
+    <message>
+        <source>Select JPEG file</source>
+        <translation>Vælg JPEG-fil</translation>
+    </message>
+    <message>
+        <source>_X Position:</source>
+        <translation>_X-position:</translation>
+    </message>
+    <message>
+        <source>_Y Position:</source>
+        <translation>_Y-position:</translation>
+    </message>
+    <message>
+        <source>_Alpha:</source>
+        <translation>_Alfa:</translation>
+    </message>
+    <message>
+        <source>Logo</source>
+        <translation>Logo</translation>
+    </message>
+    <message>
+        <source>Add logo.</source>
+        <translation>Tilføj logo.</translation>
+    </message>
+    <message>
+        <source>Put a logo on top of video, with alpha blending.</source>
+        <translation>Sæt et logo på videoen, med alfa-blanding.</translation>
+    </message>
+</context>
+<context>
+    <name>lumaonly</name>
+    <message>
+        <source>GreyScale</source>
+        <translation>Gråtone</translation>
+    </message>
+    <message>
+        <source>Remove color, only key grey image.</source>
+        <translation>Fjern farve, kun nøgle-grå billede.</translation>
+    </message>
+</context>
+<context>
+    <name>mainFilterDialog</name>
+    <message>
+        <source>Video Filter Manager</source>
+        <translation>Videofilterhåndtering</translation>
+    </message>
+    <message>
+        <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
+        <translation>&lt;big&gt;&lt;b&gt;Aktive filtre&lt;/b&gt;&lt;/big&gt;</translation>
+    </message>
+    <message>
+        <source>C&amp;onfigure</source>
+        <translation>&amp;Konfigurér</translation>
+    </message>
+    <message>
+        <source>P&amp;artial</source>
+        <translation>&amp;Delvis</translation>
+    </message>
+    <message>
+        <source>Down</source>
+        <translation>Ned</translation>
+    </message>
+    <message>
+        <source>Up</source>
+        <translation>Op</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Fjern</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Tilføj</translation>
+    </message>
+    <message>
+        <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
+        <translation>&lt;big&gt;&lt;b&gt;Tilgængelige filtre&lt;/b&gt;&lt;/big&gt;</translation>
+    </message>
+    <message>
+        <source>Transform</source>
+        <translation>Transformér</translation>
+    </message>
+    <message>
+        <source>Interlacing</source>
+        <translation>Sammenfletning</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation>Farver</translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation>Støj</translation>
+    </message>
+    <message>
+        <source>Sharpness</source>
+        <translation>Skarphed</translation>
+    </message>
+    <message>
+        <source>Subtitles</source>
+        <translation>Undertekster</translation>
+    </message>
+    <message>
+        <source>OpenGl</source>
+        <translation>OpenGL</translation>
+    </message>
+    <message>
+        <source>Miscellaneous</source>
+        <translation>Diverse</translation>
+    </message>
+    <message>
+        <source>&amp;Preview</source>
+        <translation>&amp;Forhåndsvis</translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation>&amp;Luk</translation>
+    </message>
+</context>
+<context>
+    <name>mcdeint</name>
+    <message>
+        <source>MCDeint</source>
+        <translation>MCDeint</translation>
+    </message>
+    <message>
+        <source>Motion compensation deinterlacer. Ported from MPlayer.</source>
+        <translation>Bevægelseskompensation-afsammenfletter. Ported fra MPlayer.</translation>
+    </message>
+    <message>
+        <source>Fast</source>
+        <translation>Hurtig</translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation>Medium</translation>
+    </message>
+    <message>
+        <source>Slow iterative motion search</source>
+        <translation>Langsom iterative bevægelesessøgning</translation>
+    </message>
+    <message>
+        <source>Extra slow (same as 3+multiple reference frames)</source>
+        <translation>Ekstra langsom (samme som 3+flere referencebilleder)</translation>
+    </message>
+    <message>
+        <source>_Mode:</source>
+        <translation>_Tilstand:</translation>
+    </message>
+    <message>
+        <source>Bottom :</source>
+        <translation>Nederst:</translation>
+    </message>
+    <message>
+        <source>_Qp:</source>
+        <translation>_Qp:</translation>
+    </message>
+    <message>
+        <source>mcDeinterlace</source>
+        <translation>mc afsammenflet</translation>
+    </message>
+</context>
+<context>
+    <name>meadian</name>
+    <message>
+        <source>3x3 convolution filter :median.</source>
+        <translation>3x3 foldningsfilter: median.</translation>
+    </message>
+</context>
+<context>
+    <name>mean</name>
+    <message>
+        <source>Mean convolution.</source>
+        <translation>Mean foldning.</translation>
+    </message>
+    <message>
+        <source>3x3 convolution filter :mean.</source>
+        <translation>3x3 foldningsfilter: mean.</translation>
+    </message>
+</context>
+<context>
+    <name>median</name>
+    <message>
+        <source>Median convolution.</source>
+        <translation>Median foldning.</translation>
+    </message>
+</context>
+<context>
+    <name>mkvmuxer</name>
+    <message>
+        <source>Saving Mkv</source>
+        <translation>Gemmer MKV</translation>
+    </message>
+</context>
+<context>
+    <name>mp3d</name>
+    <message>
+        <source>Mplayer Denoise 3D HQ</source>
+        <translation>MPlayer støjfjerner 3D HQ</translation>
+    </message>
+    <message>
+        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
+        <translation>Reducér støj, blødgør billede, øg komprimeringshed. HQ version.</translation>
+    </message>
+    <message>
+        <source>_Spatial luma strength:</source>
+        <translation>_Spatial luma styrke:</translation>
+    </message>
+    <message>
+        <source>S_patial chroma strength:</source>
+        <translation>S_patial chroma styrke:</translation>
+    </message>
+    <message>
+        <source>Luma _Temporal strength:</source>
+        <translation>Luma _temporal styrke:</translation>
+    </message>
+    <message>
+        <source>MPlayer denoise3d</source>
+        <translation>MPlayer støjfjerner 3D</translation>
+    </message>
+</context>
+<context>
+    <name>mp3dlow</name>
+    <message>
+        <source>Mplayer Denoise 3D</source>
+        <translation>MPlayer støjfjerner 3D</translation>
+    </message>
+    <message>
+        <source>Reduce noise, smooth image, increase compressibility.</source>
+        <translation>Reducér støj, blødgør billede, øg komprimeringshed.</translation>
+    </message>
+    <message>
+        <source>_Spatial luma strength:</source>
+        <translation>_Spatial luma styrke:</translation>
+    </message>
+    <message>
+        <source>S_patial chroma strength:</source>
+        <translation>S_patial kroma styrke:</translation>
+    </message>
+    <message>
+        <source>_Temporal strength:</source>
+        <translation>_Temporal styrke:</translation>
+    </message>
+    <message>
+        <source>MPlayer denoise3d</source>
+        <translation>MPlayer støjfjerner 3D</translation>
+    </message>
+</context>
+<context>
+    <name>msharpen</name>
+    <message>
+        <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
+        <translation>Skarpe kanter uden at forstærke støj. Af Donald Graft.</translation>
+    </message>
+    <message>
+        <source>_Mask</source>
+        <translation>_Maske</translation>
+    </message>
+    <message>
+        <source>_High Q</source>
+        <translation>_Høj kvalitet</translation>
+    </message>
+    <message>
+        <source>_Threshold:</source>
+        <translation>_Tærskel:</translation>
+    </message>
+    <message>
+        <source>_Strength:</source>
+        <translation>_Styrke:</translation>
+    </message>
+    <message>
+        <source>MSharpen</source>
+        <translation>MSharpen</translation>
+    </message>
+    <message>
+        <source>Msharpen</source>
+        <translation>Msharpen</translation>
+    </message>
+</context>
+<context>
+    <name>muxerMP4</name>
+    <message>
+        <source>Saving mp4</source>
+        <translation>Gemmer MP4</translation>
+    </message>
+    <message>
+        <source>Saving PSP</source>
+        <translation>Gemmer PSP</translation>
+    </message>
+</context>
+<context>
+    <name>muxerffPS</name>
+    <message>
+        <source>Saving mpeg PS (ff)</source>
+        <translation>Gemmer MPEG PS (ff)</translation>
+    </message>
+</context>
+<context>
+    <name>muxerffTS</name>
+    <message>
+        <source>Saving mpeg TS (ff)</source>
+        <translation>Gemmer MPEG TS (ff)</translation>
+    </message>
+</context>
+<context>
+    <name>openGlResize</name>
+    <message>
+        <source>Width :</source>
+        <translation>Bredde:</translation>
+    </message>
+    <message>
+        <source>Height :</source>
+        <translation>Højde:</translation>
+    </message>
+    <message>
+        <source>glResize</source>
+        <translation>glTilpasStørrelse</translation>
+    </message>
+</context>
+<context>
+    <name>propsDialog</name>
+    <message>
+        <source>Properties</source>
+        <translation>Egenskaber</translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation>Video</translation>
+    </message>
+    <message>
+        <source>TextLabel</source>
+        <translation>Tekstetiket</translation>
+    </message>
+    <message>
+        <source>Frame Rate:</source>
+        <translation>Billedhastighed:</translation>
+    </message>
+    <message>
+        <source>Total Duration:</source>
+        <translation>Total varighed:</translation>
+    </message>
+    <message>
+        <source>Aspect Ratio:</source>
+        <translation>Højde-bredde-forhold:</translation>
+    </message>
+    <message>
+        <source>Image Size:</source>
+        <translation>Billedstørrelse:</translation>
+    </message>
+    <message>
+        <source>Codec 4CC:</source>
+        <translation>Codec 4CC:</translation>
+    </message>
+    <message>
+        <source>Extra Video Properties</source>
+        <translation>Ekstra videoegenskaber</translation>
+    </message>
+    <message>
+        <source>ExtraDataSize:</source>
+        <translation>Størrelse på ekstradata:</translation>
+    </message>
+    <message>
+        <source>Extra data :</source>
+        <translation>Ekstradata:</translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation>Lyd</translation>
+    </message>
+    <message>
+        <source>Frequency:</source>
+        <translation>Frekvens:</translation>
+    </message>
+    <message>
+        <source>Variable Bitrate:</source>
+        <translation>Variabel bithastighed:</translation>
+    </message>
+    <message>
+        <source>Bitrate:</source>
+        <translation>Bithastighed:</translation>
+    </message>
+    <message>
+        <source>Channels:</source>
+        <translation>Kanaler:</translation>
+    </message>
+    <message>
+        <source>Codec:</source>
+        <translation>Codec:</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
+    <name>qprops</name>
+    <message>
+        <source>No</source>
+        <translation>Nej</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>%2.3f fps</source>
+        <translation>%2.3f billeder/sekund</translation>
+    </message>
+    <message>
+        <source>%02d:%02d:%02d.%03d</source>
+        <translation>%02d:%02d:%02d,%03d</translation>
+    </message>
+    <message>
+        <source>%s (%u:%u)</source>
+        <translation>%s (%u:%u)</translation>
+    </message>
+    <message>
+        <source>Mono</source>
+        <translation>Mono</translation>
+    </message>
+    <message>
+        <source>Stereo</source>
+        <translation>Stereo</translation>
+    </message>
+</context>
+<context>
+    <name>removeplane</name>
+    <message>
+        <source>Remove  Plane</source>
+        <translation>Fjern plan</translation>
+    </message>
+    <message>
+        <source>Remove Y,U or V plane (used mainly to debug other filters).</source>
+        <translation>Fjern Y-, U- eller V-plan (hovedsageligt brugt til at fejlfinde andre filtre).</translation>
+    </message>
+    <message>
+        <source>Keep Y Plane</source>
+        <translation>Bevar Y-plan</translation>
+    </message>
+    <message>
+        <source>Process luma plane</source>
+        <translation>Behandl luma-plan</translation>
+    </message>
+    <message>
+        <source>Keep U Plane</source>
+        <translation>Bevar U-plan</translation>
+    </message>
+    <message>
+        <source>Process chromaU plane</source>
+        <translation>Behandl kromaU-plan</translation>
+    </message>
+    <message>
+        <source>Keep V Plane</source>
+        <translation>Bevar V-plan</translation>
+    </message>
+    <message>
+        <source>Process chromaV plane</source>
+        <translation>Behandl kromaV-plan</translation>
+    </message>
+    <message>
+        <source>Remove plane</source>
+        <translation>Fjern plan</translation>
+    </message>
+</context>
+<context>
+    <name>resampleFps</name>
+    <message>
+        <source>Custom</source>
+        <translation>Brugerdefineret</translation>
+    </message>
+    <message>
+        <source>25  (PAL)</source>
+        <translation>25  (PAL)</translation>
+    </message>
+    <message>
+        <source>23.976 (Film)</source>
+        <translation>23,976 (film)</translation>
+    </message>
+    <message>
+        <source>29.97 (NTSC)</source>
+        <translation>29,97 (NTSC)</translation>
+    </message>
+    <message>
+        <source>50 (Pal)</source>
+        <translation>50 (PAL)</translation>
+    </message>
+    <message>
+        <source>59.93  (NTSC)</source>
+        <translation>59,93 (NTSC)</translation>
+    </message>
+    <message>
+        <source>_Mode:</source>
+        <translation>_Tilstand:</translation>
+    </message>
+    <message>
+        <source>_New frame rate:</source>
+        <translation>_Ny billedhastighed:</translation>
+    </message>
+    <message>
+        <source>Resample fps</source>
+        <translation>Gensample billeder/sekund</translation>
+    </message>
+    <message>
+        <source>Resample FPS</source>
+        <translation>Gensample billeder/sekund</translation>
+    </message>
+    <message>
+        <source>Change and enforce FPS. Keep duration and sync.</source>
+        <translation>Ændr og gennemtving billeder/sekund. Behold varighed og synk.</translation>
+    </message>
+</context>
+<context>
+    <name>resize</name>
+    <message>
+        <source>swsResize</source>
+        <translation>swsResize</translation>
+    </message>
+    <message>
+        <source>swScale Resizer.</source>
+        <translation>sw skalering tilpas størrelse.</translation>
+    </message>
+</context>
+<context>
+    <name>resizeWindow</name>
+    <message>
+        <source>Width and height cannot be odd</source>
+        <translation>Bredde og højde kan ikke være ulige</translation>
+    </message>
+</context>
+<context>
+    <name>rotate</name>
+    <message>
+        <source>Rotate</source>
+        <translation>Rotér</translation>
+    </message>
+    <message>
+        <source>Rotate the image by 90/180/270 degrees.</source>
+        <translation>Rotér billedet med 90/180/270 grader.</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Ingen</translation>
+    </message>
+    <message>
+        <source>90 degrees</source>
+        <translation>90 grader</translation>
+    </message>
+    <message>
+        <source>90Â°</source>
+        <translation>90°</translation>
+    </message>
+    <message>
+        <source>180 degrees</source>
+        <translation>180 grader</translation>
+    </message>
+    <message>
+        <source>180Â°</source>
+        <translation>180°</translation>
+    </message>
+    <message>
+        <source>270 degrees</source>
+        <translation>270 grader</translation>
+    </message>
+    <message>
+        <source>270Â°</source>
+        <translation>270°</translation>
+    </message>
+    <message>
+        <source>_Angle:</source>
+        <translation>_Vinkel:</translation>
+    </message>
+</context>
+<context>
+    <name>rotateGl</name>
+    <message>
+        <source>Angle (Â°):</source>
+        <translation>Vinkel (°):</translation>
+    </message>
+    <message>
+        <source>glRotate</source>
+        <translation>glRotér</translation>
+    </message>
+</context>
+<context>
+    <name>seekablePreviewDialog</name>
+    <message>
+        <source>Preview</source>
+        <translation>Forhåndsvis</translation>
+    </message>
+    <message>
+        <source>next</source>
+        <translation>næste</translation>
+    </message>
+    <message>
+        <source>00:00:00.000</source>
+        <translation>00:00:00,000</translation>
+    </message>
+</context>
+<context>
+    <name>swapuv</name>
+    <message>
+        <source>Swap UV</source>
+        <translation>Byt UV</translation>
+    </message>
+    <message>
+        <source>Swap the U and V planes.</source>
+        <translation>Byt om på U og V planerne.</translation>
+    </message>
+</context>
+<context>
+    <name>uisupport</name>
+    <message>
+        <source>X11</source>
+        <translation>X11</translation>
+    </message>
+    <message>
+        <source>MS Windows GDI</source>
+        <translation>MS Windows GDI</translation>
+    </message>
+    <message>
+        <source>Mac OS X Quartz 2D</source>
+        <translation>Mac OS X Quartz 2D</translation>
+    </message>
+    <message>
+        <source>Mac OS X QuickDraw</source>
+        <translation>Mac OS X QuickDraw</translation>
+    </message>
+    <message>
+        <source>OpenGL</source>
+        <translation>OpenGL</translation>
+    </message>
+    <message>
+        <source>MS Windows Direct3D</source>
+        <translation>MS Windows Direct3D</translation>
+    </message>
+    <message>
+        <source>Default Raster</source>
+        <translation>Standard raster</translation>
+    </message>
+</context>
+<context>
+    <name>vdpauVideoFilterDeint</name>
+    <message>
+        <source>Keep Top Field</source>
+        <translation>Behold øverste felt</translation>
+    </message>
+    <message>
+        <source>Keep Bottom Field</source>
+        <translation>Behold nederste felt</translation>
+    </message>
+    <message>
+        <source>Double framerate</source>
+        <translation>Dobbelt billedhastighed</translation>
+    </message>
+    <message>
+        <source>_Resize:</source>
+        <translation>_Tilpas størrelse:</translation>
+    </message>
+    <message>
+        <source>_Deint Mode:</source>
+        <translation>_Afsammenflet-tilstand:</translation>
+    </message>
+    <message>
+        <source>Width :</source>
+        <translation>Bredde:</translation>
+    </message>
+    <message>
+        <source>Height :</source>
+        <translation>Højde:</translation>
+    </message>
+    <message>
+        <source>vdpau</source>
+        <translation>vdpau</translation>
+    </message>
+</context>
+<context>
+    <name>vdpaufilter</name>
+    <message>
+        <source>Keep Top Field</source>
+        <translation>Behold øverste felt</translation>
+    </message>
+    <message>
+        <source>Keep Bottom Field</source>
+        <translation>Behold nederste felt</translation>
+    </message>
+    <message>
+        <source>Double framerate</source>
+        <translation>Dobbelt billedhastighed</translation>
+    </message>
+    <message>
+        <source>_Resize:</source>
+        <translation>_Tilpas størrelse:</translation>
+    </message>
+    <message>
+        <source>_Deint Mode:</source>
+        <translation>_Afsammenflet-tilstand:</translation>
+    </message>
+    <message>
+        <source>Width :</source>
+        <translation>Bredde:</translation>
+    </message>
+    <message>
+        <source>Height :</source>
+        <translation>Højde:</translation>
+    </message>
+    <message>
+        <source>vdpau</source>
+        <translation>vdpau</translation>
+    </message>
+</context>
+<context>
+    <name>vdpaufilter2</name>
+    <message>
+        <source>Width :</source>
+        <translation>Bredde:</translation>
+    </message>
+    <message>
+        <source>Height :</source>
+        <translation>Højde:</translation>
+    </message>
+    <message>
+        <source>vdpau</source>
+        <translation>vdpau</translation>
+    </message>
+</context>
+<context>
+    <name>vdpresize</name>
+    <message>
+        <source>vdpau: Resize</source>
+        <translation>vdpau: Ændr størrelse</translation>
+    </message>
+    <message>
+        <source>vdpau: Resize image using vdpau.</source>
+        <translation>vdpau: Ændr billedstørrelse ved brug af vdpau.</translation>
+    </message>
+</context>
+<context>
+    <name>vflip</name>
+    <message>
+        <source>Vertical Flip</source>
+        <translation>Vend lodret</translation>
+    </message>
+    <message>
+        <source>Vertically flip the image.</source>
+        <translation>Vend billedet lodret.</translation>
+    </message>
+</context>
+<context>
+    <name>vobSubDialog</name>
+    <message>
+        <source>Subtitle Font Size and Position</source>
+        <translation>Undertekst skriftstørrelse og placering</translation>
+    </message>
+    <message>
+        <source>Delay :</source>
+        <translation>Forsinkelse:</translation>
+    </message>
+    <message>
+        <source>Select File</source>
+        <translation>Vælg fil</translation>
+    </message>
+    <message>
+        <source>Language :</source>
+        <translation>Sprog:</translation>
+    </message>
+    <message>
+        <source>Idx File :</source>
+        <translation>IDX-fil:</translation>
+    </message>
+</context>
+<context>
+    <name>vorbis</name>
+    <message>
+        <source>VBR</source>
+        <translation>VBR</translation>
+    </message>
+    <message>
+        <source>Quality based</source>
+        <translation>Kvalitetsbaseret</translation>
+    </message>
+    <message>
+        <source>_Mode:</source>
+        <translation>_Tilstand:</translation>
+    </message>
+    <message>
+        <source>_Bitrate:</source>
+        <translation>_Bithastighed:</translation>
+    </message>
+    <message>
+        <source>_Quality:</source>
+        <translation>_Kvalitet:</translation>
+    </message>
+    <message>
+        <source>Vorbis Configuration</source>
+        <translation>Konfiguration af Vorbis</translation>
+    </message>
+</context>
+<context>
+    <name>workingDialog</name>
+    <message>
+        <source>Processing</source>
+        <translation>Behandler</translation>
+    </message>
+    <message>
+        <source>Elapsed:</source>
+        <translation>Forløbet:</translation>
+    </message>
+    <message>
+        <source>Time Remaining:</source>
+        <translation>Resterende tid:</translation>
+    </message>
+    <message>
+        <source>00:00:00</source>
+        <translation>00:00:00</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annullér</translation>
+    </message>
+</context>
+<context>
+    <name>x264Dialog</name>
+    <message>
+        <source>Target Bitrate:</source>
+        <translation>Ønsket bithastighed:</translation>
+    </message>
+    <message>
+        <source>kbit/s</source>
+        <translation>Kbit/s</translation>
+    </message>
+    <message>
+        <source>Quantiser:</source>
+        <translation>Quantiser:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation>Kvalitet:</translation>
+    </message>
+    <message>
+        <source>Target Video Size:</source>
+        <translation>Ønsket videostørrelse:</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <source>Average Bitrate:</source>
+        <translation>Gennemsnitlig bithastighed:</translation>
+    </message>
+    <message>
+        <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>Macroblok-træ optimering kræver at Variance Adaptive Quantisation er aktiveret.  Variance Adaptive Quantisation aktiveres automatisk.
+
+Ønsker du at fortsætte?</translation>
+    </message>
+    <message>
+        <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>Macroblok-træ optimering kræver at Variance Adaptive Quantisation er aktiveret.  Macroblok-træ optimering deaktiveres automatisk.
+
+Ønsker du at fortsætte?</translation>
+    </message>
+</context>
+<context>
+    <name>xvid4</name>
+    <message>
+        <source>None</source>
+        <translation>Ingen</translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation>Lav</translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation>Medium</translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation>Fuld</translation>
+    </message>
+    <message>
+        <source>H.263</source>
+        <translation>H.263</translation>
+    </message>
+    <message>
+        <source>MPEG</source>
+        <translation>MPEG</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation>Brugerdefineret</translation>
+    </message>
+    <message>
+        <source>DCT</source>
+        <translation>DCT</translation>
+    </message>
+    <message>
+        <source>Qpel16</source>
+        <translation>Qpel16</translation>
+    </message>
+    <message>
+        <source>Qpel8</source>
+        <translation>Qpel8</translation>
+    </message>
+    <message>
+        <source>Square</source>
+        <translation>Kvadrat</translation>
+    </message>
+    <message>
+        <source>One thread</source>
+        <translation>En tråd</translation>
+    </message>
+    <message>
+        <source>Two threads)</source>
+        <translation>To tråde</translation>
+    </message>
+    <message>
+        <source>Three threads</source>
+        <translation>Tre tråde</translation>
+    </message>
+    <message>
+        <source>Auto (#cpu)</source>
+        <translation>Auto (#cpu)</translation>
+    </message>
+    <message>
+        <source>MotionEstimation</source>
+        <translation>Bevægelsesestimering</translation>
+    </message>
+    <message>
+        <source>Threading</source>
+        <translation>Trådning</translation>
+    </message>
+    <message>
+        <source>_Trellis quantization</source>
+        <translation>_Trellis-quantisation</translation>
+    </message>
+    <message>
+        <source>_Number of B frames:</source>
+        <translation>_Antal B-billeder:</translation>
+    </message>
+    <message>
+        <source>_Quantization type:</source>
+        <translation>_Quantisationstype:</translation>
+    </message>
+    <message>
+        <source>_Macroblock decision:</source>
+        <translation>_Makroblok beslutning:</translation>
+    </message>
+    <message>
+        <source>Profile:</source>
+        <translation>Profil:</translation>
+    </message>
+    <message>
+        <source>_Gop Size:</source>
+        <translation>_Gop-størrelse:</translation>
+    </message>
+    <message>
+        <source>Advanced Simple Profile</source>
+        <translation>Avanceret simpel profil</translation>
+    </message>
+    <message>
+        <source>Motion Estimation</source>
+        <translation>Bevægelsesestimering</translation>
+    </message>
+    <message>
+        <source>Quantization</source>
+        <translation>Quantisation</translation>
+    </message>
+    <message>
+        <source>Threads</source>
+        <translation>Tråde</translation>
+    </message>
+    <message>
+        <source>Rate Control</source>
+        <translation>Ratekontrol</translation>
+    </message>
+    <message>
+        <source>Xvid4 MPEG-4 ASP configuration</source>
+        <translation>Xvid4 MPEG-4 ASP-konfiguration</translation>
+    </message>
+</context>
+</TS>

avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/avidemux_de.ts -> avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/avidemux_de.ts Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
+<TS version="2.1" language="de_DE">
 <context>
     <name></name>
     <message>
@@ -166,10 +166,6 @@
         <translation type="obsolete">_Alternativen &apos;Tag&apos; für MP3-Tonspuren in MPEG-4 Containern benutzen</translation>
     </message>
     <message>
-        <source>XVideo (best)</source>
-        <translation type="obsolete">XVideo (bestens)</translation>
-    </message>
-    <message>
         <source>SDL (good)</source>
         <translation type="obsolete">SDL (gut)</translation>
     </message>
@@ -3541,7 +3537,7 @@
     </message>
     <message>
         <source>Cannot find a demuxer for %s</source>
-        <translation type="unfinished"></translation>
+        <translation>Kann Demuxer für %s nicht finden</translation>
     </message>
     <message>
         <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
@@ -3574,6 +3570,21 @@
     </message>
 </context>
 <context>
+    <name>ADM_Qt4CoreUIToolkit::DIA_processingQt4</name>
+    <message>
+        <source>_Resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The processing is paused.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_Qt4Factory::ADM_Qbitrate</name>
     <message>
         <source>Constant Bitrate</source>
@@ -3664,6 +3675,13 @@
     </message>
 </context>
 <context>
+    <name>ADM_ffDvEncoder</name>
+    <message>
+        <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_ogmWrite</name>
     <message>
         <source>None</source>
@@ -3965,10 +3983,6 @@
         <translation type="unfinished">Format und Größe des Ausgabedatei</translation>
     </message>
     <message>
-        <source>00:00:00</source>
-        <translation type="unfinished">00:00:00</translation>
-    </message>
-    <message>
         <source>AVI</source>
         <translation type="unfinished">AVI</translation>
     </message>
@@ -4316,7 +4330,7 @@
     <name>DIA_encodingQt4</name>
     <message>
         <source>Shutting down</source>
-        <translation type="unfinished">Herunter fahren</translation>
+        <translation type="obsolete">Herunter fahren</translation>
     </message>
     <message>
         <source>The encoding is paused. Do you want to resume or abort?</source>
@@ -4330,6 +4344,14 @@
         <source>Abort</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
+    <message>
+        <source>Privileges Required</source>
+        <translation type="unfinished">Rechte erforderlich</translation>
+    </message>
+    <message>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation type="unfinished">Für diese Operation sind Root-Rechte erforderlich.</translation>
+    </message>
 </context>
 <context>
     <name>DVD</name>
@@ -4354,6 +4376,13 @@
     </message>
 </context>
 <context>
+    <name>DcaEnc</name>
+    <message>
+        <source>DcaEnc Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Decimate</name>
     <message>
         <source>Discard closer</source>
@@ -4427,7 +4456,7 @@
     <name>DialogAudioTracks</name>
     <message>
         <source>Track 1</source>
-        <translation type="unfinished">Spur 2: {1?}</translation>
+        <translation type="unfinished">Tonspur 1</translation>
     </message>
     <message>
         <source>Configure</source>
@@ -4435,27 +4464,31 @@
     </message>
     <message>
         <source>Audio Filters</source>
-        <translation type="unfinished">Audio Filter</translation>
+        <translation type="obsolete">Audio Filter</translation>
     </message>
     <message>
         <source>Track 2</source>
-        <translation type="unfinished">Spur 2: {2?}</translation>
+        <translation type="unfinished">Tonspur 2</translation>
     </message>
     <message>
         <source>Track 3</source>
-        <translation type="unfinished">Spur 2: {3?}</translation>
+        <translation type="unfinished">Tonspur 3</translation>
     </message>
     <message>
         <source>Track 4</source>
-        <translation type="unfinished">Spur 2: {4?}</translation>
+        <translation type="unfinished">Tonspur 4</translation>
     </message>
     <message>
         <source>Audio Tracks Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tonspureinstellungen</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">aktivieren</translation>
+    </message>
+    <message>
+        <source>Filters</source>
+        <translation type="unfinished">Filter</translation>
     </message>
 </context>
 <context>
@@ -4502,6 +4535,37 @@
     </message>
     <message>
         <source>Nb Lines :</source>
+        <translation type="unfinished">Zeilen:</translation>
+    </message>
+</context>
+<context>
+    <name>DialogProcessing</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished">Dialog</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <source>TimeLeft</source>
+        <translation type="unfinished">Restzeit</translation>
+    </message>
+    <message>
+        <source>ProcessImages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished">0</translation>
+    </message>
+    <message>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 fps</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4517,15 +4581,15 @@
     </message>
     <message>
         <source>Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fortschritt</translation>
     </message>
     <message>
         <source>Current job</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Laufender Auftrag</translation>
     </message>
     <message>
         <source>File being written </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Datei wird geschrieben</translation>
     </message>
 </context>
 <context>
@@ -4932,7 +4996,7 @@
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished">kopieren</translation>
+        <translation type="unfinished">Kopieren</translation>
     </message>
     <message>
         <source>Configure</source>
@@ -4975,14 +5039,6 @@
         <translation type="unfinished">Zeit:</translation>
     </message>
     <message>
-        <source>00:00:00.000</source>
-        <translation type="unfinished">00:00:00.000</translation>
-    </message>
-    <message>
-        <source>/ 00:00:00.000</source>
-        <translation type="unfinished">/ 00:00:00.000</translation>
-    </message>
-    <message>
         <source>Frame Type:</source>
         <translation type="obsolete">Bildtyp:</translation>
     </message>
@@ -4995,10 +5051,6 @@
         <translation type="unfinished">Auswahlbereich</translation>
     </message>
     <message>
-        <source>000000</source>
-        <translation type="unfinished">000000</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation type="unfinished">&amp;Hilfe</translation>
     </message>
@@ -5055,6 +5107,22 @@
         <translation type="unfinished">&amp;Öffnen...</translation>
     </message>
     <message>
+        <source>&amp;Run Project...</source>
+        <translation>&amp;Projekt laden...</translation>
+    </message>
+    <message>
+        <source>Save &amp;As Project...</source>
+        <translation>&amp;Als Projekt speichern...</translation>
+    </message>
+    <message>
+        <source>Project Script</source>
+        <translation>&amp;Gespeicherte Projekte</translation>
+    </message>
+    <message>
+        <source></source>
+        <translation></translation>
+    </message>
+    <message>
         <source>Ctrl+O</source>
         <translation type="obsolete">Strg+Ö</translation>
     </message>
@@ -5116,7 +5184,7 @@
     </message>
     <message>
         <source>&amp;Information...</source>
-        <translation type="unfinished">Datei-&amp;Informationen...</translation>
+        <translation type="unfinished">E&amp;igenschaften...</translation>
     </message>
     <message>
         <source>Alt+Return</source>
@@ -5260,7 +5328,7 @@
     </message>
     <message>
         <source>Ctrl+Alt+S</source>
-        <translation type="unfinished">Strg+T</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Filters</source>
@@ -5588,23 +5656,23 @@
     </message>
     <message>
         <source>&amp;Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Werkzeugleisten</translation>
     </message>
     <message>
         <source>&amp;Auto</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">A&amp;uto</translation>
     </message>
     <message>
         <source>&amp;Recent</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ve&amp;rlauf</translation>
     </message>
     <message>
         <source>Codec Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Codec-Einstellungen</translation>
     </message>
     <message>
         <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;b&gt;Video-Decoder&lt;/b&gt;</translation>
     </message>
     <message>
         <source>XXXX</source>
@@ -5612,11 +5680,11 @@
     </message>
     <message>
         <source>&lt;b&gt;Video Output&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;b&gt;Video-Codec&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;b&gt;Audio-Codec&lt;/b&gt;</translation>
     </message>
     <message>
         <source>   (0 track(s))</source>
@@ -5624,27 +5692,23 @@
     </message>
     <message>
         <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;b&gt;Ausgabeformat&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;b&gt;Selection&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lautstärke</translation>
     </message>
     <message>
         <source>Audio Metre</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Pegelanzeige</translation>
     </message>
     <message>
         <source>&amp;Codec Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Codec-Einstellungen</translation>
     </message>
     <message>
         <source>Ctrl+Alt+C</source>
@@ -5660,11 +5724,11 @@
     </message>
     <message>
         <source>&amp;Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Auswahlbereich</translation>
     </message>
     <message>
         <source>&amp;Volume</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Lautstärke</translation>
     </message>
     <message>
         <source>Ctrl+Alt+V</source>
@@ -5672,12 +5736,24 @@
     </message>
     <message>
         <source>&amp;Audio Metre</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Pegelanzeige</translation>
     </message>
     <message>
         <source>Ctrl+Alt+M</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display processed video on playback</source>
+        <translation type="unfinished">Filter bei Wiedergabe anwenden</translation>
+    </message>
+    <message>
+        <source>Play filtered</source>
+        <translation type="unfinished">Filter anwenden</translation>
+    </message>
+    <message>
+        <source>Open Video</source>
+        <translation type="unfinished">Videodatei öffnen</translation>
+    </message>
 </context>
 <context>
     <name>MjpegEncoder</name>
@@ -6279,6 +6355,13 @@
     </message>
 </context>
 <context>
+    <name>Webmmuxer</name>
+    <message>
+        <source>Saving Webm</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XvidConfigDialog</name>
     <message>
         <source>Xvid Configuraton</source>
@@ -6770,8 +6853,8 @@
         <source>Avidemux </source>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <source>© 2001 - 2012  Mean</source>
+    <message>
+        <source>© 2001 - 2016  Mean</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -6989,7 +7072,7 @@
     </message>
     <message>
         <source>De_ringing</source>
-        <translation type="unfinished">Video sch_ärfen (entfernt leichte Farbverzehrungen rund um scharfe Konturen)</translation>
+        <translation type="unfinished">De_ringing (entfernt leichte Farbverzerrungen rund um scharfe Konturen)</translation>
     </message>
     <message>
         <source>Default Postprocessing</source>
@@ -7009,7 +7092,7 @@
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished">Video</translation>
+        <translation type="obsolete">Video</translation>
     </message>
     <message>
         <source>CPU</source>
@@ -7020,48 +7103,52 @@
         <translation type="unfinished">Mehrkernprozessoren</translation>
     </message>
     <message>
+        <source>_Always ask which port to use</source>
+        <translation>_Immer fragen, welcher Port benutzt werden soll</translation>
+    </message>
+    <message>
+        <source>Default port to use</source>
+        <translation>Standardport</translation>
+    </message>
+    <message>
         <source>Preferences</source>
-        <translation type="unfinished">Einstellungen</translation>
+        <translation>&amp;Einstellungen</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Ö&amp;ffnen...</translation>
     </message>
     <message>
         <source>Append</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Anfügen...</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Speichern</translation>
     </message>
     <message>
         <source>Queue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Zur &amp;Warteschlange hinzufügen...</translation>
     </message>
     <message>
         <source>Save as Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Als B&amp;ild speichern</translation>
     </message>
     <message>
         <source>Save as BMP</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Als BMP-Bild speichern</translation>
     </message>
     <message>
         <source>Save as JPEG</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Als JPEG-Bild speichern</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">Schließen</translation>
-    </message>
-    <message>
-        <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation>Schlie&amp;ßen</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Eigenschaften</translation>
     </message>
     <message>
         <source>Connect to avsproxy</source>
@@ -7069,59 +7156,63 @@
     </message>
     <message>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>Undo</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Rückgängig</translation>
     </message>
     <message>
         <source>Reset Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Änderungen &amp;verwerfen</translation>
     </message>
     <message>
         <source>Cut</source>
-        <translation type="unfinished"></translation>
+        <translation>Aus&amp;schneiden</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>Ei&amp;nfügen</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>Set Marker A</source>
-        <translation type="unfinished">Setze Markierung A</translation>
+        <translation>Setze Markierung &amp;A</translation>
     </message>
     <message>
         <source>Set Marker B</source>
-        <translation type="unfinished">Setze Markierung B</translation>
+        <translation>Setze Markierung &amp;B</translation>
+    </message>
+    <message>
+        <source>Save current settings as default</source>
+        <translation>Aus&amp;gabekonfiguration als Vorgabe setzen</translation>
     </message>
     <message>
         <source>Decoder Option</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Decoder-Optionen</translation>
     </message>
     <message>
         <source>PostProcessing</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nachbearbeitung</translation>
     </message>
     <message>
         <source>Filters</source>
-        <translation type="unfinished">Filter</translation>
+        <translation>&amp;Filter</translation>
     </message>
     <message>
         <source>Select Track</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Tonspur wählen</translation>
     </message>
     <message>
         <source>Save audio</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Audio speichern</translation>
     </message>
     <message>
         <source>Build Option</source>
@@ -7149,51 +7240,51 @@
     </message>
     <message>
         <source>Play/Stop</source>
-        <translation type="unfinished">Start/Stop</translation>
+        <translation type="unfinished">Start/Stopp</translation>
     </message>
     <message>
         <source>Previous Frame</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vorheriges Bild</translation>
     </message>
     <message>
         <source>Next Frame</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nächstes Bild</translation>
     </message>
     <message>
         <source>Previous Intra Frame</source>
-        <translation type="unfinished">ein i-Bild zur&amp;ück</translation>
+        <translation type="unfinished">Ein I-Frame zurück</translation>
     </message>
     <message>
         <source>Next Intra Frame</source>
-        <translation type="unfinished">ein i-Frame vor</translation>
+        <translation type="unfinished">Ein I-Frame vor</translation>
     </message>
     <message>
         <source>Previous Black Frame</source>
-        <translation type="unfinished">ein schwarzes Bild rückwärts suchen</translation>
+        <translation type="unfinished">Ein schwarzes Bild rückwärts suchen</translation>
     </message>
     <message>
         <source>Next Black Frame</source>
-        <translation type="unfinished">ein schwarzes Bild vorwärts suchen</translation>
+        <translation type="unfinished">Ein schwarzes Bild vorwärts suchen</translation>
     </message>
     <message>
         <source>First Frame</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Erstes Bild</translation>
     </message>
     <message>
         <source>Last Frame</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Letztes Bild</translation>
     </message>
     <message>
         <source>Go To Marker A</source>
-        <translation type="unfinished"></translation>
+        <translation>Springe zur Markierung A</translation>
     </message>
     <message>
         <source>Go To Marker B</source>
-        <translation type="unfinished"></translation>
+        <translation>Springe zur Markierung B</translation>
     </message>
     <message>
         <source>Go To Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Gehe zum Zeitpunkt</translation>
     </message>
     <message>
         <source>R_esampling (Hz):</source>
@@ -7277,7 +7368,7 @@
     </message>
     <message>
         <source>G_ain value:</source>
-        <translation type="unfinished">_ändern um:</translation>
+        <translation type="unfinished">_Ändern um:</translation>
     </message>
     <message>
         <source>_Mixer:</source>
@@ -7412,40 +7503,36 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Decode video using VDPAU</source>
-        <translation type="unfinished"></translation>
+        <source>Enable openGl support</source>
+        <translation>OpenG_L benutzen</translation>
     </message>
     <message>
-        <source>Enable openGl support</source>
-        <translation type="unfinished"></translation>
+        <source>_Limit Refresh Rate</source>
+        <translation>_Bildwiederholungsfrequenz begrenzen</translation>
+    </message>
+    <message>
+        <source>Refresh Rate Cap (ms)</source>
+        <translation>Bild _neu aufbauen nicht häufiger als nach (ms)</translation>
     </message>
     <message>
         <source>High</source>
-        <translation type="unfinished"></translation>
+        <translation>Hoch</translation>
     </message>
     <message>
         <source>Low</source>
-        <translation type="unfinished"></translation>
+        <translation>Niedrig</translation>
     </message>
     <message>
         <source>_Split MPEG files every (MB):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">MPEG-Dateien splitten nach (in MiB):</translation>
     </message>
     <message>
         <source>VDPAU (best)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">VDPAU (bestens)</translation>
     </message>
     <message>
         <source>OpenGL (best)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MS Windows GDI (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MS Windows DirectX (SDL)</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenGL (bestens)</translation>
     </message>
     <message>
         <source>PCM</source>
@@ -7453,15 +7540,15 @@
     </message>
     <message>
         <source>_Horizontal deblocking</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Horizontales Deblocking</translation>
     </message>
     <message>
         <source>_Vertical deblocking</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Vertikales Deblocking</translation>
     </message>
     <message>
         <source>_Strength:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">_Intensität</translation>
     </message>
     <message>
         <source>No audio track</source>
@@ -7516,11 +7603,11 @@
     </message>
     <message>
         <source>Select AVI File...</source>
-        <translation type="unfinished">AVI-Datei auswählen...</translation>
+        <translation type="obsolete">AVI-Datei auswählen...</translation>
     </message>
     <message>
         <source>Select AVI File to Append...</source>
-        <translation type="unfinished">AVI-Datei auswählen zum Anhängen...</translation>
+        <translation type="obsolete">AVI-Datei auswählen zum Anhängen...</translation>
     </message>
     <message>
         <source>Are you sure?</source>
@@ -7724,7 +7811,7 @@
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Fehler</translation>
+        <translation>Fehler</translation>
     </message>
     <message>
         <source>Could not save all images.</source>
@@ -7752,11 +7839,11 @@
     </message>
     <message>
         <source>Recent Files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Zuletzt verwendete Dateien</translation>
     </message>
     <message>
         <source>Recent Projects</source>
-        <translation type="unfinished">kürzlich verwendete Projekte</translation>
+        <translation type="unfinished">Zuletzt verwendete Projekte</translation>
     </message>
     <message>
         <source>_Mode:</source>
@@ -7860,23 +7947,23 @@
     </message>
     <message>
         <source>The filter is already partial</source>
-        <translation type="unfinished">Der Filter ist bereits aufgeteilt</translation>
+        <translation type="obsolete">Der Filter ist bereits aufgeteilt</translation>
     </message>
     <message>
         <source>Partial Start Frame:</source>
-        <translation type="unfinished">Teilstück Startbild:</translation>
+        <translation type="obsolete">Teilstück Startbild:</translation>
     </message>
     <message>
         <source>Partial End Frame:</source>
-        <translation type="unfinished">Teilstück Endbild:</translation>
+        <translation type="obsolete">Teilstück Endbild:</translation>
     </message>
     <message>
         <source>Configure child</source>
-        <translation type="unfinished">konfiguriere Auswahl</translation>
+        <translation type="obsolete">konfiguriere Auswahl</translation>
     </message>
     <message>
         <source>Partial Video Filter</source>
-        <translation type="unfinished">Teilstück Video Filter</translation>
+        <translation type="obsolete">Teilstück Video Filter</translation>
     </message>
     <message>
         <source>_Interlaced</source>
@@ -8114,6 +8201,125 @@
         <source>This script has already been successfully executed.</source>
         <translation type="unfinished">Dieses Script wurde bereits erfolgreich abgearbeitet.</translation>
     </message>
+    <message>
+        <source>Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mixer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using VDPAU (NVIDIA)</source>
+        <translation type="unfinished">Dekodiere Video mittels _VDPAU</translation>
+    </message>
+    <message>
+        <source>Decode video using XVBA (AMD)</source>
+        <translation>Dekodiere Video mittels _XvBA (AMD Catalyst)</translation>
+    </message>
+    <message>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation>Dekodiere Video mittels _libVA</translation>
+    </message>
+    <message>
+        <source>If you use Hw decoding, it is better to use the matching display driver</source>
+        <translation type="unfinished">Bei Dekodierung in Hardware verwende den entsprechenden Videoausgabe_treiber</translation>
+    </message>
+    <message>
+        <source>LIBVA (best)</source>
+        <translation type="unfinished">libVA (bestens)</translation>
+    </message>
+    <message>
+        <source>Sdl driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Language</source>
+        <translation>_Sprache</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="unfinished">Video-Anzeige</translation>
+    </message>
+    <message>
+        <source>HW Accel</source>
+        <translation type="unfinished">HW-Beschleunigung</translation>
+    </message>
+    <message>
+        <source>You cannot remove *all* the video
+</source>
+        <translation>Das *ganze* Video zu löschen ist nicht möglich
+</translation>
+    </message>
+    <message>
+        <source>Select Video File...</source>
+        <translation>Videodatei wählen...</translation>
+    </message>
+    <message>
+        <source>Select Video File to Append...</source>
+        <translation>Videodatei zum Anfügen wählen...</translation>
+    </message>
+    <message>
+        <source>Invalid audio index given</source>
+        <translation type="unfinished">Ungültige Liste der Tonspuren</translation>
+    </message>
+    <message>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving</source>
+        <translation>Speichern</translation>
+    </message>
+    <message>
+        <source>Select script/project to run</source>
+        <translation>Skript/Projekt zum Ausführen wählen</translation>
+    </message>
+    <message>
+        <source>Select script to run</source>
+        <translation>Skript zum Ausführen wählen</translation>
+    </message>
+    <message>
+        <source>Select script to debug</source>
+        <translation>Skript zum Debuggen wählen</translation>
+    </message>
+    <message>
+        <source>No engine</source>
+        <translation>Keine Skript-Engine</translation>
+    </message>
+    <message>
+        <source>tinyPy script is not enabled in this build</source>
+        <translation>tinyPy wurde beim Kompilieren nicht aktiviert</translation>
+    </message>
+    <message>
+        <source>Cutting</source>
+        <translation>Schneiden</translation>
+    </message>
+    <message>
+        <source>Error while cutting out.</source>
+        <translation>Fehler beim Ausschneiden.</translation>
+    </message>
+    <message>
+        <source>Cannot use that file as audio track</source>
+        <translation>Kann diese Datei nicht als Tonspur verwenden</translation>
+    </message>
+    <message>
+        <source>Audio file not found in list, even though it should be there. Create a bug report!</source>
+        <translation>Audiodatei nicht in der Liste gefunden, obwohl sie dort sein sollte. Erstellen Sie einen Bugreport!</translation>
+    </message>
+    <message>
+        <source>Unable to set the audio language: No video loaded yet!</source>
+        <translation>Kann die Sprache der Tonspur nicht festlegen: Video ist noch nicht geladen!</translation>
+    </message>
+    <message>
+        <source>Setting the language for the given track index is not possible: Video has no audio file!</source>
+        <translation type="unfinished">Kann die Sprache für die gegebene Tonspur nicht festlegen: Zu diesem Video ist kein Audio geladen!</translation>
+    </message>
+    <message>
+        <source>Setting the language for the given track index is not possible: Invalid track index!</source>
+        <translation>Kann die Sprache für die gegebene Tonspur nicht festlegen: Ungültige Liste der Tonspuren!</translation>
+    </message>
 </context>
 <context>
     <name>aften</name>
@@ -8163,14 +8369,6 @@
 <context>
     <name>ass</name>
     <message>
-        <source>SSA.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardcode ass/ssa subtitles using libass.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Subtitle file (ASS/SSA):</source>
         <translation type="unfinished">_Untertitel Datei (ASS/SSA):</translation>
     </message>
@@ -8198,6 +8396,14 @@
         <source>ASS</source>
         <translation type="unfinished">ASS</translation>
     </message>
+    <message>
+        <source>SSA/ASS/SRT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>autoWizard</name>
@@ -8254,6 +8460,21 @@
     </message>
 </context>
 <context>
+    <name>black</name>
+    <message>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace a section by black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace by Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>blacken</name>
     <message>
         <source>_Left border:</source>
@@ -8655,6 +8876,13 @@
     </message>
 </context>
 <context>
+    <name>dcaenc</name>
+    <message>
+        <source>_Bitrate:</source>
+        <translation type="unfinished">_Bitrate (kb/s):</translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <source>Decomb decimate</source>
@@ -8673,10 +8901,6 @@
         <translation type="unfinished">Ersetzen (interpolieren)</translation>
     </message>
     <message>
-        <source>Discard longer dupe (animÃ©s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Pulldown dupe removal</source>
         <translation type="unfinished">&quot;Pulldown&quot; Duplikaten entfernen</translation>
     </message>
@@ -8716,12 +8940,27 @@
         <source>Decomb Decimate</source>
         <translation type="unfinished">Decomb Decimate</translation>
     </message>
+    <message>
+        <source>Discard longer dupe (animés)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>delogo</name>
     <message>
         <source>MPlayer delogo</source>
-        <translation type="unfinished">Mplayer Delogo (Logo-Entfernung)</translation>
+        <translation type="obsolete">Mplayer Delogo (Logo-Entfernung)</translation>
+    </message>
+    <message>
+        <source>Blend a logo by interpolating its surrounding box.</source>
+        <translation type="obsolete">Logoentfernung durch Interpolation der Umgebung</translation>
+    </message>
+</context>
+<context>
+    <name>delogo2</name>
+    <message>
+        <source>MPlayer delogo2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blend a logo by interpolating its surrounding box.</source>
@@ -8829,14 +9068,6 @@
         <translation type="obsolete">Audio Codec:</translation>
     </message>
     <message>
-        <source>0</source>
-        <translation type="unfinished">0</translation>
-    </message>
-    <message>
-        <source>00:00:00</source>
-        <translation type="unfinished">00:00:00</translation>
-    </message>
-    <message>
         <source>Elapsed:</source>
         <translation type="obsolete">vergangene Zeit:</translation>
     </message>
@@ -8993,6 +9224,14 @@
 &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 type="unfinished"></translation>
     </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished">Fortgeschritten</translation>
+    </message>
 </context>
 <context>
     <name>encodingWindow</name>
@@ -9002,11 +9241,11 @@
     </message>
     <message>
         <source>Privileges Required</source>
-        <translation type="unfinished">Rechte erforderlich</translation>
+        <translation type="obsolete">Rechte erforderlich</translation>
     </message>
     <message>
         <source>Root privileges are required to perform this operation.</source>
-        <translation type="unfinished">Für diese Operation sind Root-Rechte erforderlich.</translation>
+        <translation type="obsolete">Für diese Operation sind Root-Rechte erforderlich.</translation>
     </message>
     <message>
         <source>Shutting down</source>
@@ -9099,7 +9338,7 @@
     </message>
     <message>
         <source>Fade in/out.</source>
-        <translation type="unfinished">Videobild langsam ein- oder ausblenden.</translation>
+        <translation type="obsolete">Videobild langsam ein- oder ausblenden.</translation>
     </message>
     <message>
         <source>Out</source>
@@ -9133,6 +9372,21 @@
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Fade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fade to black in/out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fade to</name>
+    <message>
+        <source>Fade</source>
+        <translation type="unfinished">Ein-/Ausblenden</translation>
+    </message>
 </context>
 <context>
     <name>ffmpeg2</name>
@@ -9544,6 +9798,49 @@
     </message>
 </context>
 <context>
+    <name>ffnvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>filtermainWindow</name>
     <message>
         <source>The filter is already partial</source>
@@ -9577,6 +9874,14 @@
         <source>Partial Video Filter</source>
         <translation type="obsolete">Teilstück Video Filter</translation>
     </message>
+    <message>
+        <source>Load video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>flux</name>
@@ -10362,11 +10667,11 @@
     </message>
     <message>
         <source>C&amp;onfigure</source>
-        <translation type="unfinished">Filter &amp;einstellen</translation>
+        <translation type="obsolete">Filter &amp;einstellen</translation>
     </message>
     <message>
         <source>P&amp;artial</source>
-        <translation type="unfinished">&amp;Teilstück</translation>
+        <translation type="obsolete">&amp;Teilstück</translation>
     </message>
     <message>
         <source>Open Script</source>
@@ -10390,7 +10695,7 @@
     </message>
     <message>
         <source>Down</source>
-        <translation type="unfinished">nach unten</translation>
+        <translation type="obsolete">nach unten</translation>
     </message>
     <message>
         <source>Move Filter Up</source>
@@ -10398,7 +10703,7 @@
     </message>
     <message>
         <source>Up</source>
-        <translation type="unfinished">nach oben</translation>
+        <translation type="obsolete">nach oben</translation>
     </message>
     <message>
         <source>Remove Filter</source>
@@ -10406,7 +10711,7 @@
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished">Entfernen</translation>
+        <translation type="obsolete">Entfernen</translation>
     </message>
     <message>
         <source>Add Filter</source>
@@ -10414,7 +10719,7 @@
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished">Hinzufügen</translation>
+        <translation type="obsolete">Hinzufügen</translation>
     </message>
     <message>
         <source>Transform</source>
@@ -10721,6 +11026,49 @@
     </message>
 </context>
 <context>
+    <name>nvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>oggHeader</name>
     <message>
         <source>Take second track ?</source>
@@ -11175,7 +11523,7 @@
     </message>
     <message>
         <source>90Â°</source>
-        <translation type="unfinished">90 Grad</translation>
+        <translation type="obsolete">90 Grad</translation>
     </message>
     <message>
         <source>180 degrees</source>
@@ -11183,7 +11531,7 @@
     </message>
     <message>
         <source>180Â°</source>
-        <translation type="unfinished">180 Grad</translation>
+        <translation type="obsolete">180 Grad</translation>
     </message>
     <message>
         <source>270 degrees</source>
@@ -11191,12 +11539,24 @@
     </message>
     <message>
         <source>270Â°</source>
-        <translation type="unfinished">270 Grad</translation>
+        <translation type="obsolete">270 Grad</translation>
     </message>
     <message>
         <source>_Angle:</source>
         <translation type="unfinished">Drehen um:</translation>
     </message>
+    <message>
+        <source>90°</source>
+        <translation type="unfinished">90°</translation>
+    </message>
+    <message>
+        <source>180°</source>
+        <translation type="unfinished">180°</translation>
+    </message>
+    <message>
+        <source>270°</source>
+        <translation type="unfinished">270°</translation>
+    </message>
 </context>
 <context>
     <name>rotateFilter</name>
@@ -11236,11 +11596,11 @@
 <context>
     <name>rotateGl</name>
     <message>
-        <source>Angle (Â°):</source>
+        <source>glRotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>glRotate</source>
+        <source>Angle (°):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -11251,10 +11611,6 @@
         <translation type="unfinished">Vorschau</translation>
     </message>
     <message>
-        <source>00:00:00.000</source>
-        <translation type="unfinished">00:00:00.000</translation>
-    </message>
-    <message>
         <source>next</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11603,6 +11959,17 @@
     </message>
 </context>
 <context>
+    <name>vsWindow</name>
+    <message>
+        <source>Open VapourSynth File 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VS File Files (*.vpy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <source>Processing</source>
@@ -11617,10 +11984,6 @@
         <translation type="unfinished">verbleibende Zeit:</translation>
     </message>
     <message>
-        <source>00:00:00</source>
-        <translation type="unfinished">00:00:00</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished">Abbrechen</translation>
     </message>
@@ -12575,6 +12938,53 @@
     </message>
 </context>
 <context>
+    <name>x265Dialog</name>
+    <message>
+        <source>Target Bitrate:</source>
+        <translation type="unfinished">Ziel-Bitrate:</translation>
+    </message>
+    <message>
+        <source>kbit/s</source>
+        <translation type="unfinished">kbit/s</translation>
+    </message>
+    <message>
+        <source>Quantiser:</source>
+        <translation type="unfinished">Quantisierung:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="unfinished">Qualität:</translation>
+    </message>
+    <message>
+        <source>Target Video Size:</source>
+        <translation type="unfinished">Ziel-Videogröße:</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished">MB</translation>
+    </message>
+    <message>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished">durchschnittliche Bitrate:</translation>
+    </message>
+    <message>
+        <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 type="unfinished">Die Makroblock-Tree Optimierung benötigt den Algorithmus zur adaptiven Quantisierung (VAQ). VAQ wird daher jetzt zugeschaltet.
+
+Möchten Sie fortfahren?</translation>
+    </message>
+    <message>
+        <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 type="unfinished">VAQ ist für die Makroblock-Tree Optimierung erforderlich. MB-Tree wird daher auch abgeschaltet.
+        
+Möchten Sie fortfahren?</translation>
+    </message>
+</context>
+<context>
     <name>xvid4</name>
     <message>
         <source>None</source>
@@ -12692,6 +13102,46 @@
         <source>Xvid4 MPEG-4 ASP configuration</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>1:1 (PC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio:</source>
+        <translation type="unfinished">Seitenverhältnis:</translation>
+    </message>
+    <message>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio</source>
+        <translation type="unfinished">Seitenverhältnis</translation>
+    </message>
 </context>
 <context>
     <name>yadifFilter</name>

avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/avidemux_el.ts -> avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/avidemux_el.ts Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="el_GR" sourcelanguage="en">
+<TS version="2.1" language="el_GR" sourcelanguage="en">
 <context>
     <name></name>
     <message>
@@ -2836,6 +2836,21 @@
     </message>
 </context>
 <context>
+    <name>ADM_Qt4CoreUIToolkit::DIA_processingQt4</name>
+    <message>
+        <source>_Resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The processing is paused.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_Qt4Factory::ADM_Qbitrate</name>
     <message>
         <source>Two Pass - Video Size</source>
@@ -2891,6 +2906,13 @@
     </message>
 </context>
 <context>
+    <name>ADM_ffDvEncoder</name>
+    <message>
+        <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_ogmWrite</name>
     <message>
         <source>None</source>
@@ -3362,7 +3384,7 @@
     <name>DIA_encodingQt4</name>
     <message>
         <source>Shutting down</source>
-        <translation type="unfinished">Τερματίζεται</translation>
+        <translation type="obsolete">Τερματίζεται</translation>
     </message>
     <message>
         <source>Resume</source>
@@ -3376,6 +3398,14 @@
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Privileges Required</source>
+        <translation type="unfinished">Απαιτούνται Δικαιώματα</translation>
+    </message>
+    <message>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation type="unfinished">Απαιτούνται δικαιώματα Υπερχρήστη για να εκτελεστεί αυτή η λειτουργία.</translation>
+    </message>
 </context>
 <context>
     <name>DVEncoder</name>
@@ -3385,6 +3415,13 @@
     </message>
 </context>
 <context>
+    <name>DcaEnc</name>
+    <message>
+        <source>DcaEnc Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Decimate</name>
     <message>
         <source>Discard closer</source>
@@ -3438,7 +3475,7 @@
     </message>
     <message>
         <source>Audio Filters</source>
-        <translation type="unfinished">Φίλτρα Ήχου</translation>
+        <translation type="obsolete">Φίλτρα Ήχου</translation>
     </message>
     <message>
         <source>Audio Tracks Configuration</source>
@@ -3464,6 +3501,10 @@
         <source>Track 4</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Filters</source>
+        <translation type="unfinished">Φίλτρα</translation>
+    </message>
 </context>
 <context>
     <name>DialogOcr</name>
@@ -3513,6 +3554,41 @@
     </message>
 </context>
 <context>
+    <name>DialogProcessing</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TimeLeft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>00:00:00</source>
+        <translation type="unfinished">00:00:00</translation>
+    </message>
+    <message>
+        <source>ProcessImages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished">0</translation>
+    </message>
+    <message>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DialogProgress</name>
     <message>
         <source>1/1</source>
@@ -4489,10 +4565,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;b&gt;Selection&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4536,6 +4608,18 @@
         <source>Ctrl+Alt+M</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display processed video on playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play filtered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Video</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Mpeg1Encoder</name>
@@ -4958,6 +5042,13 @@
     </message>
 </context>
 <context>
+    <name>Webmmuxer</name>
+    <message>
+        <source>Saving Webm</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XvidConfigDialog</name>
     <message>
         <source>Rate Control</source>
@@ -5026,10 +5117,6 @@
         <source>Multi-platform Video Editor</source>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <source>© 2001 - 2012  Mean</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>&amp;License</source>
         <translation type="unfinished"></translation>
@@ -5038,6 +5125,10 @@
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>© 2001 - 2016  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>addBorders</name>
@@ -5273,7 +5364,7 @@
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished">Βίντεο</translation>
+        <translation type="obsolete">Βίντεο</translation>
     </message>
     <message>
         <source>CPU</source>
@@ -5672,10 +5763,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Decode video using VDPAU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5704,14 +5791,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MS Windows GDI (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MS Windows DirectX (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_AudioDevice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5780,11 +5859,11 @@
     </message>
     <message>
         <source>Select AVI File...</source>
-        <translation type="unfinished">Επιλέξτε αρχείο AVI...</translation>
+        <translation type="obsolete">Επιλέξτε αρχείο AVI...</translation>
     </message>
     <message>
         <source>Select AVI File to Append...</source>
-        <translation type="unfinished">Επιλέξτε ένα αρχείο AVI για προσκόλληση...</translation>
+        <translation type="obsolete">Επιλέξτε ένα αρχείο AVI για προσκόλληση...</translation>
     </message>
     <message>
         <source>Are you sure?</source>
@@ -6145,23 +6224,7 @@
     </message>
     <message>
         <source>The filter is already partial</source>
-        <translation type="unfinished">Το φίλτρο είναι ήδη μερικό</translation>
-    </message>
-    <message>
-        <source>Partial Start Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial End Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure child</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial Video Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Το φίλτρο είναι ήδη μερικό</translation>
     </message>
     <message>
         <source>_Interlaced</source>
@@ -6399,6 +6462,76 @@
         <source>This script has already been successfully executed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Gain</source>
+        <translation type="unfinished">Κέρδος</translation>
+    </message>
+    <message>
+        <source>Mixer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using VDPAU (NVIDIA)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using XVBA (AMD)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you use Hw decoding, it is better to use the matching display driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LIBVA (best)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sdl driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HW Accel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You cannot remove *all* the video
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File to Append...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid audio index given</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving</source>
+        <translation type="unfinished">Αποθήκευση</translation>
+    </message>
 </context>
 <context>
     <name>aften</name>
@@ -6436,14 +6569,6 @@
 <context>
     <name>ass</name>
     <message>
-        <source>SSA.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardcode ass/ssa subtitles using libass.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Subtitle file (ASS/SSA):</source>
         <translation type="unfinished">Αρχείο _υποτίτλων (ASS/SSA):</translation>
     </message>
@@ -6471,6 +6596,14 @@
         <source>ASS</source>
         <translation type="unfinished">ASS</translation>
     </message>
+    <message>
+        <source>SSA/ASS/SRT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>autoWizard</name>
@@ -6515,6 +6648,21 @@
     </message>
 </context>
 <context>
+    <name>black</name>
+    <message>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace a section by black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace by Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>blacken</name>
     <message>
         <source>_Left border:</source>
@@ -6892,6 +7040,13 @@
     </message>
 </context>
 <context>
+    <name>dcaenc</name>
+    <message>
+        <source>_Bitrate:</source>
+        <translation type="unfinished">_Ρυθμός bit:</translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <source>Decomb decimate</source>
@@ -6910,10 +7065,6 @@
         <translation type="unfinished">Αντικατάσταση αλφαριθμητικού</translation>
     </message>
     <message>
-        <source>Discard longer dupe (animÃ©s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Pulldown dupe removal</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6953,12 +7104,23 @@
         <source>Decomb Decimate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Discard longer dupe (animés)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>delogo</name>
     <message>
         <source>MPlayer delogo</source>
-        <translation type="unfinished">MPlayer αφαιρετής λογότυπου</translation>
+        <translation type="obsolete">MPlayer αφαιρετής λογότυπου</translation>
+    </message>
+</context>
+<context>
+    <name>delogo2</name>
+    <message>
+        <source>MPlayer delogo2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blend a logo by interpolating its surrounding box.</source>
@@ -7182,6 +7344,14 @@
 &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 type="unfinished"></translation>
     </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished">Προχωρημένα</translation>
+    </message>
 </context>
 <context>
     <name>encodingWindow</name>
@@ -7199,11 +7369,11 @@
     </message>
     <message>
         <source>Privileges Required</source>
-        <translation type="unfinished">Απαιτούνται Δικαιώματα</translation>
+        <translation type="obsolete">Απαιτούνται Δικαιώματα</translation>
     </message>
     <message>
         <source>Root privileges are required to perform this operation.</source>
-        <translation type="unfinished">Απαιτούνται δικαιώματα Υπερχρήστη για να εκτελεστεί αυτή η λειτουργία.</translation>
+        <translation type="obsolete">Απαιτούνται δικαιώματα Υπερχρήστη για να εκτελεστεί αυτή η λειτουργία.</translation>
     </message>
     <message>
         <source>Shutting down</source>
@@ -7248,7 +7418,7 @@
     </message>
     <message>
         <source>Fade in/out.</source>
-        <translation type="unfinished">Ομαλή είσοδος/έξοδος.</translation>
+        <translation type="obsolete">Ομαλή είσοδος/έξοδος.</translation>
     </message>
     <message>
         <source>Out</source>
@@ -7282,6 +7452,21 @@
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Fade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fade to black in/out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fade to</name>
+    <message>
+        <source>Fade</source>
+        <translation type="unfinished">Ομαλή μετάβαση</translation>
+    </message>
 </context>
 <context>
     <name>ffmpeg2</name>
@@ -7693,6 +7878,49 @@
     </message>
 </context>
 <context>
+    <name>ffnvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>filtermainWindow</name>
     <message>
         <source>The filter is already partial</source>
@@ -7710,6 +7938,14 @@
         <source>Save set of filters</source>
         <translation type="obsolete">Αποθήκευση ομάδας φίλτρων</translation>
     </message>
+    <message>
+        <source>Load video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>flux</name>
@@ -8425,11 +8661,11 @@
     </message>
     <message>
         <source>Down</source>
-        <translation type="unfinished">Κάτω</translation>
+        <translation type="obsolete">Κάτω</translation>
     </message>
     <message>
         <source>Up</source>
-        <translation type="unfinished">Επάνω</translation>
+        <translation type="obsolete">Επάνω</translation>
     </message>
     <message>
         <source>Transform</source>
@@ -8472,22 +8708,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;onfigure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>P&amp;artial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8748,6 +8968,49 @@
     </message>
 </context>
 <context>
+    <name>nvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>oggHeader</name>
     <message>
         <source>Take second track ?</source>
@@ -9075,29 +9338,29 @@
         <translation type="unfinished">90 μοίρες</translation>
     </message>
     <message>
-        <source>90Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>180 degrees</source>
         <translation type="unfinished">180 μοίρες</translation>
     </message>
     <message>
-        <source>180Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>270 degrees</source>
         <translation type="unfinished">270 μοίρες</translation>
     </message>
     <message>
-        <source>270Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Angle:</source>
         <translation type="unfinished">_Γωνία:</translation>
     </message>
+    <message>
+        <source>90°</source>
+        <translation type="unfinished">90°</translation>
+    </message>
+    <message>
+        <source>180°</source>
+        <translation type="unfinished">180°</translation>
+    </message>
+    <message>
+        <source>270°</source>
+        <translation type="unfinished">270°</translation>
+    </message>
 </context>
 <context>
     <name>rotateFilter</name>
@@ -9129,11 +9392,11 @@
 <context>
     <name>rotateGl</name>
     <message>
-        <source>Angle (Â°):</source>
+        <source>glRotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>glRotate</source>
+        <source>Angle (°):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9440,6 +9703,17 @@
     </message>
 </context>
 <context>
+    <name>vsWindow</name>
+    <message>
+        <source>Open VapourSynth File 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VS File Files (*.vpy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <source>Processing</source>
@@ -9689,6 +9963,49 @@
     </message>
 </context>
 <context>
+    <name>x265Dialog</name>
+    <message>
+        <source>Target Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kbit/s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quantiser:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Target Video Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>xvid4</name>
     <message>
         <source>None</source>
@@ -9806,6 +10123,46 @@
         <source>Xvid4 MPEG-4 ASP configuration</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>1:1 (PC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio:</source>
+        <translation type="unfinished">Λόγος Διαστάσεων:</translation>
+    </message>
+    <message>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>yadifFilter</name>

avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/avidemux_en.ts -> avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/avidemux_en.ts Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="en_US">
+<TS version="2.1" language="en_US">
 <context>
     <name>ADM_Composer</name>
     <message>
@@ -52,6 +52,21 @@
     </message>
 </context>
 <context>
+    <name>ADM_Qt4CoreUIToolkit::DIA_processingQt4</name>
+    <message>
+        <source>_Resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The processing is paused.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_Qt4Factory::ADM_Qbitrate</name>
     <message>
         <source>Constant Bitrate</source>
@@ -107,6 +122,13 @@
     </message>
 </context>
 <context>
+    <name>ADM_ffDvEncoder</name>
+    <message>
+        <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_qt4Factory::ADM_QthreadCount</name>
     <message>
         <source>Disabled</source>
@@ -254,10 +276,6 @@
 <context>
     <name>DIA_encodingQt4</name>
     <message>
-        <source>Shutting down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -269,6 +287,21 @@
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Privileges Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DcaEnc</name>
+    <message>
+        <source>DcaEnc Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Dialog</name>
@@ -304,10 +337,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Audio Filters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Track 2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -319,6 +348,10 @@
         <source>Track 4</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Filters</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogOcr</name>
@@ -368,6 +401,41 @@
     </message>
 </context>
 <context>
+    <name>DialogProcessing</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TimeLeft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>00:00:00</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ProcessImages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DialogProgress</name>
     <message>
         <source>Progress</source>
@@ -436,7 +504,7 @@
     </message>
     <message>
         <source>&amp;Auto</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">A&amp;uto</translation>
     </message>
     <message>
         <source>&amp;Custom</source>
@@ -543,10 +611,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;b&gt;Selection&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>A:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -670,6 +734,18 @@
         <source>Si&amp;de</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display processed video on playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play filtered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Video</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenDMLHeader</name>
@@ -838,6 +914,13 @@
     </message>
 </context>
 <context>
+    <name>Webmmuxer</name>
+    <message>
+        <source>Saving Webm</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aboutDialog</name>
     <message>
         <source>About Avidemux</source>
@@ -851,10 +934,6 @@
         <source>Multi-platform Video Editor</source>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <source>© 2001 - 2012  Mean</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>http://www.avidemux.org</source>
         <translation type="unfinished"></translation>
@@ -867,6 +946,10 @@
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>© 2001 - 2016  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>addBorders</name>
@@ -903,23 +986,23 @@
     <name>adm</name>
     <message>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Open...</translation>
     </message>
     <message>
         <source>Append</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Append...</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Save</translation>
     </message>
     <message>
         <source>Queue</source>
-        <translation type="unfinished"></translation>
+        <translation>Qu&amp;eue</translation>
     </message>
     <message>
         <source>Save as Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Save as I&amp;mage</translation>
     </message>
     <message>
         <source>Save as BMP</source>
@@ -931,7 +1014,7 @@
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Close</translation>
     </message>
     <message>
         <source>-</source>
@@ -939,7 +1022,7 @@
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Information</translation>
     </message>
     <message>
         <source>Connect to avsproxy</source>
@@ -947,7 +1030,7 @@
     </message>
     <message>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Quit</translation>
     </message>
     <message>
         <source>Undo</source>
@@ -955,63 +1038,67 @@
     </message>
     <message>
         <source>Reset Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Reset Edit</translation>
     </message>
     <message>
         <source>Cut</source>
-        <translation type="unfinished"></translation>
+        <translation>Cu&amp;t</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Copy</translation>
     </message>
     <message>
         <source>Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Paste</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Delete</translation>
     </message>
     <message>
         <source>Set Marker A</source>
-        <translation type="unfinished"></translation>
+        <translation>Set Marker &amp;A</translation>
     </message>
     <message>
         <source>Set Marker B</source>
-        <translation type="unfinished"></translation>
+        <translation>Set Marker &amp;B</translation>
     </message>
     <message>
         <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation>Pr&amp;eferences</translation>
+    </message>
+    <message>
+        <source>Save current settings as default</source>
+        <translation>Save current settings as de&amp;fault</translation>
     </message>
     <message>
         <source>Decoder Option</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Decoder Options</translation>
     </message>
     <message>
         <source>PostProcessing</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;PostProcessing</translation>
     </message>
     <message>
         <source>Filters</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Filters</translation>
     </message>
     <message>
         <source>Select Track</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Select Track</translation>
     </message>
     <message>
         <source>Save audio</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Save &amp;Audio</translation>
     </message>
     <message>
         <source>Build Option</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Build Options</translation>
     </message>
     <message>
         <source>Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Plugins</translation>
     </message>
     <message>
         <source>&amp;Advanced</source>
@@ -1027,7 +1114,7 @@
     </message>
     <message>
         <source>About</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;About</translation>
     </message>
     <message>
         <source>Play/Stop</source>
@@ -1059,23 +1146,23 @@
     </message>
     <message>
         <source>First Frame</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;First Frame</translation>
     </message>
     <message>
         <source>Last Frame</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Last Frame</translation>
     </message>
     <message>
         <source>Go To Marker A</source>
-        <translation type="unfinished"></translation>
+        <translation>Go to Marker &amp;A</translation>
     </message>
     <message>
         <source>Go To Marker B</source>
-        <translation type="unfinished"></translation>
+        <translation>Go to Marker &amp;B</translation>
     </message>
     <message>
         <source>Go To Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Go to &amp;Time</translation>
     </message>
     <message>
         <source>R_esampling (Hz):</source>
@@ -1306,10 +1393,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Decode video using VDPAU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1430,14 +1513,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MS Windows GDI (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MS Windows DirectX (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>SDL (good)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1522,10 +1597,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Threading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1581,14 +1652,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select AVI File...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select AVI File to Append...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1835,26 +1898,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The filter is already partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial Start Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial End Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure child</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial Video Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Interlaced</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2090,6 +2133,76 @@
         <source>This script has already been successfully executed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mixer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using VDPAU (NVIDIA)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using XVBA (AMD)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you use Hw decoding, it is better to use the matching display driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LIBVA (best)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sdl driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HW Accel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You cannot remove *all* the video
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File to Append...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid audio index given</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>aften</name>
@@ -2116,14 +2229,6 @@
 <context>
     <name>ass</name>
     <message>
-        <source>SSA.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardcode ass/ssa subtitles using libass.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Subtitle file (ASS/SSA):</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2151,6 +2256,14 @@
         <source>ASS</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>SSA/ASS/SRT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>avsfilter</name>
@@ -2188,6 +2301,21 @@
     </message>
 </context>
 <context>
+    <name>black</name>
+    <message>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace a section by black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace by Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>blacken</name>
     <message>
         <source>_Left border:</source>
@@ -2479,6 +2607,13 @@
     </message>
 </context>
 <context>
+    <name>dcaenc</name>
+    <message>
+        <source>_Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <source>Decomb decimate</source>
@@ -2497,10 +2632,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard longer dupe (animÃ©s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Pulldown dupe removal</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2540,11 +2671,15 @@
         <source>Decomb Decimate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Discard longer dupe (animés)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>delogo</name>
+    <name>delogo2</name>
     <message>
-        <source>MPlayer delogo</source>
+        <source>MPlayer delogo2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2754,15 +2889,12 @@
         <source>Pause / Abort</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>encodingWindow</name>
     <message>
-        <source>Privileges Required</source>
+        <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Root privileges are required to perform this operation.</source>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2784,10 +2916,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fade in/out.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Out</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2819,6 +2947,21 @@
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Fade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fade to black in/out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fade to</name>
+    <message>
+        <source>Fade</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ffmpeg2</name>
@@ -3230,6 +3373,60 @@
     </message>
 </context>
 <context>
+    <name>ffnvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filtermainWindow</name>
+    <message>
+        <source>Load video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <source>Spatio-temporal cleaner by Ross Thomas.</source>
@@ -3774,30 +3971,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;onfigure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>P&amp;artial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4028,6 +4201,49 @@
     </message>
 </context>
 <context>
+    <name>nvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>openGlResize</name>
     <message>
         <source>Width :</source>
@@ -4271,38 +4487,38 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>90Â°</source>
+        <source>180 degrees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>180 degrees</source>
+        <source>270 degrees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>180Â°</source>
+        <source>_Angle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>270 degrees</source>
+        <source>90°</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>270Â°</source>
+        <source>180°</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>_Angle:</source>
+        <source>270°</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>rotateGl</name>
     <message>
-        <source>Angle (Â°):</source>
+        <source>glRotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>glRotate</source>
+        <source>Angle (°):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4521,6 +4737,17 @@
     </message>
 </context>
 <context>
+    <name>vsWindow</name>
+    <message>
+        <source>Open VapourSynth File 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VS File Files (*.vpy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <source>Processing</source>
@@ -4587,6 +4814,49 @@
     </message>
 </context>
 <context>
+    <name>x265Dialog</name>
+    <message>
+        <source>Target Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kbit/s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quantiser:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Target Video Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>xvid4</name>
     <message>
         <source>None</source>
@@ -4704,5 +4974,45 @@
         <source>Xvid4 MPEG-4 ASP configuration</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>1:1 (PC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/avidemux_es.ts -> avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/avidemux_es.ts Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1">
 <context>
     <name></name>
     <message>
@@ -3541,6 +3541,21 @@
     </message>
 </context>
 <context>
+    <name>ADM_Qt4CoreUIToolkit::DIA_processingQt4</name>
+    <message>
+        <source>_Resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The processing is paused.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_Qt4Factory::ADM_Qbitrate</name>
     <message>
         <source>Two Pass - Video Size</source>
@@ -3596,6 +3611,13 @@
     </message>
 </context>
 <context>
+    <name>ADM_ffDvEncoder</name>
+    <message>
+        <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_ogmWrite</name>
     <message>
         <source>None</source>
@@ -4001,7 +4023,7 @@
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cancelar</translation>
     </message>
 </context>
 <context>
@@ -4108,7 +4130,7 @@
     <name>DIA_encodingQt4</name>
     <message>
         <source>Shutting down</source>
-        <translation type="unfinished">Apagando</translation>
+        <translation type="obsolete">Apagando</translation>
     </message>
     <message>
         <source>Resume</source>
@@ -4122,6 +4144,14 @@
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Privileges Required</source>
+        <translation type="unfinished">Se necesitan Privilegios</translation>
+    </message>
+    <message>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation type="unfinished">Se necesitan privilegios de Superusuario para llevar a cabo esta operación.</translation>
+    </message>
 </context>
 <context>
     <name>DVEncoder</name>
@@ -4131,6 +4161,13 @@
     </message>
 </context>
 <context>
+    <name>DcaEnc</name>
+    <message>
+        <source>DcaEnc Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Decimate</name>
     <message>
         <source>Discard closer</source>
@@ -4212,7 +4249,7 @@
     </message>
     <message>
         <source>Audio Filters</source>
-        <translation type="unfinished">Filtros de sonido</translation>
+        <translation type="obsolete">Filtros de sonido</translation>
     </message>
     <message>
         <source>Audio Tracks Configuration</source>
@@ -4238,6 +4275,10 @@
         <source>Track 4</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Filters</source>
+        <translation type="unfinished">Filtros</translation>
+    </message>
 </context>
 <context>
     <name>DialogOcr</name>
@@ -4279,7 +4320,7 @@
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cerrar</translation>
     </message>
     <message>
         <source>Nb Lines :</source>
@@ -4287,6 +4328,41 @@
     </message>
 </context>
 <context>
+    <name>DialogProcessing</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <source>TimeLeft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>00:00:00</source>
+        <translation type="unfinished">00:00:00</translation>
+    </message>
+    <message>
+        <source>ProcessImages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished">0</translation>
+    </message>
+    <message>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DialogProgress</name>
     <message>
         <source>1/1</source>
@@ -4735,10 +4811,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;b&gt;Selection&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4850,6 +4922,18 @@
         <source>Si&amp;de</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display processed video on playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play filtered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Video</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Mpeg1Encoder</name>
@@ -5284,6 +5368,13 @@
     </message>
 </context>
 <context>
+    <name>Webmmuxer</name>
+    <message>
+        <source>Saving Webm</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XvidConfigDialog</name>
     <message>
         <source>Rate Control</source>
@@ -5352,10 +5443,6 @@
         <source>Multi-platform Video Editor</source>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <source>© 2001 - 2012  Mean</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>&amp;License</source>
         <translation type="unfinished"></translation>
@@ -5364,6 +5451,10 @@
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>© 2001 - 2016  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>addBorders</name>
@@ -5621,7 +5712,7 @@
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished">Vídeo</translation>
+        <translation type="obsolete">Vídeo</translation>
     </message>
     <message>
         <source>CPU</source>
@@ -6024,10 +6115,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Decode video using VDPAU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable openGl support</source>
         <translation type="unfinished">Activar soporte openGL</translation>
     </message>
@@ -6044,14 +6131,6 @@
         <translation type="unfinished">OpenGL (mejor)</translation>
     </message>
     <message>
-        <source>MS Windows GDI (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MS Windows DirectX (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_AudioDevice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6111,11 +6190,11 @@
     </message>
     <message>
         <source>Select AVI File...</source>
-        <translation type="unfinished">Seleccionar archivo AVI...</translation>
+        <translation type="obsolete">Seleccionar archivo AVI...</translation>
     </message>
     <message>
         <source>Select AVI File to Append...</source>
-        <translation type="unfinished">Seleccionar archivo AVI para anexar...</translation>
+        <translation type="obsolete">Seleccionar archivo AVI para anexar...</translation>
     </message>
     <message>
         <source>Are you sure?</source>
@@ -6247,7 +6326,8 @@
     </message>
     <message>
         <source>_Deringing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>Output file</source>
@@ -6398,26 +6478,6 @@
         <translation type="obsolete">Completo</translation>
     </message>
     <message>
-        <source>Log</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Phods</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>EPZS</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>H.263</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>MPEG</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Advanced Simple Profile</source>
         <translation type="unfinished">Perfil Simple Avanzado</translation>
     </message>
@@ -6430,10 +6490,6 @@
         <translation type="unfinished">Medio</translation>
     </message>
     <message>
-        <source>VBR</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Quality based</source>
         <translation type="obsolete">Basado en Calidad </translation>
     </message>
@@ -6471,23 +6527,23 @@
     </message>
     <message>
         <source>The filter is already partial</source>
-        <translation type="unfinished">El filtro ya es parcial</translation>
+        <translation type="obsolete">El filtro ya es parcial</translation>
     </message>
     <message>
         <source>Partial Start Frame:</source>
-        <translation type="unfinished">Imagen de Inicio Parcial</translation>
+        <translation type="obsolete">Imagen de Inicio Parcial</translation>
     </message>
     <message>
         <source>Partial End Frame:</source>
-        <translation type="unfinished">Imagen de Final Parcial</translation>
+        <translation type="obsolete">Imagen de Final Parcial</translation>
     </message>
     <message>
         <source>Configure child</source>
-        <translation type="unfinished">Configurar Pequeño</translation>
+        <translation type="obsolete">Configurar Pequeño</translation>
     </message>
     <message>
         <source>Partial Video Filter</source>
-        <translation type="unfinished">Filtro de Video Parcial</translation>
+        <translation type="obsolete">Filtro de Video Parcial</translation>
     </message>
     <message>
         <source>_Interlaced</source>
@@ -6725,6 +6781,76 @@
         <source>This script has already been successfully executed.</source>
         <translation type="unfinished">Este script se ha ejecutado satisfactoriamente</translation>
     </message>
+    <message>
+        <source>Gain</source>
+        <translation type="unfinished">Ganancia</translation>
+    </message>
+    <message>
+        <source>Mixer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using VDPAU (NVIDIA)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using XVBA (AMD)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you use Hw decoding, it is better to use the matching display driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LIBVA (best)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sdl driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HW Accel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You cannot remove *all* the video
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File to Append...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid audio index given</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving</source>
+        <translation type="unfinished">Guardando</translation>
+    </message>
 </context>
 <context>
     <name>aften</name>
@@ -6762,12 +6888,8 @@
 <context>
     <name>ass</name>
     <message>
-        <source>SSA.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Hardcode ass/ssa subtitles using libass.</source>
-        <translation type="unfinished">Grabado de subtítulos ass/ssa en vídeo mediante libass.</translation>
+        <translation type="obsolete">Grabado de subtítulos ass/ssa en vídeo mediante libass.</translation>
     </message>
     <message>
         <source>_Subtitle file (ASS/SSA):</source>
@@ -6797,12 +6919,13 @@
         <source>ASS</source>
         <translation type="unfinished">ASS</translation>
     </message>
-</context>
-<context>
-    <name>autoWizard</name>
     <message>
-        <source>Codec:</source>
-        <translation type="obsolete"></translation>
+        <source>SSA/ASS/SRT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6841,6 +6964,21 @@
     </message>
 </context>
 <context>
+    <name>black</name>
+    <message>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace a section by black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace by Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>blacken</name>
     <message>
         <source>_Left border:</source>
@@ -7210,6 +7348,13 @@
     </message>
 </context>
 <context>
+    <name>dcaenc</name>
+    <message>
+        <source>_Bitrate:</source>
+        <translation type="unfinished">_Bitrate:</translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <source>Decomb decimate</source>
@@ -7229,7 +7374,7 @@
     </message>
     <message>
         <source>Discard longer dupe (animÃ©s)</source>
-        <translation type="unfinished">Descartar duplicado largo (animÃ©s)</translation>
+        <translation type="obsolete">Descartar duplicado largo (animÃ©s)</translation>
     </message>
     <message>
         <source>Pulldown dupe removal</source>
@@ -7269,6 +7414,11 @@
     </message>
     <message>
         <source>Decomb Decimate</source>
+        <translation type="unfinished">
+            </translation>
+    </message>
+    <message>
+        <source>Discard longer dupe (animés)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -7276,11 +7426,22 @@
     <name>delogo</name>
     <message>
         <source>MPlayer delogo</source>
-        <translation type="unfinished">Mplayer Delogo</translation>
+        <translation type="obsolete">Mplayer Delogo</translation>
     </message>
     <message>
         <source>Blend a logo by interpolating its surrounding box.</source>
-        <translation type="unfinished">Borrar logo interpolando imagen circundante.</translation>
+        <translation type="obsolete">Borrar logo interpolando imagen circundante.</translation>
+    </message>
+</context>
+<context>
+    <name>delogo2</name>
+    <message>
+        <source>MPlayer delogo2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Blend a logo by interpolating its surrounding box.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7335,7 +7496,8 @@
     </message>
     <message>
         <source>DGBob</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
@@ -7500,6 +7662,14 @@
 &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 type="unfinished"></translation>
     </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished">Principal</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished">Avanzado</translation>
+    </message>
 </context>
 <context>
     <name>encodingWindow</name>
@@ -7517,11 +7687,11 @@
     </message>
     <message>
         <source>Privileges Required</source>
-        <translation type="unfinished">Se necesitan Privilegios</translation>
+        <translation type="obsolete">Se necesitan Privilegios</translation>
     </message>
     <message>
         <source>Root privileges are required to perform this operation.</source>
-        <translation type="unfinished">Se necesitan privilegios de Superusuario para llevar a cabo esta operación.</translation>
+        <translation type="obsolete">Se necesitan privilegios de Superusuario para llevar a cabo esta operación.</translation>
     </message>
     <message>
         <source>Shutting down</source>
@@ -7566,7 +7736,7 @@
     </message>
     <message>
         <source>Fade in/out.</source>
-        <translation type="unfinished">Desvanecimiento ent/sal.</translation>
+        <translation type="obsolete">Desvanecimiento ent/sal.</translation>
     </message>
     <message>
         <source>Out</source>
@@ -7600,6 +7770,21 @@
         <source>Fade to black</source>
         <translation type="unfinished">Fundido a Negro</translation>
     </message>
+    <message>
+        <source>Fade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fade to black in/out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fade to</name>
+    <message>
+        <source>Fade</source>
+        <translation type="unfinished">Desvanecer</translation>
+    </message>
 </context>
 <context>
     <name>ffmpeg2</name>
@@ -8011,6 +8196,49 @@
     </message>
 </context>
 <context>
+    <name>ffnvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished">Configuración libavcodec MPEG-4</translation>
+    </message>
+</context>
+<context>
     <name>filtermainWindow</name>
     <message>
         <source>The filter is already partial</source>
@@ -8028,6 +8256,14 @@
         <source>Save set of filters</source>
         <translation type="obsolete">Guardar conjunto de filtros</translation>
     </message>
+    <message>
+        <source>Load video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>flux</name>
@@ -8045,7 +8281,8 @@
     </message>
     <message>
         <source>FluxSmooth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
@@ -8095,7 +8332,7 @@
         <translation type="unfinished">Distorsión de ratio</translation>
     </message>
     <message>
-            <source>Mi_n. quantizer:</source>
+        <source>Mi_n. quantizer:</source>
         <translation type="unfinished">Cuantizador mi_n.:</translation>
     </message>
     <message>
@@ -8188,10 +8425,6 @@
         <source>_Order:</source>
         <translation type="obsolete">_Orden:</translation>
     </message>
-    <message>
-        <source>yadif</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>h263Header</name>
@@ -8520,7 +8753,8 @@
     </message>
     <message>
         <source>T_woway</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>Extrapolate better (better not to use it)</source>
@@ -8586,10 +8820,6 @@
         <source>P_rocess chroma</source>
         <translation type="obsolete">P_rocesar chroma</translation>
     </message>
-    <message>
-        <source>Fast Convolution</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>largemedian</name>
@@ -8684,27 +8914,27 @@
     </message>
     <message>
         <source>Linear interpolate</source>
-        <translation type="obsolete">Interpolado lineal</translation>
+        <translation type="unfinished">Interpolado lineal</translation>
     </message>
     <message>
         <source>Cubic interpolate</source>
-        <translation type="obsolete">Interpolado cúbico</translation>
+        <translation type="unfinished">Interpolado cúbico</translation>
     </message>
     <message>
         <source>Median interpolate</source>
-        <translation type="obsolete">Interpolado medio:</translation>
+        <translation type="unfinished">Interpolado medio:</translation>
     </message>
     <message>
         <source>FFmpeg deint</source>
-        <translation type="obsolete">Desen. FFmpeg</translation>
+        <translation type="unfinished">Desen. FFmpeg</translation>
     </message>
     <message>
         <source>_Deinterlacing:</source>
-        <translation type="obsolete">_Desentrelazado:</translation>
+        <translation type="unfinished">_Desentrelazado:</translation>
     </message>
     <message>
         <source>_Autolevel</source>
-        <translation type="obsolete">_Autonivelado</translation>
+        <translation type="unfinished">_Autonivelado</translation>
     </message>
     <message>
         <source>libavcodec deinterlacer</source>
@@ -8817,27 +9047,27 @@
     </message>
     <message>
         <source>C&amp;onfigure</source>
-        <translation type="unfinished">C&amp;onfigurar</translation>
+        <translation type="obsolete">C&amp;onfigurar</translation>
     </message>
     <message>
         <source>P&amp;artial</source>
-        <translation type="unfinished">P&amp;arcial</translation>
+        <translation type="obsolete">P&amp;arcial</translation>
     </message>
     <message>
         <source>Down</source>
-        <translation type="unfinished">Abajo</translation>
+        <translation type="obsolete">Abajo</translation>
     </message>
     <message>
         <source>Up</source>
-        <translation type="unfinished">Arriba</translation>
+        <translation type="obsolete">Arriba</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished">Eliminar</translation>
+        <translation type="obsolete">Eliminar</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished">Añadir</translation>
+        <translation type="obsolete">Añadir</translation>
     </message>
     <message>
         <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
@@ -9080,6 +9310,49 @@
     </message>
 </context>
 <context>
+    <name>nvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>oggHeader</name>
     <message>
         <source>Take second track ?</source>
@@ -9419,7 +9692,7 @@
     </message>
     <message>
         <source>90Â°</source>
-        <translation type="unfinished">90Â°</translation>
+        <translation type="obsolete">90Â°</translation>
     </message>
     <message>
         <source>180 degrees</source>
@@ -9427,7 +9700,7 @@
     </message>
     <message>
         <source>180Â°</source>
-        <translation type="unfinished">180Â°</translation>
+        <translation type="obsolete">180Â°</translation>
     </message>
     <message>
         <source>270 degrees</source>
@@ -9435,12 +9708,24 @@
     </message>
     <message>
         <source>270Â°</source>
-        <translation type="unfinished">270Â°</translation>
+        <translation type="obsolete">270Â°</translation>
     </message>
     <message>
         <source>_Angle:</source>
         <translation type="unfinished">_Angulo:</translation>
     </message>
+    <message>
+        <source>90°</source>
+        <translation type="unfinished">90°</translation>
+    </message>
+    <message>
+        <source>180°</source>
+        <translation type="unfinished">180°</translation>
+    </message>
+    <message>
+        <source>270°</source>
+        <translation type="unfinished">270°</translation>
+    </message>
 </context>
 <context>
     <name>rotateFilter</name>
@@ -9473,12 +9758,16 @@
     <name>rotateGl</name>
     <message>
         <source>Angle (Â°):</source>
-        <translation type="unfinished">Angulo (Â°)</translation>
+        <translation type="obsolete">Angulo (Â°)</translation>
     </message>
     <message>
         <source>glRotate</source>
         <translation type="unfinished">Rotar GL</translation>
     </message>
+    <message>
+        <source>Angle (°):</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>seekablePreviewDialog</name>
@@ -9823,6 +10112,17 @@
     </message>
 </context>
 <context>
+    <name>vsWindow</name>
+    <message>
+        <source>Open VapourSynth File 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VS File Files (*.vpy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <source>Processing</source>
@@ -10065,9 +10365,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>La optimización del Árbol-Macroblock requiere que se active la Cuantización Variable Adaptativa. Esta optimización se desactivará automáticamente.
+        <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Macroblock-Tree optimisation will automatically be disabled.
 
-¿Quiere continuar?</source>
+Do you wish to continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>x265Dialog</name>
+    <message>
+        <source>Target Bitrate:</source>
+        <translation type="unfinished">Bitrate Buscado</translation>
+    </message>
+    <message>
+        <source>kbit/s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quantiser:</source>
+        <translation type="unfinished">Cuantizador</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="unfinished">Calidad</translation>
+    </message>
+    <message>
+        <source>Target Video Size:</source>
+        <translation type="unfinished">Tamaño de Video Buscado</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished">Bitrate Medio</translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
     </message>
 </context>
@@ -10189,6 +10532,46 @@
         <source>Xvid4 MPEG-4 ASP configuration</source>
         <translation type="unfinished">Configuración Xvid4 MPEG-4 ASP</translation>
     </message>
+    <message>
+        <source>1:1 (PC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio:</source>
+        <translation type="unfinished">Relación de aspecto:</translation>
+    </message>
+    <message>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>yadifFilter</name>
@@ -10224,9 +10607,5 @@
         <source>_Order:</source>
         <translation type="obsolete">_Orden:</translation>
     </message>
-    <message>
-        <source>yadif</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 </TS>

avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/avidemux_eu.ts -> avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/avidemux_eu.ts Changed

@@ -1,39 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="eu">
+<!DOCTYPE TS>
+<TS version="2.1" language="eu">
 <context>
     <name>ADMImage</name>
     <message>
-        <location filename="" line="383"/>
         <source>Memory error</source>
         <translation type="obsolete">Oroimen akatsa</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Error converting to BMP</source>
         <translation type="obsolete">Akatsa BMP-ra bihurtzean</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Something bad happened</source>
         <translation type="obsolete">Zerbait gaitza gertatu da</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>File error</source>
         <translation type="obsolete">Agiri akatsa</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Cannot open &quot;%s&quot; for writing.</source>
         <translation type="obsolete">Ezinezkoa &quot;%s&quot; idazteko irekitzea.</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Cannot encode the frame</source>
         <translation type="obsolete">Ezinezkoa framea kodeatzea</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Cannot initialise JPEG encoder</source>
         <translation type="obsolete">Ezinezkoa JPEG kodeatzailea abiaraztea</translation>
     </message>
@@ -41,42 +35,34 @@
 <context>
     <name>ADMVideoAVSfilter</name>
     <message>
-        <location filename="" line="383"/>
         <source>_wine app file:</source>
         <translation type="obsolete">_wine gehigarri agiria:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Select wine filenamewine/cedega/etc.</source>
         <translation type="obsolete">Hautatu wine agirizenawine/cedega/etab.</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_loader file:</source>
         <translation type="obsolete">_gertatzaile agiria:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Select loader filenameavsload.exe</source>
         <translation type="obsolete">Hautatu gertatzaile agirizenaavxload.exe</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_avs file:</source>
         <translation type="obsolete">_avs agiria:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Select avs filename*.avs</source>
         <translation type="obsolete">Hautatu avs agirizena*.avs</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_pipe timeout:</source>
         <translation type="obsolete">_hodi itxaronaldia:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>AvsFilter config</source>
         <translation type="obsolete">AvsIragazki itxurapena</translation>
     </message>
@@ -84,52 +70,42 @@
 <context>
     <name>ADMVideoComputeAverage</name>
     <message>
-        <location filename="" line="383"/>
         <source>_Start Frame (first frame # to include in average):</source>
         <translation type="obsolete">_Hasiera Framea (lehen fraime zenb. bataz-bestekoan sartzeko):</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_End Frame (last frame # to include), -1 = last:</source>
         <translation type="obsolete">_Amaiera Framea (azken frame zenb.sartzeko), -1 = azkena:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_Output File:</source>
         <translation type="obsolete">_Irteera Agiria:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Select output file</source>
         <translation type="obsolete">Hautatu irteera agiria</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_Bias (only for display; use 0 for average, 128 for frame minus average):</source>
         <translation type="obsolete">_Bias (erakuspenerako bakarrik; erabili 0 bataz-besterako, 128 frame ken bataz-best.):</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Current frame minus average so far</source>
         <translation type="obsolete">Uneko frame ken bataz-bestekoa oraingoz</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Average so far</source>
         <translation type="obsolete">Bataz-bestekoa oraingoz</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Display nothing (fast for batch processing)</source>
         <translation type="obsolete">Erakuspenik ez (azkarra multzoak prozesatzeko)</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Display _Mode:</source>
         <translation type="obsolete">Erakus _Modua:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>ComputeAverage</source>
         <translation type="obsolete">Konputazio Bataz-bestekoa</translation>
     </message>
@@ -137,32 +113,26 @@
 <context>
     <name>ADMVideoDenoise</name>
     <message>
-        <location filename="" line="383"/>
         <source>_Luma lock:</source>
         <translation type="obsolete">_Argitasun blokeoa:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>C_hroma lock:</source>
         <translation type="obsolete">_Margotasun blokeoa:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>L_uma threshold:</source>
         <translation type="obsolete">Ar_gitasun muga:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Ch_roma threshold:</source>
         <translation type="obsolete">Mar_gotasun muga:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_Scene change:</source>
         <translation type="obsolete">_Agerraldi aldaketa:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Denoise</source>
         <translation type="obsolete">Zaratakentzea</translation>
     </message>
@@ -170,12 +140,10 @@
 <context>
     <name>ADMVideoDropOut</name>
     <message>
-        <location filename="" line="383"/>
         <source>DropOut Threshold</source>
         <translation type="obsolete">Erorketa Irteera Muga</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Drop Out</source>
         <translation type="obsolete">Erorketa Irteera</translation>
     </message>
@@ -183,87 +151,70 @@
 <context>
     <name>ADMVideoEraser</name>
     <message>
-        <location filename="" line="383"/>
         <source>Erase</source>
         <translation type="obsolete">Ezabatu</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Un-Erase</source>
         <translation type="obsolete">Ez-Ezabatu</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>1x1</source>
         <translation type="obsolete">1x1</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>3x3</source>
         <translation type="obsolete">3x3</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>5x5</source>
         <translation type="obsolete">5x5</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>7x7</source>
         <translation type="obsolete">7x7</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>9x9</source>
         <translation type="obsolete">9x9</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>11x11</source>
         <translation type="obsolete">11x11</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>15x15</source>
         <translation type="obsolete">15x15</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>21x21</source>
         <translation type="obsolete">21x21</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Brush _Mode:</source>
         <translation type="obsolete">Eskuila _Modua:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Brush _Size:</source>
         <translation type="obsolete">Eskuila _Neurria:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Output &quot;_Color&quot; for all masked pixels:</source>
         <translation type="obsolete">Irteera &quot;_Margoa&quot; mozorrotutako pixel guztientzat:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Eraser _Data File:</source>
         <translation type="obsolete">Ezabatu _Datu Agiria:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Select data file</source>
         <translation type="obsolete">Hautatu datu agiria</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_Debugging settings (bits):</source>
         <translation type="obsolete">_Garbiketa ezarpenak (bit):</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Eraser Configuration</source>
         <translation type="obsolete">Ezabatzaile Itxurapena</translation>
     </message>
@@ -271,17 +222,14 @@
 <context>
     <name>ADMVideoFlux</name>
     <message>
-        <location filename="" line="383"/>
         <source>_Temporal threshold:</source>
         <translation type="obsolete">_Denbora muga:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_Spatial threshold:</source>
         <translation type="obsolete">_Espazio muga:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>FluxSmooth</source>
         <translation type="obsolete">Jario Lehuna</translation>
     </message>
@@ -289,32 +237,26 @@
 <context>
     <name>ADMVideoForcedPP</name>
     <message>
-        <location filename="" line="383"/>
         <source>_Filter strength:</source>
         <translation type="obsolete">_Iragazki indarra:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_Quantizer:</source>
         <translation type="obsolete">_Kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_Horizontal deblocking</source>
         <translation type="obsolete">_Desblokeaketa etzana</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_Vertical deblocking</source>
         <translation type="obsolete">_Desblokeaketa zutia</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_Deringing</source>
         <translation type="obsolete">_Dehosketa</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Forced Postprocessing</source>
         <translation type="obsolete">Behertu prozesatze-ondorengoa</translation>
     </message>
@@ -322,62 +264,50 @@
 <context>
     <name>ADMVideoKernelDeint</name>
     <message>
-        <location filename="" line="383"/>
         <source>Top</source>
         <translation type="obsolete">Goren</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Bottom</source>
         <translation type="obsolete">Beheren</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_Field order:</source>
         <translation type="obsolete">_Eremu ordena:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_Threshold:</source>
         <translation type="obsolete">_Muga:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Smaller means more deinterlacing</source>
         <translation type="obsolete">Txikiagoak esanahi du ezelkarlotura gehiago</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_Sharp</source>
         <translation type="obsolete">_Garbitasuna</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_Sharper engine:</source>
         <translation type="obsolete">_Garbitasun gailua:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>T_woway</source>
         <translation type="obsolete">T_woway</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Extrapolate better (better not to use it)</source>
         <translation type="obsolete">Estrapolazio hobea (hobe ez erabiltzea)</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_Map</source>
         <translation type="obsolete">_Mapa</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Show interlaced areas (for test!)</source>
         <translation type="obsolete">Erakutsi elkarlotutako eremuak (azterketarako!)</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>KernelDeint</source>
         <translation type="obsolete">Kernel Deselkarl</translation>
     </message>
@@ -385,22 +315,18 @@
 <context>
     <name>ADMVideoLargeMedian</name>
     <message>
-        <location filename="" line="383"/>
         <source>_Process luma</source>
         <translation type="obsolete">_Garapen argitasuna</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Process luma plane</source>
         <translation type="obsolete">Garapen argitasun planoa</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>P_rocess chroma</source>
         <translation type="obsolete">Ga_rapen margotasuna</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Large Median 5x5</source>
         <translation type="obsolete">Handi Ertaina 5x5</translation>
     </message>
@@ -408,52 +334,42 @@
 <context>
     <name>ADMVideoLavPPDeint</name>
     <message>
-        <location filename="" line="383"/>
         <source>None</source>
         <translation type="obsolete">Ezer ez</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Linear blend</source>
         <translation type="obsolete">Nahasketa  linearra</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Linear interpolate</source>
         <translation type="obsolete">Interpolazio linearra</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Cubic interpolate</source>
         <translation type="obsolete">Interpolazio kubikoa</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Median interpolate</source>
         <translation type="obsolete">Interpolazio ertaina</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>FFmpeg deint</source>
         <translation type="obsolete">FFmpeg deselkarl</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Lowpass5 deint</source>
         <translation type="obsolete">Lowpass5 deselkarl</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_Deinterlacing:</source>
         <translation type="obsolete">_Deselkarlotura:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_Autolevel</source>
         <translation type="obsolete">_Berezmailaketa</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>libavcodec deinterlacer</source>
         <translation type="obsolete">libavcodec deselkarlotura</translation>
     </message>
@@ -461,32 +377,26 @@
 <context>
     <name>ADMVideoLogo</name>
     <message>
-        <location filename="" line="383"/>
         <source>_Logo (jpg file):</source>
         <translation type="obsolete">_Logoa (jpg agiria):</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Select JPEG file</source>
         <translation type="obsolete">Hautatu JPEG agiria</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_X Position:</source>
         <translation type="obsolete">_X Kokapena:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_Y Position:</source>
         <translation type="obsolete">_Y Kokapena:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>_Alpha:</source>
         <translation type="obsolete">_Alfa:</translation>
     </message>
     <message>
-        <location filename="" line="383"/>
         <source>Logo</source>
         <translation type="obsolete">Logoa</translation>
     </message>
@@ -494,32 +404,26 @@
 <context>
     <name>ADMVideoMPD3D</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="235"/>
         <source>_Spatial luma strength:</source>
-        <translation>Argitasun _espazial indarra:</translation>
+        <translation type="vanished">Argitasun _espazial indarra:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="236"/>
         <source>S_patial chroma strength:</source>
-        <translation>Margotasun es_pazial indarra:</translation>
+        <translation type="vanished">Margotasun es_pazial indarra:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="238"/>
         <source>Luma _Temporal strength:</source>
-        <translation>Margotasun _Tenporal indarra:</translation>
+        <translation type="vanished">Margotasun _Tenporal indarra:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="242"/>
         <source>MPlayer denoise3d</source>
-        <translation>MPlayer zaratakentze 3d</translation>
+        <translation type="vanished">MPlayer zaratakentze 3d</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="242"/>
         <source>_Temporal strength:</source>
         <translation type="obsolete">_Denbora indarra:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="242"/>
         <source>MPlayer hqdn3d</source>
         <translation type="obsolete">MPlayer hqdn3d</translation>
     </message>
@@ -527,45 +431,37 @@
 <context>
     <name>ADMVideoMPD3Dlow</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="69"/>
         <source>_Spatial luma strength:</source>
-        <translation>Argitasun _espazial indarra:</translation>
+        <translation type="vanished">Argitasun _espazial indarra:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="70"/>
         <source>S_patial chroma strength:</source>
-        <translation>Margotasun es_pazial indarra:</translation>
+        <translation type="vanished">Margotasun es_pazial indarra:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="71"/>
         <source>_Temporal strength:</source>
-        <translation>_Tenporal indarra:</translation>
+        <translation type="vanished">_Tenporal indarra:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>MPlayer denoise3d</source>
-        <translation>MPlayer zaratakentze 3d</translation>
+        <translation type="vanished">MPlayer zaratakentze 3d</translation>
     </message>
 </context>
 <context>
     <name>ADMVideoMaskedSoften</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Luma threshold:</source>
         <translation type="obsolete">_Argitasun muga:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>C_hroma threshold:</source>
         <translation type="obsolete">Ma_rgotasun muga:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Radius:</source>
         <translation type="obsolete">_Radioa:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Soften</source>
         <translation type="obsolete">Lehunketa</translation>
     </message>
@@ -573,27 +469,22 @@
 <context>
     <name>ADMVideoMosaic</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Horizontal stacking:</source>
         <translation type="obsolete">_Pilaketa etzana:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Vertical stacking:</source>
         <translation type="obsolete">_Zutikako pilaketa:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Shrink factor:</source>
         <translation type="obsolete">_Murrizpen ezaugarria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Show _frame</source>
         <translation type="obsolete">Erakutsi _framea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Mosaic</source>
         <translation type="obsolete">Eradonkia</translation>
     </message>
@@ -601,12 +492,10 @@
 <context>
     <name>ADMVideoPalShift</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Try reverse</source>
         <translation type="obsolete">_Saiatu alderantzizkoa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Pal Field Shift</source>
         <translation type="obsolete">Pal Eremu Aldaketa</translation>
     </message>
@@ -614,77 +503,62 @@
 <context>
     <name>ADMVideoParticle</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>New format, preferred, good for Tracker3D</source>
         <translation type="obsolete">Heuskarri berria, hobetsia, ona 3D Aztarnarirako</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>DG@UWA format (includes shape info &amp; bounding box)</source>
         <translation type="obsolete">DG@UWA heuakarria (forma argibideak &amp; muga kutxa barne)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>AB@ODU format (includes shape info)</source>
         <translation type="obsolete">AB@ODU heuskarria (forma argibideak barne)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Old format that Tracker3D can&apos;t read directly</source>
         <translation type="obsolete">Tracker3D-k zuzenean irakurri ezin duen heuskarri zaharra</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Output _Format:</source>
         <translation type="obsolete">Irteera _Heuskarria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Mi_nimum area for a particle to be detected:</source>
         <translation type="obsolete">Gu_txineko eremua zatia atzemana izateko:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Ma_ximum area for a particle to be detected:</source>
         <translation type="obsolete">Ge_hienezko eremua zatia atzemana izateko:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Left side crop (ignore particles in):</source>
         <translation type="obsolete">_Ezker alde mozketa (ezikusi zatiak hemen):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Right side crop (ignore particles in):</source>
         <translation type="obsolete">Eskuin alde mozketa (ezikusi zataik hemen):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Top crop (ignore particles in):</source>
         <translation type="obsolete">_Goren mozketa (ezikusi zatiak hemen):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Bottom crop (ignore particles in):</source>
         <translation type="obsolete">_Beheren mozketa (ezikusi zatiak hemen):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Output File:</source>
         <translation type="obsolete">_Irteera Agiria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Select file</source>
         <translation type="obsolete">Hautatu agiria</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Camera number:</source>
         <translation type="obsolete">_Kamera zenbakia:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Debugging settings (bits):</source>
         <translation type="obsolete">_Garbiketa ezarpenak (bit):</translation>
     </message>
@@ -692,17 +566,14 @@
 <context>
     <name>ADMVideoResampleFPS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_New frame rate:</source>
         <translation type="obsolete">_Frame neurri berria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Blend</source>
         <translation type="obsolete">_Nahasketa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Resample fps</source>
         <translation type="obsolete">Birlaginketa fs-ko</translation>
     </message>
@@ -710,47 +581,38 @@
 <context>
     <name>ADMVideoRotate</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>None</source>
         <translation type="obsolete">Ezer ez</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>90 degrees</source>
         <translation type="obsolete">90 gradu</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
-        <source>90&#xb0;</source>
+        <source>90°</source>
         <translation type="obsolete">90°</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>180 degrees</source>
         <translation type="obsolete">180 gradu</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
-        <source>180&#xb0;</source>
+        <source>180°</source>
         <translation type="obsolete">180°</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>270 degrees</source>
         <translation type="obsolete">270 gradu</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
-        <source>270&#xb0;</source>
+        <source>270°</source>
         <translation type="obsolete">270°</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Angle:</source>
         <translation type="obsolete">_Angelua:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Rotate</source>
         <translation type="obsolete">Itzulikatu</translation>
     </message>
@@ -758,12 +620,10 @@
 <context>
     <name>ADMVideoStabilize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Stabilize Threshold</source>
         <translation type="obsolete">Egonkortze Muga</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Stabilize</source>
         <translation type="obsolete">Egonkortu</translation>
     </message>
@@ -771,37 +631,30 @@
 <context>
     <name>ADMVideoSubASS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Subtitle file (ASS/SSA):</source>
         <translation type="obsolete">_Azpidatzi agiria (ASS/SSA):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Select Subtitle file</source>
         <translation type="obsolete">Hautatu Azpidatzi agiria</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Line spacing:</source>
         <translation type="obsolete">_Lerro tartea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Font scale:</source>
         <translation type="obsolete">_Hizki neurria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Top margin:</source>
         <translation type="obsolete">_Goiko bazterra:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Botto_m margin</source>
         <translation type="obsolete">Behe_ko bazterra</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>ASS</source>
         <translation type="obsolete">ASS</translation>
     </message>
@@ -809,12 +662,10 @@
 <context>
     <name>ADMVideoSubtitle</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Could not open subtitle file</source>
         <translation type="obsolete">Ezinezkoa azpidatzi agiria irekitzea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Cannot identify subtitle format</source>
         <translation type="obsolete">Ezinezkoa azpidatzi heuskarria ezagutzea</translation>
     </message>
@@ -822,175 +673,142 @@
 <context>
     <name>ADMVideoSwissArmyKnife</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>P&apos; = A</source>
         <translation type="obsolete">P&apos; = A</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>P&apos; = P</source>
         <translation type="obsolete">P&apos; = P</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>P&apos; = P - A</source>
         <translation type="obsolete">P&apos; = P - A</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>P&apos; = A - P</source>
         <translation type="obsolete">P&apos; = A - P</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>P&apos; = P + A</source>
         <translation type="obsolete">P&apos; = P + A</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>P&apos; = P * A</source>
         <translation type="obsolete">P&apos; = P * A</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>P&apos; = P / A</source>
         <translation type="obsolete">P&apos; = P / A</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>P&apos; = A / P</source>
         <translation type="obsolete">P&apos; = A / P</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>P&apos; = min (P, A)</source>
         <translation type="obsolete">P&apos; = gutx (P, A)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>P&apos; = max (P, A)</source>
         <translation type="obsolete">P&apos; = geh (P, A)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>A = convolve(P); Load convolution kernel from file</source>
         <translation type="obsolete">A = Bihurriketa(P); Gertatu kernel itzulingurua agiritik</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>A = pixel from image file as float; Load image from file</source>
         <translation type="obsolete">A = pixela irudi agiritik gain bezala; Gertatu irudia agiritik</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>A = pixel from image file as integer; Load image from file</source>
         <translation type="obsolete">A = pixela irudi agiritik oso bezala; Gertatu irudia agiritik</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>A = floating point constant value</source>
         <translation type="obsolete">A = gain puntua balio aldagaitzaz</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>A = rolling average of pixel: A = A*(1-alpha)+(P*alpha)</source>
         <translation type="obsolete">A = pixelaren bataz-besteko jarraipena: A = A*(1-alpha)+(P*alpha)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Select _Operation on each pixel P and input A:</source>
         <translation type="obsolete">Hautatu _Eragiketa P pixel bakoitzean eta sartu A:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Input _Type:</source>
         <translation type="obsolete">Sarrera _Mota:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Input _File (image or convolution kernel):</source>
         <translation type="obsolete">Sarrera _Agiria (irudia edo kernel itzulingurua):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Select file</source>
         <translation type="obsolete">Hautatu agiria</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Load Bias (added to each pixel
 in file image when loaded):</source>
         <translation type="obsolete">_Gertatu Bias (gehituz pixel
 bakoitzari agiri irudian gertatzerakoan):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Load _Multiplier (each pixel in
 file image mult. by this when loaded):</source>
         <translation type="obsolete">Gertatu _Biderkatzailea (pixel bakoitza
 agiri irudian bider. gertatzerakoan):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Input _Constant:</source>
         <translation type="obsolete">Sarrera _Aldagaitza:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Memory constant _alpha
 (where A = (1-alpha)*A + alpha*(curr_frame + lookahead)):</source>
         <translation type="obsolete">Oroimen aldagaitza _alpha
 (non A = (1-alpha)*A + alpha*(unek_frame + aurrerabegira)):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Look ahead _N frames:</source>
         <translation type="obsolete">Aurrera begira _N frameP:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Init _Start Frame (first frame # to use for head start):</source>
         <translation type="obsolete">Has _Hasiera Framea (lehen framea zenb. buru hasieran erabiltzeko):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Init _End Frame (last frame # to use for head start):</source>
         <translation type="obsolete">Has _Amai Framea (azken frame zenb. buru hasieran erabiltzeko):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Init By _Rolling (compute head start using a rolling average rather than a straight average)</source>
         <translation type="obsolete">Has _Jarripenaz (konputatu buru hasiera jarraipen bat.-best. erabiliz zuzeneko bat.-best. ordez)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Bias (will be added to result):</source>
         <translation type="obsolete">_Bias (emaitzara gehituko da):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Result Bias (added to each result pixel):</source>
         <translation type="obsolete">_Emaitz Bias (emaitz pixel bakoitzera gehituta):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Result _Multiplier (each result pixel
 multiplied by this):</source>
         <translation type="obsolete">Emaitza _Biderkatzailea (emaitz pixel
 bakoitza hone biderkatuta):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Histogram every N frames (0 to disable):</source>
         <translation type="obsolete">_Histograma N frame bakoitzeko (0 ezgaitzeko):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Debugging settings (bits):</source>
         <translation type="obsolete">_Garbiketa ezarpenak (bit):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Swiss Army Knife Configuration</source>
         <translation type="obsolete">Armada Suitzarreko Labana Itxurapena</translation>
     </message>
@@ -998,57 +816,46 @@
 <context>
     <name>ADMVideoTIsophote</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Simple</source>
         <translation type="obsolete">Arrunta</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Medium</source>
         <translation type="obsolete">Ertaina</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Slow</source>
         <translation type="obsolete">Astiro</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Type:</source>
         <translation type="obsolete">_Mota:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Iterations:</source>
         <translation type="obsolete">_Berrizteak:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Smaller means more deinterlacing</source>
         <translation type="obsolete">Txikiagoak esanahi du ezelkarlotura gehigo</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Chroma:</source>
         <translation type="obsolete">_Mota:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Process chroma.</source>
         <translation type="obsolete">Garatu margotasuna.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Step:</source>
         <translation type="obsolete">_Urratsa:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Step.</source>
         <translation type="obsolete">Urratsa.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>KernelDeint</source>
         <translation type="obsolete">Kernel Deselkarl</translation>
     </message>
@@ -1056,37 +863,30 @@
 <context>
     <name>ADMVideoThreshold</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Mi_nimum value to be in-range:</source>
         <translation type="obsolete">Gu_txieneko balioa sarrera-mailarako:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Ma_ximum value to be in-range:</source>
         <translation type="obsolete">Ge_hienezko balioa sarrera-mailarako:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>In-range values go white, out-of-range go black</source>
         <translation type="obsolete">Sar-maila balioak zuri doaz, irt-maila beltz doaz</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>In-range values go black, out-of-range go white</source>
         <translation type="obsolete">Sar-maila balioak beltz doaz, irt-maila zuri doaz</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Output values:</source>
         <translation type="obsolete">Irteera balioak:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Debugging settings (bits):</source>
         <translation type="obsolete">_Garbiketa ezarpenak (bit):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Threshold Configuration</source>
         <translation type="obsolete">Muga Itxurapena</translation>
     </message>
@@ -1094,47 +894,38 @@
 <context>
     <name>ADMVideoYadif</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Temporal &amp; spatial check</source>
         <translation type="obsolete">Denbora &amp; espazio hautapena</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Bob, temporal &amp; spatial check</source>
         <translation type="obsolete">Bob, denbora &amp; espazio hautapena</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Skip spatial temporal check</source>
         <translation type="obsolete">Jauzi espazio denbora hautapena</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Bob, skip spatial temporal check</source>
         <translation type="obsolete">Bob, jauzi espazio denbora hautapena</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Bottom field first</source>
         <translation type="obsolete">Beheko eremua lehenik</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Top field first</source>
         <translation type="obsolete">Goiko eremua lehenik</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Mode:</source>
         <translation type="obsolete">_Modua:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>_Order:</source>
         <translation type="obsolete">_Ordena:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>yadif</source>
         <translation type="obsolete">yadif</translation>
     </message>
@@ -1142,12 +933,10 @@
 <context>
     <name>ADM_AudiocodecWMA</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Internal error</source>
         <translation type="obsolete">Barneko akatsa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Cannot open WMA2 codec.</source>
         <translation type="obsolete">Ezinezkoa WMA2 kodeka irekitzea.</translation>
     </message>
@@ -1155,67 +944,57 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>No video loaded</source>
         <translation type="obsolete">Ez dago bideorik gertatuta</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Not indexable</source>
         <translation type="obsolete">Aurkibidetu ezina</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>DivX 5 + packed?</source>
         <translation type="obsolete">DivX 5 + paketatua?</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Rebuilding Frames</source>
         <translation type="obsolete">Frameak Birreraikitzen</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Aborted</source>
         <translation type="obsolete">Utzita</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Unsupported</source>
         <translation type="obsolete">Ez-sostengatua</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>Old format project file</source>
         <translation type="obsolete">Heuskarri zaharreko egitasmo agiria</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>No more supported.</source>
         <translation type="obsolete">Ez da gehiago sostengatua.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>File type identified but no loader support detected...</source>
         <translation type="obsolete">Agiri mota ezaguna baina ez da gertatzaile sostengurik atzeman...</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="75"/>
         <source>May be related to an old index file.</source>
         <translation type="obsolete">Badaiteke aurkibide agiri zahar batekin elkartua izatea.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="178"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+182"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>Ezin da desmultiplexatzailea aurkitu %s-rako</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="200"/>
+        <location line="+36"/>
         <source>Attempt to open %s failed!</source>
         <translation>%s irekitze saiatze hutsegitea!</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
+        <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.) concatinate them together</source>
@@ -1224,12 +1003,10 @@
 2) Kateatu elkarrekin</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
         <source>Video dimensions don&apos;t match.</source>
         <translation type="obsolete">Bideo neurriak ez datoz bat.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
         <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
@@ -1239,85 +1016,70 @@
 1) &quot;Birneurritu&quot; / &quot;Gehitu Hertza&quot; / &quot;Moztu&quot; bereizmen bereko jario bakoitza2) Kateatu elkarrekin</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
         <source>Build Time Map</source>
         <translation type="obsolete">Eraiki Denbora Mapa</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
         <source>Build VBR time map?</source>
         <translation type="obsolete">Eraiki VBR denbora mapa?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
         <source>Use safe mode</source>
         <translation type="obsolete">Erabili modu segurua</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
         <source>H.264 detected</source>
         <translation type="obsolete">H.264 atzemanda</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
         <source>If the file is using B-frames as reference it can lead to a crash or stuttering.
 Avidemux can use another mode which is safe but YOU WILL LOSE FRAME ACCURACY.
 Do you want to use that mode?</source>
         <translation type="obsolete">Agiriak B-frameak erabiltzen baditu xehetasun bezala matxura edo totelka eragin dezaketeAvidemuxek beste modu bat erabili dezake heusteko baina FRAME ZEHAZTASUNA GALDUKO DUZUModu hau erabiltzea nahi duzu?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
         <source>Packed Bitstream detected</source>
         <translation type="obsolete">Paketatutako Bitjarioa atzemada</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
         <source>Do you want me to unpack it ?</source>
         <translation type="obsolete">Despaketatzea nahi duzu?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
         <source>Could not unpack the video</source>
         <translation type="obsolete">Ezin da bideoa despaketatu</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
         <source>Using backup decoder - not frame accurate.</source>
         <translation type="obsolete">Babeskopia dekodeatzailea erabiliz - frame zehaztasunik ez.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
         <source>Weird</source>
         <translation type="obsolete">Arraroa</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
         <source>The unpacking succeedeed but the index is still not up to date.</source>
         <translation type="obsolete">Despaketatzea egin da baina aurkibidea eguneratu gabe dago.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
         <source>Index is not up to date</source>
         <translation type="obsolete">Aurkibidea eguneratu gabe</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
         <source>You should use Tool-&gt;Rebuild frame. Do it now ?</source>
         <translation type="obsolete">Erabili behar duzu Tresna-&gt;Berreraiki framea. Orain egin?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
         <source>This looks like mpeg
  Do you want to index it?</source>
         <translation type="obsolete">Hau mpeg antzekoa daAurkibidetzea nahi duzu?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
         <source>Indexing failed</source>
         <translation type="obsolete">Aurkibidetze hutsegitea</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edCheckForInvalidPts.cpp" line="68"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+69"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -1337,100 +1099,121 @@
 <context>
     <name>ADM_Qt4CoreUIToolkit</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="32"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+32"/>
         <source>Alert</source>
         <translation>Alerta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="88"/>
+        <location line="+6"/>
+        <location line="+25"/>
+        <location line="+25"/>
         <source>Info</source>
         <translation>Argibideak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="142"/>
+        <location line="+24"/>
+        <location line="+30"/>
         <source>Confirmation</source>
         <translation>Baieztapena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="161"/>
+        <location line="+19"/>
         <source>Question</source>
         <translation>Galdera</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="184"/>
+        <location line="+23"/>
         <source>Question?</source>
         <translation>Galdera?</translation>
     </message>
 </context>
 <context>
+    <name>ADM_Qt4CoreUIToolkit::DIA_processingQt4</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+160"/>
+        <source>_Resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The processing is paused.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_Qt4Factory::ADM_Qbitrate</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="50"/>
+        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="+50"/>
         <source>Constant Bitrate</source>
         <translation>Bitneurri Aldagaitza</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="51"/>
+        <location line="+1"/>
         <source>Constant Quantiser</source>
         <translation>Kuantizatzaile Aldagaitza</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="52"/>
+        <location line="+1"/>
         <source>Same Quantiser as Input</source>
         <translation>Sarrereko Kuantizatzaile berdina</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="53"/>
+        <location line="+1"/>
         <source>Constant Rate Factor</source>
         <translation>Neurri Ezaugarri Aldagaitza</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="54"/>
+        <location line="+1"/>
         <source>Two Pass - Video Size</source>
         <translation>Bi Pasaldi - Bideo Neurria</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="55"/>
+        <location line="+1"/>
         <source>Two Pass - Average Bitrate</source>
         <translation>Bi Pasaldi - Bataz-besteko Bitneurria</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="57"/>
+        <location line="+2"/>
         <source>Encoding mode</source>
         <translation>Kodeaketa modua</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="62"/>
+        <location line="+5"/>
         <source>Bitrate</source>
         <translation>Bitneurria</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="148"/>
+        <location line="+86"/>
         <source>Target bitrate (kb/s)</source>
         <translation>Xede bitneurria (kb/s)</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="172"/>
+        <location line="+5"/>
+        <location line="+19"/>
         <source>Quantizer</source>
         <translation>Kuantizatzailea</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="172"/>
         <source>Quantiser</source>
         <translation type="obsolete">Kuantizatzailea</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="158"/>
+        <location line="-14"/>
         <source>Target video size (MB)</source>
         <translation>Xede bideo neurria (MB)</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="163"/>
+        <location line="+5"/>
         <source>Average bitrate (kb/s)</source>
         <translation>Bataz-besteko bitneurria (kb/s)</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
+        <location line="+5"/>
         <source>-</source>
         <translation>-</translation>
     </message>
@@ -1438,75 +1221,69 @@
 <context>
     <name>ADM_Qt4Factory::ADM_QconfigMenu</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>Configuration:</source>
         <translation type="obsolete">Itxurapena:</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>Save As</source>
         <translation type="obsolete">Gorde Honela</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>Delete</source>
         <translation type="obsolete">Ezabatu</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>&lt;default&gt;</source>
         <translation type="obsolete">&lt;berezkoa&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>&lt;custom&gt;</source>
         <translation type="obsolete">&lt;norberea&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>Are you sure you wish to delete the selected configuration?</source>
         <translation type="obsolete">Zihur zaude hautatutako itxurapena ezabatzea nahi duzula?</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>Configuration File (*.xml)</source>
         <translation type="obsolete">Itxurapen Agiria (*.xml)</translation>
     </message>
 </context>
 <context>
+    <name>ADM_ffDvEncoder</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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_ogmWrite</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>None</source>
         <translation type="obsolete">Ezer ez</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>Copy</source>
         <translation type="obsolete">Kopiatu</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>File error</source>
         <translation type="obsolete">Agiri akatsa</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>Cannot open &quot;%s&quot; for writing.</source>
         <translation type="obsolete">Ezinezkoa &quot;%s&quot; idazteko irekitzea.</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>OGM</source>
         <translation type="obsolete">OGM</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>Could not initialize video</source>
         <translation type="obsolete">Ezin da bideoa abiarazi</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>Could not initialize audio</source>
         <translation type="obsolete">Ezin da audioa abiarazi</translation>
     </message>
@@ -1514,12 +1291,10 @@
 <context>
     <name>ADM_ogmWriteCopy</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>Copy</source>
         <translation type="obsolete">Kopiatu</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>Saving...</source>
         <translation type="obsolete">Gordetzen...</translation>
     </message>
@@ -1527,27 +1302,22 @@
 <context>
     <name>ADM_ogmWriteProcess</name>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>Reuse the existing log file?</source>
         <translation type="obsolete">Ukatu dagoen ohar agiria?</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>Filter init failed</source>
         <translation type="obsolete">Iragazki abio hutsegitea</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>Pass one</source>
         <translation type="obsolete">Bat urratsa</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>Pass 2</source>
         <translation type="obsolete">2 Urratsa</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_bitrate.cpp" line="168"/>
         <source>Encoding</source>
         <translation type="obsolete">Kodeatzen</translation>
     </message>
@@ -1555,17 +1325,17 @@
 <context>
     <name>ADM_qt4Factory::ADM_QthreadCount</name>
     <message>
-        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="45"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+45"/>
         <source>Disabled</source>
         <translation>Ezgaituta</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="46"/>
+        <location line="+1"/>
         <source>Auto-detect</source>
         <translation>Berez-atzeman</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="47"/>
+        <location line="+1"/>
         <source>Custom</source>
         <translation>Norbererara</translation>
     </message>
@@ -1573,7 +1343,7 @@
 <context>
     <name>ADM_qtray</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/ADM_qtray.cpp" line="82"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/ADM_qtray.cpp" line="+82"/>
         <source>Open Avidemux</source>
         <translation>Ireki Avidemux</translation>
     </message>
@@ -1581,30 +1351,25 @@
 <context>
     <name>AVDMFastVideoConvolution</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="136"/>
         <source>_Process luma</source>
-        <translation>_Prozesatu argitasuna</translation>
+        <translation type="vanished">_Prozesatu argitasuna</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="136"/>
         <source>Process luma plane</source>
-        <translation>Garapen argit planoa</translation>
+        <translation type="vanished">Garapen argit planoa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="137"/>
         <source>P_rocess chroma</source>
-        <translation>P_ozesatu margotasuna</translation>
+        <translation type="vanished">P_ozesatu margotasuna</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="141"/>
         <source>Fast Convolution</source>
-        <translation>Konboluzio Azkarra</translation>
+        <translation type="vanished">Konboluzio Azkarra</translation>
     </message>
 </context>
 <context>
     <name>AVDMGenericAudioStream</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="141"/>
         <source>Building VBR map</source>
         <translation type="obsolete">BVR mapa eraikitzen</translation>
     </message>
@@ -1612,37 +1377,30 @@
 <context>
     <name>AVDMVideoAddBorder</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="141"/>
         <source>_Left border:</source>
         <translation type="obsolete">E_zker hertza:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="141"/>
         <source>_Right border:</source>
         <translation type="obsolete">E_skuin hertza:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="141"/>
         <source>_Top border:</source>
         <translation type="obsolete">_Goiko hertza:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="141"/>
         <source>_Bottom border:</source>
         <translation type="obsolete">_Beheko hertza:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="141"/>
         <source>Add Borders</source>
         <translation type="obsolete">Gehitu Hertzak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="141"/>
         <source>Incorrect parameters</source>
         <translation type="obsolete">Neurri okerrak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="141"/>
         <source>All parameters must be even and within range.</source>
         <translation type="obsolete">Parametro guztiak berdinak eta mailakoak izan behar dute.</translation>
     </message>
@@ -1650,95 +1408,77 @@
 <context>
     <name>AVDMVideoMCDeint</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="120"/>
         <source>Fast</source>
-        <translation>Azkarra</translation>
+        <translation type="vanished">Azkarra</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="121"/>
         <source>Medium</source>
-        <translation>Ertaina</translation>
+        <translation type="vanished">Ertaina</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="122"/>
         <source>Slow iterative motion search</source>
-        <translation>Mugimendu bilaketa berrizte motela</translation>
+        <translation type="vanished">Mugimendu bilaketa berrizte motela</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="123"/>
         <source>Extra slow (same as 3+multiple reference frames)</source>
-        <translation>Oso motela (3+frame xehetasun anitz bezala)</translation>
+        <translation type="vanished">Oso motela (3+frame xehetasun anitz bezala)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="127"/>
         <source>Bottom :</source>
-        <translation>Beheren:</translation>
+        <translation type="vanished">Beheren:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="127"/>
         <source>Top</source>
         <translation type="obsolete">Goren</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="127"/>
         <source>Bottom</source>
         <translation type="obsolete">Beheren</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="126"/>
         <source>_Mode:</source>
-        <translation>_Modua:</translation>
+        <translation type="vanished">_Modua:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="126"/>
         <source>_Field dominance:</source>
         <translation type="obsolete">_Eremu nagusitasuna:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="128"/>
         <source>_Qp:</source>
-        <translation>_Qp:</translation>
+        <translation type="vanished">_Qp:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="132"/>
         <source>mcDeinterlace</source>
-        <translation>mcDeselkarlotura</translation>
+        <translation type="vanished">mcDeselkarlotura</translation>
     </message>
 </context>
 <context>
     <name>AVDMVideoStreamBSMear</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="132"/>
         <source>_Left border:</source>
         <translation type="obsolete">E_zker hertza:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="132"/>
         <source>_Right border:</source>
         <translation type="obsolete">E_skuin hertza:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="132"/>
         <source>_Top border:</source>
         <translation type="obsolete">_Goiko hertza:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="132"/>
         <source>_Bottom border:</source>
         <translation type="obsolete">_Beheko hertza:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="132"/>
         <source>Blacken Borders</source>
         <translation type="obsolete">Hertz Beltzenak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="132"/>
         <source>Incorrect parameters</source>
         <translation type="obsolete">Neurri okerrak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="132"/>
         <source>All parameters must be even and within range.</source>
         <translation type="obsolete">Parametro guztiak berdinak etamailakoak izan behar dute.</translation>
     </message>
@@ -1746,17 +1486,14 @@
 <context>
     <name>AVDMVideoVlad</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="132"/>
         <source>_Luma temporal threshold:</source>
         <translation type="obsolete">_Margotasun denbora muga:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="132"/>
         <source>Ch_roma temporal threshold:</source>
         <translation type="obsolete">_Margotasun denbora muga:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="132"/>
         <source>Temporal Cleaner</source>
         <translation type="obsolete">Aldibaterako Garbitzailea</translation>
     </message>
@@ -1764,72 +1501,58 @@
 <context>
     <name>AVDM_Fade</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="63"/>
         <source>Out</source>
-        <translation>Irteera</translation>
+        <translation type="vanished">Irteera</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="63"/>
         <source>Fade out</source>
-        <translation>Irteera hutsaltasuna</translation>
+        <translation type="vanished">Irteera hutsaltasuna</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="63"/>
         <source>In</source>
-        <translation>Sarrera</translation>
+        <translation type="vanished">Sarrera</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="63"/>
         <source>Fade in</source>
-        <translation>Sarrera baterapena</translation>
+        <translation type="vanished">Sarrera baterapena</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="72"/>
         <source>_Fade type:</source>
-        <translation>_Hutsaltasun mota:</translation>
+        <translation type="vanished">_Hutsaltasun mota:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="73"/>
         <source>_Start time (ms):</source>
-        <translation>_Hasiera Denbora (sm):</translation>
+        <translation type="vanished">_Hasiera Denbora (sm):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="74"/>
         <source>_End time (ms):</source>
-        <translation>_Amaiera Denbora (sm):</translation>
+        <translation type="vanished">_Amaiera Denbora (sm):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="77"/>
         <source>Fade to black</source>
-        <translation>Hutsaldu beltzera</translation>
+        <translation type="vanished">Hutsaldu beltzera</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="77"/>
         <source>_Start frame:</source>
         <translation type="obsolete">_Hasiera framea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="77"/>
         <source>_End frame:</source>
         <translation type="obsolete">_Amaiera framea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="77"/>
         <source>Fade to _black</source>
         <translation type="obsolete">Bateratu _beltzera</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="77"/>
         <source>Fade</source>
         <translation type="obsolete">Baterapena</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="77"/>
         <source>Parameter Error</source>
         <translation type="obsolete">Neurri Akatsa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="77"/>
         <source>Start must be before end, and both within video # of frames.</source>
         <translation type="obsolete">Hasiera amaiera baino lehen eogn behar da, edo biak bideo frame zenb. berean.</translation>
     </message>
@@ -1837,12 +1560,10 @@
 <context>
     <name>Apple iPod</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="77"/>
         <source>A video file must be open to use this Auto Wizard.</source>
         <translation type="obsolete">Bideo agiria ireki behar da Berez Laguntzaile hau erabiltzeko.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="77"/>
         <source>Apple iPod Auto Wizard</source>
         <translation type="obsolete">Apple iPod Berez Laguntzailea</translation>
     </message>
@@ -1850,152 +1571,161 @@
 <context>
     <name>CalculatorDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="16"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="+16"/>
         <source>Calculator</source>
         <translation>Kalkulagailua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="28"/>
+        <location line="+12"/>
         <source>Target</source>
         <translation>Xedea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="56"/>
+        <location line="+28"/>
         <source>00:00:00</source>
         <translation>00:00:00</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="64"/>
+        <location line="+8"/>
         <source>AVI</source>
         <translation>AVI</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="69"/>
+        <location line="+5"/>
         <source>OGM</source>
         <translation>OGM</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="74"/>
+        <location line="+5"/>
         <source>MPEG</source>
         <translation>MPEG</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="82"/>
+        <location line="+8"/>
         <source>Medium:</source>
         <translation>Ertaina:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="89"/>
+        <location line="+7"/>
         <source>Format:</source>
         <translation>Heuskarria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="96"/>
+        <location line="+7"/>
         <source>Duration:</source>
         <translation>Iraupena:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="104"/>
+        <location line="+8"/>
         <source>1 x 80 minute CD</source>
         <translation>1 x 80 minutuko CD-a</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="109"/>
+        <location line="+5"/>
         <source>2 x 80 minute CD</source>
         <translation>2 x 80 minutuko CD-a</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="114"/>
+        <location line="+5"/>
         <source>1 x 74 minute CD</source>
         <translation>1 x 74 minutuko CD-a</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="119"/>
+        <location line="+5"/>
         <source>2 x 74 minute CD</source>
         <translation>2 x 74 minutuko CD-a</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="124"/>
+        <location line="+5"/>
         <source>DVD-5</source>
         <translation>DVD-5</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="129"/>
+        <location line="+5"/>
         <source>Custom</source>
         <translation>Egilea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="187"/>
+        <location line="+58"/>
         <source>Custom Size:</source>
         <translation>Egile Neurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="469"/>
+        <location line="+23"/>
+        <location line="+198"/>
+        <location line="+27"/>
+        <location line="+34"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="252"/>
+        <location line="-217"/>
         <source>Audio Bitrate</source>
         <translation>Audio Bitneurria</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="272"/>
+        <location line="+20"/>
         <source>Track 1:</source>
         <translation>1 Bidea:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="555"/>
+        <location line="+14"/>
+        <location line="+37"/>
+        <location line="+232"/>
         <source>kbps</source>
         <translation>kbs-ko</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="309"/>
+        <location line="-246"/>
         <source>Track 2:</source>
         <translation>2 Bidea:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="348"/>
+        <location line="+39"/>
         <source>Result</source>
         <translation>Emaitza</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="376"/>
+        <location line="+28"/>
         <source>Audio Size:</source>
         <translation>Audio Neurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="383"/>
+        <location line="+7"/>
         <source>Video Size:</source>
         <translation>Bideo Neurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="545"/>
+        <location line="+15"/>
+        <location line="+27"/>
+        <location line="+34"/>
+        <location line="+68"/>
+        <location line="+18"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="444"/>
+        <location line="-101"/>
         <source>Total Size:</source>
         <translation>Neurria Guztira:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="564"/>
+        <location line="+120"/>
         <source>Bits Per Pixel:</source>
         <translation>Bit Pixeleko:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="571"/>
+        <location line="+7"/>
         <source>Video Bitrate:</source>
         <translation>Bideo Bitneurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="632"/>
+        <location line="+61"/>
         <source>OK</source>
         <translation>Ongi</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
+        <location line="+7"/>
         <source>Cancel</source>
         <translation>Ezeztatu</translation>
     </message>
@@ -2003,77 +1733,62 @@
 <context>
     <name>Cnr2Dialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Chroma Noise Reducer 2</source>
         <translation type="obsolete">Margotasun Zarata Murriztzailea 2</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Scene Change</source>
         <translation type="obsolete">Agerraldi Aldaketa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>0%</source>
         <translation type="obsolete">0%</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Scene Change Threshold</source>
         <translation type="obsolete">Agerraldi Aldaketa Muga</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>100%</source>
         <translation type="obsolete">100%</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Use chroma to also detect scene change</source>
         <translation type="obsolete">Erabili margotasuna agerraldi aldaketa ere atzematen bada</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Settings</source>
         <translation type="obsolete">Ezarpenak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Wide</source>
         <translation type="obsolete">Zabalera</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Narrow</source>
         <translation type="obsolete">Estua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Mode</source>
         <translation type="obsolete">Modua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Luma Y:</source>
         <translation type="obsolete">Y Argitasuna:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Chroma V:</source>
         <translation type="obsolete">V Margotasuna:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Maximum</source>
         <translation type="obsolete">Gehienez</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Chroma U:</source>
         <translation type="obsolete">U Margotasuna:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Sensibility</source>
         <translation type="obsolete">Sentikortasuna</translation>
     </message>
@@ -2081,117 +1796,94 @@
 <context>
     <name>ColorYuvDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Avisynth ColorYUV</source>
         <translation type="obsolete">Avisynth MargoaYUV</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Colour Correction Matrix</source>
         <translation type="obsolete">Margo Zuzenketa Matriza</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Contrast</source>
         <translation type="obsolete">Zuribeltztasuna</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Chroma U:</source>
         <translation type="obsolete">U Margotasuna:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Chroma V:</source>
         <translation type="obsolete">V Margotasuna:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Luma Y:</source>
         <translation type="obsolete">Y Argitasuna:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Brightness</source>
         <translation type="obsolete">Dizdira</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Gain</source>
         <translation type="obsolete">Irabazia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Gamma</source>
         <translation type="obsolete">Gamma</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Note: all values are normalised to 256</source>
         <translation type="obsolete">Oharra: balio guztiak 256-ra normalduta daude</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Parameters</source>
         <translation type="obsolete">Parametroak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Matrix:</source>
         <translation type="obsolete">Matriza:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>None</source>
         <translation type="obsolete">Ezer ez</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>TV -&gt; PC</source>
         <translation type="obsolete">TB -&gt; PC</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>PC -&gt; TV</source>
         <translation type="obsolete">PC -&gt; TB</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>PC -&gt; TV.Y</source>
         <translation type="obsolete">PC -&gt; TB.Y</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Level:</source>
         <translation type="obsolete">Maila:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Rec.709</source>
         <translation type="obsolete">Rec.709</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Coring</source>
         <translation type="obsolete">Coring</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Opt:</source>
         <translation type="obsolete">Auk:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Auto Gain</source>
         <translation type="obsolete">Berez Irabazia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Display Colour Statistics</source>
         <translation type="obsolete">Erakutsi Margo Estatistikak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Centre Colour Offsets</source>
         <translation type="obsolete">Erdiratu Margo Orekak</translation>
     </message>
@@ -2199,42 +1891,34 @@
 <context>
     <name>CurveDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Curve Editor</source>
         <translation type="obsolete">Bihurgune Editatzailea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Choose channel for editing</source>
         <translation type="obsolete">Hautatu editatzeko bidea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Luma (Y)</source>
         <translation type="obsolete">Argitasuna (Y)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Chroma (U)</source>
         <translation type="obsolete">Margotasuna (U)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Chroma (V)</source>
         <translation type="obsolete">Margotasuna (V)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Sets default curve</source>
         <translation type="obsolete">Berezko bihurgunea ezartzen du</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Refresh</source>
         <translation type="obsolete">Berritu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Help</source>
         <translation type="obsolete">Laguntza</translation>
     </message>
@@ -2242,7 +1926,6 @@
 <context>
     <name>CurveEditor</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="639"/>
         <source>Control points count: Y:%d, U:%d, V:%d</source>
         <translation type="obsolete">Aginte puntu zenbatekoa: Y:%d, U:%d, V:%d</translation>
     </message>
@@ -2250,85 +1933,84 @@
 <context>
     <name>DGbob</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="68"/>
         <source>Top</source>
-        <translation>Goren</translation>
+        <translation type="vanished">Goren</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="69"/>
         <source>Bottom</source>
-        <translation>Beheren</translation>
+        <translation type="vanished">Beheren</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="72"/>
         <source>Keep nb of frames and fps</source>
-        <translation>Gorde frame eta fs-ko zenbatekoa</translation>
+        <translation type="vanished">Gorde frame eta fs-ko zenbatekoa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="73"/>
         <source>Double nb of frames and fps</source>
-        <translation>Frame eta fs-ko zenbateko bikoitza</translation>
+        <translation type="vanished">Frame eta fs-ko zenbateko bikoitza</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="74"/>
         <source>Double nb of frames (slow motion)</source>
-        <translation>Frame zenbateko bikoitza (mugimendu astiroa)</translation>
+        <translation type="vanished">Frame zenbateko bikoitza (mugimendu astiroa)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="77"/>
         <source>_Top Field First:</source>
-        <translation>_Goiko Eremua Lehenik:</translation>
+        <translation type="vanished">_Goiko Eremua Lehenik:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="77"/>
         <source>_Field order:</source>
         <translation type="obsolete">_Eremu ordena:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="78"/>
         <source>_Mode:</source>
-        <translation>_Modua:</translation>
+        <translation type="vanished">_Modua:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="79"/>
         <source>_Threshold:</source>
-        <translation>_Muga:</translation>
+        <translation type="vanished">_Muga:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="80"/>
         <source>_Extra</source>
-        <translation>_Estra</translation>
+        <translation type="vanished">_Estra</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="80"/>
         <source>Extra check, avoid using it</source>
-        <translation>Gain egiaztapena, saihestu erabiltzea</translation>
+        <translation type="vanished">Gain egiaztapena, saihestu erabiltzea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="83"/>
         <source>DGBob</source>
-        <translation>DGBob</translation>
+        <translation type="vanished">DGBob</translation>
     </message>
 </context>
 <context>
     <name>DIA_encodingQt4</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="159"/>
         <source>Shutting down</source>
-        <translation>Itzaltzen</translation>
+        <translation type="vanished">Itzaltzen</translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+57"/>
+        <location line="+20"/>
+        <source>Privileges Required</source>
+        <translation type="unfinished">Eskubide Bereziak behar dira</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <location line="+20"/>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation type="unfinished">Erro eskubideak beharrezkoak dira eragiketa hau burutzeko.</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="376"/>
+        <location line="+284"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>Kodeaketa pausatuta dago. Berrekitea edo uztea nahi duzu?</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="377"/>
+        <location line="+1"/>
         <source>Resume</source>
         <translation>Berrekin</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="377"/>
+        <location line="+0"/>
         <source>Abort</source>
         <translation>Utzi</translation>
     </message>
@@ -2336,12 +2018,10 @@
 <context>
     <name>DVD</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="377"/>
         <source>A video file must be open to use this Auto Wizard.</source>
         <translation type="obsolete">Bideo agiria irekita egon behar da Berez Laguntzaile hau erabiltzeko.</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="377"/>
         <source>DVD Auto Wizard</source>
         <translation type="obsolete">DVD Berez Laguntzailea</translation>
     </message>
@@ -2349,113 +2029,103 @@
 <context>
     <name>DVEncoder</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="377"/>
         <source>The DV encoder only accepts the following profiles:</source>
         <translation type="obsolete">DV kodeatzaileak hurrengo profilak bakarrik onartzen ditu:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="377"/>
         <source>Incompatible settings</source>
         <translation type="obsolete">Ezarpen bateraezinak</translation>
     </message>
 </context>
 <context>
+    <name>DcaEnc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp" line="+278"/>
+        <source>DcaEnc Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Decimate</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="74"/>
         <source>Discard closer</source>
-        <translation>Baztertu istzailea</translation>
+        <translation type="vanished">Baztertu istzailea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="75"/>
         <source>Replace (interpolate)</source>
-        <translation>Ordeztu (interpolatu)</translation>
+        <translation type="vanished">Ordeztu (interpolatu)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="75"/>
-        <source>Discard longer dupe (anim&#xe9;s)</source>
+        <source>Discard longer dupe (animés)</source>
         <translation type="obsolete">Baztertu bikoizketa luzea (animazioa)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="77"/>
         <source>Pulldown dupe removal</source>
-        <translation>Hedagarri bikoiztu kenketa</translation>
+        <translation type="vanished">Hedagarri bikoiztu kenketa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="80"/>
         <source>Fastest (no chroma, partial luma)</source>
-        <translation>Azkarrena (margot. gabe, argit. partziala)</translation>
+        <translation type="vanished">Azkarrena (margot. gabe, argit. partziala)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="80"/>
         <source>Fast (partial luma and chroma)</source>
         <translation type="obsolete">Azkar (argit. eta margot. partziala)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="82"/>
         <source>Medium (full luma, no chroma)</source>
-        <translation>Ertaina (argit. osoa, margot. gabe)</translation>
+        <translation type="vanished">Ertaina (argit. osoa, margot. gabe)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="82"/>
         <source>Slow (full luma and chroma)</source>
         <translation type="obsolete">Motela (argit. eta margot. osoa)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="76"/>
-        <source>Discard longer dupe (anim&#xc3;&#xa9;s)</source>
-        <translation>Baztertu bikoizpen luzeak (animÃ©s)</translation>
+        <source>Discard longer dupe (animÃ©s)</source>
+        <translation type="vanished">Baztertu bikoizpen luzeak (animÃ©s)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="87"/>
         <source>_Mode:</source>
-        <translation>M_odua:</translation>
+        <translation type="vanished">M_odua:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="88"/>
         <source>_Quality:</source>
-        <translation>_Ontasun:</translation>
+        <translation type="vanished">_Ontasun:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="89"/>
         <source>_Threshold 1:</source>
-        <translation>_Muga 1:</translation>
+        <translation type="vanished">_Muga 1:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="90"/>
         <source>T_hreshold 2:</source>
-        <translation>M_uga 2:</translation>
+        <translation type="vanished">M_uga 2:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="91"/>
         <source>C_ycle:</source>
-        <translation>Z_ikloa:</translation>
+        <translation type="vanished">Z_ikloa:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="92"/>
         <source>Sho_w</source>
-        <translation>E_rakutsi</translation>
+        <translation type="vanished">E_rakutsi</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="95"/>
         <source>Decomb Decimate</source>
-        <translation>Ezorrazketa Hamarrendua</translation>
+        <translation type="vanished">Ezorrazketa Hamarrendua</translation>
     </message>
 </context>
 <context>
     <name>Dialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="64"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+64"/>
         <source>Indexing</source>
         <translation>Aurkibidetzen</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="65"/>
+        <location line="+1"/>
         <source>Time Left : Infinity</source>
         <translation>Gelditzen den Denbora: Mugagabea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="66"/>
+        <location line="+1"/>
         <source># Images :</source>
         <translation># Irudiak :</translation>
     </message>
@@ -2463,42 +2133,55 @@
 <context>
     <name>DialogAudioTracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="14"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="+14"/>
         <source>Audio Tracks Configuration</source>
         <translation>Audio Bide Itxurapena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="22"/>
+        <location line="+11"/>
         <source>Track 1</source>
         <translation>1 Bidea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="143"/>
+        <location line="+7"/>
+        <location line="+41"/>
+        <location line="+41"/>
+        <location line="+41"/>
         <source>Enabled</source>
         <translation>Gaituta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="156"/>
+        <location line="-107"/>
+        <location line="+41"/>
+        <location line="+41"/>
+        <location line="+41"/>
         <source>Configure</source>
         <translation>Itxuratu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="163"/>
+        <location line="-116"/>
+        <location line="+41"/>
+        <location line="+41"/>
+        <location line="+41"/>
+        <source>Filters</source>
+        <translation type="unfinished">Iragazkiak</translation>
+    </message>
+    <message>
         <source>Audio Filters</source>
-        <translation>Audio Iragazkiak</translation>
+        <translation type="vanished">Audio Iragazkiak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="60"/>
+        <location line="-112"/>
         <source>Track 2</source>
         <translation>2 Bidea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="98"/>
+        <location line="+41"/>
         <source>Track 3</source>
         <translation>3 Bidea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="136"/>
+        <location line="+41"/>
         <source>Track 4</source>
         <translation>4 Bidea</translation>
     </message>
@@ -2506,85 +2189,128 @@
 <context>
     <name>DialogOcr</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="13"/>
+        <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="+13"/>
         <source>Dialog</source>
         <translation>Elkarrizketa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="33"/>
+        <location line="+20"/>
         <source>Calibrate</source>
         <translation>Kalibratu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="40"/>
+        <location line="+7"/>
         <source>Skip All</source>
         <translation>Jauzi Dena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="47"/>
+        <location line="+7"/>
         <source>Skip Glyph</source>
         <translation>Jauzi Glyph</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="54"/>
+        <location line="+7"/>
         <source>Ignore</source>
         <translation>Ezikusi</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="74"/>
+        <location line="+20"/>
         <source>Ok</source>
         <translation>Ongi</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="92"/>
+        <location line="+18"/>
         <source>Close</source>
         <translation>Itxi</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="102"/>
+        <location line="+10"/>
         <source>00:00:00/000</source>
         <translation>00:00:00/000</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="109"/>
+        <location line="+7"/>
         <source>Timecode:</source>
         <translation>Denbora-kodea:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="116"/>
+        <location line="+7"/>
         <source>0/0</source>
         <translation>0/0</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="123"/>
+        <location line="+7"/>
         <source>Nb Lines :</source>
         <translation>Lerro Zenb.:</translation>
     </message>
 </context>
 <context>
+    <name>DialogProcessing</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="+14"/>
+        <source>Dialog</source>
+        <translation type="unfinished">Elkarrizketa</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Ezeztatu</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TimeLeft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>00:00:00</source>
+        <translation type="unfinished">00:00:00</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>ProcessImages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>0</source>
+        <translation type="unfinished">0</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>0 fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DialogProgress</name>
     <message>
-        <location filename="../ADM_jobs/src/uiProgress.ui" line="17"/>
+        <location filename="../ADM_jobs/src/uiProgress.ui" line="+17"/>
         <source>Progress</source>
         <translation>Garapena</translation>
     </message>
     <message>
-        <location filename="../ADM_jobs/src/uiProgress.ui" line="30"/>
+        <location line="+13"/>
         <source>Current job</source>
         <translation>Oraingo lana</translation>
     </message>
     <message>
-        <location filename="../ADM_jobs/src/uiProgress.ui" line="37"/>
+        <location line="+7"/>
         <source>1/1</source>
         <translation>1/1</translation>
     </message>
     <message>
-        <location filename="../ADM_jobs/src/uiProgress.ui" line="44"/>
+        <location line="+7"/>
         <source>File being written </source>
         <translation>Agiria idazten da </translation>
     </message>
     <message>
-        <location filename="../ADM_jobs/src/uiProgress.ui" line="51"/>
+        <location line="+7"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -2592,7 +2318,6 @@
 <context>
     <name>EncoderCopy</name>
     <message>
-        <location filename="../ADM_jobs/src/uiProgress.ui" line="51"/>
         <source>Copy</source>
         <translation type="obsolete">Kopiatu</translation>
     </message>
@@ -2600,7 +2325,6 @@
 <context>
     <name>EncoderRequant</name>
     <message>
-        <location filename="../ADM_jobs/src/uiProgress.ui" line="51"/>
         <source>Requant</source>
         <translation type="obsolete">Berkuant</translation>
     </message>
@@ -2608,7 +2332,6 @@
 <context>
     <name>EncoderYV12</name>
     <message>
-        <location filename="../ADM_jobs/src/uiProgress.ui" line="51"/>
         <source>YV12</source>
         <translation type="obsolete">YV12</translation>
     </message>
@@ -2616,17 +2339,14 @@
 <context>
     <name>EqualiserDialog</name>
     <message>
-        <location filename="../ADM_jobs/src/uiProgress.ui" line="51"/>
         <source>Equaliser</source>
         <translation type="obsolete">Ekualizagailua</translation>
     </message>
     <message>
-        <location filename="../ADM_jobs/src/uiProgress.ui" line="51"/>
         <source>Settings</source>
         <translation type="obsolete">Ezarpenak</translation>
     </message>
     <message>
-        <location filename="../ADM_jobs/src/uiProgress.ui" line="51"/>
         <source>Histogram</source>
         <translation type="obsolete">Historiagrama</translation>
     </message>
@@ -2634,22 +2354,18 @@
 <context>
     <name>FLV1Encoder</name>
     <message>
-        <location filename="../ADM_jobs/src/uiProgress.ui" line="51"/>
         <source>_Bitrate (kb/s):</source>
         <translation type="obsolete">_Bitneurria (kb/s):</translation>
     </message>
     <message>
-        <location filename="../ADM_jobs/src/uiProgress.ui" line="51"/>
         <source>_GOP size:</source>
         <translation type="obsolete">_GOP neurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_jobs/src/uiProgress.ui" line="51"/>
         <source>Settings</source>
         <translation type="obsolete">Ezarpenak</translation>
     </message>
     <message>
-        <location filename="../ADM_jobs/src/uiProgress.ui" line="51"/>
         <source>avcodec Sorenson Spark Configuration</source>
         <translation type="obsolete">avcodec Sorenson Spark Itxurapena</translation>
     </message>
@@ -2657,7 +2373,7 @@
 <context>
     <name>GUIPlayback</name>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
+        <location filename="../../common/gui_play.cpp" line="+410"/>
         <source>Trouble initializing audio device</source>
         <translation>Arazoak audio gailua abiarazterakoan</translation>
     </message>
@@ -2665,32 +2381,26 @@
 <context>
     <name>GenericAviSave</name>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Error initalizing audio filters</source>
         <translation type="obsolete">Akatsa audio iragazkiak abiarazterakoan</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Error initalizing video filters</source>
         <translation type="obsolete">Akatsa bideo iragazkiak abiarazterakoan</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>None</source>
         <translation type="obsolete">Ezer ez</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Copy</source>
         <translation type="obsolete">Kopiatu</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>AVI</source>
         <translation type="obsolete">AVI</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Cannot initiate save</source>
         <translation type="obsolete">Ezinezkoa gordetzea abiaraztea</translation>
     </message>
@@ -2698,12 +2408,10 @@
 <context>
     <name>GenericAviSaveCopy</name>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Cannot initiate save</source>
         <translation type="obsolete">Ezinezkoa gordetzea abiaraztea</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Saving</source>
         <translation type="obsolete">Gordetzen</translation>
     </message>
@@ -2711,12 +2419,10 @@
 <context>
     <name>GenericAviSaveCopyPack</name>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Cannot initiate save</source>
         <translation type="obsolete">Ezinezkoa gordetzea abiaraztea</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Saving</source>
         <translation type="obsolete">Gordetzen</translation>
     </message>
@@ -2724,12 +2430,10 @@
 <context>
     <name>GenericAviSaveCopyUnpack</name>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Cannot initiate save</source>
         <translation type="obsolete">Ezinezkoa gordetzea abiaraztea</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Saving</source>
         <translation type="obsolete">Gordetzen</translation>
     </message>
@@ -2737,39 +2441,32 @@
 <context>
     <name>GenericAviSaveProcess</name>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Width is not a multiple of 8
  continue anyway ?</source>
         <translation type="obsolete">Zabalera ez da 8-ren biderkagarria
  jarrraitu horrela ere?</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Reuse the existing log file?</source>
         <translation type="obsolete">Ukatu dagoen ohar agiria?</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Filter init failed</source>
         <translation type="obsolete">Hasiera Iragazki hutsegitea</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>1st Pass</source>
         <translation type="obsolete">1. Urratsa</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Aborting</source>
         <translation type="obsolete">Uzten</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Encoding</source>
         <translation type="obsolete">Kodeatzen</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>2nd Pass</source>
         <translation type="obsolete">2. Urratsa</translation>
     </message>
@@ -2777,7 +2474,6 @@
 <context>
     <name>GenericAviSaveSmart</name>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Smart Copy</source>
         <translation type="obsolete">Kopia Azkarra</translation>
     </message>
@@ -2785,42 +2481,34 @@
 <context>
     <name>GlyphEditorDialog</name>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Glyph Editor</source>
         <translation type="obsolete">Glyph Editatzailea</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Prev. Empty</source>
         <translation type="obsolete">Aurreikus. Hutsik</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Home</source>
         <translation type="obsolete">Etxea</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Next</source>
         <translation type="obsolete">Hurrengoa</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Find</source>
         <translation type="obsolete">Bilatu</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Previous</source>
         <translation type="obsolete">Aurrekoa</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Next Empty</source>
         <translation type="obsolete">Hurrengo Hutsik</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Delete</source>
         <translation type="obsolete">Ezabatu</translation>
     </message>
@@ -2828,32 +2516,26 @@
 <context>
     <name>GlyphEditorWindow</name>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Head reached</source>
         <translation type="obsolete">Burua bilatuta</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>No more glyphs</source>
         <translation type="obsolete">Ez glyphs gehiago</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>End reached</source>
         <translation type="obsolete">Amaiera bilatuta</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>String</source>
         <translation type="obsolete">Katea</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Search string</source>
         <translation type="obsolete">Bilatu katea</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Select GlyphFile to edit</source>
         <translation type="obsolete">Hautatu Glyph-Agiria editatzeko</translation>
     </message>
@@ -2861,147 +2543,118 @@
 <context>
     <name>H263Encoder</name>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>None</source>
         <translation type="obsolete">Ezer ez</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Full</source>
         <translation type="obsolete">Osoa</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Log</source>
         <translation type="obsolete">Ohar</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Phods</source>
         <translation type="obsolete">Phodak</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>EPZS</source>
         <translation type="obsolete">EPZS</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>H.263</source>
         <translation type="obsolete">H.263</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>MPEG</source>
         <translation type="obsolete">MPEG</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Sum of Absolute Differences</source>
         <translation type="obsolete">Ezberdintasun Osoen Gehiketa</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Fewest Bits</source>
         <translation type="obsolete">Gutxiengo Bit</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Rate Distortion</source>
         <translation type="obsolete">Neurri Bihurdura</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Encoding Mode</source>
         <translation type="obsolete">Kodeaketa Modua</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Motion Estimation Method:</source>
         <translation type="obsolete">Mugimendu Estimazio Metodoa:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>_Maximum Consecutive B-frames:</source>
         <translation type="obsolete">_Gehienezko B-frame Jarraian:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>4 _Motion Vector</source>
         <translation type="obsolete">4 _Mugimendu Bektorea</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>_Quarter Pixel</source>
         <translation type="obsolete">_Eremu Pixel</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>_Global Motion Compensation</source>
         <translation type="obsolete">_Mugimendu Orekapen Orokorra</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Motion Estimation</source>
         <translation type="obsolete">Mugimendi Estimazioa</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>_Quantisation Type:</source>
         <translation type="obsolete">_Kuantizazioa Mota:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>_Macroblock Decision Mode:</source>
         <translation type="obsolete">_Makrobloke Erabaki Modua:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Mi_nimum Quantiser:</source>
         <translation type="obsolete">Gut_xienezko Kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Ma_ximum Quantiser:</source>
         <translation type="obsolete">Gehi_enezko Kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Maximum Quantiser _Difference:</source>
         <translation type="obsolete">Gehienezko Kuantizatzaile _Aldea:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>_Quantiser Compression:</source>
         <translation type="obsolete">_Kuantizatzaile Konpresioa:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Quantiser _Blur:</source>
         <translation type="obsolete">_Blur Kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>_Trellis Quantisation</source>
         <translation type="obsolete">_Trellis Kuantizazioa</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Quantisation</source>
         <translation type="obsolete">Kuantizazioa</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>avcodec H.263 Configuration</source>
         <translation type="obsolete">avkodek H.263 Itxurapena</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>The H.263 encoder only accepts the following resolutions:</source>
         <translation type="obsolete">H.263 kodeatzaileak hurrengo bereizmenak bakarrik onartzen ditu:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Incompatible settings</source>
         <translation type="obsolete">Ezarpen bateraezinak</translation>
     </message>
@@ -3009,27 +2662,22 @@
 <context>
     <name>IndexDialog</name>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Indexing</source>
         <translation type="obsolete">Aurkibidetzen</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Time Left:</source>
         <translation type="obsolete">Gelditzen den Denbora:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>%1:%2:%3</source>
         <translation type="obsolete">%1:%2:%3</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source># Images: %1</source>
         <translation type="obsolete">Irudi zenb.: %1</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
         <source>Time Left: %1:%2:%3</source>
         <translation type="obsolete">Gelditzen den Denbora: %1:%2:%3</translation>
     </message>
@@ -3037,12 +2685,13 @@
 <context>
     <name>MP4Header</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="623"/>
+        <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>Arazoak SVQ3 idazburuak irakurtzean</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="343"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="+343"/>
         <source>No stts table</source>
         <translation>Ez dago stts taularik</translation>
     </message>
@@ -3050,32 +2699,26 @@
 <context>
     <name>MPDelogoDialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="343"/>
         <source>MPlayer Delogo</source>
         <translation type="obsolete">MPlayer Delogoa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="343"/>
         <source>Band:</source>
         <translation type="obsolete">Banda:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="343"/>
         <source>Height:</source>
         <translation type="obsolete">Garaiera:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="343"/>
         <source>Width:</source>
         <translation type="obsolete">Zabalera:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="343"/>
         <source>Y:</source>
         <translation type="obsolete">Y:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="343"/>
         <source>X:</source>
         <translation type="obsolete">X:</translation>
     </message>
@@ -3083,1012 +2726,911 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="15"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+15"/>
         <source>Avidemux</source>
         <translation>Avidemux</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="15"/>
         <source>&lt;b&gt;Video&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Bideoa&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="590"/>
+        <location line="+417"/>
+        <location line="+151"/>
         <source>Copy</source>
         <translation>Kopiatu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="779"/>
+        <location line="-258"/>
+        <location line="+124"/>
+        <location line="+151"/>
+        <location line="+172"/>
         <source>Configure</source>
         <translation>Itxuratu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="169"/>
+        <location line="-603"/>
         <source>&amp;Recent</source>
         <translation>Az&amp;kenak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="228"/>
+        <location line="+41"/>
         <source>Codec Options</source>
         <translation>Kodek Aukerak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="261"/>
+        <location line="+33"/>
         <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
         <translation>&lt;b&gt;Bideo Dekodeatzailea&lt;b&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="316"/>
+        <location line="+57"/>
+        <location line="+7"/>
         <source>XXXX</source>
         <translation>XXXX</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="371"/>
+        <location line="+57"/>
         <source>&lt;b&gt;Video Output&lt;/b&gt;</source>
         <translation>&lt;b&gt;Bideo Irteera&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="623"/>
+        <location line="+101"/>
+        <location line="+151"/>
         <source>Filters</source>
         <translation>Iragazkiak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="623"/>
         <source>&lt;b&gt;Audio&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Audioa&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="641"/>
+        <location line="+18"/>
         <source>&amp;Shift:</source>
         <translation>&amp;Shift:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="673"/>
+        <location line="+32"/>
         <source>ms</source>
         <translation>sm</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="673"/>
         <source>&lt;b&gt;Format&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Heuskarria&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1464"/>
+        <location line="+215"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <location line="+334"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1464"/>
         <source>Frame:</source>
         <translation type="obsolete">Frame:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1464"/>
         <source>0</source>
         <translation type="obsolete">0</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1464"/>
         <source>/ 0</source>
         <translation type="obsolete">/ 0</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1170"/>
+        <location line="-288"/>
         <source>Time:</source>
         <translation>Denbora:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1189"/>
+        <location line="+19"/>
         <source>00:00:00.000</source>
         <translation>00:00:00.000</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1208"/>
+        <location line="+19"/>
         <source>/ 00:00:00.000</source>
         <translation>/ 00:00:00.000</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1208"/>
         <source>Frame Type:</source>
         <translation type="obsolete">Frame Mota:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1250"/>
+        <location line="+42"/>
         <source>?</source>
         <translation>?</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1294"/>
+        <location line="+44"/>
         <source>Selection</source>
         <translation>Hautapena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1390"/>
+        <location line="+73"/>
         <source>A:</source>
         <translation>A:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1411"/>
+        <location line="+14"/>
+        <location line="+7"/>
         <source>000000</source>
         <translation>000000</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1397"/>
+        <location line="-14"/>
         <source>B:</source>
         <translation>B:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="113"/>
+        <location line="-1238"/>
         <source>Vi&amp;deo</source>
         <translation>&amp;Bideoa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="127"/>
+        <location line="+14"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Tresnabarrak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="139"/>
+        <location line="+12"/>
         <source>&amp;Auto</source>
         <translation>&amp;Berez</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="159"/>
+        <location line="+20"/>
         <source>&amp;Audio</source>
         <translation>A&amp;udioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="118"/>
+        <location line="-41"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editatu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="123"/>
+        <location line="+5"/>
         <source>&amp;View</source>
         <translation>&amp;Ikusi</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="123"/>
         <source>&amp;Preview Mode</source>
         <translation type="obsolete">A&amp;urreikuspen Modua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="144"/>
+        <location line="+21"/>
         <source>&amp;Custom</source>
         <translation>&amp;Norbererara</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="149"/>
+        <location line="+5"/>
         <source>&amp;Go</source>
         <translation>&amp;Joan</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="164"/>
+        <location line="+15"/>
         <source>&amp;File</source>
         <translation>&amp;Agiria</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="164"/>
         <source>&amp;Recent Files</source>
         <translation type="obsolete">A&amp;zken Agiriak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="164"/>
         <source>&amp;Save</source>
         <translation type="obsolete">&amp;Gorde</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="164"/>
         <source>Recent Projects</source>
         <translation type="obsolete">Azken Egitasmoak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="108"/>
+        <location line="-56"/>
         <source>&amp;Help</source>
         <translation>&amp;Laguntza</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="108"/>
         <source>A&amp;uto</source>
         <translation type="obsolete">Be&amp;rez</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="154"/>
+        <location line="+46"/>
         <source>&amp;Tools</source>
         <translation>&amp;Tresnak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="529"/>
+        <location line="+368"/>
         <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
         <translation>&lt;b&gt;Audio Irteera&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="539"/>
+        <location line="+10"/>
         <source>   (0 track(s))</source>
         <translation>   (0 bide)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="708"/>
+        <location line="+169"/>
         <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
         <translation>&lt;b&gt;Irteera Heuskarria&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="822"/>
+        <location line="+114"/>
         <source>Navigation</source>
         <translation>Nabigazioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1237"/>
+        <location line="+399"/>
         <source>Frame type:</source>
         <translation>Frame mota:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1362"/>
         <source>&lt;b&gt;Selection&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Hautapena&lt;/b&gt;</translation>
+        <translation type="vanished">&lt;b&gt;Hautapena&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1436"/>
+        <location line="+193"/>
         <source>Volume</source>
         <translation>Bolumena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1536"/>
+        <location line="+100"/>
         <source>Audio Metre</source>
         <translation>Audio Neurgailua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1577"/>
+        <location line="+41"/>
         <source>&amp;Open...</source>
         <translation>&amp;Ireki...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1577"/>
         <source>Ctrl+O</source>
         <translation type="obsolete">Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1577"/>
         <source>&amp;Append...</source>
         <translation type="obsolete">G&amp;ehitu...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1577"/>
         <source>Ctrl+Alt+A</source>
         <translation type="obsolete">Ctrl+Alt+A</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1577"/>
         <source>E&amp;xit</source>
         <translation type="obsolete">I&amp;rten</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1577"/>
         <source>Cu&amp;t</source>
         <translation type="obsolete">&amp;Ebaki</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1577"/>
         <source>Ctrl+X</source>
         <translation type="obsolete">Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1577"/>
         <source>&amp;Copy</source>
         <translation type="obsolete">&amp;Kopiatu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1577"/>
         <source>Ctrl+C</source>
         <translation type="obsolete">Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1577"/>
         <source>&amp;Paste</source>
         <translation type="obsolete">It&amp;satsi</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1577"/>
         <source>Ctrl+V</source>
         <translation type="obsolete">Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1577"/>
         <source>&amp;Delete</source>
         <translation type="obsolete">E&amp;zabatu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1577"/>
         <source>Del</source>
         <translation type="obsolete">Del</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1577"/>
         <source>Set Marker A</source>
         <translation type="obsolete">Ezarri A Markatzailea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1577"/>
         <source></source>
         <translation type="obsolete"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1577"/>
         <source>Set Marker B</source>
         <translation type="obsolete">Ezarri B Markatzailea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1577"/>
         <source></source>
         <translation type="obsolete"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1586"/>
+        <location line="+12"/>
         <source>&amp;Information...</source>
         <translation>&amp;Argibideak...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1589"/>
+        <location line="+3"/>
         <source>Alt+Return</source>
         <translation>Alt+Sartu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1598"/>
+        <location line="+9"/>
         <source>Save &amp;Video...</source>
         <translation>Gorde &amp;Bideoa...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1604"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>Save Video</source>
         <translation>Gorde Bideoa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1604"/>
         <source>Ctrl+S</source>
         <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1604"/>
         <source>Save &amp;BMP Image...</source>
         <translation type="obsolete">Gorde B&amp;MP Irudia...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1604"/>
         <source>Save BMP Image</source>
         <translation type="obsolete">Gorde BMP Irudia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1604"/>
         <source>Save &amp;JPEG Image...</source>
         <translation type="obsolete">Gorde &amp;JPEG Irudia...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1604"/>
         <source>Save JPEG Image</source>
         <translation type="obsolete">Gorde JPEG Irudia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1613"/>
+        <location line="+9"/>
         <source>&amp;Load/Run Project...</source>
         <translation>Gertatu/Ekin Egitas&amp;moa...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1619"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>Load/Run Project</source>
         <translation>Gertatu/Ekin Egitasmoa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1628"/>
+        <location line="+9"/>
         <source>Save &amp;Project</source>
         <translation>Gorde Egi&amp;tasmoa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
+        <location line="+3"/>
+        <location line="+3"/>
         <source>Save Project</source>
         <translation>Gorde Egitasmoa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>Save P&amp;roject As...</source>
         <translation type="obsolete">Gorde Egita&amp;smoa Honela...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>Save Project As</source>
         <translation type="obsolete">Gorde Egitasmoa Honela</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>&amp;Zoom 1:4</source>
         <translation type="obsolete">&amp;Zooma 1:4</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>Ctrl+Shift+4</source>
         <translation type="obsolete">Ctrl+Shift+4</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>Z&amp;oom 1:2</source>
         <translation type="obsolete">Z&amp;ooma 1:2</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>Ctrl+Shift+2</source>
         <translation type="obsolete">Ctrl+Shift+2</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>Zoom &amp;1:1</source>
         <translation type="obsolete">Zooma &amp;1:1</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>Ctrl+Alt+1</source>
         <translation type="obsolete">Ctrl+Alt+1</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>Zoom &amp;2:1</source>
         <translation type="obsolete">Zooma &amp;2:1</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>Ctrl+Alt+2</source>
         <translation type="obsolete">Ctrl+Alt+2</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>&amp;Decoder Options...</source>
         <translation type="obsolete">&amp;Dekodeaketa Aukerak...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>Decoder Options</source>
         <translation type="obsolete">Dekodeaketa Aukerak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>F3</source>
         <translation type="obsolete">F3</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>&amp;Postprocessing...</source>
         <translation type="obsolete">&amp;Prozesatze-ondorengoan...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>F4</source>
         <translation type="obsolete">F4</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>&amp;Frame Rate...</source>
         <translation type="obsolete">&amp;Frame Neurria...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>Frame Rate</source>
         <translation type="obsolete">Frame Neurria</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>Fil&amp;ters...</source>
         <translation type="obsolete">&amp;Iragazkiak...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>Ctrl+Alt+F</source>
         <translation type="obsolete">Ctrl+Alt+F</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>&amp;Main Track...</source>
         <translation type="obsolete">&amp;Bide Nagusia...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>&amp;Secondary Track...</source>
         <translation type="obsolete">Biga&amp;rren Bidea...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>Build VBR Time Map</source>
         <translation type="obsolete">Eraiki VBR Denbora Mapa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
         <source>S&amp;ave...</source>
         <translation type="obsolete">G&amp;orde...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1715"/>
+        <location line="+81"/>
         <source>Ctrl+Alt+S</source>
         <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1715"/>
         <source>&amp;Filters</source>
         <translation type="obsolete">&amp;Iragazkiak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1643"/>
+        <location line="-72"/>
         <source>&amp;Calculator...</source>
         <translation>&amp;Kalkulagailua...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
+        <location line="+3"/>
         <source>F7</source>
         <translation>F7</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>&amp;Rebuild I &amp;&amp; B Frames</source>
         <translation type="obsolete">&amp;Birreraiki I &amp;&amp; B Frameak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Rebuild I &amp; B Frames</source>
         <translation type="obsolete">Birreraiki I &amp; B Frameak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>&amp;Bitrate Histogram...</source>
         <translation type="obsolete">Bi&amp;tneurri Historiagrama...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Bitrate Histogram</source>
         <translation type="obsolete">Bitneurri Historiagrama</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>&amp;Scan for Black Frames...</source>
         <translation type="obsolete">&amp;Mihatu Frame Beltzen bila...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Scan for Black Frames</source>
         <translation type="obsolete">Mihatu Frame Beltzen bila</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>&amp;VOB -&gt; VobSub...</source>
         <translation type="obsolete">&amp;VOB -&gt; VobSub...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>VOB -&gt; VobSub</source>
         <translation type="obsolete">VOB -&gt; VobSub</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>&amp;OCR (VobSub -&gt; srt)...</source>
         <translation type="obsolete">&amp;OCR (VobSub -&gt; srt)...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>OCR (VobSub -&gt; srt)</source>
         <translation type="obsolete">OCR (VobSub -&gt; srt)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>P&amp;revious Frame</source>
         <translation type="obsolete">A&amp;urreko Framea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Left</source>
         <translation type="obsolete">Ezker</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>&amp;Next Frame</source>
         <translation type="obsolete">&amp;Hurrengo Framea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Right</source>
         <translation type="obsolete">Eskuin</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Pr&amp;evious Intra Frame</source>
         <translation type="obsolete">Au&amp;rreko Intra Framea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Previous Intra Frame</source>
         <translation type="obsolete">Aurreko Intra Framea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Down</source>
         <translation type="obsolete">Behera</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Next &amp;Intra Frame</source>
         <translation type="obsolete">Hurrengo In&amp;tra Framea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Next Intra Frame</source>
         <translation type="obsolete">Hurrengo Intra Framea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Up</source>
         <translation type="obsolete">Gora</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Previou&amp;s Black Frame</source>
         <translation type="obsolete">Aurreko Frame Belt&amp;za</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Previous Black Frame</source>
         <translation type="obsolete">Aurreko Frame Beltza</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Ne&amp;xt Black Frame</source>
         <translation type="obsolete">Hurren&amp;go Frame Beltza</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Next Black Frame</source>
         <translation type="obsolete">Hurrengo Frame Beltza</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>&amp;First Frame</source>
         <translation type="obsolete">&amp;Lehen Framea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Home</source>
         <translation type="obsolete">Etxea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>&amp;Last Frame</source>
         <translation type="obsolete">&amp;Azken Framea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>End</source>
         <translation type="obsolete">Amaiera</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Jump to Marker &amp;A</source>
         <translation type="obsolete">Jauzi &amp;A Markatzailera</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Jump to Marker A</source>
         <translation type="obsolete">Jauzi A Markatzailera</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Ctrl+</source>
         <translation type="obsolete">Ctrl+</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Jump to Marker &amp;B</source>
         <translation type="obsolete">Jauzi &amp;B Markatzailera</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Jump to Marker B</source>
         <translation type="obsolete">Jauzi B Markatzailera</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Ctrl+</source>
         <translation type="obsolete">Ctrl+</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Jump to Fra&amp;me...</source>
         <translation type="obsolete">Jauzi &amp;Framera...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Ctrl+F</source>
         <translation type="obsolete">Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Jump to &amp;Time...</source>
         <translation type="obsolete">Jauzi &amp;Denborara...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Ctrl+T</source>
         <translation type="obsolete">Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>&amp;Built-in Support...</source>
         <translation type="obsolete">E&amp;raiketa Sostengatua...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Built-in Support</source>
         <translation type="obsolete">Eraiketa Sostengua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>&amp;About Avidemux...</source>
         <translation type="obsolete">&amp;Avidemuxi buruz...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>About Avidemux</source>
         <translation type="obsolete">Avidemuxi buruz</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>&amp;Play/Stop</source>
         <translation type="obsolete">&amp;Irakurri/Gelditu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Play/Stop</source>
         <translation type="obsolete">Irakurri/Gelditu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>P</source>
         <translation type="obsolete">P</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Recent0</source>
         <translation type="obsolete">Berrikiko 0</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Recent1</source>
         <translation type="obsolete">Berrikiko 1</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Recent2</source>
         <translation type="obsolete">Berrikiko 2</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Recent3</source>
         <translation type="obsolete">Berrikiko 3</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Add to &amp;Joblist...</source>
         <translation type="obsolete">Gehitu &amp;Lan-zerrendara...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Add to Joblist</source>
         <translation type="obsolete">Gehitu Lan-zerrendara</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>View &amp;Joblist...</source>
         <translation type="obsolete">I&amp;kusi Lan-zerrenda...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>View Joblist</source>
         <translation type="obsolete">Ikusi Lan-zerrenda</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Ctrl+J</source>
         <translation type="obsolete">Ctrl+J</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Co&amp;nnect to avsproxy</source>
         <translation type="obsolete">Elkarketatu avsprox&amp;yra</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Connect to avsproxy</source>
         <translation type="obsolete">Elkarketatu avsproxyra</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>&amp;Reset Edits</source>
         <translation type="obsolete">&amp;Berrezarri Editatuak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>OCR (&amp;TS -&gt; srt)...</source>
         <translation type="obsolete">O&amp;CR (TS -&gt; srt)...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>OCR (TS -&gt; srt)</source>
         <translation type="obsolete">OCR (TS -&gt; srt)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Edit &amp;Glyphs...</source>
         <translation type="obsolete">Editatu &amp;Glyphs...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
         <source>Edit Glyphs</source>
         <translation type="obsolete">Editatu Glyphs</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1661"/>
+        <location line="+15"/>
         <source>&amp;Input</source>
         <translation>&amp;Sarrera</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1673"/>
+        <location line="+12"/>
         <source>&amp;Output</source>
         <translation>&amp;Irteera</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1684"/>
+        <location line="+11"/>
         <source>&amp;Codec Options</source>
         <translation>&amp;Kodek Aukerak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1687"/>
+        <location line="+3"/>
         <source>Ctrl+Alt+C</source>
         <translation>Ctrl+Alt+C</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1698"/>
+        <location line="+11"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Nabigazioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1701"/>
+        <location line="+3"/>
         <source>Ctrl+Alt+N</source>
         <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1712"/>
+        <location line="+11"/>
         <source>&amp;Selection</source>
         <translation>&amp;Hautapena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1726"/>
+        <location line="+14"/>
         <source>&amp;Volume</source>
         <translation>&amp;Bolumena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1729"/>
+        <location line="+3"/>
         <source>Ctrl+Alt+V</source>
         <translation>Ctrl+Alt+V</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1740"/>
+        <location line="+11"/>
         <source>&amp;Audio Metre</source>
         <translation>A&amp;udio Neurgailua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1743"/>
+        <location line="+3"/>
         <source>Ctrl+Alt+M</source>
         <translation>Ctrl+Alt+M</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1779"/>
+        <location line="+36"/>
         <source>Si&amp;de</source>
         <translation>A&amp;ldea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1767"/>
+        <location line="-12"/>
         <source>&amp;Top</source>
         <translation>&amp;Goian</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
+        <location line="-369"/>
+        <source>Display processed video on playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Play filtered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+169"/>
+        <source>Open Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+178"/>
         <source>&amp;Separate</source>
         <translation>&amp;Bananduta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>&amp;Close</source>
         <translation type="obsolete">It&amp;xi</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Ctrl+W</source>
         <translation type="obsolete">Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Save Selection as JPEG Images...</source>
         <translation type="obsolete">Gorde Hautapena JPEG irudiak bezala...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>&amp;Preferences...</source>
         <translation type="obsolete">&amp;Hobespenak...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>P&amp;lugins...</source>
         <translation type="obsolete">&amp;Pluginak...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Recent4</source>
         <translation type="obsolete">Berrikiko 4</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Recent5</source>
         <translation type="obsolete">Berrikiko 5</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>RecentProject0</source>
         <translation type="obsolete">Azken Egitasmoak 0</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>RecentProject1</source>
         <translation type="obsolete">Azken Egitasmoak 1</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>RecentProject2</source>
         <translation type="obsolete">Azken Egitasmoak 2</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>RecentProject3</source>
         <translation type="obsolete">Azken Egitasmoak 3</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>RecentProject4</source>
         <translation type="obsolete">Azken Egitasmoak 4</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>RecentProject5</source>
         <translation type="obsolete">Azken Egitasmoak 5</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>&amp;Plugin Manager...</source>
         <translation type="obsolete">Plugin &amp;Kudeatzailea...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>%1 (%2)</source>
         <translation type="obsolete">%1 (%2)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Optical Disc</source>
         <translation type="obsolete">Diska Optikoa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>DVD</source>
         <translation type="obsolete">DVD</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Super Video CD</source>
         <translation type="obsolete">Super Video CD-a</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Video CD</source>
         <translation type="obsolete">Bideo CD-a</translation>
     </message>
@@ -4096,17 +3638,14 @@
 <context>
     <name>MjpegEncoder</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Quantiser:</source>
         <translation type="obsolete">_Kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Settings</source>
         <translation type="obsolete">Ezarpenak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>avcodec M-JPEG Configuration</source>
         <translation type="obsolete">avkodek M-JPEG Itxurapena</translation>
     </message>
@@ -4114,107 +3653,86 @@
 <context>
     <name>Mpeg1Encoder</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>4:3</source>
         <translation type="obsolete">4:3</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>16:9</source>
         <translation type="obsolete">16:9</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Default</source>
         <translation type="obsolete">Berezkoa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>TMPGEnc</source>
         <translation type="obsolete">TMPGEnc</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Anime</source>
         <translation type="obsolete">Animazioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>KVCD</source>
         <translation type="obsolete">KVCD</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Progressive</source>
         <translation type="obsolete">Aurrerakoia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Interlaced BFF</source>
         <translation type="obsolete">BFF Elkarlotuta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Interlaced TFF</source>
         <translation type="obsolete">TFF Elkarlotuta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Ma_x. bitrate:</source>
         <translation type="obsolete">Ge_h. bitneurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Mi_n. bitrate:</source>
         <translation type="obsolete">Gu_tx. bitneurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Use Xvid rate control</source>
         <translation type="obsolete">_Erabili Xvid neurri agintea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Buffer size:</source>
         <translation type="obsolete">_Buffer neurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Aspect _ratio:</source>
         <translation type="obsolete">Ikuspegi _maila:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Matrices:</source>
         <translation type="obsolete">_Matrizak:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_GOP size:</source>
         <translation type="obsolete">_GOP neurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Interlacing:</source>
         <translation type="obsolete">_Elkarlotura:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Settings</source>
         <translation type="obsolete">Ezarpenak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>avcodec MPEG-1 Configuration</source>
         <translation type="obsolete">avkodek MPEG-1 Itxurapena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>New sequence every (MB):</source>
         <translation type="obsolete">_Frame neurri berria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>mpeg2enc Configuration</source>
         <translation type="obsolete">mpeg2enc Itxurapena</translation>
     </message>
@@ -4222,122 +3740,98 @@
 <context>
     <name>Mpeg2Encoder</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>4:3</source>
         <translation type="obsolete">4:3</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>16:9</source>
         <translation type="obsolete">16:9</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Default</source>
         <translation type="obsolete">Berezkoa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>TMPGEnc</source>
         <translation type="obsolete">TMPGEnc</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Anime</source>
         <translation type="obsolete">Animazioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>KVCD</source>
         <translation type="obsolete">KVCD</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Progressive</source>
         <translation type="obsolete">Aurrerakoia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Interlaced BFF</source>
         <translation type="obsolete">BFF Elkarlotuta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Interlaced TFF</source>
         <translation type="obsolete">TFF Elkarlotuta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Ma_x. bitrate:</source>
         <translation type="obsolete">Ge_h. bitneurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Mi_n. bitrate:</source>
         <translation type="obsolete">Gu_tx. bitneurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Use Xvid rate control</source>
         <translation type="obsolete">_Erabili Xvid neurri agintea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Buffer size:</source>
         <translation type="obsolete">_Buffer neurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Aspect _ratio:</source>
         <translation type="obsolete">Ikuspegi _maila:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Matrices:</source>
         <translation type="obsolete">_Matrizak:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_GOP size:</source>
         <translation type="obsolete">_GOP neurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Interlacing:</source>
         <translation type="obsolete">_Elkarlotuz:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Settings</source>
         <translation type="obsolete">Ezarpenak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>avcodec MPEG-2 Configuration</source>
         <translation type="obsolete">avkodek MPEG-2 Itxurapena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>DVD</source>
         <translation type="obsolete">DVD</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Super Video CD</source>
         <translation type="obsolete">Super Video CD-a</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>New sequence every (MB):</source>
         <translation type="obsolete">Sekuentzia berria (MB):</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Stream _type:</source>
         <translation type="obsolete">Jario _mota:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>mpeg2enc Configuration</source>
         <translation type="obsolete">mpeg2enc Itxurapena</translation>
     </message>
@@ -4345,137 +3839,110 @@
 <context>
     <name>Mpeg4aspEncoder</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>None</source>
         <translation type="obsolete">Ezer ez</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Full</source>
         <translation type="obsolete">Osoa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Log</source>
         <translation type="obsolete">Ohar</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Phods</source>
         <translation type="obsolete">Phodak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>EPZS</source>
         <translation type="obsolete">EPZS</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>H.263</source>
         <translation type="obsolete">H.263</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>MPEG</source>
         <translation type="obsolete">MPEG</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Sum of Absolute Differences</source>
         <translation type="obsolete">Ezberdintasun Osoen Gehiketa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Fewest Bits</source>
         <translation type="obsolete">Gutxiengo Bit</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Rate Distortion</source>
         <translation type="obsolete">Neurri Bihurdura</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Encoding Mode</source>
         <translation type="obsolete">Kodeaketa modua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Motion Estimation Method:</source>
         <translation type="obsolete">Mugimendu Estimazio Metodoa:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Maximum Consecutive B-frames:</source>
         <translation type="obsolete">Gehienezko B-frame Jarraian:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>4 _Motion Vector</source>
         <translation type="obsolete">4 _Mugimendu Bektorea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Quarter Pixel</source>
         <translation type="obsolete">_Eremu Pixel</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Global Motion Compensation</source>
         <translation type="obsolete">_Mugimendu Orekapen Orokorra</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Motion Estimation</source>
         <translation type="obsolete">Mugimendi Estimazioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Quantisation Type:</source>
         <translation type="obsolete">_Kuantizazioa Mota:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Macroblock Decision Mode:</source>
         <translation type="obsolete">_Makrobloke Erabaki Modua:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Mi_nimum Quantiser:</source>
         <translation type="obsolete">Gut_xieneko Kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Ma_ximum Quantiser:</source>
         <translation type="obsolete">Gehi_enezko Kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Maximum Quantiser _Difference:</source>
         <translation type="obsolete">Gehienezko Kuantizatzaile _Aldea:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Quantiser Compression:</source>
         <translation type="obsolete">_Kuantizatzaile Konpresioa:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Quantiser _Blur:</source>
         <translation type="obsolete">_Blur Kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Trellis Quantisation</source>
         <translation type="obsolete">_Trellis Kuantizazioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Quantisation</source>
         <translation type="obsolete">Kuantizazioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>avcodec H.263 Configuration</source>
         <translation type="obsolete">avkodek H.263 Itxurapena</translation>
     </message>
@@ -4483,17 +3950,14 @@
 <context>
     <name>MpegMuxer</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Incompatible audio</source>
         <translation type="obsolete">Audio bateraezina</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>For DVD, audio must be MP2 or AC3.</source>
         <translation type="obsolete">DVD-rako, audioa MP2 edo AC3 izan behar da.</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>lvemux init failed</source>
         <translation type="obsolete">|vemux has hutsegitea</translation>
     </message>
@@ -4501,27 +3965,22 @@
 <context>
     <name>Msharpen</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Mask</source>
         <translation type="obsolete">_Mozorroa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_High Q</source>
         <translation type="obsolete">_Ontasun Handia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Threshold:</source>
         <translation type="obsolete">Muga:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Strength:</source>
         <translation type="obsolete">_Indartsua:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>MSharpen</source>
         <translation type="obsolete">M Zorrotza</translation>
     </message>
@@ -4529,27 +3988,22 @@
 <context>
     <name>Msmooth</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_High quality</source>
         <translation type="obsolete">_Ontasun handia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>Show _mask</source>
         <translation type="obsolete">Erakutsi _mozorroa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Threshold:</source>
         <translation type="obsolete">_Muga:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>_Strength:</source>
         <translation type="obsolete">_Indartsua:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
         <source>MSmooth</source>
         <translation type="obsolete">M Lehuna</translation>
     </message>
@@ -4557,17 +4011,18 @@
 <context>
     <name>OpenDMLHeader</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="656"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location line="+76"/>
+        <location line="+264"/>
         <source>Malformed header</source>
         <translation>Idazburu gaizkieratua</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="89"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+89"/>
         <source>Unpacking bitstream</source>
         <translation>Bitjarioa despaketatzen</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="89"/>
         <source>Indexing</source>
         <translation type="obsolete">Aurkibidetzen</translation>
     </message>
@@ -4575,27 +4030,23 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="89"/>
         <source>Alert</source>
         <translation type="obsolete">Alerta</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="89"/>
         <source>Info</source>
         <translation type="obsolete">Argibideak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="89"/>
         <source>Confirmation</source>
         <translation type="obsolete">Baieztapena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="191"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+7"/>
         <source>Question</source>
         <translation>Galdera</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="191"/>
         <source>Question?</source>
         <translation type="obsolete">Galdera?</translation>
     </message>
@@ -4603,12 +4054,10 @@
 <context>
     <name>Sony PlayStation Portable</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="191"/>
         <source>A video file must be open to use this Auto Wizard.</source>
         <translation type="obsolete">Bideo agiria ireki behar da Berez Laguntzaile hau erabiltzeko.</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="191"/>
         <source>Sony PSP Auto Wizard</source>
         <translation type="obsolete">Sony PSP Berez Laguntzailea</translation>
     </message>
@@ -4616,22 +4065,22 @@
 <context>
     <name>SpiderMonkeyShell</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="17"/>
+        <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="+17"/>
         <source>Shell</source>
         <translation>Shell</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="49"/>
+        <location line="+32"/>
         <source>Clear</source>
         <translation>Garbitu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="89"/>
+        <location line="+40"/>
         <source>Evaluate</source>
         <translation>Aztertu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="92"/>
+        <location line="+3"/>
         <source>Ctrl+Return</source>
         <translation>Ctrl+Sartu</translation>
     </message>
@@ -4639,12 +4088,10 @@
 <context>
     <name>Super Video CD</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="92"/>
         <source>A video file must be open to use this Auto Wizard.</source>
         <translation type="obsolete">Bideo agiria ireki behar da Berez Laguntzaile hau erabiltzeko.</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="92"/>
         <source>Super Video CD Auto Wizard</source>
         <translation type="obsolete">Super Video CD Berez Laguntzailea</translation>
     </message>
@@ -4652,142 +4099,142 @@
 <context>
     <name>Telecide</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="+185"/>
         <source>No strategy</source>
         <translation>Ez estrategia</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="187"/>
+        <location line="+1"/>
         <source>3:2 pulldown</source>
         <translation>3:2 hedagarria</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="188"/>
+        <location line="+1"/>
         <source>PAL/SECAM</source>
         <translation>PAL/SECAM</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="189"/>
+        <location line="+1"/>
         <source>NTSC converted from PAL</source>
         <translation>NTSC bihurtuta PAL-etik</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="193"/>
+        <location line="+4"/>
         <source>Top</source>
         <translation>Goren</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="194"/>
+        <location line="+1"/>
         <source>Bottom</source>
         <translation>Beheren</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="198"/>
+        <location line="+4"/>
         <source>Never</source>
         <translation>Inoiz ez</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="199"/>
+        <location line="+1"/>
         <source>If still combed</source>
         <translation>Ezorraztuta bada</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="200"/>
+        <location line="+1"/>
         <source>Always</source>
         <translation>Betik</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="204"/>
+        <location line="+4"/>
         <source>None</source>
         <translation>Ezer ez</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="205"/>
+        <location line="+1"/>
         <source>None but compute</source>
         <translation>Ezer ez konputatzeko</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="206"/>
+        <location line="+1"/>
         <source>Postproc on best match</source>
         <translation>Prozes.-ondorengoa maila hoberenean</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="207"/>
+        <location line="+1"/>
         <source>Postproc and show zones (debug)</source>
         <translation>Prozes.-ondorengoa eta eremu erakuspena (garbiketa)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="208"/>
+        <location line="+1"/>
         <source>Process image (not fields)</source>
         <translation>Prozesatu irudia (eremuak ez)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="209"/>
+        <location line="+1"/>
         <source>Process image (not fields), debug</source>
         <translation>Prozesatu irudia (eremuak ez), garbiketa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="213"/>
+        <location line="+4"/>
         <source>_Strategy:</source>
         <translation>_Estrategia:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="214"/>
+        <location line="+1"/>
         <source>_Field order:</source>
         <translation>_Eremu ordena:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="215"/>
+        <location line="+1"/>
         <source>_Postprocessing:</source>
         <translation>_Prozes.-ondorengoa:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="216"/>
+        <location line="+1"/>
         <source>_Try backward:</source>
         <translation>_Saiatu atzeraka:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="218"/>
+        <location line="+2"/>
         <source>_Direct threshold:</source>
         <translation>_Zuzeneko muga:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="219"/>
+        <location line="+1"/>
         <source>_Backward threshold:</source>
         <translation>_Atzeraka muga:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="220"/>
+        <location line="+1"/>
         <source>_Noise threshold:</source>
         <translation>_Zarata muga:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="221"/>
+        <location line="+1"/>
         <source>Postp_rocessing threshold:</source>
         <translation>P_rozesatze-ondorengo muga:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="223"/>
+        <location line="+2"/>
         <source>_Use chroma to decide</source>
         <translation>_Erabili margotasuna erabakitzeko</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="224"/>
+        <location line="+1"/>
         <source>Sho_w info</source>
         <translation>Erak_utsi argibideak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="225"/>
+        <location line="+1"/>
         <source>Debu_g</source>
         <translation>Garbi_keta</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="226"/>
+        <location line="+1"/>
         <source>Bl_end</source>
         <translation>Naha_sketa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="234"/>
+        <location line="+8"/>
         <source>Decomb Telecide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4795,7 +4242,7 @@
 <context>
     <name>Ui_licenseWindow</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_license.cpp" line="25"/>
+        <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 type="unfinished"></translation>
     </message>
@@ -4803,22 +4250,18 @@
 <context>
     <name>Ui_pluginManagerWindow</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_license.cpp" line="25"/>
         <source>Name</source>
         <translation type="obsolete">Izena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_license.cpp" line="25"/>
         <source>Version</source>
         <translation type="obsolete">Bertsioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_license.cpp" line="25"/>
         <source>Description</source>
         <translation type="obsolete">Azalpena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_license.cpp" line="25"/>
         <source>Internal video encoder</source>
         <translation type="obsolete">Barneko bideo kodeatzailea</translation>
     </message>
@@ -4826,7 +4269,7 @@
 <context>
     <name>Ui_vobsubWindow</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
         <source>Select Idx File</source>
         <translation>Hautatu Idx Agiria</translation>
     </message>
@@ -4834,550 +4277,449 @@
 <context>
     <name>Video CD</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>A video file must be open to use this Auto Wizard.</source>
         <translation type="obsolete">Bideo agiria ireki behar da Berez Laguntzaile hau erabiltzeko.</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Video CD Auto Wizard</source>
         <translation type="obsolete">Bideo CD Berez Laguntzailea</translation>
     </message>
 </context>
 <context>
+    <name>Webmmuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="+154"/>
+        <source>Saving Webm</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XvidConfigDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Xvid Configuraton</source>
         <translation type="obsolete">Xvid Itxurapena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Configuration:</source>
         <translation type="obsolete">Itxurapena:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Save As</source>
         <translation type="obsolete">Gorde Honela</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Delete</source>
         <translation type="obsolete">Ezabatu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>General</source>
         <translation type="obsolete">Orokorra</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Rate Control</source>
         <translation type="obsolete">Neurri Agintea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Target Video Size:</source>
         <translation type="obsolete">Xede Bideo Neurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Constant Bitrate (Single Pass)</source>
         <translation type="obsolete">Bitneurri Aldagaitza (Urrats Bakarra)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Constant Quantiser (Single Pass)</source>
         <translation type="obsolete">Kuantizatzaile Aldagaitza (Urrats Bakarra)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Video Size (Two Pass)</source>
         <translation type="obsolete">Bideo Neurria (Bi Urrats)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Average Bitrate (Two Pass)</source>
         <translation type="obsolete">Bataz-besteko Bitneurria (Bi Urrats)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Encoding Mode:</source>
         <translation type="obsolete">Kodeaketa Modua:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>MB</source>
         <translation type="obsolete">MB</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>1 (High Quality)</source>
         <translation type="obsolete">1 (Ontasun Handia)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Quantiser</source>
         <translation type="obsolete">Kuantizatzailea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>31 (Low Quality)</source>
         <translation type="obsolete">31 (Ontasun Apala)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Pixel Aspect Ratio</source>
         <translation type="obsolete">Pixel Ikuspegi Maila</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Custom:</source>
         <translation type="obsolete">Norbererara:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>As Input</source>
         <translation type="obsolete">Sarrera Bezala</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Predefined Aspect Ratio:</source>
         <translation type="obsolete">Aurrezehaztutako Ikuspegi Maila:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>16:15 (PAL 4:3)</source>
         <translation type="obsolete">16:15 (PAL 4:3)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>64:45 (PAL 16:9)</source>
         <translation type="obsolete">64:45 (PAL 16:9)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>8:9 (NTSC 4:3)</source>
         <translation type="obsolete">8:9 (NTSC 4:3)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>32:27 (NTSC 16:9)</source>
         <translation type="obsolete">32:27 (NTSC 16:9)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Multithreading</source>
         <translation type="obsolete">Hari-anitz</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Disable</source>
         <translation type="obsolete">Ezgaitu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Auto-detect</source>
         <translation type="obsolete">Berez-atzeman</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Motion</source>
         <translation type="obsolete">Mugimendua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Motion Estimation</source>
         <translation type="obsolete">Mugimendu Estimazioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Motion Estimation:</source>
         <translation type="obsolete">Mugimendu Estimazioa:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Low</source>
         <translation type="obsolete">Apala</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Medium</source>
         <translation type="obsolete">Ertaina</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>High</source>
         <translation type="obsolete">Handia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Rate Distortion Optimisation:</source>
         <translation type="obsolete">Neurri Bihurdura Hobekuntza:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>No Search (DCT only)</source>
         <translation type="obsolete">Bilaketarik Ez (DCT bakarrik)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Limited Search</source>
         <translation type="obsolete">Bilaketa Mugatua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Medium Search</source>
         <translation type="obsolete">Bilaketa Ertaina</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Wide Search</source>
         <translation type="obsolete">Bilaketa Zabala</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Rate Distortion Optimisation for B-frames</source>
         <translation type="obsolete">Neurri Bihurdura Hobekuntza B-framentzat</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Chroma Motion Estimation</source>
         <translation type="obsolete">Margotasun Mugimendu Estimazioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Quarter Pixel Motion Estimation</source>
         <translation type="obsolete">Eremu Pixel Mugimendu Estimazioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Global Motion Compensation</source>
         <translation type="obsolete">Mugimendu Orekapen Orokorra</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Turbo Mode</source>
         <translation type="obsolete">Turbo Modua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Frame</source>
         <translation type="obsolete">Frame</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Frame Encoding</source>
         <translation type="obsolete">Frame Kodeaketa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Chroma Optimiser</source>
         <translation type="obsolete">Margotasun Hobetzailea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Four Motion Vectors per Macroblock</source>
         <translation type="obsolete">Lau Mugimendu Bektore Makroblokeko</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Cartoon</source>
         <translation type="obsolete">Marrazki biziduna</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Greyscale</source>
         <translation type="obsolete">Griseskala</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Interlaced:</source>
         <translation type="obsolete">Elkarlotuta:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Bottom Field First</source>
         <translation type="obsolete">Beheko Eremua Lehenik</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Top Field First</source>
         <translation type="obsolete">Goiko Eremua Lehenik</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Maximum I-frame Interval:</source>
         <translation type="obsolete">Gehienezko I-frame Aldia:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Frame Drop Ratio:</source>
         <translation type="obsolete">Frame Erorketa Maila:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>B-frames</source>
         <translation type="obsolete">B-frame</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>B-frame Sensitivity:</source>
         <translation type="obsolete">B-frame Sentikortasuna:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Maximum Consecutive B-frames:</source>
         <translation type="obsolete">Gehienezko B-frame Jarraian:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Closed GOP</source>
         <translation type="obsolete">GOP itxita</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Packed Bitstream</source>
         <translation type="obsolete">Paketatutako Bitjarioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Quantiser Control</source>
         <translation type="obsolete">Kuantizatzaile Agintea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Maximum B-frame Quantiser:</source>
         <translation type="obsolete">Gehienezko B-frame Kuantizatzaile:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>B-frame Quantiser Offset:</source>
         <translation type="obsolete">B-frame Kuantizatzaile Oreka:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Minimum P-frame Quantiser:</source>
         <translation type="obsolete">Gutxienezko P-frame Kuantizatzaile:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>B-frame Quantiser Ratio:</source>
         <translation type="obsolete">B-frame Kuantizatzaile Maila:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Minimum I-frame Quantiser:</source>
         <translation type="obsolete">Gutxienezko I-frame Kuantizatzaile:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Minimum B-frame Quantiser:</source>
         <translation type="obsolete">Gutxienezko B-frame Kuantizatzaile:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Maximum P-frame Quantiser:</source>
         <translation type="obsolete">Gehienezko P-frame Kuantizatzaile:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Maximum I-frame Quantiser:</source>
         <translation type="obsolete">Gehienezko I-frame Kuantizatzaile:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Trellis Quantisation</source>
         <translation type="obsolete">Trellis Kuantizazioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Quantisation Matrix</source>
         <translation type="obsolete">Kuantizazioa Matriza</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>H.263 Matrix</source>
         <translation type="obsolete">H.263 Matriza</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>MPEG Matrix</source>
         <translation type="obsolete">MPEG Matriza</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Custom Matrix</source>
         <translation type="obsolete">Egile Matriza</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Edit</source>
         <translation type="obsolete">Editatu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Single Pass</source>
         <translation type="obsolete">Urrats Bakarra</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Smoother:</source>
         <translation type="obsolete">Lehuntzailea:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Averaging Quantiser Period:</source>
         <translation type="obsolete">Bataz-besteko Kuantizatzaile Aldia:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Reaction Delay Factor:</source>
         <translation type="obsolete">Erreakzio Atzerapen Ezaugarria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Two Pass</source>
         <translation type="obsolete">Bi Urrats</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>I-frames</source>
         <translation type="obsolete">I-frame</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>I-frame Boost:</source>
         <translation type="obsolete">I-frame Kitzikapena:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>%</source>
         <translation type="obsolete">%</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>I-frame Bitrate Reduction Threshold:</source>
         <translation type="obsolete">I-frame Bitneurri Murrizketa Muga:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Maximum I-frame Bitrate Reduction:</source>
         <translation type="obsolete">Gehienezko I-frame Bitneurri Murrizpena:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>frame(s)</source>
         <translation type="obsolete">frame</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Overflow Control</source>
         <translation type="obsolete">Gaineko Agintea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Maximum Overflow Degradation:</source>
         <translation type="obsolete">Gehienezko Gainezkapen Itsuspena:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Maximum Overflow Improvement:</source>
         <translation type="obsolete">Gehinezko Gainezkapen Hobetura:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Overflow Control Strength:</source>
         <translation type="obsolete">Gainezkatze Aginte Indarra:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Curve Compression</source>
         <translation type="obsolete">Bihurgune Konpresioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Above Average Curve Compression:</source>
         <translation type="obsolete">Gaineko Bataz-besteko Bihurgune Konpresioa:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Below Average Curve Compression:</source>
         <translation type="obsolete">Azpiko Bataz-besteko Bihurgune Konpresioa:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Video Buffer Verifier</source>
         <translation type="obsolete">Bideo Buffer Egiaztatzailea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>bit/s</source>
         <translation type="obsolete">bit/s</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>bit(s)</source>
         <translation type="obsolete">bit</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>VBV Buffer Size:</source>
         <translation type="obsolete">VBV Buffer Neurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Maximum VBV Bitrate:</source>
         <translation type="obsolete">Gehienezko VBV Bitneurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Peak Bitrate Over 1 Second:</source>
         <translation type="obsolete">Bitneurri Gailurra 1 Segundu Gainean:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>&lt;default&gt;</source>
         <translation type="obsolete">&lt;berezkoa&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>&lt;custom&gt;</source>
         <translation type="obsolete">&lt;norberea&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Xvid Configuration File (*.xml)</source>
         <translation type="obsolete">Xvid Itxurapen Agiria (*.xml)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Are you sure you wish to delete the selected configuration?</source>
         <translation type="obsolete">Zihur zaude hautatutako itxurapena ezabatzea nahi duzula?</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Target Bitrate:</source>
         <translation type="obsolete">Xede Bitneurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>kbit/s</source>
         <translation type="obsolete">kbit/s</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Quantiser:</source>
         <translation type="obsolete">Kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Average Bitrate:</source>
         <translation type="obsolete">Bataz-besteko Bitneurria:</translation>
     </message>
@@ -5385,52 +4727,42 @@
 <context>
     <name>XvidCustomMatrixDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Xvid Custom Matrix</source>
         <translation type="obsolete">Xvid Egile Matriza</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Intra 8x8</source>
         <translation type="obsolete">Intra 8x8</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Luma:</source>
         <translation type="obsolete">Argitasuna:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Inter 8x8</source>
         <translation type="obsolete">Inter 8x8</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Load File</source>
         <translation type="obsolete">Gertatu Agiria</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>OK</source>
         <translation type="obsolete">Ongi</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Cancel</source>
         <translation type="obsolete">Ezeztatu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Select Matrix File</source>
         <translation type="obsolete">Hautatu Matrize Agira</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Read Error</source>
         <translation type="obsolete">Irakurri Akatsa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="88"/>
         <source>Error reading custom matrix file.</source>
         <translation type="obsolete">Akatsa egile matrize agiria irakurtzerakoan.</translation>
     </message>
@@ -5438,42 +4770,45 @@
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="16"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+16"/>
         <source>About Avidemux</source>
         <translation>Avidemux buruz</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="91"/>
+        <location line="+75"/>
         <source>Avidemux </source>
         <translation>Avidemux </translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="110"/>
+        <location line="+19"/>
         <source>Multi-platform Video Editor</source>
         <translation>Plataforma-anitzeko Bideo Editatzailea</translation>
     </message>
-    <message encoding="UTF-8">
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="120"/>
+    <message>
+        <location line="+10"/>
+        <source>© 2001 - 2016  Mean</source>
+        <translation type="unfinished">© 2001 - 2010  Mean {2001 ?} {2016 ?}</translation>
+    </message>
+    <message>
         <source>© 2001 - 2012  Mean</source>
-        <translation>© 2001 - 2012  Mean</translation>
+        <translation type="vanished">© 2001 - 2012  Mean</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="195"/>
+        <location line="+75"/>
         <source>OK</source>
         <translation>Ongi</translation>
     </message>
-    <message encoding="UTF-8">
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="195"/>
+    <message>
         <source>© 2001 - 2010  Mean</source>
         <translation type="obsolete">© 2001 - 2010  Mean</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="139"/>
+        <location line="-56"/>
         <source>http://www.avidemux.org</source>
         <translation>http://www.avidemux.org</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="175"/>
+        <location line="+36"/>
         <source>&amp;License</source>
         <translation>&amp;Baimena</translation>
     </message>
@@ -5481,37 +4816,37 @@
 <context>
     <name>addBorders</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+182"/>
         <source>_Left border:</source>
         <translation>E_zker hertza:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="183"/>
+        <location line="+1"/>
         <source>_Right border:</source>
         <translation>E_skuin hertza:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="184"/>
+        <location line="+1"/>
         <source>_Top border:</source>
         <translation>_Goiko hertza:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="185"/>
+        <location line="+1"/>
         <source>_Bottom border:</source>
         <translation>_Beheko hertza:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="188"/>
+        <location line="+3"/>
         <source>Add Borders</source>
         <translation>Gehitu Hertzak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="192"/>
+        <location line="+4"/>
         <source>Incorrect parameters</source>
         <translation>Parametro okerrak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="192"/>
+        <location line="+0"/>
         <source>All parameters must be even and within range.</source>
         <translation>Parametro guztiak berdinak eta mailakoak izan behar dute.</translation>
     </message>
@@ -5519,1505 +4854,1610 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="33"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+33"/>
         <source>R_esampling (Hz):</source>
         <translation>B_irlaginketa (Hz):</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="33"/>
+        <location line="+0"/>
         <source>Resampling frequency (Hz)</source>
         <translation>Birlaginketa maiztasuna (Hz)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="43"/>
+        <location line="+4"/>
+        <location line="+25"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+43"/>
         <source>None</source>
         <translation>Ezer ez</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="38"/>
+        <location line="-24"/>
         <source>Film to PAL</source>
         <translation>Filmatik PAL-ra</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="39"/>
+        <location line="+1"/>
         <source>PAL to Film</source>
         <translation>PAL-tik Filmara</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="42"/>
+        <location line="+3"/>
         <source>_Frame rate change:</source>
         <translation>_Frame neurri aldaketa:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="46"/>
+        <location line="+4"/>
         <source>No change</source>
         <translation>Ez aldatu</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="47"/>
+        <location line="+1"/>
         <source>Mono</source>
         <translation>Monoa</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="293"/>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+353"/>
         <source>Stereo</source>
         <translation>Estereoa</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="49"/>
+        <location line="+1"/>
         <source>Stereo+surround</source>
         <translation>Estereoa+ingurasoinua</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="50"/>
+        <location line="+1"/>
         <source>Stereo+center</source>
         <translation>Estereoa+erdia</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="51"/>
+        <location line="+1"/>
         <source>Stereo+center+surround</source>
         <translation>Estereoa+erdia+ingurasoinua</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="52"/>
+        <location line="+1"/>
         <source>Stereo front+stereo rear</source>
         <translation>Estereo aurrea+estereo atzea</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="53"/>
+        <location line="+1"/>
         <source>5 channels</source>
         <translation>5 bide</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="54"/>
+        <location line="+1"/>
         <source>5.1</source>
         <translation>5.1</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="55"/>
+        <location line="+1"/>
         <source>Dolby Pro Logic</source>
         <translation>Dolby Pro Logic</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="56"/>
+        <location line="+1"/>
         <source>Dolby Pro Logic II</source>
         <translation>Dolby Pro Logic II</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="59"/>
+        <location line="+3"/>
         <source>DRC</source>
         <translation>DRC</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="63"/>
+        <location line="+4"/>
         <source>Automatic (max -3 dB)</source>
         <translation>Berezgaitasunezkoa (geh -3 dB)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="64"/>
+        <location line="+1"/>
         <source>Manual (dB)</source>
         <translation>Eskuzkoa (dB)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="66"/>
+        <location line="+2"/>
+        <source>Gain</source>
+        <translation type="unfinished">Irabazia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>_Gain mode:</source>
         <translation>_Irabazi Modua:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="68"/>
+        <location line="+1"/>
         <source>G_ain value:</source>
         <translation>I_rabazi Modua:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="72"/>
+        <location line="+7"/>
         <source>_Mixer:</source>
         <translation>_Nahastzailea:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="74"/>
+        <location line="+2"/>
         <source>Remix:</source>
         <translation>Bernahastu:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="77"/>
+        <location line="+3"/>
+        <source>Mixer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Shift audio:</source>
         <translation>Aldatu audioa:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="77"/>
+        <location line="+0"/>
         <source>Shift Value (ms):</source>
         <translation>Aldatu Balioa (sm):</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="80"/>
+        <location line="+3"/>
         <source>Audio Filters</source>
         <translation>Audio Iragazkiak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="81"/>
+        <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+81"/>
         <source>Fontconfig</source>
         <translation>Hizki-itxurapena</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="82"/>
+        <location line="+1"/>
         <source>FreeType 2</source>
         <translation>FreeType 2</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="83"/>
+        <location line="+1"/>
         <source>Gettext</source>
         <translation>Gettext</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="84"/>
+        <location line="+1"/>
         <source>SDL</source>
         <translation>SDL</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="85"/>
+        <location line="+1"/>
         <source>XVideo</source>
         <translation>XVideo</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="86"/>
+        <location line="+1"/>
         <source>VDPAU</source>
         <translation>VDPAU</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="88"/>
+        <location line="+2"/>
         <source>x86</source>
         <translation>x86</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="89"/>
+        <location line="+1"/>
         <source>x86-64</source>
         <translation>x86-64</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="96"/>
+        <location line="+7"/>
         <source>Libraries</source>
         <translation>Liburutegiak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="359"/>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+110"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="101"/>
+        <location line="+4"/>
         <source>Built-in Support</source>
         <translation>Eraiketa Sostengua</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="31"/>
+        <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+31"/>
         <source>TimeStamp:</source>
         <translation>DenboraIrarketa:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="34"/>
+        <location line="+3"/>
         <source>Go to Time</source>
         <translation>Joan Denborara</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="8"/>
+        <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="+8"/>
         <source>_Job name:</source>
         <translation>_Lan izena:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="9"/>
+        <location line="+1"/>
         <source>Output _File:</source>
         <translation>Irteera _Agiria:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="9"/>
+        <location line="+0"/>
         <source>Select Video To Write</source>
         <translation>Hautatu Idazteko Bideoa</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="12"/>
+        <location line="+3"/>
         <source>Save Job</source>
         <translation>Gorde Lana</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="57"/>
+        <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="+57"/>
         <source>Audio Plugins</source>
         <translation>Audio Pluginak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="349"/>
+        <location line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-29"/>
+        <location line="+3"/>
+        <location line="+5"/>
         <source>Audio</source>
         <translation>Audioa</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="86"/>
+        <location line="+6"/>
         <source>Video Encoder Plugins</source>
         <translation>Bideo Kodeatzaile Pluginak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="110"/>
+        <location line="+24"/>
         <source>Video Encoder</source>
         <translation>Bideo Kodeatzailea</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="115"/>
+        <location line="+5"/>
         <source>Video Decoder Plugins</source>
         <translation>Bideo Dekodeatzaile Pluginak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="139"/>
+        <location line="+24"/>
         <source>Video Decoder</source>
         <translation>Bideo Dekodeatzailea</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="144"/>
+        <location line="+5"/>
         <source>Audio Device Plugins</source>
         <translation>Audio Gailu Pluginak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="166"/>
+        <location line="+22"/>
         <source>Audio Device</source>
         <translation>Audio Gailua</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="173"/>
+        <location line="+7"/>
         <source>Audio Encoder Plugins</source>
         <translation>Audio Kodeatzaile Pluginak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="195"/>
+        <location line="+22"/>
         <source>Audio Encoders</source>
         <translation>Audio Kodeatzaileak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="202"/>
+        <location line="+7"/>
         <source>Demuxer Plugins</source>
         <translation>Desmultiplexatzaile Pluginak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="224"/>
+        <location line="+22"/>
         <source>Demuxers</source>
         <translation>Desmultiplexatzaileak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="232"/>
+        <location line="+8"/>
         <source>Muxer Plugins</source>
         <translation>Desmultiplexatzaile Pluginak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="254"/>
+        <location line="+22"/>
         <source>Muxers</source>
         <translation>Desmultiplexatzaileak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="259"/>
+        <location line="+5"/>
         <source>Plugins Info</source>
         <translation>Plugin Argibideak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="27"/>
+        <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+27"/>
         <source>_Filter strength:</source>
         <translation>_Iragazki indarra:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="28"/>
+        <location line="+1"/>
         <source>_Swap U and V</source>
         <translation>_Aldatu U eta V</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="314"/>
+        <location line="+10"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-68"/>
         <source>_Horizontal deblocking</source>
         <translation>_Desblokeaketa etzana</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="315"/>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
         <source>_Vertical deblocking</source>
         <translation>_Desblokeaketa zutia</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="40"/>
+        <location line="+1"/>
         <source>_Deringing</source>
         <translation>_Deshosketa</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="182"/>
         <source>Decode video using VDPAU</source>
-        <translation>Dekodeatu bideoa VDPAU erabiliz</translation>
+        <translation type="vanished">Dekodeatu bideoa VDPAU erabiliz</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-178"/>
+        <source>Decode video using VDPAU (NVIDIA)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="183"/>
+        <location line="+1"/>
+        <source>Decode video using XVBA (AMD)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Enable openGl support</source>
         <translation>Gaitu openGl sostengua</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="188"/>
+        <location line="+3"/>
+        <source>If you use Hw decoding, it is better to use the matching display driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <source>_Use systray while encoding</source>
         <translation>_Erabili sistema-erretilua kodeatzerakoan</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="189"/>
+        <location line="+1"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>_Onartu audio maiztasun ez-estandarra DVD-rako</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="190"/>
+        <location line="+1"/>
         <source>Create _OpenDML files</source>
         <translation>Sortu _OpenDML agiriak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="194"/>
+        <location line="+4"/>
         <source>SIMD</source>
         <translation>SIMD</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="196"/>
+        <location line="+2"/>
         <source>Enable all SIMD</source>
         <translation>Gaitu SIMD guztiak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="197"/>
+        <location line="+1"/>
         <source>Enable MMX</source>
         <translation>Gaitu MMX</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="198"/>
+        <location line="+1"/>
         <source>Enable MMXEXT</source>
         <translation>Gaitu MMXEXT</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="199"/>
+        <location line="+1"/>
         <source>Enable 3DNOW</source>
         <translation>Gaitu 3DNOW</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="200"/>
+        <location line="+1"/>
         <source>Enable 3DNOWEXT</source>
         <translation>Gaitu 3DNOWEXT</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="201"/>
+        <location line="+1"/>
         <source>Enable SSE</source>
         <translation>Gaitu SSE</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="202"/>
+        <location line="+1"/>
         <source>Enable SSE2</source>
         <translation>Gaitu SSE2</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="203"/>
+        <location line="+1"/>
         <source>Enable SSE3</source>
         <translation>Gaitu SSE3</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="204"/>
+        <location line="+1"/>
         <source>Enable SSSE3</source>
         <translation>Gaitu SSSE3</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="225"/>
+        <location line="+21"/>
         <source>_lavc threads:</source>
         <translation>_lavc hariak:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="227"/>
+        <location line="+2"/>
         <source>Multi-threading</source>
         <translation>Hari-anitz</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="47"/>
+        <location line="+4"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+4"/>
         <source>High</source>
         <translation>Handia</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="232"/>
+        <location line="+1"/>
         <source>Above normal</source>
         <translation>Arruntaren gainetikoa</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="233"/>
+        <location line="+1"/>
         <source>Normal</source>
         <translation>Arrunta</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="234"/>
+        <location line="+1"/>
         <source>Below normal</source>
         <translation>Arruntaren azpitikoa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="45"/>
+        <location line="+1"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-2"/>
         <source>Low</source>
         <translation>Apala</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="237"/>
+        <location line="+2"/>
         <source>_Encoding priority:</source>
         <translation>_Kodeaketa lehentasuna:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="238"/>
+        <location line="+1"/>
         <source>_Indexing/unpacking priority:</source>
         <translation>_Aurkibidetze/despaketatze lehentasuna:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="239"/>
+        <location line="+1"/>
         <source>_Playback priority:</source>
         <translation>_Irakurketa lehentasuna:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="241"/>
+        <location line="+2"/>
         <source>Prioritisation</source>
         <translation>Lehentasunpena</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="246"/>
+        <location line="+5"/>
         <source>_Split MPEG files every (MB):</source>
         <translation>_Banandu MPEG agiriak zatika (MB):</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="248"/>
+        <location line="+2"/>
         <source>_Use alternative tag for MP3 in .mp4</source>
         <translation>_Erabili aukerazko etiketak MP3-rako .mp4-an</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="253"/>
+        <location line="+5"/>
         <source>XVideo (best)</source>
         <translation>XVideo (hoberena)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="256"/>
+        <location line="+3"/>
         <source>VDPAU (best)</source>
         <translation>VDPAU (hoberena)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="259"/>
+        <location line="+7"/>
         <source>OpenGL (best)</source>
         <translation>OpenGL (hoberena)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="264"/>
+        <location line="+3"/>
+        <source>LIBVA (best)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+157"/>
+        <source>Display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>HW Accel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>MS Windows GDI (SDL)</source>
-        <translation>MS Windows GDI (SDL)</translation>
+        <translation type="vanished">MS Windows GDI (SDL)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="265"/>
         <source>MS Windows DirectX (SDL)</source>
-        <translation>MS Windows DirectX (SDL)</translation>
+        <translation type="vanished">MS Windows DirectX (SDL)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="267"/>
+        <location line="-155"/>
         <source>SDL (good)</source>
         <translation>SDL (ona)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="271"/>
+        <location line="+3"/>
         <source>Video _display:</source>
         <translation>Bideo _erakuspena:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="276"/>
+        <location line="+20"/>
+        <location line="+3"/>
+        <source>Sdl driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>No alerts</source>
         <translation>Alertarik ez</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="277"/>
+        <location line="+1"/>
         <source>Display only error alerts</source>
         <translation>Erakutsi akats alertak bakarrik</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="278"/>
+        <location line="+1"/>
         <source>Display all alerts</source>
         <translation>Erakutsi alerta guztiak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="280"/>
+        <location line="+2"/>
         <source>_Message level:</source>
         <translation>_Mezu maila:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="285"/>
+        <location line="+5"/>
         <source>PCM</source>
         <translation>PCM</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="286"/>
+        <location line="+1"/>
         <source>Master</source>
         <translation>Masterra</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="287"/>
+        <location line="+1"/>
         <source>_Volume control:</source>
         <translation>_Bolumen agintea:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="292"/>
+        <location line="+5"/>
         <source>No downmixing</source>
         <translation>Ez behera-nahastu</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="294"/>
+        <location line="+2"/>
         <source>Pro Logic</source>
         <translation>Pro Logic</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="295"/>
+        <location line="+1"/>
         <source>Pro Logic II</source>
         <translation>Pro Logic II</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="297"/>
+        <location line="+2"/>
         <source>_Local playback downmixing:</source>
         <translation>_Tokiko irakurketa behera-nahasketa:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="311"/>
+        <location line="+14"/>
         <source>_AudioDevice</source>
         <translation>_AudioGailua</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="316"/>
+        <location line="+5"/>
         <source>De_ringing</source>
         <translation>_Deshosketa</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="317"/>
+        <location line="+1"/>
         <source>_Strength:</source>
         <translation>_Indartsua:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="318"/>
+        <location line="+1"/>
         <source>Default Postprocessing</source>
         <translation>Berezko prozesatze-ondorengoa</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="328"/>
+        <location line="+35"/>
+        <source>_Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>User Interface</source>
         <translation>Erabiltzaile Interfazea</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="335"/>
+        <location line="+7"/>
         <source>Output</source>
         <translation>Irteera</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="355"/>
         <source>Video</source>
-        <translation>Bideoa</translation>
+        <translation type="vanished">Bideoa</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="363"/>
+        <location line="+39"/>
         <source>Threading</source>
         <translation>Hariak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="64"/>
+        <location line="+21"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+64"/>
         <source>Preferences</source>
         <translation>Hobespenak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="35"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-29"/>
         <source>Open</source>
         <translation>Ireki</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="36"/>
+        <location line="+1"/>
         <source>Append</source>
         <translation>Erantsi</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="37"/>
+        <location line="+1"/>
         <source>Save</source>
         <translation>Gorde</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="38"/>
+        <location line="+1"/>
         <source>Queue</source>
         <translation>Lerrokatu</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="39"/>
+        <location line="+1"/>
         <source>Save as Image</source>
         <translation>Gorde Irudi bezala</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="40"/>
+        <location line="+1"/>
         <source>Save as BMP</source>
         <translation>Gorde BMP bezala</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="41"/>
+        <location line="+1"/>
         <source>Save as JPEG</source>
         <translation>Gorde JPEG bezala</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="42"/>
+        <location line="+1"/>
         <source>Close</source>
         <translation>Itxi</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="47"/>
+        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="44"/>
+        <location line="-3"/>
         <source>Information</source>
         <translation>Argibideak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="46"/>
+        <location line="+2"/>
         <source>Connect to avsproxy</source>
         <translation>Elkarketatu avsproxyra</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="48"/>
+        <location line="+2"/>
         <source>Quit</source>
         <translation>Utzi</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="54"/>
+        <location line="+6"/>
         <source>Undo</source>
         <translation>Desegin</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="55"/>
+        <location line="+1"/>
         <source>Reset Edit</source>
         <translation>Berrezarri Edizioa</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="56"/>
+        <location line="+1"/>
         <source>Cut</source>
         <translation>Ebaki</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="57"/>
+        <location line="+1"/>
         <source>Copy</source>
         <translation>Kopiatu</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="58"/>
+        <location line="+1"/>
         <source>Paste</source>
         <translation>Itsatsi</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="59"/>
+        <location line="+1"/>
         <source>Delete</source>
         <translation>Ezabatu</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="61"/>
+        <location line="+2"/>
         <source>Set Marker A</source>
         <translation>Ezarri A Markatzailea</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="62"/>
+        <location line="+1"/>
         <source>Set Marker B</source>
         <translation>Ezarri B Markatzailea</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="70"/>
+        <location line="+8"/>
         <source>Decoder Option</source>
         <translation>Dekodeatzaile Aukera</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="71"/>
+        <location line="+1"/>
         <source>PostProcessing</source>
         <translation>Prozes.-ondorengoa</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="80"/>
+        <location line="+1"/>
+        <location line="+8"/>
         <source>Filters</source>
         <translation>Iragazkiak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="78"/>
+        <location line="-2"/>
         <source>Select Track</source>
         <translation>Hautatu Bidea</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="79"/>
+        <location line="+1"/>
         <source>Save audio</source>
         <translation>Gorde audioa</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="86"/>
+        <location line="+7"/>
         <source>Build Option</source>
         <translation>Eraiketa Aukera</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="87"/>
+        <location line="+1"/>
         <source>Plugins</source>
         <translation>Pluginak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="90"/>
+        <location line="+3"/>
         <source>&amp;Advanced</source>
         <translation>A&amp;urreratua</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="91"/>
+        <location line="+1"/>
         <source>Open Application &amp;Log</source>
         <translation>Ireki Aplikazioaren &amp;Oharra</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="92"/>
+        <location line="+1"/>
         <source>Open Application Data &amp;Folder</source>
         <translation>Ireki Aplikazioaren &amp;Datu Agiritegia</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="95"/>
+        <location line="+3"/>
         <source>About</source>
         <translation>Honi buruz</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="102"/>
+        <location line="+7"/>
         <source>Play/Stop</source>
         <translation>Irakurri/Gelditu</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="103"/>
+        <location line="+1"/>
         <source>Previous Frame</source>
         <translation>Aurreko  Framea</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="104"/>
+        <location line="+1"/>
         <source>Next Frame</source>
         <translation>Hurrengo Framea</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="105"/>
+        <location line="+1"/>
         <source>Previous Intra Frame</source>
         <translation>Aurreko Intra Framea</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="106"/>
+        <location line="+1"/>
         <source>Next Intra Frame</source>
         <translation>Hurrengo Intra Framea</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="107"/>
+        <location line="+1"/>
         <source>Previous Black Frame</source>
         <translation>Aurreko Frame Beltza</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="108"/>
+        <location line="+1"/>
         <source>Next Black Frame</source>
         <translation>Hurrengo Frame Beltza</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="109"/>
+        <location line="+1"/>
         <source>First Frame</source>
         <translation>Lehen Framea</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="110"/>
+        <location line="+1"/>
         <source>Last Frame</source>
         <translation>Azken Framea</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="112"/>
+        <location line="+2"/>
         <source>Go To Marker A</source>
         <translation>Joan A Markatzailera</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="113"/>
+        <location line="+1"/>
         <source>Go To Marker B</source>
         <translation>Joan B Markatzailera</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="115"/>
+        <location line="+2"/>
         <source>Go To Time</source>
         <translation>Joan Denborara</translation>
     </message>
     <message>
-        <location filename="../../common/gui_autodrive.cpp" line="48"/>
+        <location filename="../../common/gui_autodrive.cpp" line="+48"/>
         <source>No audio track</source>
         <translation>Audio biderik ez</translation>
     </message>
     <message>
-        <location filename="../../common/gui_autodrive.cpp" line="48"/>
+        <location line="+0"/>
         <source>An audio track is necessary to create such file</source>
         <translation>Audio bide bat behar da agiria sortzeko</translation>
     </message>
     <message>
-        <location filename="../../common/gui_autodrive.cpp" line="192"/>
+        <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>Kodek Akatsa</translation>
     </message>
     <message>
-        <location filename="../../common/gui_autodrive.cpp" line="64"/>
+        <location line="-128"/>
         <source>Cannot select the MPEG-4 SP codec.</source>
         <translation>Ezinezkoa MPEG-4SP kodeka hautatu.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_autodrive.cpp" line="78"/>
+        <location line="+14"/>
         <source>No AAC audio encoder plugin found.</source>
         <translation>Ez da AAC audio kodeatzaile pluginik aurkitu.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_autodrive.cpp" line="110"/>
+        <location line="+32"/>
         <source>The MP3 codec does not allow disabling reservoir.
 Install lame plugin</source>
         <translation>MP3 kodekak ez du biltegia ezgaitzea ahalbidetzen.
 Ezarril lame plugina</translation>
     </message>
     <message>
-        <location filename="../../common/gui_autodrive.cpp" line="116"/>
+        <location line="+6"/>
         <source>You don&apos;t have LAME!.
 It is needed to create FLV  video.</source>
         <translation>Ez duzu LAME!.
 Hau beharrezkoa da FLV  bideoa sortzeko.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_autodrive.cpp" line="130"/>
+        <location line="+14"/>
         <source>Cannot select FLV1  codec.</source>
         <translation>Ezin da FLV1  kodeka hautatu.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_autodrive.cpp" line="157"/>
+        <location line="+27"/>
         <source>Cannot select mpeg4 sp codec.</source>
         <translation>Ezin da mpeg4 sp kodeka hautatu.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_autodrive.cpp" line="193"/>
+        <location line="+36"/>
         <source>You don&apos;t have FAAC!.
 It is needed to create PSP compatible video.</source>
         <translation>Ez duzu FAAC!.
 Hau beharrezkoa da PSP bateragarri bideoa sortzeko.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="168"/>
+        <location filename="../../common/gui_main.cpp" line="+175"/>
         <source>Select script to save</source>
         <translation>Hautatu gordetzeko eskripta</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="317"/>
+        <location line="+150"/>
         <source>Not coded in this version</source>
         <translation>Kodeatu gabe bertsio honetan</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="393"/>
         <source>Select AVI File...</source>
-        <translation>Hautatu AVI Agiria...</translation>
+        <translation type="vanished">Hautatu AVI Agiria...</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="396"/>
         <source>Select AVI File to Append...</source>
-        <translation>Hautatu Eransteko AVI Agiria...</translation>
+        <translation type="vanished">Hautatu Eransteko AVI Agiria...</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="482"/>
+        <location line="+11"/>
+        <location line="+65"/>
+        <source>Select Video File...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Select Video File to Append...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+102"/>
         <source>Are you sure?</source>
         <translation>Zihur zaude?</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="567"/>
+        <location line="+87"/>
         <source>Permission error</source>
         <translation>Baimen akatsa</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="567"/>
+        <location line="+0"/>
         <source>Cannot open &quot;%s&quot;.</source>
         <translation>Ezin da &quot;%s&quot; ireki.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="570"/>
+        <location line="+4"/>
         <source>File error</source>
         <translation>Agiri akatsa</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="570"/>
+        <location line="+0"/>
         <source>&quot;%s&quot; does not exist.</source>
         <translation>&quot;%s&quot; ez dago.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="607"/>
+        <location line="+38"/>
         <source>Cannot open project using the video loader.</source>
         <translation>Ezin da egitasmoa ireki bideo gertatzailea erabiliz.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="608"/>
+        <location line="+1"/>
         <source>Try &apos;File&apos; -&gt; &apos;Load/Run Project...&apos;</source>
         <translation>Saiatu &apos;Agiria&apos; -&gt; &apos;Gertatu/Ekin Egitasmoa...&apos;</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="610"/>
+        <location line="+4"/>
         <source>Could not open the file</source>
         <translation>Ezinezkoa agiria irekitzea</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="646"/>
+        <location line="+40"/>
         <source>Multiple Audio Tracks</source>
         <translation>Audio Bide Anitz</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="646"/>
+        <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>Gertatu duzun agiriak audio bide ugari ditu.
 Joan Audio-&gt;Bide Nagusia gaituriko bat hautatzeko.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="736"/>
+        <location line="+89"/>
         <source>Something failed when appending</source>
         <translation>Zerbaitek huts egin du eransterakoan</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="939"/>
+        <location line="+9"/>
+        <location line="+195"/>
         <source>Something bad happened (II)</source>
         <translation>Zerbait gaitza gertatu da (II)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="883"/>
+        <location line="-56"/>
         <source>Checking video</source>
         <translation>Bideoa aztertzen</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="899"/>
+        <location line="+16"/>
         <source>No error found</source>
         <translation>Ez da akatsik aurkitu</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="903"/>
+        <location line="+4"/>
         <source>Errors found in %u frames</source>
         <translation>Akatsak aurkitu dira %u frametan</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="919"/>
+        <location line="+16"/>
         <source>Marker A &gt; B</source>
         <translation>Markatzailea A &gt; B</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="919"/>
+        <location line="+0"/>
         <source>Cannot delete the selection.</source>
         <translation>Ezin da hautapena ezabatu.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="924"/>
+        <location line="+5"/>
         <source>You can&apos;t remove all frames</source>
         <translation>Ezin dituzu frame guztiak kendu</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="932"/>
+        <location line="+8"/>
         <source>Something bad happened</source>
         <translation>Zerbait gaitza gertatu da</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="1020"/>
+        <location line="+88"/>
         <source>_Track from video:</source>
         <translation>_Bidea bideotik:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="1023"/>
+        <location line="+3"/>
         <source>Main Audio Track</source>
         <translation>Audio Bide Nagusia</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="1169"/>
+        <location line="+29"/>
+        <location line="+7"/>
+        <source>Invalid audio index given</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+210"/>
         <source>AvsProxy</source>
         <translation>AvsProxy</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="1169"/>
+        <location line="+0"/>
         <source>Failed to connect to avsproxy.
 Is it running ?</source>
         <translation>Hutsegitea avsproxy-ra elkarketatzerakoan.
 Ekinean dago ?</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="1174"/>
+        <location line="+5"/>
         <source>avsproxy</source>
         <translation>avsproxy</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="1208"/>
+        <location line="+34"/>
         <source>Frame type:</source>
         <translation>Frame mota:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="1209"/>
+        <location line="+1"/>
         <source>Frame size:</source>
         <translation>Frame neurria:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="1211"/>
+        <location line="+2"/>
         <source>Frame Hex Dump</source>
         <translation>Frame Hex Iraulketa</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="62"/>
+        <location filename="../../common/gui_save.cpp" line="+68"/>
         <source>Output file</source>
         <translation>Irteera agiria</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="63"/>
+        <location line="+1"/>
         <source>Job name</source>
         <translation>Lanaren izena</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="66"/>
+        <location line="+3"/>
         <source>Queue job to jobList</source>
         <translation>Lerrokatu lana lan-zerrendan</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="79"/>
+        <location line="+15"/>
         <source>Select Workbench to Save</source>
         <translation>Hautatu Gordtzeko Lanmahaia</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="87"/>
+        <location line="+8"/>
         <source>Select File to Save Audio</source>
         <translation>Hautatu Audioa Gordetzeko Agiria</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="92"/>
+        <location line="+5"/>
         <source>Select JPEG Sequence to Save</source>
         <translation>Autatu Gordetzeko JPEG Sekuentzia</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="95"/>
+        <location line="+5"/>
         <source>Select BMP to Save</source>
         <translation>Hautatu Gordetzeko BMP-a</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="99"/>
+        <location line="+6"/>
         <source>Select JPEG to Save</source>
         <translation>Hautatu Gordetzeko JPEG-a</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="104"/>
+        <location line="+8"/>
         <source>Select File to Save</source>
         <translation>Hautatu Gordetzeko Agiria</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="164"/>
+        <location line="+61"/>
         <source>Saving audio</source>
         <translation>Audioa gordetzen</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="310"/>
+        <location line="+146"/>
         <source>Jpeg</source>
         <translation>Jpeg</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="310"/>
+        <location line="+0"/>
         <source>Fail to save as jpeg</source>
         <translation>Hutsegitea jpeg bezala gordetzerakoan</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="341"/>
+        <location line="+31"/>
         <source>Saving as set of jpegs</source>
         <translation>jpeg ezarpen bezala gordetzen</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="347"/>
+        <location line="+6"/>
         <source>Cannot decode frame</source>
         <translation>Ezinezkoa framea dekodeatzea</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="347"/>
+        <location line="+0"/>
         <source>Aborting.</source>
         <translation>Uzten.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="396"/>
+        <location line="+11"/>
+        <location line="+38"/>
         <source>Done</source>
         <translation>Eginda</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="358"/>
+        <location line="-38"/>
         <source>Saved %d images.</source>
         <translation>%d irudi gordeta.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="360"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+612"/>
+        <location filename="../../common/gui_save.cpp" line="+2"/>
         <source>Error</source>
         <translation>Akatsa</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="360"/>
+        <location line="+0"/>
+        <source>You cannot remove *all* the video
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/gui_save.cpp" line="+0"/>
         <source>Could not save all images.</source>
         <translation>Ezinezkoa agiri guztiak gordetzea.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="382"/>
+        <location line="+22"/>
         <source>BMP op failed</source>
         <translation>BMP op hutsegitea</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="382"/>
+        <location line="+0"/>
         <source>Saving %s as a BMP file failed.</source>
         <translation>Hutsegitea %s BMP agiri bat bezala gordetzerakoan.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="396"/>
+        <location line="+14"/>
         <source>File %s has been successfully saved.</source>
         <translation>%s agiria ongi gorde da.</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="13"/>
+        <location line="+4"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="+13"/>
         <source>Failed</source>
         <translation>Hutsegitea</translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="400"/>
+        <location line="+0"/>
         <source>File %s was NOT saved correctly.</source>
         <translation>%s agiria EZ da zuzen gorde.</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="34"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-11"/>
         <source>_Interlaced</source>
         <translation>_Elkarlotuta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="35"/>
+        <location line="+1"/>
         <source>Ca_rtoon mode</source>
         <translation>_Marrazki bizidun modua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="36"/>
+        <location line="+1"/>
         <source>_Greyscale</source>
         <translation>_Urdinabar</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="37"/>
+        <location line="+1"/>
         <source>Turbo mode</source>
         <translation>Turbo modua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="38"/>
+        <location line="+1"/>
         <source>C_hroma optimizer</source>
         <translation>M_argotasun hobetzailea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="40"/>
+        <location line="+2"/>
         <source>Main</source>
         <translation>Nagusia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="44"/>
+        <location line="+4"/>
         <source>Very Low</source>
         <translation>Oso Apala</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="46"/>
+        <location line="+2"/>
         <source>Medium</source>
         <translation>Ertaina</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="48"/>
+        <location line="+2"/>
         <source>Very High</source>
         <translation>Oso Handia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="49"/>
+        <location line="+1"/>
         <source>Ultra High</source>
         <translation>Ultra Handia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="50"/>
+        <location line="+1"/>
         <source>Motion Search Precision</source>
         <translation>Mugimendu Bilaketa Zehaztasuna</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="53"/>
+        <location line="+3"/>
         <source>Off</source>
         <translation>Etenda</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="54"/>
+        <location line="+1"/>
         <source>Mode Decision</source>
         <translation>Erabaki Modua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="55"/>
+        <location line="+1"/>
         <source>Limited Search</source>
         <translation>Bilaketa Mugatua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="56"/>
+        <location line="+1"/>
         <source>Medium Search</source>
         <translation>Bilaketa Ertaina</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="57"/>
+        <location line="+1"/>
         <source>Wide Search</source>
         <translation>Bilaketa Zabala</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="58"/>
+        <location line="+1"/>
         <source>VHQ Mode</source>
         <translation>VHQ Modua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="62"/>
+        <location line="+4"/>
         <source>Max B Frames</source>
         <translation>Geh B Frame</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="63"/>
+        <location line="+1"/>
         <source>Quarter Pixel</source>
         <translation>_Eremu Pixel</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="64"/>
+        <location line="+1"/>
         <source>GMC</source>
         <translation>GMC</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="65"/>
+        <location line="+1"/>
         <source>BVHQ</source>
         <translation>BVHQ</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="66"/>
+        <location line="+1"/>
         <source>Advanced Simple Profile</source>
         <translation>Profil Aurreratu Arrunta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="74"/>
+        <location line="+8"/>
         <source>4MV</source>
         <translation>4MV</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="75"/>
+        <location line="+1"/>
         <source>Chroma ME</source>
         <translation>Margo ME</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="76"/>
+        <location line="+1"/>
         <source>HQ AC</source>
         <translation>HQ AC</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="77"/>
+        <location line="+1"/>
         <source>More Search</source>
         <translation>Bilaketa Gehiago</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="82"/>
+        <location line="+5"/>
         <source>Min Gop Size</source>
         <translation>Gutx Gop Neurria</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="83"/>
+        <location line="+1"/>
         <source>Max Gop Size</source>
         <translation>Geh Gop Neurria</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="84"/>
+        <location line="+1"/>
         <source>GOP Size</source>
         <translation>GOP Neurria</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="89"/>
+        <location line="+5"/>
         <source>Motion</source>
         <translation>Mugimendua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="92"/>
+        <location line="+3"/>
         <source>H263</source>
         <translation>H263</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="93"/>
+        <location line="+1"/>
         <source>Mpeg</source>
         <translation>Mpeg</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="94"/>
+        <location line="+1"/>
         <source>Quantization Matrix</source>
         <translation>Kuantizazio Matrixa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="95"/>
+        <location line="+1"/>
         <source>Trellis Quantization</source>
         <translation>Trellis Kuantizazioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="99"/>
+        <location line="+4"/>
         <source>Quantization</source>
         <translation>Kuantizazioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="103"/>
+        <location line="+4"/>
         <source>Two Pass Tuning</source>
         <translation>Bi Pasaldi</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="105"/>
+        <location line="+2"/>
         <source>Key Frame Boost(%)</source>
         <translation>Giltza Frame Bultzada(%)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="107"/>
+        <location line="+2"/>
         <source>I-frames closer than...</source>
         <translation>I-frameak hau baino hurbilago...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="108"/>
+        <location line="+1"/>
         <source>.. are reduced by(%)</source>
         <translation>.. murrizten ditu(%)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="109"/>
+        <location line="+1"/>
         <source>Max Overflow Improvement(%)</source>
         <translation>Geh. Gainezkatze hobekuntza(%)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="110"/>
+        <location line="+1"/>
         <source>Max Overglow Degradation(%)</source>
         <translation>Gehienezko Gainezkatze Itsuspena(%)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="114"/>
+        <location line="+4"/>
         <source>Curve Compression</source>
         <translation>Bihurgune Konpresioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="116"/>
+        <location line="+2"/>
         <source>High Bitrate Scenes (%)</source>
         <translation>Bitneurri Handiko Agerraldiak (%)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="117"/>
+        <location line="+1"/>
         <source>Low Bitrate Scenes (%)</source>
         <translation>Bitneurri Apaleko Agerraldiak (%)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="118"/>
+        <location line="+1"/>
         <source>Overflow Control Strength</source>
         <translation>Gainezkatze Aginte Indarra</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="121"/>
+        <location line="+3"/>
         <source>Two Pass</source>
         <translation>Bi Pasaldi</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="128"/>
+        <location line="+7"/>
         <source>Xvid4 Configuration</source>
         <translation>Xvid4 Itxurapena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="+0"/>
         <source>Ready</source>
         <translation>Gertu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="13"/>
+        <location line="+0"/>
         <source>Succeeded</source>
         <translation>Gertatuta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="13"/>
+        <location line="+0"/>
         <source>Deleted</source>
         <translation>Ezabatuta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="13"/>
+        <location line="+0"/>
         <source>Running</source>
         <translation>Ekiten</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="37"/>
+        <location line="+24"/>
         <source>Job Name</source>
         <translation>Lanaren Izena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="37"/>
+        <location line="+0"/>
         <source>Status</source>
         <translation>Egoera</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="37"/>
+        <location line="+0"/>
         <source>Start Time</source>
         <translation>Hasiera Denbora</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="37"/>
+        <location line="+0"/>
         <source>End Time</source>
         <translation>Amaiera Denbora</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="115"/>
+        <location line="+64"/>
+        <location line="+14"/>
         <source>Sure!</source>
         <translation>Zihur!</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="101"/>
+        <location line="-14"/>
         <source>Delete job</source>
         <translation>Ezabatu lana</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="101"/>
+        <location line="+0"/>
         <source>Are you sure you want to delete %s job?</source>
         <translation>Zihur zaude %s lana ezabatzea nahi duzula?</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="115"/>
+        <location line="+14"/>
         <source>Delete *all* job</source>
         <translation>Ezabatu lan *guzitiak*</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="115"/>
+        <location line="+0"/>
         <source>Are you sure you want to delete ALL jobs?</source>
         <translation>Zihur zaude lana GUZTIAK ezabatzea nahi dituzula?</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="139"/>
+        <location line="+24"/>
         <source>Already done</source>
         <translation>Jadanik eginda</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="139"/>
+        <location line="+0"/>
         <source>This script has already been successfully executed.</source>
         <translation>Eskript hau jadanik ongi exekutaturik dago.</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="418"/>
         <source>The filter is already partial</source>
-        <translation>Iragazkia jadanik zatia da</translation>
+        <translation type="vanished">Iragazkia jadanik zatia da</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="610"/>
         <source>Partial Start Frame:</source>
-        <translation>Zati Hasiera Framea:</translation>
+        <translation type="vanished">Zati Hasiera Framea:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="611"/>
         <source>Partial End Frame:</source>
-        <translation>Zati Amaiera Framea:</translation>
+        <translation type="vanished">Zati Amaiera Framea:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="612"/>
         <source>Configure child</source>
-        <translation>Child itxurapena</translation>
+        <translation type="vanished">Child itxurapena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="615"/>
         <source>Partial Video Filter</source>
-        <translation>Zati Bideo Iragazkia</translation>
+        <translation type="vanished">Zati Bideo Iragazkia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="303"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+381"/>
         <source>Recent Files</source>
         <translation>Azken Agiriak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="304"/>
+        <location line="+1"/>
         <source>Recent Projects</source>
         <translation>Azken Egitasmoak</translation>
     </message>
+    <message>
+        <location filename="../../common/gui_savenew.cpp" line="+171"/>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+226"/>
+        <source>Saving</source>
+        <translation type="unfinished">Gordetzen</translation>
+    </message>
 </context>
 <context>
     <name>aften</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="239"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
         <source>_Bitrate:</source>
         <translation>_Bitneurria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="245"/>
+        <location line="+6"/>
         <source>Aften Configuration</source>
         <translation>Aften Itxurapena</translation>
     </message>
@@ -7025,12 +6465,12 @@
 <context>
     <name>asharp</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp" line="65"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp" line="+65"/>
         <source>Asharp</source>
         <translation>Asharp</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp" line="66"/>
+        <location line="+1"/>
         <source>Adaptative sharpener by MarcFD.</source>
         <translation>Zorroztzaile egokigarria MarcFD-ek egina.</translation>
     </message>
@@ -7038,27 +6478,22 @@
 <context>
     <name>asharpDialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp" line="66"/>
         <source>ASharp</source>
         <translation type="obsolete">A Zorrotza</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp" line="66"/>
         <source>Strength</source>
         <translation type="obsolete">Indartsua</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp" line="66"/>
         <source>Threshold</source>
         <translation type="obsolete">Muga</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp" line="66"/>
         <source>Block Adaptative</source>
         <translation type="obsolete">Bloke Egokigarria</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp" line="66"/>
         <source>High Quality Block Filtering</source>
         <translation type="obsolete">Ontasun Handiko Bloke Iragazpena</translation>
     </message>
@@ -7066,35 +6501,74 @@
 <context>
     <name>ass</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="60"/>
         <source>SSA.</source>
-        <translation>SSA.</translation>
+        <translation type="vanished">SSA.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="61"/>
         <source>Hardcode ass/ssa subtitles using libass.</source>
-        <translation>Erre ass/ssa azpidatziak libass erabiliz.</translation>
+        <translation type="vanished">Erre ass/ssa azpidatziak libass erabiliz.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="+61"/>
+        <source>SSA/ASS/SRT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>_Subtitle file (ASS/SSA):</source>
+        <translation type="unfinished">_Azpidatzi agiria (ASS/SSA):</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Select Subtitle file</source>
+        <translation type="unfinished">Hautatu Azpidatzi agiria</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Line spacing:</source>
+        <translation type="unfinished">_Lerro tartea:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Font scale:</source>
+        <translation type="unfinished">_Hizki neurria:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Top margin:</source>
+        <translation type="unfinished">_Goiko bazterra:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Botto_m margin</source>
+        <translation type="unfinished">Behe_ko bazterra</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>ASS</source>
+        <translation type="unfinished">ASS</translation>
     </message>
 </context>
 <context>
     <name>autoWizard</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="61"/>
         <source>Resolution:</source>
         <translation type="obsolete">Bereizmena:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="61"/>
         <source>Source Aspect Ratio:</source>
         <translation type="obsolete">Iturburu Ikuspegi Maila:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="61"/>
         <source>Destination Aspect Ratio:</source>
         <translation type="obsolete">Helmuga Ikuspegi Maila:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="61"/>
         <source>Codec:</source>
         <translation type="obsolete">Kodeka:</translation>
     </message>
@@ -7102,151 +6576,218 @@
 <context>
     <name>avsfilter</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="551"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="+593"/>
         <source>_wine app file:</source>
         <translation>_wine gehigarri agiria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="552"/>
+        <location line="+1"/>
         <source>Select wine filenamewine/cedega/etc.</source>
         <translation>Hautatu wine agirizenawine/cedega/etab.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="554"/>
+        <location line="+2"/>
         <source>_loader file:</source>
         <translation>_gertatzaile agiria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="555"/>
+        <location line="+1"/>
         <source>Select loader filenameavsload.exe</source>
         <translation>Hautatu gertatzaile agirizenaavxload.exe</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="557"/>
+        <location line="+2"/>
         <source>_avs file:</source>
         <translation>_avs agiria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="558"/>
+        <location line="+1"/>
         <source>Select avs filename*.avs</source>
         <translation>Hautatu avs agirizena*.avs</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="559"/>
+        <location line="+1"/>
         <source>_pipe timeout:</source>
         <translation>_hodi itxaronaldia:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="563"/>
+        <location line="+4"/>
         <source>AvsFilter config</source>
         <translation>AvsIragazki itxurap</translation>
     </message>
 </context>
 <context>
+    <name>black</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp" line="+48"/>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace a section by black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Replace by Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blacken</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp" line="+159"/>
+        <source>_Left border:</source>
+        <translation type="unfinished">E_zker hertza:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Right border:</source>
+        <translation type="unfinished">E_skuin hertza:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Top border:</source>
+        <translation type="unfinished">_Goiko hertza:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Bottom border:</source>
+        <translation type="unfinished">_Beheko hertza:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Blacken Borders</source>
+        <translation type="unfinished">Hertz Beltzenak</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Incorrect parameters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All parameters must be even and within range.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>blackenBorders</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp" line="159"/>
         <source>_Left border:</source>
-        <translation>E_zker hertza:</translation>
+        <translation type="vanished">E_zker hertza:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp" line="160"/>
         <source>_Right border:</source>
-        <translation>E_skuin hertza:</translation>
+        <translation type="vanished">E_skuin hertza:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp" line="161"/>
         <source>_Top border:</source>
-        <translation>_Goiko hertza:</translation>
+        <translation type="vanished">_Goiko hertza:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp" line="162"/>
         <source>_Bottom border:</source>
-        <translation>_Beheko hertza:</translation>
+        <translation type="vanished">_Beheko hertza:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp" line="165"/>
         <source>Blacken Borders</source>
-        <translation>Hertz Beltzenak</translation>
+        <translation type="vanished">Hertz Beltzenak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp" line="169"/>
         <source>Incorrect parameters</source>
-        <translation>Parametro okerrak</translation>
+        <translation type="vanished">Parametro okerrak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp" line="169"/>
         <source>All parameters must be even and within range.</source>
-        <translation>Parametro guztiak berdinak eta mailakoak izan behar dute.</translation>
+        <translation type="vanished">Parametro guztiak berdinak eta mailakoak izan behar dute.</translation>
     </message>
 </context>
 <context>
     <name>changeFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="40"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
         <source>Custom</source>
         <translation>Egilea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="41"/>
+        <location line="+1"/>
         <source>25  (PAL)</source>
         <translation>25  (PAL)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="42"/>
+        <location line="+1"/>
         <source>23.976 (Film)</source>
         <translation>23.976 (Filma)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="43"/>
+        <location line="+1"/>
         <source>29.97 (NTSC)</source>
         <translation>29.97 (NTSC)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="44"/>
+        <location line="+1"/>
         <source>50 (Pal)</source>
         <translation>50 (Pal)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="45"/>
+        <location line="+1"/>
         <source>59.93  (NTSC)</source>
         <translation>59.93  (NTSC)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="208"/>
+        <location line="+163"/>
         <source>Source Fps:</source>
         <translation>Iturburu Fs-ko:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="209"/>
+        <location line="+1"/>
         <source>Source frame rate:</source>
         <translation>Iturburu frame neurria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="213"/>
+        <location line="+4"/>
         <source>Destination Fps:</source>
         <translation>Helmuga Fs-ko:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="214"/>
+        <location line="+1"/>
         <source>Destination frame rate:</source>
         <translation>Helmuga frame neurria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="222"/>
+        <location line="+8"/>
         <source>Change fps</source>
         <translation>Aldatu fs-ko</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Invalid fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>changefps</name>
+    <message>
+        <location line="-151"/>
+        <source>Change FPS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>chromashift</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp" line="34"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp" line="+34"/>
         <source>ChromaShift</source>
         <translation>Margotasuna Aldatu</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp" line="35"/>
+        <location line="+1"/>
         <source>Shift chroma U/V to fix badly synced luma/chroma.</source>
         <translation>Aldatu margo U/V gaizki aldibereturiko argit/margot. zuzentzeko.</translation>
     </message>
@@ -7254,17 +6795,14 @@
 <context>
     <name>chromashiftDialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp" line="35"/>
         <source>ChromaShift</source>
         <translation type="obsolete">Margotasuna Aldatu</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp" line="35"/>
         <source>V Shift</source>
         <translation type="obsolete">V Aldatu</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp" line="35"/>
         <source>U Shift</source>
         <translation type="obsolete">U Aldatu</translation>
     </message>
@@ -7272,45 +6810,160 @@
 <context>
     <name>coloryuv</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="+62"/>
         <source>Avisynth color filter.</source>
         <translation>Avisynth margo iragazkia.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="63"/>
+        <location line="+1"/>
         <source>Color management filter.</source>
         <translation>Margo kudeaketa iragazkia.</translation>
     </message>
+    <message>
+        <location line="+12"/>
+        <source>AutoWhite</source>
+        <translation type="unfinished">Berez-Zuria</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>AutoGain</source>
+        <translation type="unfinished">Berez-Irabazia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clip to Tv Range (16-235)</source>
+        <translation type="unfinished">Klikatu Tb Mailara (16-235)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>None</source>
+        <translation type="unfinished">Ezer ez</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>PC-&gt;TV</source>
+        <translation type="unfinished">PC-&gt;TB</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>TV-&gt;PC</source>
+        <translation type="unfinished">TB-&gt;PC</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Levels:</source>
+        <translation type="unfinished">Mailak:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Y gain</source>
+        <translation type="unfinished">Y irabazia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Y Brightness</source>
+        <translation type="unfinished">Y Dizdira</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Y Gamma</source>
+        <translation type="unfinished">Y Gamma</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Y Contrast</source>
+        <translation type="unfinished">Y Zuribeltztasuna</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>U gain</source>
+        <translation type="unfinished">U irabazia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>U Brightness</source>
+        <translation type="unfinished">U Dizdira</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>U Contrast</source>
+        <translation type="unfinished">U Zuribeltztasuna</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>V gain</source>
+        <translation type="unfinished">V irabazia</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>V Brightness</source>
+        <translation type="unfinished">V Dizdira</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>V Contrast</source>
+        <translation type="unfinished">V Zuribeltztasuna</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Flags</source>
+        <translation type="unfinished">Ikurrak</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Y</source>
+        <translation type="unfinished">Y</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>U</source>
+        <translation type="unfinished">U</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>V</source>
+        <translation type="unfinished">V</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>colorYuv</source>
+        <translation type="unfinished">margoa-Yuv</translation>
+    </message>
 </context>
 <context>
     <name>contrast</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/cli/DIA_contrast.cpp" line="25"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/cli/DIA_contrast.cpp" line="+25"/>
         <source>U :</source>
         <translation>U :</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/cli/DIA_contrast.cpp" line="26"/>
+        <location line="+1"/>
         <source>V :</source>
         <translation>V :</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/cli/DIA_contrast.cpp" line="27"/>
+        <location line="+1"/>
         <source>L :</source>
         <translation>L :</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/cli/DIA_contrast.cpp" line="29"/>
+        <location line="+2"/>
         <source>Offset :</source>
         <translation>Oreka :</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/cli/DIA_contrast.cpp" line="30"/>
+        <location line="+1"/>
         <source>Coef :</source>
         <translation>Ezaug :</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+34"/>
+        <source>Contrast</source>
+        <translation type="unfinished">Zuribeltztasuna</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Adjust contrast, brightness and colors.</source>
         <translation>Zehaztu zuribeltztasuna, dizdira eta margoak.</translation>
     </message>
@@ -7318,55 +6971,71 @@
 <context>
     <name>contrastDialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="35"/>
         <source>Contrast</source>
         <translation type="obsolete">Zuribeltztasuna</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="35"/>
         <source>Contrast:</source>
         <translation type="obsolete">Zuribeltztasuna:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="35"/>
         <source>Brightness:</source>
         <translation type="obsolete">Dizdira:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="35"/>
         <source>Colour Space</source>
         <translation type="obsolete">Margo Eremua</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="35"/>
         <source>Luma</source>
         <translation type="obsolete">Argitasuna</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="35"/>
         <source>ChromaU</source>
         <translation type="obsolete">U Margotasuna</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="35"/>
         <source>ChromaV</source>
         <translation type="obsolete">V Margotasuna</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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Process luma plane</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>P_rocess chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Fast Convolution</source>
+        <translation type="unfinished">Konboluzio Azkarra</translation>
+    </message>
+</context>
+<context>
     <name>crash</name>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="85"/>
+        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+85"/>
         <source>Load it</source>
         <translation>Gertatu hura</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="85"/>
+        <location line="+0"/>
         <source>Crash file</source>
         <translation>Matxura agiria</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="86"/>
+        <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>
@@ -7378,94 +7047,237 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
         <source>crop</source>
         <translation>moztu</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="57"/>
+        <location line="+1"/>
         <source>crop filter</source>
         <translation>moztu iragazkia</translation>
     </message>
+    <message>
+        <location line="+22"/>
+        <source>Warning Cropping too much width ! Width reseted !
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Warning Cropping too much height ! Height reseted !
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>cropDialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="57"/>
         <source>Crop</source>
         <translation type="obsolete">Moztu</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="57"/>
         <source>Right:</source>
         <translation type="obsolete">Eskuin:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="57"/>
         <source>Top:</source>
         <translation type="obsolete">Goi:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="57"/>
         <source>Reset</source>
         <translation type="obsolete">Birrezarri</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="57"/>
         <source>Bottom:</source>
         <translation type="obsolete">Behe:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="57"/>
         <source>Left:</source>
         <translation type="obsolete">Ezker:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="57"/>
         <source>Auto Crop</source>
         <translation type="obsolete">Berez Moztu</translation>
     </message>
 </context>
 <context>
+    <name>dcaenc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp" line="-6"/>
+        <source>_Bitrate:</source>
+        <translation type="unfinished">_Bitneurria:</translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+56"/>
         <source>Decomb decimate</source>
         <translation>Ezorrazketa Hamarrendua</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="57"/>
+        <location line="+1"/>
         <source>Donald Graft decimate. Remove duplicate after telecide.</source>
         <translation>Donald Graft hamarrendua. Kendu bikoiztuak telecide ondoren.</translation>
     </message>
+    <message>
+        <location line="+17"/>
+        <source>Discard closer</source>
+        <translation type="unfinished">Baztertu istzailea</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace (interpolate)</source>
+        <translation type="unfinished">Ordeztu (interpolatu)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Discard longer dupe (animés)</source>
+        <translation type="unfinished">Baztertu bikoizketa luzea (animazioa)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Pulldown dupe removal</source>
+        <translation type="unfinished">Hedagarri bikoiztu kenketa</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Fastest (no chroma, partial luma)</source>
+        <translation type="unfinished">Azkarrena (margot. gabe, argit. partziala)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Medium (full luma, no chroma)</source>
+        <translation type="unfinished">Ertaina (argit. osoa, margot. gabe)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Threshold 1:</source>
+        <translation type="unfinished">_Muga 1:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>T_hreshold 2:</source>
+        <translation type="unfinished">M_uga 2:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>C_ycle:</source>
+        <translation type="unfinished">Z_ikloa:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Sho_w</source>
+        <translation type="unfinished">E_rakutsi</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Decomb Decimate</source>
+        <translation type="unfinished">Ezorrazketa Hamarrendua</translation>
+    </message>
+</context>
+<context>
+    <name>delogo2</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp" line="+42"/>
+        <source>MPlayer delogo2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend a logo by interpolating its surrounding box.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>dgbob</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+56"/>
         <source>dgbob</source>
         <translation>dgbob</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="57"/>
+        <location line="+1"/>
         <source>Donald Graft Bob.</source>
         <translation>Donald Graft Bob.</translation>
     </message>
+    <message>
+        <location line="+11"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Keep nb of frames and fps</source>
+        <translation type="unfinished">Gorde frame eta fs-ko zenbatekoa</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double nb of frames and fps</source>
+        <translation type="unfinished">Frame eta fs-ko zenbateko bikoitza</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Double nb of frames (slow motion)</source>
+        <translation type="unfinished">Frame zenbateko bikoitza (mugimendu astiroa)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Top Field First:</source>
+        <translation type="unfinished">_Goiko Eremua Lehenik:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Threshold:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Extra</source>
+        <translation type="unfinished">_Estra</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Extra check, avoid using it</source>
+        <translation type="unfinished">Gain egiaztapena, saihestu erabiltzea</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DGBob</source>
+        <translation type="unfinished">DGBob</translation>
+    </message>
 </context>
 <context>
     <name>dmxHeader</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="57"/>
         <source>Out of memory</source>
         <translation type="obsolete">Oroimenetik kanpo</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="57"/>
         <source>Opening MPEG</source>
         <translation type="obsolete">MPEG-a irekitzen</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="57"/>
         <source>MPEG renumbering error</source>
         <translation type="obsolete">MPEG birzenbakitze akatsa</translation>
     </message>
@@ -7473,112 +7285,107 @@
 <context>
     <name>encodingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="14"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+26"/>
         <source>Encoding...</source>
         <translation>Kodeatzen...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="72"/>
+        <location line="+57"/>
         <source>Phase:</source>
         <translation>Aldia:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="85"/>
+        <location line="+216"/>
         <source>Video Codec:</source>
         <translation>Bideo Kodeka:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="123"/>
+        <location line="-229"/>
+        <location line="+182"/>
+        <location line="+24"/>
         <source>None</source>
         <translation>Ezer ez</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="174"/>
+        <location line="-223"/>
+        <location line="+216"/>
         <source>Unknown</source>
         <translation>Ezezaguna</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="174"/>
         <source>Container:</source>
         <translation type="obsolete">Edukiontzia:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="174"/>
         <source>Audio Codec:</source>
         <translation type="obsolete">Audio Kodeka:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="363"/>
+        <location line="+155"/>
+        <location line="+37"/>
+        <location line="+51"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="181"/>
+        <location line="-7"/>
         <source>00:00:00</source>
         <translation>00:00:00</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="181"/>
         <source>Elapsed:</source>
         <translation type="obsolete">Igarota:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="181"/>
         <source>Time Remaining:</source>
         <translation type="obsolete">Gelditzen dena:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="181"/>
         <source>Frames/sec:</source>
         <translation type="obsolete">Frame/seg:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="279"/>
+        <location line="-152"/>
+        <location line="+7"/>
+        <location line="+17"/>
         <source>0 MB</source>
         <translation>0 MB</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="279"/>
         <source>Total Size:</source>
         <translation type="obsolete">Neurria Guztira:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="279"/>
         <source>Audio Size:</source>
         <translation type="obsolete">Audio Neurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="279"/>
         <source>Video Size:</source>
         <translation type="obsolete">Bideo Neurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="279"/>
         <source>Processed Frames:</source>
         <translation type="obsolete">Prozesatutako Frameak:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="279"/>
         <source>Total Frames:</source>
         <translation type="obsolete">Frameak Guztira:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="346"/>
+        <location line="+77"/>
         <source>0 kB/s</source>
         <translation>0 kB/s</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="346"/>
         <source>Average Bitrate:</source>
         <translation type="obsolete">Bataz-besteko Bitneurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="346"/>
         <source>Quantiser:</source>
         <translation type="obsolete">Kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="113"/>
+        <location line="-171"/>
         <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;
@@ -7589,7 +7396,7 @@
 &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;Edukiontzia:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="130"/>
+        <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;
@@ -7600,7 +7407,7 @@
 &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 Kodeka:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="188"/>
+        <location line="+236"/>
         <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;
@@ -7611,7 +7418,7 @@
 &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;Igarota:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="198"/>
+        <location line="-405"/>
         <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;
@@ -7622,7 +7429,7 @@
 &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;Gelditzen Da:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="208"/>
+        <location line="+429"/>
         <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;
@@ -7633,7 +7440,7 @@
 &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;Frame/seg:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="252"/>
+        <location line="-176"/>
         <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;
@@ -7644,7 +7451,12 @@
 &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;Neurria Guztira:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="269"/>
+        <location line="-137"/>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <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;
@@ -7655,7 +7467,7 @@
 &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 Neurria:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="289"/>
+        <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;
@@ -7666,7 +7478,7 @@
 &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;Bideo Neurria:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="326"/>
+        <location line="+67"/>
         <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;
@@ -7677,7 +7489,7 @@
 &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;Prozesatutako Frameak:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="353"/>
+        <location line="-20"/>
         <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;
@@ -7688,7 +7500,7 @@
 &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;Bataz-besteko Bitneurria:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="370"/>
+        <location line="+30"/>
         <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;
@@ -7699,42 +7511,47 @@
 &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;Kuantizatzailea:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="429"/>
+        <location line="-340"/>
         <source>Shut down computer when finished</source>
         <translation>Itzali ordenagailua amaitutakoan</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="449"/>
+        <location line="-62"/>
+        <source>Main</source>
+        <translation type="unfinished">Nagusia</translation>
+    </message>
+    <message>
+        <location line="+82"/>
         <source>Priority:</source>
         <translation>Lehentasuna:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="460"/>
+        <location line="+11"/>
         <source>High</source>
         <translation>Handia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="465"/>
+        <location line="+5"/>
         <source>Above Normal</source>
         <translation>Arruntaren Gainetikoa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="470"/>
+        <location line="+5"/>
         <source>Normal</source>
         <translation>Arrunta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="475"/>
+        <location line="+5"/>
         <source>Below Normal</source>
         <translation>Arruntaren Azpitikoa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="480"/>
+        <location line="+5"/>
         <source>Low</source>
         <translation>Apala</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="554"/>
+        <location line="+38"/>
         <source>Pause / Abort</source>
         <translation>Pausatu / Utzi</translation>
     </message>
@@ -7742,37 +7559,30 @@
 <context>
     <name>encodingWindow</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="554"/>
         <source>Pause / Abort</source>
         <translation type="obsolete">Pausatu / Utzi</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="554"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="obsolete">Kodeaketa pausatuta dago. Berrekitea edo uztea nahi duzu?</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="554"/>
         <source>Resume</source>
         <translation type="obsolete">Berrekin</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="554"/>
         <source>Abort</source>
         <translation type="obsolete">Utzi</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="99"/>
         <source>Privileges Required</source>
-        <translation>Eskubide Bereziak behar dira</translation>
+        <translation type="vanished">Eskubide Bereziak behar dira</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="99"/>
         <source>Root privileges are required to perform this operation.</source>
-        <translation>Erro eskubideak beharrezkoak dira eragiketa hau burutzeko.</translation>
+        <translation type="vanished">Erro eskubideak beharrezkoak dira eragiketa hau burutzeko.</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="99"/>
         <source>Shutting down</source>
         <translation type="obsolete">Itzaltzen</translation>
     </message>
@@ -7780,12 +7590,12 @@
 <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="+59"/>
         <source>MPlayer eq2</source>
         <translation>MPlayer eq2</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="60"/>
+        <location line="+1"/>
         <source>Adjust contrast, brightness, saturation and gamma.</source>
         <translation>Zehaztu zuribeltztasuna, dizdira, margoasetasuna eta gamma.</translation>
     </message>
@@ -7793,52 +7603,42 @@
 <context>
     <name>eq2Dialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="60"/>
         <source>MPlayer eq2</source>
         <translation type="obsolete">MPlayer eq2</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="60"/>
         <source>Contrast:</source>
         <translation type="obsolete">Zuribeltztasuna:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="60"/>
         <source>Brightness:</source>
         <translation type="obsolete">Dizdira:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="60"/>
         <source>Saturation:</source>
         <translation type="obsolete">Margoasetasuna:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="60"/>
         <source>Gamma</source>
         <translation type="obsolete">Gamma</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="60"/>
         <source>Green</source>
         <translation type="obsolete">Orlegia</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="60"/>
         <source>Red</source>
         <translation type="obsolete">Gorria</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="60"/>
         <source>Blue</source>
         <translation type="obsolete">Urdina</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="60"/>
         <source>Weight</source>
         <translation type="obsolete">Pisua</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="60"/>
         <source>Initial</source>
         <translation type="obsolete">Hasiera</translation>
     </message>
@@ -7846,215 +7646,277 @@
 <context>
     <name>fade</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+54"/>
         <source>Fade</source>
         <translation>Hutsaltasuna</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="52"/>
+        <location line="+1"/>
+        <source>Fade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Fade in/out.</source>
-        <translation>Hutsaltasuna sar/irt.</translation>
+        <translation type="vanished">Hutsaltasuna sar/irt.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp" line="-3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+19"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+75"/>
+        <source>_Start time (ms):</source>
+        <translation type="unfinished">_Hasiera Denbora (sm):</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+1"/>
+        <source>_End time (ms):</source>
+        <translation type="unfinished">_Amaiera Denbora (sm):</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="-23"/>
+        <location line="+26"/>
+        <source>Fade to black</source>
+        <translation type="unfinished">Hutsaldu beltzera</translation>
+    </message>
+    <message>
+        <location line="-25"/>
+        <source>Fade to black in/out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Out</source>
+        <translation type="unfinished">Irteera</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade out</source>
+        <translation type="unfinished">Irteera hutsaltasuna</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>In</source>
+        <translation type="unfinished">Sarrera</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Fade in</source>
+        <translation type="unfinished">Sarrera baterapena</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>_Fade type:</source>
+        <translation type="unfinished">_Hutsaltasun mota:</translation>
+    </message>
+</context>
+<context>
+    <name>fade to</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+3"/>
+        <source>Fade</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="200"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+208"/>
         <source>Normal (4:3)</source>
         <translation>Arrunta (4:3)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="201"/>
+        <location line="+1"/>
         <source>Wide (16:9)</source>
         <translation>Zabala (16:9)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="206"/>
+        <location line="+5"/>
         <source>Default</source>
         <translation>Berezkoa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="207"/>
+        <location line="+1"/>
         <source>Tmpgenc</source>
         <translation>Tmpgenc</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="208"/>
+        <location line="+1"/>
         <source>Animes</source>
         <translation>Animazioak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="209"/>
+        <location line="+1"/>
         <source>KVCD</source>
         <translation>KVCD</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="213"/>
+        <location line="+4"/>
         <source>MB comparison</source>
         <translation>MB alderaketa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="214"/>
+        <location line="+1"/>
         <source>Fewest bits (vhq)</source>
         <translation>Gutxiengo bit (vhq)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="215"/>
+        <location line="+1"/>
         <source>Rate distortion</source>
         <translation>Neurri bihurdura</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="218"/>
+        <location line="+3"/>
         <source>One thread</source>
         <translation>Bat hari</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="219"/>
+        <location line="+1"/>
         <source>Two threads)</source>
         <translation>Bi hari)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="220"/>
+        <location line="+1"/>
         <source>Three threads</source>
         <translation>Hiru hari</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="221"/>
+        <location line="+1"/>
         <source>Auto (#cpu)</source>
         <translation>Berez (#cpu)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="225"/>
+        <location line="+4"/>
         <source>Progressive</source>
         <translation>Aurrerakoia</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="226"/>
+        <location line="+1"/>
         <source>Interlaced</source>
         <translation>Elkarlotuta</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="229"/>
+        <location line="+3"/>
         <source>Top Field First</source>
         <translation>Goren Eremua Lehenik</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="230"/>
+        <location line="+1"/>
         <source>Bottom Field First</source>
         <translation>Beheren Eremua Lehenik</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="240"/>
+        <location line="+10"/>
         <source>Threading</source>
         <translation>Hariak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="241"/>
+        <location line="+1"/>
         <source>Mi_n. quantizer:</source>
         <translation>Gut_x kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="242"/>
+        <location line="+1"/>
         <source>Ma_x. quantizer:</source>
         <translation>Ge_h kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="243"/>
+        <location line="+1"/>
         <source>Max. quantizer _difference:</source>
         <translation>Geh kuantizatzaile _aldea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="244"/>
+        <location line="+1"/>
         <source>VBV Buffer Size:</source>
         <translation>BNA Buffer Neurria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="245"/>
+        <location line="+1"/>
         <source>Max bitrate (kb/s):</source>
         <translation>Geh bitneurria (kb/s):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="247"/>
+        <location line="+2"/>
         <source>_Trellis quantization</source>
         <translation>_Trellis kuantizazioa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="249"/>
+        <location line="+2"/>
         <source>_Number of B frames:</source>
         <translation>_B frame zenbatekoa:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="253"/>
+        <location line="+4"/>
         <source>_Macroblock decision:</source>
         <translation>_Makrobloke erabakia:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="254"/>
+        <location line="+1"/>
         <source>Aspect ratio:</source>
         <translation>Ikuspegi Maila:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="255"/>
+        <location line="+1"/>
         <source>Matrices:</source>
         <translation>Matrizeak:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="256"/>
+        <location line="+1"/>
         <source>_Filesize tolerance (kb):</source>
         <translation>_Agirineurri jasangarritasuna (kb):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="258"/>
+        <location line="+2"/>
         <source>_Quantizer compression:</source>
         <translation>_Kuantizatzaile konpresioa:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="259"/>
+        <location line="+1"/>
         <source>Quantizer _blur:</source>
         <translation>_Blur Kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="261"/>
+        <location line="+2"/>
         <source>_Gop Size:</source>
         <translation>_Gop Neurria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="263"/>
+        <location line="+2"/>
         <source>_Interlaced:</source>
         <translation>_Elkarlotuta:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="264"/>
+        <location line="+1"/>
         <source>Field Order:</source>
         <translation>Eremu Hurrenkera:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="268"/>
+        <location line="+4"/>
         <source>Basic Settings</source>
         <translation>Ohinarrizko Ezarpenak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="272"/>
+        <location line="+4"/>
         <source>Adv. Settings</source>
         <translation>Ezarpen Aurreratuak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="276"/>
+        <location line="+4"/>
         <source>Interlacing</source>
         <translation>Elkarlotzen</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="281"/>
+        <location line="+5"/>
         <source>Quantization</source>
         <translation>Kuantizazioa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="286"/>
+        <location line="+5"/>
         <source>Rate Control</source>
         <translation>Neurri Agintea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="289"/>
+        <location line="+3"/>
         <source>libavcodec MPEG-2 configuration</source>
         <translation>libavcodec MPEG-2 itxurapena</translation>
     </message>
@@ -8062,187 +7924,187 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="176"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+186"/>
         <source>None</source>
         <translation>Ezer ez</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="177"/>
+        <location line="+1"/>
         <source>Full</source>
         <translation>Osoa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="178"/>
+        <location line="+1"/>
         <source>Log</source>
         <translation>Oharra</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="179"/>
+        <location line="+1"/>
         <source>Phods</source>
         <translation>Phodak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="180"/>
+        <location line="+1"/>
         <source>EPZS</source>
         <translation>EPZS</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="181"/>
+        <location line="+1"/>
         <source>X1</source>
         <translation>X1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="185"/>
+        <location line="+4"/>
         <source>H.263</source>
         <translation>H.263</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="186"/>
+        <location line="+1"/>
         <source>MPEG</source>
         <translation>MPEG</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="190"/>
+        <location line="+4"/>
         <source>MB comparison</source>
         <translation>MB alderaketa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="191"/>
+        <location line="+1"/>
         <source>Fewest bits (vhq)</source>
         <translation>Gutxiengo bit (vhq)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="192"/>
+        <location line="+1"/>
         <source>Rate distortion</source>
         <translation>Neurri bihurdura</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="195"/>
+        <location line="+3"/>
         <source>One thread</source>
         <translation>Bat hari</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="196"/>
+        <location line="+1"/>
         <source>Two threads)</source>
         <translation>Bi hari)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="197"/>
+        <location line="+1"/>
         <source>Three threads</source>
         <translation>Hiru hari</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="198"/>
+        <location line="+1"/>
         <source>Auto (#cpu)</source>
         <translation>berez (#cpu)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="208"/>
+        <location line="+10"/>
         <source>Matrices</source>
         <translation>Matrizeak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="209"/>
+        <location line="+1"/>
         <source>Threading</source>
         <translation>Hariak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="210"/>
+        <location line="+1"/>
         <source>Mi_n. quantizer:</source>
         <translation>Gut_x kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="211"/>
+        <location line="+1"/>
         <source>Ma_x. quantizer:</source>
         <translation>Ge_h kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="212"/>
+        <location line="+1"/>
         <source>Max. quantizer _difference:</source>
         <translation>Geh kuantizatzaile _aldea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="214"/>
+        <location line="+2"/>
         <source>4_MV</source>
         <translation>4_MV</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="215"/>
+        <location line="+1"/>
         <source>_Trellis quantization</source>
         <translation>_Trellis kuantizazioa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="217"/>
+        <location line="+2"/>
         <source>_Quarter pixel</source>
         <translation>_Eremu Pixel</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="218"/>
+        <location line="+1"/>
         <source>_GMC</source>
         <translation>_GMC</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="221"/>
+        <location line="+3"/>
         <source>_Number of B frames:</source>
         <translation>_B frame zenbatekoa:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="222"/>
+        <location line="+1"/>
         <source>_Quantization type:</source>
         <translation>_Kuantizazio mota:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="224"/>
+        <location line="+2"/>
         <source>_Macroblock decision:</source>
         <translation>_Makrobloke erabakia:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="226"/>
+        <location line="+2"/>
         <source>_Filesize tolerance (kb):</source>
         <translation>_Agirineurri jasangarritasuna (kb):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="228"/>
+        <location line="+2"/>
         <source>_Quantizer compression:</source>
         <translation>_Kuantizatzaile konpresioa:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="229"/>
+        <location line="+1"/>
         <source>Quantizer _blur:</source>
         <translation>_Blur Kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="231"/>
+        <location line="+2"/>
         <source>_Gop Size:</source>
         <translation>_GOP Neurria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="234"/>
+        <location line="+3"/>
         <source>User Interface</source>
         <translation>Erabiltzaile Interfazea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="237"/>
+        <location line="+3"/>
         <source>Advanced Simple Profile</source>
         <translation>Profil Aurreratu Arrunta</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="244"/>
+        <location line="+7"/>
         <source>Motion Estimation</source>
         <translation>Mugimendi Estimazioa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="248"/>
+        <location line="+4"/>
         <source>Quantization</source>
         <translation>Kuantizazioa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="253"/>
+        <location line="+5"/>
         <source>Rate Control</source>
         <translation>Neurri Agintea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="256"/>
+        <location line="+3"/>
         <source>libavcodec MPEG-4 configuration</source>
         <translation>libavcodec MPEG-4 itxurapena</translation>
     </message>
@@ -8250,183 +8112,239 @@
 <context>
     <name>ffmsmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="214"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="+224"/>
         <source>None</source>
         <translation>Ezer ez</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="215"/>
+        <location line="+1"/>
         <source>Full</source>
         <translation>Osoa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="216"/>
+        <location line="+1"/>
         <source>Log</source>
         <translation>Oharra</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="217"/>
+        <location line="+1"/>
         <source>Phods</source>
         <translation>Phodak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="218"/>
+        <location line="+1"/>
         <source>EPZS</source>
         <translation>EPZS</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="219"/>
+        <location line="+1"/>
         <source>X1</source>
         <translation>X1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="223"/>
+        <location line="+4"/>
         <source>H.263</source>
         <translation>H.263</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="224"/>
+        <location line="+1"/>
         <source>MPEG</source>
         <translation>MPEG</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="228"/>
+        <location line="+4"/>
         <source>MB comparison</source>
         <translation>MB alderaketa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="229"/>
+        <location line="+1"/>
         <source>Fewest bits (vhq)</source>
         <translation>Gutxiengo bit (vhq)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="230"/>
+        <location line="+1"/>
         <source>Rate distortion</source>
         <translation>Neurri bihurdura</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="239"/>
+        <location line="+9"/>
         <source>Mi_n. quantizer:</source>
         <translation>Gut_x kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="240"/>
+        <location line="+1"/>
         <source>Ma_x. quantizer:</source>
         <translation>Ge_h kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="241"/>
+        <location line="+1"/>
         <source>Max. quantizer _difference:</source>
         <translation>Geh kuantizatzaile _aldea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="242"/>
+        <location line="+1"/>
         <source>_Trellis quantization</source>
         <translation>_Trellis kuantizazioa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="243"/>
+        <location line="+1"/>
         <source>_Filesize tolerance (kb):</source>
         <translation>_Agirineurri jasangarritasuna (kb):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="245"/>
+        <location line="+2"/>
         <source>_Quantizer compression:</source>
         <translation>_Kuantizatzaile konpresioa:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="246"/>
+        <location line="+1"/>
         <source>Quantizer _blur:</source>
         <translation>_Blur Kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="248"/>
+        <location line="+2"/>
         <source>_Gop Size:</source>
         <translation>_GOP neurria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="251"/>
+        <location line="+3"/>
         <source>User Interface</source>
         <translation>Erabiltzaile Interfazea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="256"/>
+        <location line="+5"/>
         <source>Quantization</source>
         <translation>Kuantizazioa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="261"/>
+        <location line="+5"/>
         <source>Rate Control</source>
         <translation>Neurri Agintea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="264"/>
+        <location line="+3"/>
         <source>libavcodec MPEG-4 configuration</source>
         <translation>libavcodec MPEG-4 itxurapena</translation>
     </message>
 </context>
 <context>
+    <name>ffnvenc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEnc.cpp" line="+192"/>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished">libavcodec MPEG-4 itxurapena</translation>
+    </message>
+</context>
+<context>
     <name>filtermainWindow</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="264"/>
         <source>The filter is already partial</source>
         <translation type="obsolete">Iragazkia jadanik zatia da</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="264"/>
         <source>Load set of filters</source>
         <translation type="obsolete">Gertatu iragazkien ezapenak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="264"/>
         <source>Nothing to save</source>
         <translation type="obsolete">Ezer ez gordetzeko</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="264"/>
         <source>Save set of filters</source>
         <translation type="obsolete">Gorde iragazkien ezarpena</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="264"/>
         <source>Partial Start Frame:</source>
         <translation type="obsolete">Zati Hasiera Framea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="264"/>
         <source>Partial End Frame:</source>
         <translation type="obsolete">Zati Amaiera Framea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="264"/>
         <source>Configure child</source>
         <translation type="obsolete">Child itxurapena</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="264"/>
         <source>Partial Video Filter</source>
         <translation type="obsolete">Zati Bideo Iragazkia</translation>
     </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+552"/>
+        <source>Load video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Save video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>flux</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+38"/>
         <source>Spatio-temporal cleaner by Ross Thomas.</source>
         <translation>Espazial-tenporal garbitzailea Ross Thomas-ek egina.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="88"/>
+        <location line="+50"/>
         <source>_Temporal threshold:</source>
         <translation>_Tenporal muga:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="89"/>
+        <location line="+1"/>
         <source>_Spatial threshold:</source>
         <translation>_Espazial muga:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="93"/>
+        <location line="-52"/>
+        <location line="+56"/>
         <source>FluxSmooth</source>
         <translation>Jario Lehuna</translation>
     </message>
@@ -8434,117 +8352,117 @@
 <context>
     <name>flv1</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="154"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="+162"/>
         <source>None</source>
         <translation>Ezer ez</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="155"/>
+        <location line="+1"/>
         <source>Full</source>
         <translation>Osoa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="156"/>
+        <location line="+1"/>
         <source>Log</source>
         <translation>Oharra</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="157"/>
+        <location line="+1"/>
         <source>Phods</source>
         <translation>Phodak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="158"/>
+        <location line="+1"/>
         <source>EPZS</source>
         <translation>EPZS</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="159"/>
+        <location line="+1"/>
         <source>X1</source>
         <translation>X1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="163"/>
+        <location line="+4"/>
         <source>H.263</source>
         <translation>H.263</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="164"/>
+        <location line="+1"/>
         <source>MPEG</source>
         <translation>MPEG</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="168"/>
+        <location line="+4"/>
         <source>MB comparison</source>
         <translation>MB alderaketa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="169"/>
+        <location line="+1"/>
         <source>Fewest bits (vhq)</source>
         <translation>Gutxiengo bit (vhq)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="170"/>
+        <location line="+1"/>
         <source>Rate distortion</source>
         <translation>Neurri bihurdura</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="179"/>
+        <location line="+9"/>
         <source>Mi_n. quantizer:</source>
         <translation>Gut_x kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="180"/>
+        <location line="+1"/>
         <source>Ma_x. quantizer:</source>
         <translation>Ge_h kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="181"/>
+        <location line="+1"/>
         <source>Max. quantizer _difference:</source>
         <translation>Geh kuantizatzaile _aldea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="182"/>
+        <location line="+1"/>
         <source>_Trellis quantization</source>
         <translation>_Trellis kuantizazioa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="183"/>
+        <location line="+1"/>
         <source>_Filesize tolerance (kb):</source>
         <translation>_Agirineurri jasangarritasuna (kb):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="185"/>
+        <location line="+2"/>
         <source>_Quantizer compression:</source>
         <translation>_Kuantizatzaile konpresioa:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="186"/>
+        <location line="+1"/>
         <source>Quantizer _blur:</source>
         <translation>_Blur Kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="188"/>
+        <location line="+2"/>
         <source>_Gop Size:</source>
         <translation>_GOP neurria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="191"/>
+        <location line="+3"/>
         <source>User Interface</source>
         <translation>Erabiltzaile Interfazea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="196"/>
+        <location line="+5"/>
         <source>Quantization</source>
         <translation>Kuantizazioa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="201"/>
+        <location line="+5"/>
         <source>Rate Control</source>
         <translation>Neurri Agintea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="204"/>
+        <location line="+3"/>
         <source>libavcodec FLV1 configuration</source>
         <translation>libavcodec FLV1 itxurapena</translation>
     </message>
@@ -8552,12 +8470,12 @@
 <context>
     <name>gaussian</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Gauss.cpp" line="26"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Gauss.cpp" line="+26"/>
         <source>Gaussian convolution.</source>
         <translation>Gaussiar konboluzioa.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Gauss.cpp" line="27"/>
+        <location line="+1"/>
         <source>3x3 convolution filter :gaussian.</source>
         <translation>3x3 konboluzioa iragazkiar :gaussiarra.</translation>
     </message>
@@ -8565,63 +8483,87 @@
 <context>
     <name>h263Header</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Gauss.cpp" line="27"/>
         <source>Size is not (s)QCIF</source>
         <translation type="obsolete">Neurria ez da (s)QCIF</translation>
     </message>
 </context>
 <context>
+    <name>hflip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/horizontalFlip/horizontalFlip.cpp" line="+44"/>
+        <source>Horizontal Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>histogram</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_bitrateHisto.cpp" line="131"/>
+        <location filename="../../common/ADM_commonUI/DIA_bitrateHisto.cpp" line="+56"/>
+        <location line="+75"/>
         <source>No data</source>
         <translation>Daturik ez</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_bitrateHisto.cpp" line="202"/>
+        <location line="+71"/>
         <source>Max. bitrate:</source>
         <translation>Geh. bitneurria:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_bitrateHisto.cpp" line="203"/>
+        <location line="+1"/>
         <source>Average bitrate:</source>
         <translation>Bataz-besteko bitneurria:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_bitrateHisto.cpp" line="204"/>
+        <location line="+1"/>
         <source>Number of I frames:</source>
         <translation>_I frame zenbatekoa:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_bitrateHisto.cpp" line="205"/>
+        <location line="+1"/>
         <source>Number of P frames:</source>
         <translation>P frame zenbatekoa:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_bitrateHisto.cpp" line="206"/>
+        <location line="+1"/>
         <source>Number of B frames:</source>
         <translation>B frame zenbatekoa:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_bitrateHisto.cpp" line="207"/>
+        <location line="+1"/>
         <source>Max. B frames:</source>
         <translation>Geh. B frame:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_bitrateHisto.cpp" line="220"/>
+        <location line="+13"/>
         <source>Bitrate Histogram</source>
         <translation>Bitneurri Historiograma</translation>
     </message>
 </context>
 <context>
+    <name>hue</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+56"/>
+        <source>Mplayer Hue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust hue and saturation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>hueDialog</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_bitrateHisto.cpp" line="220"/>
         <source>Hue</source>
         <translation type="obsolete">Nabardura</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_bitrateHisto.cpp" line="220"/>
         <source>Saturation</source>
         <translation type="obsolete">Margoasetasuna</translation>
     </message>
@@ -8629,22 +8571,22 @@
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="99"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+99"/>
         <source>HUFFYUV</source>
         <translation>HUFFYUV</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="100"/>
+        <location line="+1"/>
         <source>FF HUFFYUV</source>
         <translation>FF HUFFYUV</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="109"/>
+        <location line="+9"/>
         <source>Type:</source>
         <translation>Mota:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="112"/>
+        <location line="+3"/>
         <source>HuffYUV Configuration</source>
         <translation>HuffYUV Itxurapena</translation>
     </message>
@@ -8652,22 +8594,22 @@
 <context>
     <name>indexing</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="82"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
         <source>Continue indexing</source>
         <translation>Jarraitu aurkibidetzen</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="82"/>
+        <location line="+0"/>
         <source>Abort Requested</source>
         <translation>Utzi Eskabidea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="82"/>
+        <location line="+0"/>
         <source>Do you want to abort indexing ?</source>
         <translation>Aurkibidetzea uztea nahi duzu?</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="158"/>
+        <location line="+76"/>
         <source>Time Left :%02d:%02d:%02d</source>
         <translation>Gelditzen den Denbora :%02d:%02d:%02d</translation>
     </message>
@@ -8675,57 +8617,57 @@
 <context>
     <name>jobs</name>
     <message>
-        <location filename="../ADM_jobs/src/uiJobs.ui" line="17"/>
+        <location filename="../ADM_jobs/src/uiJobs.ui" line="+17"/>
         <source>Avidemux Jobs</source>
         <translation>Avidemux Lanak</translation>
     </message>
     <message>
-        <location filename="../ADM_jobs/src/uiJobs.ui" line="28"/>
+        <location line="+11"/>
         <source>Run all pending jobs</source>
         <translation>Ekin egiteke dauden lan denak</translation>
     </message>
     <message>
-        <location filename="../ADM_jobs/src/uiJobs.ui" line="31"/>
+        <location line="+3"/>
         <source>Run jobs</source>
         <translation>Ekin lanei</translation>
     </message>
     <message>
-        <location filename="../ADM_jobs/src/uiJobs.ui" line="38"/>
+        <location line="+7"/>
         <source>Delete already executed jobs</source>
         <translation>Ezabatu jadanik exekutaturiko lanak</translation>
     </message>
     <message>
-        <location filename="../ADM_jobs/src/uiJobs.ui" line="41"/>
+        <location line="+3"/>
         <source>Cleanup</source>
         <translation>Garbitu</translation>
     </message>
     <message>
-        <location filename="../ADM_jobs/src/uiJobs.ui" line="48"/>
+        <location line="+7"/>
         <source>If you use VDPAU you cannot use CLI version</source>
         <translation>VDPAU erabiltzen baduzu ezin duzu CLI bertsioa erabili</translation>
     </message>
     <message>
-        <location filename="../ADM_jobs/src/uiJobs.ui" line="51"/>
+        <location line="+3"/>
         <source>use QT4 version</source>
         <translation>erabili QT4 bertsioa</translation>
     </message>
     <message>
-        <location filename="../ADM_jobs/src/uiJobs.ui" line="71"/>
+        <location line="+20"/>
         <source>Quit</source>
         <translation>Utzi</translation>
     </message>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="37"/>
+        <location filename="../../common/GUI_jobs.cpp" line="+37"/>
         <source>Oops</source>
         <translation>Ustekabea</translation>
     </message>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="37"/>
+        <location line="+0"/>
         <source>Something very wrong happened when building joblist.</source>
         <translation>Zerbait oso okerra gertatu da lan-zerrenda eraikitzerakoan.</translation>
     </message>
     <message>
-        <location filename="../../common/GUI_jobs.cpp" line="43"/>
+        <location line="+6"/>
         <source>There are no jobs stored</source>
         <translation>Ez dago lanik biltegiratuta</translation>
     </message>
@@ -8733,27 +8675,27 @@
 <context>
     <name>jobsDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="+13"/>
         <source>Jobs</source>
         <translation>Lanak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="50"/>
+        <location line="+37"/>
         <source>Delete Sel. Job</source>
         <translation>Ezabatu Haut. Lanak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="57"/>
+        <location line="+7"/>
         <source>Delete All Jobs</source>
         <translation>Ezabatu Lan Guztiak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="64"/>
+        <location line="+7"/>
         <source>Run All Jobs</source>
         <translation>Ekin Lan Guztiei</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="71"/>
+        <location line="+7"/>
         <source>Run Selected Job</source>
         <translation>Ekin Hautatutako Lanei</translation>
     </message>
@@ -8761,87 +8703,70 @@
 <context>
     <name>jobsWindow</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="71"/>
         <source>Ready</source>
         <translation type="obsolete">Gertu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="71"/>
         <source>Succeeded</source>
         <translation type="obsolete">Gertatuta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="71"/>
         <source>Failed</source>
         <translation type="obsolete">Huts eginda</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="71"/>
         <source>Deleted</source>
         <translation type="obsolete">Ezabatuta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="71"/>
         <source>Running</source>
         <translation type="obsolete">Ekiten</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="71"/>
         <source>Job Name</source>
         <translation type="obsolete">Lan Izena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="71"/>
         <source>Status</source>
         <translation type="obsolete">Egoera</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="71"/>
         <source>Start Time</source>
         <translation type="obsolete">Hasiera Denbora</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="71"/>
         <source>End Time</source>
         <translation type="obsolete">Amaiera Denbora</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="71"/>
         <source>%1:%2:%3</source>
         <translation type="obsolete">%1:%2:%3</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="71"/>
         <source>Sure!</source>
         <translation type="obsolete">Zihur!</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="71"/>
         <source>Delete job</source>
         <translation type="obsolete">Ezabatu lana</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="71"/>
         <source>Are you sure you want to delete %s job?</source>
         <translation type="obsolete">Zihur zaude %s lana ezabatzea nahi duzula?</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="71"/>
         <source>Delete *all* job</source>
         <translation type="obsolete">Ezabatu lan *guzitiak*</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="71"/>
         <source>Are you sure you want to delete ALL jobs?</source>
         <translation type="obsolete">Zihur zaude lana GUZTIAK ezabatzea nahi dituzula?</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="71"/>
         <source>Already done</source>
         <translation type="obsolete">Jadanik eginda</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="71"/>
         <source>This script has already been successfully executed.</source>
         <translation type="obsolete">Eskript hau jadanik ongi exekutatuta dago.</translation>
     </message>
@@ -8849,27 +8774,27 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="76"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+76"/>
         <source>YUV422</source>
         <translation>YUV422</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="77"/>
+        <location line="+1"/>
         <source>YUV420</source>
         <translation>YUV420</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="88"/>
+        <location line="+11"/>
         <source>_Quantizer:</source>
         <translation>_Kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="89"/>
+        <location line="+1"/>
         <source>_ColorSpace:</source>
         <translation>_MargoEremua:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="93"/>
+        <location line="+4"/>
         <source>Mjpeg Configuration</source>
         <translation>Mjpeg Itxurapena</translation>
     </message>
@@ -8877,100 +8802,161 @@
 <context>
     <name>kernelDeint</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="65"/>
         <source>Top</source>
-        <translation>Goia</translation>
+        <translation type="vanished">Goia</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="66"/>
         <source>Bottom</source>
-        <translation>Behea</translation>
+        <translation type="vanished">Behea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="70"/>
         <source>_Field order:</source>
-        <translation>_Eremu hurrenkera:</translation>
+        <translation type="vanished">_Eremu hurrenkera:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="71"/>
         <source>_Threshold:</source>
-        <translation>_Muga:</translation>
+        <translation type="vanished">_Muga:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="71"/>
         <source>Smaller means more deinterlacing</source>
-        <translation>Txikiagoak esanahi du ezelkarlotura gehiago</translation>
+        <translation type="vanished">Txikiagoak esanahi du ezelkarlotura gehiago</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="72"/>
         <source>_Sharp</source>
-        <translation>_Garbitasuna</translation>
+        <translation type="vanished">_Garbitasuna</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="72"/>
         <source>_Sharper engine:</source>
-        <translation>_Garbitasun gailua:</translation>
+        <translation type="vanished">_Garbitasun gailua:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="73"/>
         <source>T_woway</source>
-        <translation>T_woway</translation>
+        <translation type="vanished">T_woway</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="73"/>
         <source>Extrapolate better (better not to use it)</source>
-        <translation>Estrapolazio hobea (hobe ez erabiltzea)</translation>
+        <translation type="vanished">Estrapolazio hobea (hobe ez erabiltzea)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="74"/>
         <source>_Map</source>
-        <translation>_Mapa</translation>
+        <translation type="vanished">_Mapa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="74"/>
         <source>Show interlaced areas (for test!)</source>
-        <translation>Erakutsi elkarlotutako eremuak (azterketarako!)</translation>
+        <translation type="vanished">Erakutsi elkarlotutako eremuak (azterketarako!)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="78"/>
         <source>KernelDeint</source>
-        <translation>Kernel Deselkarl</translation>
+        <translation type="vanished">Kernel Deselkarl</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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Port of Donald Graft Kernel Deinterlacer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Field order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Threshold:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Smaller means more deinterlacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Sharp</source>
+        <translation type="unfinished">_Garbitasuna</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>_Sharper engine:</source>
+        <translation type="unfinished">_Garbitasun gailua:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>T_woway</source>
+        <translation type="unfinished">T_woway</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Extrapolate better (better not to use it)</source>
+        <translation type="unfinished">Estrapolazio hobea (hobe ez erabiltzea)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Map</source>
+        <translation type="unfinished">_Mapa</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Show interlaced areas (for test!)</source>
+        <translation type="unfinished">Erakutsi elkarlotutako eremuak (azterketarako!)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>KernelDeint</source>
+        <translation type="unfinished">Kernel Deselkarl</translation>
     </message>
 </context>
 <context>
     <name>lame</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="310"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="+310"/>
         <source>CBR</source>
         <translation>BNG</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="311"/>
+        <location line="+1"/>
         <source>ABR</source>
         <translation>BNA</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="313"/>
+        <location line="+2"/>
         <source>Bit_rate mode:</source>
         <translation>Bit_neurri modua:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="329"/>
+        <location line="+18"/>
         <source>_Bitrate:</source>
         <translation>_Bitneurria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="331"/>
+        <location line="+2"/>
         <source>_Quality:</source>
         <translation>_Ontasuna:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="334"/>
+        <location line="+3"/>
         <source>_Disable reservoir:</source>
         <translation>_Ezgaitu biltegia:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="338"/>
+        <location line="+4"/>
         <source>LAME Configuration</source>
         <translation>LAME Itxurapena</translation>
     </message>
@@ -8978,96 +8964,172 @@
 <context>
     <name>largeMedian</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.cpp" line="71"/>
         <source>_Process luma</source>
-        <translation>_Prozesatu argitasuna</translation>
+        <translation type="vanished">_Prozesatu argitasuna</translation>
+    </message>
+    <message>
+        <source>Process luma plane</source>
+        <translation type="vanished">Prozesatu argit. planoa</translation>
+    </message>
+    <message>
+        <source>P_rocess chroma</source>
+        <translation type="vanished">Prozesatu margoa</translation>
+    </message>
+    <message>
+        <source>Fast Convolution</source>
+        <translation type="vanished">Konboluzio Azkarra</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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Median filter on 5x5 matrix.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>_Process luma</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.cpp" line="71"/>
+        <location line="+0"/>
         <source>Process luma plane</source>
-        <translation>Prozesatu argit. planoa</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.cpp" line="72"/>
+        <location line="+1"/>
         <source>P_rocess chroma</source>
-        <translation>Prozesatu margoa</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.cpp" line="76"/>
+        <location line="+4"/>
         <source>Fast Convolution</source>
-        <translation>Konboluzio Azkarra</translation>
+        <translation type="unfinished">Konboluzio Azkarra</translation>
     </message>
 </context>
 <context>
     <name>lavDeint</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="188"/>
         <source>None</source>
-        <translation>Ezer ez</translation>
+        <translation type="vanished">Ezer ez</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="189"/>
         <source>Linear blend</source>
-        <translation>Nahasketa  linearra</translation>
+        <translation type="vanished">Nahasketa  linearra</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="190"/>
         <source>Linear interpolate</source>
-        <translation>Interpolazio linearra</translation>
+        <translation type="vanished">Interpolazio linearra</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="191"/>
         <source>Cubic interpolate</source>
-        <translation>Interpolazio kubikoa</translation>
+        <translation type="vanished">Interpolazio kubikoa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="192"/>
         <source>Median interpolate</source>
-        <translation>Interpolazio ertaina</translation>
+        <translation type="vanished">Interpolazio ertaina</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="193"/>
         <source>FFmpeg deint</source>
-        <translation>FFmpeg deselkarl</translation>
+        <translation type="vanished">FFmpeg deselkarl</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="197"/>
         <source>_Deinterlacing:</source>
-        <translation>_Deselkarlotura:</translation>
+        <translation type="vanished">_Deselkarlotura:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="198"/>
         <source>_Autolevel</source>
-        <translation>_Berezmailaketa</translation>
+        <translation type="vanished">_Berezmailaketa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="202"/>
         <source>libavcodec deinterlacer</source>
-        <translation>libavcodec deselkarlotura</translation>
+        <translation type="vanished">libavcodec deselkarlotura</translation>
     </message>
 </context>
 <context>
     <name>lavMuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="202"/>
         <source>Can&apos;t mux that video codec into MKV</source>
         <translation type="obsolete">Ezinezkoa bideo kodeka MKV-an multiplexatzea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="202"/>
         <source>Incompatible frame rate</source>
         <translation type="obsolete">Frame neurri bateraezina</translation>
     </message>
 </context>
 <context>
+    <name>lavdeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="+71"/>
+        <source>Libavdec Deinterlacers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lavcodec deinterlacer family.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+116"/>
+        <source>None</source>
+        <translation type="unfinished">Ezer ez</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Linear blend</source>
+        <translation type="unfinished">Nahasketa  linearra</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Linear interpolate</source>
+        <translation type="unfinished">Interpolazio linearra</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cubic interpolate</source>
+        <translation type="unfinished">Interpolazio kubikoa</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Median interpolate</source>
+        <translation type="unfinished">Interpolazio ertaina</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>FFmpeg deint</source>
+        <translation type="unfinished">FFmpeg deselkarl</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Deinterlacing:</source>
+        <translation type="unfinished">_Deselkarlotura:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Autolevel</source>
+        <translation type="unfinished">_Berezmailaketa</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>libavcodec deinterlacer</source>
+        <translation type="unfinished">libavcodec deselkarlotura</translation>
+    </message>
+</context>
+<context>
     <name>licenseDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/license.ui" line="16"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/license.ui" line="+16"/>
         <source>License</source>
         <translation>Baimena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/license.ui" line="62"/>
+        <location line="+46"/>
         <source>OK</source>
         <translation>Ongi</translation>
     </message>
@@ -9075,183 +9137,244 @@
 <context>
     <name>logo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp" line="150"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp" line="+51"/>
+        <source>Add logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Put a logo on top of video, with alpha blending.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+98"/>
         <source>_Logo (jpg file):</source>
         <translation>_Logoa (jpg agiria):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp" line="150"/>
+        <location line="+0"/>
         <source>Select JPEG file</source>
         <translation>Hautatu JPEG agiria</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp" line="151"/>
+        <location line="+1"/>
         <source>_X Position:</source>
         <translation>_X Kokapena:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp" line="152"/>
+        <location line="+1"/>
         <source>_Y Position:</source>
         <translation>_Y Kokapena:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp" line="153"/>
+        <location line="+1"/>
         <source>_Alpha:</source>
         <translation>_Alfa:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp" line="157"/>
+        <location line="+4"/>
         <source>Logo</source>
         <translation>Logoa</translation>
     </message>
 </context>
 <context>
+    <name>lumaonly</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
+        <source>GreyScale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove color, only key grey image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>mainFilterDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="20"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="+20"/>
         <source>Video Filter Manager</source>
         <translation>Bideo Iragazki Kudeatzailea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="81"/>
+        <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;Eragindako Iragazkiak&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="121"/>
         <source>C&amp;onfigure</source>
-        <translation>&amp;Itxuratu</translation>
+        <translation type="vanished">&amp;Itxuratu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="134"/>
         <source>P&amp;artial</source>
-        <translation>Za&amp;tia</translation>
+        <translation type="vanished">Za&amp;tia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="134"/>
         <source>Open Script</source>
         <translation type="obsolete">Ireki Eskripta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="134"/>
         <source>Load</source>
         <translation type="obsolete">Gertatu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="134"/>
         <source>Save Script As</source>
         <translation type="obsolete">Gorde Eskripta Honela</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="134"/>
         <source>Save Script</source>
         <translation type="obsolete">Gorde Eskripta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="134"/>
         <source>Move Filter Down</source>
         <translation type="obsolete">Mugitu Iragazkia Behera</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="141"/>
         <source>Down</source>
-        <translation>Behera</translation>
+        <translation type="vanished">Behera</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="141"/>
         <source>Move Filter Up</source>
         <translation type="obsolete">Mugitu Iragazkia Gora</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="152"/>
         <source>Up</source>
-        <translation>Gora</translation>
+        <translation type="vanished">Gora</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="152"/>
         <source>Remove Filter</source>
         <translation type="obsolete">Kendu Iragazkia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="176"/>
         <source>Remove</source>
-        <translation>Kendu</translation>
+        <translation type="vanished">Kendu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="176"/>
         <source>Add Filter</source>
         <translation type="obsolete">Gehitu Iragazkia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="210"/>
         <source>Add</source>
-        <translation>Gehitu</translation>
+        <translation type="vanished">Gehitu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="273"/>
+        <location line="+119"/>
         <source>Transform</source>
         <translation>Eraldatu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="282"/>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation>Elkarlotzen</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="291"/>
+        <location line="+9"/>
         <source>Colors</source>
         <translation>Margoak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="300"/>
+        <location line="+9"/>
         <source>Noise</source>
         <translation>Zarata</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="309"/>
+        <location line="+9"/>
         <source>Sharpness</source>
         <translation>Garbitasuna</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="318"/>
+        <location line="+9"/>
         <source>Subtitles</source>
         <translation>Azpidatziak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="327"/>
+        <location line="+9"/>
         <source>OpenGl</source>
         <translation>OpenGl</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="336"/>
+        <location line="+9"/>
         <source>Miscellaneous</source>
         <translation>Askotarikoak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="398"/>
+        <location line="+62"/>
         <source>&amp;Close</source>
         <translation>It&amp;xi</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="398"/>
         <source>External</source>
         <translation type="obsolete">Kanpokoa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="232"/>
+        <location line="-166"/>
         <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation>&lt;big&gt;&lt;b&gt;Iragazki Eskuragarriak&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="387"/>
+        <location line="+155"/>
         <source>&amp;Preview</source>
         <translation>&amp;Aurreikuspena</translation>
     </message>
 </context>
 <context>
+    <name>mcdeint</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="+81"/>
+        <source>MCDeint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation deinterlacer. Ported from MPlayer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Medium</source>
+        <translation type="unfinished">Ertaina</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Slow iterative motion search</source>
+        <translation type="unfinished">Mugimendu bilaketa berrizte motela</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Extra slow (same as 3+multiple reference frames)</source>
+        <translation type="unfinished">Oso motela (3+frame xehetasun anitz bezala)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>_Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bottom :</source>
+        <translation type="unfinished">Beheren:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Qp:</source>
+        <translation type="unfinished">_Qp:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>mcDeinterlace</source>
+        <translation type="unfinished">mcDeselkarlotura</translation>
+    </message>
+</context>
+<context>
     <name>meadian</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Median.cpp" line="29"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Median.cpp" line="+29"/>
         <source>3x3 convolution filter :median.</source>
         <translation>3x3 konboluzioa iragazkia :median.</translation>
     </message>
@@ -9259,12 +9382,12 @@
 <context>
     <name>mean</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Mean.cpp" line="27"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Mean.cpp" line="+27"/>
         <source>Mean convolution.</source>
         <translation>Mean konboluzioa.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Mean.cpp" line="28"/>
+        <location line="+1"/>
         <source>3x3 convolution filter :mean.</source>
         <translation>3x3 konboluzioa iragazkia :mean.</translation>
     </message>
@@ -9272,7 +9395,7 @@
 <context>
     <name>median</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Median.cpp" line="28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Median.cpp" line="-1"/>
         <source>Median convolution.</source>
         <translation>Mean konboluzioa.</translation>
     </message>
@@ -9280,40 +9403,112 @@
 <context>
     <name>mkvmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="134"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp" line="+134"/>
         <source>Saving Mkv</source>
         <translation>Mkv gordeketa</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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>_Spatial luma strength:</source>
+        <translation type="unfinished">Argitasun _espazial indarra:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>S_patial chroma strength:</source>
+        <translation type="unfinished">Margotasun es_pazial indarra:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Luma _Temporal strength:</source>
+        <translation type="unfinished">Margotasun _Tenporal indarra:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MPlayer denoise3d</source>
+        <translation type="unfinished">MPlayer zaratakentze 3d</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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce noise, smooth image, increase compressibility.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>_Spatial luma strength:</source>
+        <translation type="unfinished">Argitasun _espazial indarra:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>S_patial chroma strength:</source>
+        <translation type="unfinished">Margotasun es_pazial indarra:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Temporal strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>MPlayer denoise3d</source>
+        <translation type="unfinished">MPlayer zaratakentze 3d</translation>
+    </message>
+</context>
+<context>
     <name>msharpen</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="78"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="+77"/>
+        <source>Msharpen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
         <translation>Zorroztu hertzak zarata handitu gabe. Donald Graft-ek egina.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="133"/>
+        <location line="+55"/>
         <source>_Mask</source>
         <translation>_Mozorroa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="134"/>
+        <location line="+1"/>
         <source>_High Q</source>
         <translation>_Ontasun Handia</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="136"/>
+        <location line="+2"/>
         <source>_Threshold:</source>
         <translation>_Muga:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="137"/>
+        <location line="+1"/>
         <source>_Strength:</source>
         <translation>_Indartsua:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp" line="142"/>
+        <location line="+5"/>
         <source>MSharpen</source>
         <translation>MSharpen</translation>
     </message>
@@ -9321,12 +9516,12 @@
 <context>
     <name>muxerMP4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="150"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+152"/>
         <source>Saving mp4</source>
         <translation>mp4 gordetzea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="151"/>
+        <location line="+1"/>
         <source>Saving PSP</source>
         <translation>PSP gordetzea</translation>
     </message>
@@ -9334,7 +9529,7 @@
 <context>
     <name>muxerffPS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="140"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+140"/>
         <source>Saving mpeg PS (ff)</source>
         <translation>mpeg PS (ff) gordetzea</translation>
     </message>
@@ -9342,7 +9537,7 @@
 <context>
     <name>muxerffTS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="147"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+141"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>mpeg TS (ff) gordetzea</translation>
     </message>
@@ -9350,40 +9545,86 @@
 <context>
     <name>nuvHeader</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="147"/>
         <source>Opening Nuppel video</source>
         <translation type="obsolete">Nuppel bideoa irekitzen</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="147"/>
         <source>Sure you want to abort ?</source>
         <translation type="obsolete">Zihur zaude uztea nahi duzula ?</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="147"/>
         <source>Size mismatch</source>
         <translation type="obsolete">Neurri zehazgabezia</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="147"/>
         <source>Expect a crash.</source>
         <translation type="obsolete">Matxura itxaron.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="147"/>
         <source>Do you want to save an index ?</source>
         <translation type="obsolete">Aurkibide batean gordetzea nahi duzu ?</translation>
     </message>
 </context>
 <context>
+    <name>nvenc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc.cpp" line="+136"/>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>oggHeader</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="147"/>
         <source>Take second track ?</source>
         <translation type="obsolete">Biigarren bidea hartu ?</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="147"/>
         <source>Scanning OGM</source>
         <translation type="obsolete">OGM Mihatzen</translation>
     </message>
@@ -9391,17 +9632,17 @@
 <context>
     <name>openGlResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="218"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="+217"/>
         <source>Width :</source>
         <translation>Zabalera :</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="219"/>
+        <location line="+1"/>
         <source>Height :</source>
         <translation>Garaiera :</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
+        <location line="+4"/>
         <source>glResize</source>
         <translation>gl-Birneurriratu</translation>
     </message>
@@ -9409,37 +9650,30 @@
 <context>
     <name>pluginManagerDialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>Plugin Manager</source>
         <translation type="obsolete">Plugin Kudeatzailea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>&amp;Video Encoder</source>
         <translation type="obsolete">&amp;Bideo Kodeatzailea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>&amp;Set As Default</source>
         <translation type="obsolete">&amp;Ezarri Berezko Bezala</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>&amp;Enable All</source>
         <translation type="obsolete">&amp;Gaitu Denak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>Disable &amp;All</source>
         <translation type="obsolete">E&amp;zgaitu Denak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>Move &amp;Up</source>
         <translation type="obsolete">Mugitu G&amp;ora</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>Move &amp;Down</source>
         <translation type="obsolete">Mugitu Be&amp;hera</translation>
     </message>
@@ -9447,7 +9681,6 @@
 <context>
     <name>previewDialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>Preview</source>
         <translation type="obsolete">Aurreikuspena</translation>
     </message>
@@ -9455,62 +9688,50 @@
 <context>
     <name>propWindow</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>No</source>
         <translation type="obsolete">Ez</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>Yes</source>
         <translation type="obsolete">Bai</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>%1 x %2</source>
         <translation type="obsolete">%1 x %2</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>%1 fps</source>
         <translation type="obsolete">%1 fs-ko</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>%1 frames</source>
         <translation type="obsolete">%1 frame</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>%1:%2:%3.%4</source>
         <translation type="obsolete">%1:%2:%3.%4</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>%1 (%2:%3)</source>
         <translation type="obsolete">%1 (%2:%3)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>Mono</source>
         <translation type="obsolete">Monoa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>Stereo</source>
         <translation type="obsolete">Estereoa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>%1 Hz</source>
         <translation type="obsolete">%1 Hz</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>%1 Bps / %2 kbps</source>
         <translation type="obsolete">%1 Bs-ko / %2 kbs-ko</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
         <source>%1 MB</source>
         <translation type="obsolete">%1 MB</translation>
     </message>
@@ -9518,117 +9739,117 @@
 <context>
     <name>propsDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="14"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="+14"/>
         <source>Properties</source>
         <translation>Ezaugarriak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="26"/>
+        <location line="+12"/>
         <source>Video</source>
         <translation>Bideoa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="97"/>
+        <location line="+15"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <location line="+14"/>
         <source>TextLabel</source>
         <translation>Idazki Etiketa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="48"/>
+        <location line="-49"/>
         <source>Frame Rate:</source>
         <translation>Frame Neurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="48"/>
         <source>Frame Count: </source>
         <translation type="obsolete">Frame Zenbat.: </translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="179"/>
+        <location line="+14"/>
+        <location line="+117"/>
         <source>Total Duration:</source>
         <translation>Iraupena Guztira:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="76"/>
+        <location line="-103"/>
         <source>Aspect Ratio:</source>
         <translation>Ikuspegi Maila:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="90"/>
+        <location line="+14"/>
         <source>Image Size:</source>
         <translation>Irudi Neurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="104"/>
+        <location line="+14"/>
         <source>Codec 4CC:</source>
         <translation>4 CC Kodeka:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="114"/>
+        <location line="+10"/>
         <source>Extra Video Properties</source>
         <translation>Estra Bideo Ezaugarriak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="133"/>
+        <location line="+19"/>
         <source>ExtraDataSize:</source>
         <translation>GainDatuNeurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="147"/>
+        <location line="+14"/>
         <source>Extra data :</source>
         <translation>Gain datuak :</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="268"/>
+        <location line="+121"/>
         <source>OK</source>
         <translation>Ongi</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="268"/>
         <source>Global Motion Compensation:</source>
         <translation type="obsolete">Mugimendu Orekapen Orokorra:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="268"/>
         <source>Packed Bitstream:</source>
         <translation type="obsolete">Paketatutako Bitjarioa:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="268"/>
         <source>Quarter Pixel:</source>
         <translation type="obsolete">Eremu Pixel:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="157"/>
+        <location line="-111"/>
         <source>Audio</source>
         <translation>Audioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="157"/>
         <source>File Size:</source>
         <translation type="obsolete">Agiri Neurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="186"/>
+        <location line="+29"/>
         <source>Frequency:</source>
         <translation>Maiztasuna:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="200"/>
+        <location line="+14"/>
         <source>Variable Bitrate:</source>
         <translation>Bitneurri Aldakorra:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="221"/>
+        <location line="+21"/>
         <source>Bitrate:</source>
         <translation>Bitneurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="235"/>
+        <location line="+14"/>
         <source>Channels:</source>
         <translation>Bideak:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="249"/>
+        <location line="+14"/>
         <source>Codec:</source>
         <translation>Kodeka:</translation>
     </message>
@@ -9636,37 +9857,38 @@
 <context>
     <name>qprops</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="23"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+23"/>
         <source>No</source>
         <translation>Ez</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="23"/>
+        <location line="+0"/>
         <source>Yes</source>
         <translation>Bai</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="49"/>
+        <location line="+26"/>
         <source>%2.3f fps</source>
         <translation>%2.3f fs-ko</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="112"/>
+        <location line="+4"/>
+        <location line="+59"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d.%03d</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="59"/>
+        <location line="-53"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="92"/>
+        <location line="+33"/>
         <source>Mono</source>
         <translation>Monoa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="95"/>
+        <location line="+3"/>
         <source>Stereo</source>
         <translation>Estereoa</translation>
     </message>
@@ -9674,193 +9896,236 @@
 <context>
     <name>removePlaneFilter</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp" line="151"/>
         <source>Keep Y Plane</source>
-        <translation>Heutsi Y Planoari</translation>
+        <translation type="vanished">Heutsi Y Planoari</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp" line="151"/>
         <source>Process luma plane</source>
-        <translation>Prozesatu argit. planoa</translation>
+        <translation type="vanished">Prozesatu argit. planoa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp" line="152"/>
         <source>Keep U Plane</source>
-        <translation>Heutsi U Planoari</translation>
+        <translation type="vanished">Heutsi U Planoari</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp" line="152"/>
         <source>Process chromaU plane</source>
-        <translation>Prozesatu margoU Planoa</translation>
+        <translation type="vanished">Prozesatu margoU Planoa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp" line="153"/>
         <source>Keep V Plane</source>
-        <translation>Heutsi V Planoari</translation>
+        <translation type="vanished">Heutsi V Planoari</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp" line="153"/>
         <source>Process chromaV plane</source>
-        <translation>Prozesatu margoV planoa</translation>
+        <translation type="vanished">Prozesatu margoV planoa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp" line="158"/>
         <source>Remove plane</source>
-        <translation>Kendu planoa</translation>
+        <translation type="vanished">Kendu planoa</translation>
+    </message>
+</context>
+<context>
+    <name>removeplane</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp" line="+45"/>
+        <source>Remove  Plane</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove Y,U or V plane (used mainly to debug other filters).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+105"/>
+        <source>Keep Y Plane</source>
+        <translation type="unfinished">Heutsi Y Planoari</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Process luma plane</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Keep U Plane</source>
+        <translation type="unfinished">Heutsi U Planoari</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Process chromaU plane</source>
+        <translation type="unfinished">Prozesatu margoU Planoa</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Keep V Plane</source>
+        <translation type="unfinished">Heutsi V Planoari</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Process chromaV plane</source>
+        <translation type="unfinished">Prozesatu margoV planoa</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Remove plane</source>
+        <translation type="unfinished">Kendu planoa</translation>
     </message>
 </context>
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+43"/>
         <source>Custom</source>
         <translation>Egilea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="44"/>
+        <location line="+1"/>
         <source>25  (PAL)</source>
         <translation>25  (PAL)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="45"/>
+        <location line="+1"/>
         <source>23.976 (Film)</source>
         <translation>23.976 (Filma)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="46"/>
+        <location line="+1"/>
         <source>29.97 (NTSC)</source>
         <translation>29.97 (NTSC)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="47"/>
+        <location line="+1"/>
         <source>50 (Pal)</source>
         <translation>50 (Pal)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="48"/>
+        <location line="+1"/>
         <source>59.93  (NTSC)</source>
         <translation>59.93  (NTSC)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="358"/>
+        <location line="+35"/>
+        <source>Resample FPS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Change and enforce FPS. Keep duration and sync.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+274"/>
         <source>_Mode:</source>
         <translation>_Modua:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="359"/>
+        <location line="+1"/>
         <source>_New frame rate:</source>
         <translation>_Frame neurri berria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
+        <location line="+6"/>
         <source>Resample fps</source>
         <translation>Birlaginketa fs-ko</translation>
     </message>
 </context>
 <context>
+    <name>resize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+80"/>
+        <source>swsResize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>swScale Resizer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>resizeDialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>Resize</source>
         <translation type="obsolete">Birneurritu</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>Aspect Ratio</source>
         <translation type="obsolete">Ikuspegi Maila</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>Lock Aspect Ratio</source>
         <translation type="obsolete">Blokeatu Ikuspegi Maila</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>Source:</source>
         <translation type="obsolete">Iturria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>1:1</source>
         <translation type="obsolete">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>4:3</source>
         <translation type="obsolete">4:3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>16:9</source>
         <translation type="obsolete">16:9</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>Destination:</source>
         <translation type="obsolete">Helmuga:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>Resize Dimensions</source>
         <translation type="obsolete">Birneurritu Neurriak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>Width:</source>
         <translation type="obsolete">Zabalera:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>Height:</source>
         <translation type="obsolete">Garaiera:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>Round to the Nearest Multiple of 16</source>
         <translation type="obsolete">16-ren Hurbileneko Biderkagarri Inguruan</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>1%</source>
         <translation type="obsolete">1%</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>Percent</source>
         <translation type="obsolete">Ehunekoa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>200%</source>
         <translation type="obsolete">200%</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>Error X / Y:</source>
         <translation type="obsolete">Akatsa X / Y:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>0.00 / 0.00</source>
         <translation type="obsolete">0.00 / 0.00</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>Resize Method:</source>
         <translation type="obsolete">Birneurriratze Metodoa:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>Bilinear</source>
         <translation type="obsolete">Bilinearra</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>Bicubic</source>
         <translation type="obsolete">Bikubikoa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="365"/>
         <source>Lanzcos3</source>
         <translation type="obsolete">Lanzcos3</translation>
     </message>
@@ -9868,68 +10133,117 @@
 <context>
     <name>resizeWindow</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="251"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+251"/>
         <source>Width and height cannot be odd</source>
         <translation>Zabalera eta garaiera ezin dira eta piku izan</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 type="unfinished">Itzulikatu</translation>
+    </message>
+    <message>
+        <location line="-162"/>
+        <source>Rotate the image by 90/180/270 degrees.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+155"/>
+        <source>None</source>
+        <translation type="unfinished">Ezer ez</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>90 degrees</source>
+        <translation type="unfinished">90 gradu</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>90°</source>
+        <translation type="unfinished">90°</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>180 degrees</source>
+        <translation type="unfinished">180 gradu</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>180°</source>
+        <translation type="unfinished">180°</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>270 degrees</source>
+        <translation type="unfinished">270 gradu</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>270°</source>
+        <translation type="unfinished">270°</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>_Angle:</source>
+        <translation type="unfinished">_Angelua:</translation>
+    </message>
+</context>
+<context>
     <name>rotateFilter</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="208"/>
         <source>None</source>
-        <translation>Ezer ez</translation>
+        <translation type="vanished">Ezer ez</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="209"/>
         <source>90 degrees</source>
-        <translation>90 gradu</translation>
+        <translation type="vanished">90 gradu</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="209"/>
-        <source>90&#xc2;&#xb0;</source>
-        <translation>90Â°</translation>
+        <source>90Â°</source>
+        <translation type="vanished">90Â°</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="210"/>
         <source>180 degrees</source>
-        <translation>180 gradu</translation>
+        <translation type="vanished">180 gradu</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="210"/>
-        <source>180&#xc2;&#xb0;</source>
-        <translation>180Â°</translation>
+        <source>180Â°</source>
+        <translation type="vanished">180Â°</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="211"/>
         <source>270 degrees</source>
-        <translation>270 gradu</translation>
+        <translation type="vanished">270 gradu</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="211"/>
-        <source>270&#xc2;&#xb0;</source>
-        <translation>270Â°</translation>
+        <source>270Â°</source>
+        <translation type="vanished">270Â°</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="213"/>
         <source>_Angle:</source>
-        <translation>_Angelua:</translation>
+        <translation type="vanished">_Angelua:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="215"/>
         <source>Rotate</source>
-        <translation>Itzulikatu</translation>
+        <translation type="vanished">Itzulikatu</translation>
     </message>
 </context>
 <context>
     <name>rotateGl</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp" line="179"/>
-        <source>Angle (&#xc2;&#xb0;):</source>
-        <translation>Angelua (Â°):</translation>
+        <source>Angle (Â°):</source>
+        <translation type="vanished">Angelua (Â°):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp" line="184"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp" line="+178"/>
+        <source>Angle (°):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>glRotate</source>
         <translation>gl-Itzulikapena</translation>
     </message>
@@ -9937,17 +10251,17 @@
 <context>
     <name>seekablePreviewDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/seekablePreview.ui" line="20"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/seekablePreview.ui" line="+20"/>
         <source>Preview</source>
         <translation>Aurreikuspena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/seekablePreview.ui" line="96"/>
+        <location line="+76"/>
         <source>next</source>
         <translation>hurrengoa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/seekablePreview.ui" line="103"/>
+        <location line="+7"/>
         <source>00:00:00.000</source>
         <translation>00:00:00.000</translation>
     </message>
@@ -9955,12 +10269,10 @@
 <context>
     <name>srtDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/seekablePreview.ui" line="103"/>
         <source>Subtitle Font Size and Position</source>
         <translation type="obsolete">Azpidatzi Hizki Neurria eta Kokapena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/seekablePreview.ui" line="103"/>
         <source>Font Size :</source>
         <translation type="obsolete">Hizki Neurria:</translation>
     </message>
@@ -9968,75 +10280,81 @@
 <context>
     <name>subAss</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="170"/>
         <source>_Subtitle file (ASS/SSA):</source>
-        <translation>_Azpidatzi agiria (ASS/SSA):</translation>
+        <translation type="vanished">_Azpidatzi agiria (ASS/SSA):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="170"/>
         <source>Select Subtitle file</source>
-        <translation>Hautatu Azpidatzi agiria</translation>
+        <translation type="vanished">Hautatu Azpidatzi agiria</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="171"/>
         <source>_Line spacing:</source>
-        <translation>_Lerro tartea:</translation>
+        <translation type="vanished">_Lerro tartea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="172"/>
         <source>_Font scale:</source>
-        <translation>_Hizki neurria:</translation>
+        <translation type="vanished">_Hizki neurria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="173"/>
         <source>_Top margin:</source>
-        <translation>_Goiko bazterra:</translation>
+        <translation type="vanished">_Goiko bazterra:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="174"/>
         <source>Botto_m margin</source>
-        <translation>Behe_ko bazterra</translation>
+        <translation type="vanished">Behe_ko bazterra</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="178"/>
         <source>ASS</source>
-        <translation>ASS</translation>
+        <translation type="vanished">ASS</translation>
+    </message>
+</context>
+<context>
+    <name>swapuv</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp" line="+41"/>
+        <source>Swap UV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Swap the U and V planes.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="165"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="+191"/>
         <source>X11</source>
         <translation>X11</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="167"/>
+        <location line="+2"/>
         <source>MS Windows GDI</source>
         <translation>MS Windows GDI</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="169"/>
+        <location line="+2"/>
         <source>Mac OS X Quartz 2D</source>
         <translation>Mac OS X Quartz 2D</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="171"/>
+        <location line="+2"/>
         <source>Mac OS X QuickDraw</source>
         <translation>Mac OS X QuickDraw</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="173"/>
+        <location line="+2"/>
         <source>OpenGL</source>
         <translation>OpenGL</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="176"/>
+        <location line="+3"/>
         <source>MS Windows Direct3D</source>
         <translation>MS Windows Direct3D</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="179"/>
+        <location line="+3"/>
         <source>Default Raster</source>
         <translation>Berezko Raster</translation>
     </message>
@@ -10044,42 +10362,42 @@
 <context>
     <name>vdpauVideoFilterDeint</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="315"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="+316"/>
         <source>Keep Top Field</source>
         <translation>Heutsi Goiko Eremuari</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="316"/>
+        <location line="+1"/>
         <source>Keep Bottom Field</source>
         <translation>Heutsi Beheko Eremuari</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="317"/>
+        <location line="+1"/>
         <source>Double framerate</source>
         <translation>Frameneurri bikoitza</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="321"/>
+        <location line="+4"/>
         <source>_Resize:</source>
         <translation>_Birneurriratu:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="322"/>
+        <location line="+1"/>
         <source>_Deint Mode:</source>
         <translation>_Deint Modua:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="323"/>
+        <location line="+1"/>
         <source>Width :</source>
         <translation>Zabalera :</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="324"/>
+        <location line="+1"/>
         <source>Height :</source>
         <translation>Garaiera :</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="328"/>
+        <location line="+4"/>
         <source>vdpau</source>
         <translation>vdpau</translation>
     </message>
@@ -10087,42 +10405,42 @@
 <context>
     <name>vdpaufilter</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="264"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="+263"/>
         <source>Keep Top Field</source>
         <translation>Heutsi Goiko Eremuari</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="265"/>
+        <location line="+1"/>
         <source>Keep Bottom Field</source>
         <translation>Heutsi Beheko Eremuari</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="266"/>
+        <location line="+1"/>
         <source>Double framerate</source>
         <translation>Frameneurri bikoitza</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="270"/>
+        <location line="+4"/>
         <source>_Resize:</source>
         <translation>_Birneurriratu:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="271"/>
+        <location line="+1"/>
         <source>_Deint Mode:</source>
         <translation>_Deint Modua:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="272"/>
+        <location line="+1"/>
         <source>Width :</source>
         <translation>Zabalera :</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="273"/>
+        <location line="+1"/>
         <source>Height :</source>
         <translation>Garaiera :</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="277"/>
+        <location line="+4"/>
         <source>vdpau</source>
         <translation>vdpau</translation>
     </message>
@@ -10130,65 +10448,82 @@
 <context>
     <name>vdpaufilter2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="198"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="+203"/>
         <source>Width :</source>
         <translation>Zabaleera :</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="199"/>
+        <location line="+1"/>
         <source>Height :</source>
         <translation>Garaiera :</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="203"/>
+        <location line="+4"/>
         <source>vdpau</source>
         <translation>vdpau</translation>
     </message>
 </context>
 <context>
+    <name>vdpresize</name>
+    <message>
+        <location line="-139"/>
+        <source>vdpau: Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>vdpau: Resize image using vdpau.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>vflip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/verticalFlip/verticalFlip.cpp" line="+47"/>
+        <source>Vertical Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vidBlendRemoval</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="203"/>
         <source>_Threshold:</source>
         <translation type="obsolete">_Muga:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="203"/>
         <source>If value is smaller than threshold it is considered valid.Smaller value might mean more false positive.</source>
         <translation type="obsolete">Balio hau muga baino txikiagoa bada baliozkotzat hartzen da. Balio txikiagoak esanahi du faltsu positibo gehiago.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="203"/>
         <source>_Noise:</source>
         <translation type="obsolete">_Zarata:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="203"/>
         <source>If pixels are closer than noise, they are considered to be the same</source>
         <translation type="obsolete">Pixelak zarata baino hurbilago badaude, berdintzat hartzen dira</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="203"/>
         <source>I_dentical:</source>
         <translation type="obsolete">Be_rdintasuna:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="203"/>
         <source>If metric is less than identical, images are considered identical</source>
         <translation type="obsolete">Neurria berdintasuna baino txikiagoa bada, irudiak berdintzat hartzen dira</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="203"/>
         <source>_Show metrics</source>
         <translation type="obsolete">_Erakutsi neurriak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="203"/>
         <source>Show metric in image (debug)</source>
         <translation type="obsolete">Erakutsi neurriak irudian (garbiketa)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="203"/>
         <source>Blend Removal</source>
         <translation type="obsolete">Nahasketa Kentzea</translation>
     </message>
@@ -10196,170 +10531,137 @@
 <context>
     <name>vidColorYuv</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="75"/>
         <source>AutoWhite</source>
-        <translation>Berez-Zuria</translation>
+        <translation type="vanished">Berez-Zuria</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="76"/>
         <source>AutoGain</source>
-        <translation>Berez-Irabazia</translation>
+        <translation type="vanished">Berez-Irabazia</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="77"/>
         <source>Clip to Tv Range (16-235)</source>
-        <translation>Klikatu Tb Mailara (16-235)</translation>
+        <translation type="vanished">Klikatu Tb Mailara (16-235)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="78"/>
         <source>None</source>
-        <translation>Ezer ez</translation>
+        <translation type="vanished">Ezer ez</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="79"/>
         <source>PC-&gt;TV</source>
-        <translation>PC-&gt;TB</translation>
+        <translation type="vanished">PC-&gt;TB</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="80"/>
         <source>TV-&gt;PC</source>
-        <translation>TB-&gt;PC</translation>
+        <translation type="vanished">TB-&gt;PC</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="82"/>
         <source>Levels:</source>
-        <translation>Mailak:</translation>
+        <translation type="vanished">Mailak:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="89"/>
         <source>Y gain</source>
-        <translation>Y irabazia</translation>
+        <translation type="vanished">Y irabazia</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="90"/>
         <source>Y Brightness</source>
-        <translation>Y Dizdira</translation>
+        <translation type="vanished">Y Dizdira</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="91"/>
         <source>Y Gamma</source>
-        <translation>Y Gamma</translation>
+        <translation type="vanished">Y Gamma</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="92"/>
         <source>Y Contrast</source>
-        <translation>Y Zuribeltztasuna</translation>
+        <translation type="vanished">Y Zuribeltztasuna</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="97"/>
         <source>U gain</source>
-        <translation>U irabazia</translation>
+        <translation type="vanished">U irabazia</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="98"/>
         <source>U Brightness</source>
-        <translation>U Dizdira</translation>
+        <translation type="vanished">U Dizdira</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="100"/>
         <source>U Contrast</source>
-        <translation>U Zuribeltztasuna</translation>
+        <translation type="vanished">U Zuribeltztasuna</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="106"/>
         <source>V gain</source>
-        <translation>V irabazia</translation>
+        <translation type="vanished">V irabazia</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="107"/>
         <source>V Brightness</source>
-        <translation>V Dizdira</translation>
+        <translation type="vanished">V Dizdira</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="109"/>
         <source>V Contrast</source>
-        <translation>V Zuribeltztasuna</translation>
+        <translation type="vanished">V Zuribeltztasuna</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="113"/>
         <source>Flags</source>
-        <translation>Ikurrak</translation>
+        <translation type="vanished">Ikurrak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="114"/>
         <source>Y</source>
-        <translation>Y</translation>
+        <translation type="vanished">Y</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="115"/>
         <source>U</source>
-        <translation>U</translation>
+        <translation type="vanished">U</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="116"/>
         <source>V</source>
-        <translation>V</translation>
+        <translation type="vanished">V</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="119"/>
         <source>colorYuv</source>
-        <translation>margoa-Yuv</translation>
+        <translation type="vanished">margoa-Yuv</translation>
     </message>
 </context>
 <context>
     <name>vidHardPDRemoval</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="119"/>
         <source>_Threshold:</source>
         <translation type="obsolete">_Muga:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="119"/>
         <source>If value is smaller than threshold it is considered valid. Smaller value might mean more false positive</source>
         <translation type="obsolete">Balio hau muga baino txikiagoa bada baliozkotzat hartzen da. Balio txikiagoak esanahi du faltsu positibo gehiago</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="119"/>
         <source>_Noise:</source>
         <translation type="obsolete">_Zarata:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="119"/>
         <source>If pixels are closer than noise, they are considered to be the same</source>
         <translation type="obsolete">Pixelak zarata baino hurbilago badaude, berdintzat hartzen dira</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="119"/>
         <source>_Identical:</source>
         <translation type="obsolete">_Berdinak:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="119"/>
         <source>If metric is less than identical, images are considered identical</source>
         <translation type="obsolete">Neurria berdintasuna baino txikiagoa bada, irudiak berdintzat hartzen dira</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="119"/>
         <source>_Show metrics</source>
         <translation type="obsolete">_Erakutsi neurriak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="119"/>
         <source>Show metric in image (debug)</source>
         <translation type="obsolete">Erakutsi neurriak irudian (garbiketa)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="119"/>
         <source>Hard IVTC Removal</source>
         <translation type="obsolete">IVTC Gogor Kentzea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="119"/>
         <source>Metrics</source>
         <translation type="obsolete">Metrikak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="119"/>
         <source>Do you want to print metrics on screen ?</source>
         <translation type="obsolete">Neurriak ikusleihoan irarkitzea nahi duzu ?</translation>
     </message>
@@ -10367,47 +10669,43 @@
 <context>
     <name>vobSubDialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="119"/>
         <source>VobSub Settings</source>
         <translation type="obsolete">VobSub Ezarpenak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="119"/>
         <source>Language:</source>
         <translation type="obsolete">Hizkuntza:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="119"/>
         <source>Idx File:</source>
         <translation type="obsolete">Idx Agiria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="119"/>
         <source>Delay:</source>
         <translation type="obsolete">Atzerapena:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/vobsub.ui" line="13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/vobsub.ui" line="+13"/>
         <source>Subtitle Font Size and Position</source>
         <translation>Azpidatzi Hizki Neurria eta Kokapena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/vobsub.ui" line="50"/>
+        <location line="+37"/>
         <source>Delay :</source>
         <translation>Atzerapena :</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/vobsub.ui" line="60"/>
+        <location line="+10"/>
         <source>Select File</source>
         <translation>Hautatu Agiria</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/vobsub.ui" line="67"/>
+        <location line="+7"/>
         <source>Language :</source>
         <translation>Hizkuntza :</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/vobsub.ui" line="74"/>
+        <location line="+7"/>
         <source>Idx File :</source>
         <translation>Idx Agiria :</translation>
     </message>
@@ -10415,60 +10713,73 @@
 <context>
     <name>vorbis</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp" line="331"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp" line="+331"/>
         <source>VBR</source>
         <translation>BNG</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp" line="332"/>
+        <location line="+1"/>
         <source>Quality based</source>
         <translation>Ontasunean ohinarrituta</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp" line="334"/>
+        <location line="+2"/>
         <source>_Mode:</source>
         <translation>_Modua:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp" line="348"/>
+        <location line="+14"/>
         <source>_Bitrate:</source>
         <translation>_Bitneurria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp" line="350"/>
+        <location line="+2"/>
         <source>_Quality:</source>
         <translation>_Ontasuna:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp" line="357"/>
+        <location line="+7"/>
         <source>Vorbis Configuration</source>
         <translation>Vorbis Itxurapena</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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>VS File Files (*.vpy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="13"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+13"/>
         <source>Processing</source>
         <translation>Prozesatzen</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="77"/>
+        <location line="+64"/>
         <source>Elapsed:</source>
         <translation>Igarota:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="99"/>
+        <location line="+22"/>
         <source>Time Remaining:</source>
         <translation>Gelditzen da:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="125"/>
+        <location line="+26"/>
         <source>00:00:00</source>
         <translation>00:00:00</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
+        <location line="+87"/>
         <source>Cancel</source>
         <translation>Ezeztatu</translation>
     </message>
@@ -10476,1114 +10787,892 @@
 <context>
     <name>x264ConfigDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>x264 Configuraton</source>
         <translation type="obsolete">x264 Itxurapena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Configuration:</source>
         <translation type="obsolete">Itxurapena:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Save As</source>
         <translation type="obsolete">Gorde Honela</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Delete</source>
         <translation type="obsolete">Ezabatu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>General</source>
         <translation type="obsolete">Orokorra</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Rate Control</source>
         <translation type="obsolete">Neurri Agintea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Target Video Size:</source>
         <translation type="obsolete">Xede Bideo Neurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Constant Bitrate (Single Pass)</source>
         <translation type="obsolete">Bitneurri Aldagaitza (Urrats Bakarra)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Constant Quantiser (Single Pass)</source>
         <translation type="obsolete">Kuantizatzaile Aldagaitza (Urrats Bakarra)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Constant Rate Factor (Single Pass)</source>
         <translation type="obsolete">Neurri Ezaugarri Aldagaitza (Urrats Bakarra)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Video Size (Two Pass)</source>
         <translation type="obsolete">Bideo Neurria (Bi Urrats)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Average Bitrate (Two Pass)</source>
         <translation type="obsolete">Bataz-besteko Bitneurria (Bi Urrats)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Encoding Mode:</source>
         <translation type="obsolete">Kodeaketa Modua:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>MB</source>
         <translation type="obsolete">MB</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>0 (High Quality)</source>
         <translation type="obsolete">0 (Ontasun Handia)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Quantiser</source>
         <translation type="obsolete">Kuantizatzailea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>51 (Low Quality)</source>
         <translation type="obsolete">51 (Ontasun Apala)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Maximum Constant Rate Factor</source>
         <translation type="obsolete">Gehienezko Neurri Ezaugarri Aldagaitza</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Fast First Pass</source>
         <translation type="obsolete">Lehen Urrats Azkarra</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Macroblock-tree Rate Control</source>
         <translation type="obsolete">Makrobloke-zuhaitz Neurri Agintea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Frametype Lookahead:</source>
         <translation type="obsolete">Frame-mota Aurrerabegira:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>frames</source>
         <translation type="obsolete">frame</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Motion</source>
         <translation type="obsolete">Mugimendua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Motion Estimation</source>
         <translation type="obsolete">MMugimendu Estimazioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Motion Estimation Method:</source>
         <translation type="obsolete">Mugimendu Estimazio Metodoa:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Diamond Search</source>
         <translation type="obsolete">Diamante Bilaketa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Hexagonal Search</source>
         <translation type="obsolete">Bilaketa Hexagonala</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Uneven Multi-hexagonal Search</source>
         <translation type="obsolete">Multi-hexagonal Bilaketa Ezberdina</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Exhaustive Search</source>
         <translation type="obsolete">Bilaketa Bizia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Hadamard Exhaustive Search</source>
         <translation type="obsolete">Hadamard Bilaketa Bizia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>1 (Fast)</source>
         <translation type="obsolete">1 (Azkarra)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Subpixel Refinement</source>
         <translation type="obsolete">Azpipixela Irazketa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>10 (Best)</source>
         <translation type="obsolete">10 (Hobea)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Motion Vector</source>
         <translation type="obsolete">Mugimendu Bektorea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Maximum Motion Vector Length:</source>
         <translation type="obsolete">Gehienezko Mugimendu Bektore Luzera:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Minimum Buffer Between Threads:</source>
         <translation type="obsolete">Gutxienezko Buffera Harien Artean:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Maximum Motion Vector Search Range:</source>
         <translation type="obsolete">Gehienezko Mugimendu Bektore Bilaketa Maila:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Prediction</source>
         <translation type="obsolete">Iragarpena</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Disabled</source>
         <translation type="obsolete">Ezgaituta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Weighted References</source>
         <translation type="obsolete">Neurritasun Xehetasunak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Weighted References + Duplicates</source>
         <translation type="obsolete">Neurritasun Xehetasunak + Bikoizpenak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Direct Prediction Mode:</source>
         <translation type="obsolete">Zuzeneko Iragarpen Modua:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Weighted Prediction for P-frames:</source>
         <translation type="obsolete">Neurritasun Iragarpenak P-framentzat:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>None</source>
         <translation type="obsolete">Ezer ez</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Spatial</source>
         <translation type="obsolete">Espaziala</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Temporal</source>
         <translation type="obsolete">Tenporala</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Auto</source>
         <translation type="obsolete">Berez</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Weighted Prediction for B-frames</source>
         <translation type="obsolete">Neurritasun Iragarpenak B-framentzat</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Constrained Intra Prediction</source>
         <translation type="obsolete">Intra Iragarpen Hertsatua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Partition</source>
         <translation type="obsolete">Zatiketa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Partition Search</source>
         <translation type="obsolete">Zatiketa Bilaketa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>8x8 DCT Spatial Transform</source>
         <translation type="obsolete">8x8 DCT Espazio Eraldaketa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>8x8, 8x16 and 16x8 P-frame Intra-predicted Blocks</source>
         <translation type="obsolete">8x8, 8x16 eta 16x8 P-frame Intra-iragarritako Blokeak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>8x8, 8x16 and 16x8 B-frame Intra-predicted Blocks</source>
         <translation type="obsolete">8x8, 8x16 eta 16x8 B-frame Intra-iragarritako Blokeak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>4x4, 4x8 and 8x4 P-frame Intra-predicted Blocks</source>
         <translation type="obsolete">4x4, 4x8 eta 8x4 P-frame Intra-iragarritako Blokeak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>8x8 Intra-predicted Blocks</source>
         <translation type="obsolete">8x8 Intra-iragarritako Blokeak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>4x4 Intra-predicted Blocks</source>
         <translation type="obsolete">4x4 Intra-iragarritako Blokeak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Frame</source>
         <translation type="obsolete">Frame</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Frame Encoding</source>
         <translation type="obsolete">Frame Kodeaketa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>CABAC</source>
         <translation type="obsolete">CABAC</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Loop Filter:</source>
         <translation type="obsolete">Bigizta Iragazkia:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Strength:</source>
         <translation type="obsolete">Indartsua:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Threshold:</source>
         <translation type="obsolete">Muga:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Open GOP:</source>
         <translation type="obsolete">Ireki GOP:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Normal Mode</source>
         <translation type="obsolete">Modu Arrunta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Blu-ray Mode</source>
         <translation type="obsolete">Blu-ray Modua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Interlaced:</source>
         <translation type="obsolete">Elkarlotuta:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Bottom Field First</source>
         <translation type="obsolete">Beheko Eremua Lehenik</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Top Field First</source>
         <translation type="obsolete">Goiko Eremua Lehenik</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Fake Interlaced</source>
         <translation type="obsolete">Elkarlotura Faltsua</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Maximum Reference Frames:</source>
         <translation type="obsolete">Gehienezko Xehetasun Frameak:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>B-frames</source>
         <translation type="obsolete">B-frame</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>B-frames as References:</source>
         <translation type="obsolete">B-frameak Xehetasun bezala:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Strictly Hierarchical Pyramid</source>
         <translation type="obsolete">Piramide Hierarkiko Zorrotza</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Non-strict (Not Blu-ray Compatible)</source>
         <translation type="obsolete">Ez-zorrotza (Bluray-arekin Bateraezina)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Fast</source>
         <translation type="obsolete">Azkar</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Optimal</source>
         <translation type="obsolete">Hoberen</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>B-frame Bias:</source>
         <translation type="obsolete">B-frame Bias:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Maximum Consecutive B-frames:</source>
         <translation type="obsolete">Gehienezko B-frame Jarraian:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Adaptive B-frame Decision:</source>
         <translation type="obsolete">B-frame Erabaki Egokigarria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>I-frames</source>
         <translation type="obsolete">I-frame</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>GOP Size:</source>
         <translation type="obsolete">GOP Neurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Minimum:</source>
         <translation type="obsolete">Gutxienez:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Maximum:</source>
         <translation type="obsolete">Gehienez:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>I-frame Threshold:</source>
         <translation type="obsolete">I-frame Muga:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Periodic Intra Refresh</source>
         <translation type="obsolete">Aldikako Intra Berritzea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Analysis</source>
         <translation type="obsolete">Azterketa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Mixed References</source>
         <translation type="obsolete">Nahasketa Hobespenak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Chroma Motion Estimation</source>
         <translation type="obsolete">Margotasun Mugimendu Estimazioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Trellis Quantization:</source>
         <translation type="obsolete">Trellis Kuantizazioa:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Final Macroblock Only</source>
         <translation type="obsolete">Amaiera Makroblokea Bakarrik</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Always On</source>
         <translation type="obsolete">Betik Eraginda</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Fast Skip Detection on P-frames</source>
         <translation type="obsolete">Atzemate Jauzi Azkarra P-frametan</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>DCT Decimation on P-frames</source>
         <translation type="obsolete">DCT Hamarrenjtzea P-frametan</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Psychovisual Rate Distortion Optimisation:</source>
         <translation type="obsolete">Psikoikuspen Neurri Bihurdura Hobekuntza:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Psychovisual Trellis:</source>
         <translation type="obsolete">Trellis Psikoikuspena:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Noise Reduction:</source>
         <translation type="obsolete">Zarata Murrizpena:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Luma Quantisation Deadzone</source>
         <translation type="obsolete">Luma Kuantizazio Gunehila</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Intra Luma Quantisation Deadzone:</source>
         <translation type="obsolete">Intra Luma Kuantizazio Gunehila:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Inter Luma Quantisation Deadzone:</source>
         <translation type="obsolete">Inter Luma Kuantizazio Gunehila:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Quantisation Matrix</source>
         <translation type="obsolete">Kuantizazioa Matriza</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Flat Matrix</source>
         <translation type="obsolete">Flat Matriza</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>JVT Matrix</source>
         <translation type="obsolete">JVT Matriza</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Custom Matrix</source>
         <translation type="obsolete">Egile Matriza</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Edit</source>
         <translation type="obsolete">Editatu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Quantiser Control</source>
         <translation type="obsolete">Kuantizatzaile Agintea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Maximum Quantiser:</source>
         <translation type="obsolete">Gehienezko Kuantizatzaile:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>I and P-frame Quantiser Ratio:</source>
         <translation type="obsolete">I eta P-frame Kuantzizatzaile Maila:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>%</source>
         <translation type="obsolete">%</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Maximum Quantiser Step:</source>
         <translation type="obsolete">Gehienezko Kuantizatzaile Urrats:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>P and B-frame Quantiser Ratio:</source>
         <translation type="obsolete">P eta B-frame Kuantizatzaile Maila:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Average Bitrate Tolerance:</source>
         <translation type="obsolete">Bataz-besteko Bitneurri Jasangarritasuna:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Chroma to Luma Quantiser Offset:</source>
         <translation type="obsolete">Margotasuna Luma Kuantizatzaile Orekarako:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Minimum Quantiser:</source>
         <translation type="obsolete">Gutxineko Kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Quantiser Curve Compression</source>
         <translation type="obsolete">Kuantizatzaile Bihurgune Konpresioa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Quantiser Curve Compression:</source>
         <translation type="obsolete">Kuantizatzaile Bihurgune Konpresioa:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Reduce Fluctuation Before Curve Compression:</source>
         <translation type="obsolete">Murriztu Gorabehera Konpresio Bihurgunearen Aurretik:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Reduce Fluctuation After Curve Compression:</source>
         <translation type="obsolete">Murriztu Gorabehera Konpresio Bihurgunearen Ondoren:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Adaptive Quantisation</source>
         <translation type="obsolete">Kuantizazioa Egokigarria</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Variance AQ:</source>
         <translation type="obsolete">AQ Aldaera:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Normal</source>
         <translation type="obsolete">Arrunta</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Auto Variance AQ</source>
         <translation type="obsolete">AQ  Berez Aldaera</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Advanced 1</source>
         <translation type="obsolete">Aurreratua 1</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Video Buffer Verifier</source>
         <translation type="obsolete">Bideo Buffer Egiaztatzailea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Maximum VBV Bitrate:</source>
         <translation type="obsolete">Gehienezko VBV Bitneurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Initial VBV Buffer Occupancy:</source>
         <translation type="obsolete">Hasierako VBV Buffer Tokia:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>kbit</source>
         <translation type="obsolete">kbit</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>kbit/s</source>
         <translation type="obsolete">kbit/s</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>VBV Buffer Size:</source>
         <translation type="obsolete">VBV Buffer Neurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Slicing</source>
         <translation type="obsolete">Ebakina</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Slices per Frame:</source>
         <translation type="obsolete">Ebakin Frameko:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Maximum Size per Slice:</source>
         <translation type="obsolete">Gehienezko Neurria Ebakineko:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>bytes</source>
         <translation type="obsolete">byte</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Maximum Macroblocks per Slice:</source>
         <translation type="obsolete">Gehienezko Makrobloke Ebakineko:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Zones</source>
         <translation type="obsolete">Gune</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Add</source>
         <translation type="obsolete">Gehitu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Advanced 2</source>
         <translation type="obsolete">Aurreratua 2</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Multithreading</source>
         <translation type="obsolete">Eginkizun-anitz</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Disable</source>
         <translation type="obsolete">Ezgaitu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Auto-detect</source>
         <translation type="obsolete">Berez-atzeman</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Custom:</source>
         <comment>multithreading</comment>
         <translation type="obsolete">Egilea:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Enforce Repeatability</source>
         <translation type="obsolete">Behartu Berregintasuna</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Slice-based Threading</source>
         <translation type="obsolete">Ebakin-ohinarriko Hariketa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Custom Threaded Lookahead Buffer:</source>
         <translation type="obsolete">Egileak Haritutako Aurrerabegira Bufferra:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Output 1</source>
         <translation type="obsolete">Irteera 1</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Output</source>
         <translation type="obsolete">Irteera</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>1</source>
         <translation type="obsolete">1</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>1.1</source>
         <translation type="obsolete">1.1</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>1.2</source>
         <translation type="obsolete">1.2</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>1.3</source>
         <translation type="obsolete">1.3</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>2</source>
         <translation type="obsolete">2</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>2.1</source>
         <translation type="obsolete">2.1</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>2.2</source>
         <translation type="obsolete">2.2</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>3</source>
         <translation type="obsolete">3</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>3.1</source>
         <translation type="obsolete">3.1</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>3.2</source>
         <translation type="obsolete">3.2</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>4</source>
         <translation type="obsolete">4</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>4.1</source>
         <translation type="obsolete">4.1</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>4.2</source>
         <translation type="obsolete">4.2</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>5</source>
         <translation type="obsolete">5</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>5.1</source>
         <translation type="obsolete">5.1</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Sequence Parameter Set Identifer:</source>
         <translation type="obsolete">Sekuentzia Parametro Ezarpen Ezautzailea:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>IDC Level:</source>
         <translation type="obsolete">IDC Maila:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>0</source>
         <translation type="obsolete">0</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>7</source>
         <translation type="obsolete">7</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>15</source>
         <translation type="obsolete">15</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>31</source>
         <translation type="obsolete">31</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Generate Access Unit Delimiters</source>
         <translation type="obsolete">Sortu Sarbide Batasun Mugatzaileak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Pixel Aspect Ratio</source>
         <translation type="obsolete">Pixel Ikuspegi Maila</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Custom:</source>
         <comment>PAR</comment>
         <translation type="obsolete">Egilea:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>As Input</source>
         <translation type="obsolete">Sarrera Bezala</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Predefined Aspect Ratio:</source>
         <translation type="obsolete">Aurrezehatutako Ikuspegi Maila:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>16:15 (PAL 4:3)</source>
         <translation type="obsolete">16:15 (PAL 4:3)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>64:45 (PAL 16:9)</source>
         <translation type="obsolete">64:45 (PAL 16:9)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>8:9 (NTSC 4:3)</source>
         <translation type="obsolete">8:9 (NTSC 4:3)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>32:27 (NTSC 16:9)</source>
         <translation type="obsolete">32:27 (NTSC 16:9)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Output 2</source>
         <translation type="obsolete">Irteera 2</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Video Usability Information</source>
         <translation type="obsolete">Bideo Erabilgarritasun Argibideak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>These settings are only suggestions for the playback equipment.  Use at your own risk.</source>
         <translation type="obsolete">Ezarpen hauek irakurketa tresneriarentzako iradokizunak bakarrik dira.  Erabili zeure arriskupean.</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Overscan:</source>
         <translation type="obsolete">Gainmihaketa:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Undefined</source>
         <translation type="obsolete">Zehaztugabea</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Show</source>
         <translation type="obsolete">Erakutsi</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Crop</source>
         <translation type="obsolete">Moztu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Video Format:</source>
         <translation type="obsolete">Bideo Heuskarria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Component</source>
         <translation type="obsolete">Osagaia</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>PAL</source>
         <translation type="obsolete">PAL</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>NTSC</source>
         <translation type="obsolete">NTSC</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>SECAM</source>
         <translation type="obsolete">SECAM</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>MAC</source>
         <translation type="obsolete">MAC</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Colour Primaries:</source>
         <translation type="obsolete">Lehen margoak:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>BT709</source>
         <translation type="obsolete">BT709</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>BT470M</source>
         <translation type="obsolete">BT470M</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>BT470BG</source>
         <translation type="obsolete">BT470BG</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>SMPTE170M</source>
         <translation type="obsolete">SMPTE170M</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>SMPTE240M</source>
         <translation type="obsolete">SMPTE170M</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Film</source>
         <translation type="obsolete">Filma</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Transfer Characteristics:</source>
         <translation type="obsolete">Eskualdaketa Ezaugarriak:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Linear</source>
         <translation type="obsolete">Linearra</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>LOG100</source>
         <translation type="obsolete">LOG100</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>LOG316</source>
         <translation type="obsolete">LOG316</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>SMPTEL170M</source>
         <translation type="obsolete">SMPTEL170M</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Colour Matrix:</source>
         <translation type="obsolete">Margo Matriza:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>FCC</source>
         <translation type="obsolete">FCC</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>GBR</source>
         <translation type="obsolete">GBR</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>YCgCo</source>
         <translation type="obsolete">YCgCo</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>HRD Parameters:</source>
         <translation type="obsolete">HRD Parametroak:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>VBR</source>
         <translation type="obsolete">VBR</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>CBR</source>
         <translation type="obsolete">CBR</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Chroma Sample Location:</source>
         <translation type="obsolete">Margotasun Lagun Kokalekua:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Full Range Samples</source>
         <translation type="obsolete">Maila Osoko Laginak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Blind Offset</source>
         <translation type="obsolete">Mozorro Oreka</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Smart Analysis</source>
         <translation type="obsolete">Azterketa Azkarrak</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>&lt;default&gt;</source>
         <translation type="obsolete">&lt;berezkoa&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>&lt;custom&gt;</source>
         <translation type="obsolete">&lt;egilea&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>x264 Configuration File (*.xml)</source>
         <translation type="obsolete">x264 Itxurapen Agiria (*.xml)</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Are you sure you wish to delete the selected configuration?</source>
         <translation type="obsolete">Zihur zaude hautatutako itxurapena ezabatzea nahi duzula?</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Target Bitrate:</source>
         <translation type="obsolete">Xede Bitneurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Quantiser:</source>
         <translation type="obsolete">Kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Quality:</source>
         <translation type="obsolete">Ontasuna:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Average Bitrate:</source>
         <translation type="obsolete">Bataz-besteko Bitneurria:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -11592,7 +11681,6 @@
 Jarraitzea nahi duzu?</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Macroblock-Tree optimisation will automatically be disabled.
 
 Do you wish to continue?</source>
@@ -11601,7 +11689,6 @@
 Jarraitzea nahi duzu?</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Are you sure you wish to delete the selected zone?</source>
         <translation type="obsolete">Zihur zaude hautatutako gunea ezabatzea nahi duzula?</translation>
     </message>
@@ -11609,67 +11696,54 @@
 <context>
     <name>x264CustomMatrixDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>x264 Custom Matrix</source>
         <translation type="obsolete">x264 Egile Matriza</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Intra 4x4</source>
         <translation type="obsolete">Intra 4x4</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Luma:</source>
         <translation type="obsolete">Argitasuna:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Chroma U/V:</source>
         <translation type="obsolete">Margotasuna U/V:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Inter 4x4</source>
         <translation type="obsolete">Inter 4x4</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Intra 8x8</source>
         <translation type="obsolete">Intra 8x8</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Inter 8x8</source>
         <translation type="obsolete">Inter 8x8</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Load File</source>
         <translation type="obsolete">Gertatu Agiria</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>OK</source>
         <translation type="obsolete">Ongi</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Cancel</source>
         <translation type="obsolete">Ezeztatu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Select Matrix File</source>
         <translation type="obsolete">Hautatu Matrize Agira</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Read Error</source>
         <translation type="obsolete">Irakurri Akatsa</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="212"/>
         <source>Error reading custom matrix file.</source>
         <translation type="obsolete">Akatsa egile matrize agiria irakurtzerakoan.</translation>
     </message>
@@ -11677,42 +11751,43 @@
 <context>
     <name>x264Dialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="479"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+630"/>
         <source>Target Bitrate:</source>
         <translation>Xede Bitneurria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="499"/>
+        <location line="+1"/>
+        <location line="+19"/>
         <source>kbit/s</source>
         <translation>kbit/s</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="484"/>
+        <location line="-15"/>
         <source>Quantiser:</source>
         <translation>Kuantizatzailea:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="488"/>
+        <location line="+4"/>
         <source>Quality:</source>
         <translation>Ontasuna:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="493"/>
+        <location line="+5"/>
         <source>Target Video Size:</source>
         <translation>Xede Bideo Neurria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="494"/>
+        <location line="+1"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="498"/>
+        <location line="+4"/>
         <source>Average Bitrate:</source>
         <translation>Bataz-besteko Bitneurria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="561"/>
+        <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>
@@ -11721,7 +11796,7 @@
 Jarraitzea nahi duzu?</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="572"/>
+        <location line="+11"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Macroblock-Tree optimisation will automatically be disabled.
 
 Do you wish to continue?</source>
@@ -11733,12 +11808,10 @@
 <context>
     <name>x264ZoneTableDelegate</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="572"/>
         <source>Quantiser</source>
         <translation type="obsolete">Kuantizatzailea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="572"/>
         <source>Bitrate Factor</source>
         <translation type="obsolete">Bitneurri Ezaugarria</translation>
     </message>
@@ -11746,180 +11819,282 @@
 <context>
     <name>x264ZoneTableModel</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="572"/>
         <source>Quantiser</source>
         <translation type="obsolete">Kuantizatzailea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="572"/>
         <source>Bitrate Factor</source>
         <translation type="obsolete">Bitneurri Ezaugarria</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="572"/>
         <source>Frame Start</source>
         <translation type="obsolete">Frame Hasiera</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="572"/>
         <source>Frame End</source>
         <translation type="obsolete">Frame Amaiera</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="572"/>
         <source>Mode</source>
         <translation type="obsolete">Modua</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="572"/>
         <source>Value</source>
         <translation type="obsolete">Balioa</translation>
     </message>
 </context>
 <context>
+    <name>x265Dialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+588"/>
+        <source>Target Bitrate:</source>
+        <translation type="unfinished">Xede Bitneurria:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+20"/>
+        <source>kbit/s</source>
+        <translation type="unfinished">kbit/s</translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Quantiser:</source>
+        <translation type="unfinished">Kuantizatzailea:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Quality:</source>
+        <translation type="unfinished">Ontasuna:</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Target Video Size:</source>
+        <translation type="unfinished">Xede Bideo Neurria:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>MB</source>
+        <translation type="unfinished">MB</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished">Bataz-besteko Bitneurria:</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <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 type="unfinished">Makrobloke-Zuhaitz hobekuntzak Aldaera Egokigarriko Kuantizazioa gaituta egotea behar du.  Aldaera Egokigarriko Kuantizazioa berezgaitasunez gaituko da.
+
+Jarraitzea nahi duzu?</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <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 type="unfinished">Makrobloke-Zuhaitz hobekuntzak Aldaera Egokigarriko Kuantizazioa gaituta egotea behar du.  Makrobloke-Zuhaitz hobekuntza berezgaitasunez ezgaituko da.
+
+Jarraitzea nahi duzu?</translation>
+    </message>
+</context>
+<context>
     <name>xvid4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="61"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+37"/>
+        <location line="+24"/>
         <source>None</source>
         <translation>Ezer ez</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="38"/>
+        <location line="-23"/>
         <source>Low</source>
         <translation>Apala</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="39"/>
+        <location line="+1"/>
         <source>Medium</source>
         <translation>Ertaina</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="40"/>
+        <location line="+1"/>
         <source>Full</source>
         <translation>Osoa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="44"/>
+        <location line="+4"/>
         <source>H.263</source>
         <translation>H.263</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="45"/>
+        <location line="+1"/>
         <source>MPEG</source>
         <translation>MPEG</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="46"/>
+        <location line="+1"/>
         <source>Custom</source>
         <translation>Egilea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="62"/>
+        <location line="+16"/>
         <source>DCT</source>
         <translation>DCT</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="63"/>
+        <location line="+1"/>
         <source>Qpel16</source>
         <translation>Qpel16</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="64"/>
+        <location line="+1"/>
         <source>Qpel8</source>
         <translation>Qpel8</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="65"/>
+        <location line="+1"/>
         <source>Square</source>
         <translation>Eremua</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="69"/>
+        <location line="+4"/>
         <source>One thread</source>
         <translation>Bat hari</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="70"/>
+        <location line="+1"/>
         <source>Two threads)</source>
         <translation>Bi hari)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="71"/>
+        <location line="+1"/>
         <source>Three threads</source>
         <translation>Hiru hari</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="72"/>
+        <location line="+1"/>
         <source>Auto (#cpu)</source>
         <translation>Berez (#cpu)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="79"/>
+        <location line="+4"/>
+        <source>1:1 (PC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4:3 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4:3 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>16:9 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>16:9 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>MotionEstimation</source>
         <translation>MugimenduEstimazioa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="81"/>
+        <location line="+2"/>
         <source>Threading</source>
         <translation>Hariak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="87"/>
+        <location line="+2"/>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished">Gut_x kuantizatzailea:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished">Ge_h kuantizatzailea:</translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>_Trellis quantization</source>
         <translation>_Trellis kuantizazioa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="88"/>
+        <location line="+1"/>
         <source>_Number of B frames:</source>
         <translation>_B frame zenbatekoa:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="90"/>
+        <location line="+2"/>
         <source>_Quantization type:</source>
         <translation>_Kuantizazio mota:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="92"/>
+        <location line="+2"/>
         <source>_Macroblock decision:</source>
         <translation>_Makrobloke erabakia:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="94"/>
+        <location line="+2"/>
         <source>Profile:</source>
         <translation>Profila:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="101"/>
+        <location line="+2"/>
+        <source>Aspect Ratio:</source>
+        <translation type="unfinished">Ikuspegi Maila:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>_Gop Size:</source>
         <translation>_GOP Neurria:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="104"/>
+        <location line="+3"/>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Advanced Simple Profile</source>
         <translation>Profil Aurreratu Arrunta</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="112"/>
+        <location line="+9"/>
         <source>Motion Estimation</source>
         <translation>Mugimendu Estimazioa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="117"/>
+        <location line="+5"/>
         <source>Quantization</source>
         <translation>Kuantizazioa</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="121"/>
+        <location line="+4"/>
         <source>Threads</source>
         <translation>Hariak</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="124"/>
+        <location line="+7"/>
+        <source>Aspect Ratio</source>
+        <translation type="unfinished">Ikuspegi Maila</translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Rate Control</source>
         <translation>Neurri Agintea</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="127"/>
+        <location line="+3"/>
         <source>Xvid4 MPEG-4 ASP configuration</source>
         <translation>Xvid4 MPEG-4 ASP itxurapena</translation>
     </message>

avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/avidemux_fr.ts -> avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/avidemux_fr.ts Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fr">
+<TS version="2.1" language="fr">
 <context>
     <name>ADMImage</name>
     <message>
@@ -139,7 +139,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edCheckForInvalidPts.cpp" line="68"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="69"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -155,17 +155,17 @@
 Ignorer les informations de timing ?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="178"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="182"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>Impossible de trouver un demuxer pour lire %s</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="200"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="218"/>
         <source>Attempt to open %s failed!</source>
         <translation>l&apos;ouverture de %s a echouée !</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="226"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="244"/>
         <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.) concatinate them together</source>
@@ -204,6 +204,24 @@
     </message>
 </context>
 <context>
+    <name>ADM_Qt4CoreUIToolkit::DIA_processingQt4</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="160"/>
+        <source>_Resume</source>
+        <translation type="unfinished">_Reprendre</translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="161"/>
+        <source>The processing is paused.</source>
+        <translation type="unfinished">L&apos;operation est en pause</translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="162"/>
+        <source>Cancel it ?</source>
+        <translation type="unfinished">Annuler ?</translation>
+    </message>
+</context>
+<context>
     <name>ADM_Qt4Factory::ADM_Qbitrate</name>
     <message>
         <location filename="../ADM_UIs/src/T_bitrate.cpp" line="50"/>
@@ -273,6 +291,14 @@
     </message>
 </context>
 <context>
+    <name>ADM_ffDvEncoder</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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_qt4Factory::ADM_QthreadCount</name>
     <message>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="45"/>
@@ -411,7 +437,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="272"/>
         <source>Track 1:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Piste 1:</translation>
     </message>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="286"/>
@@ -423,7 +449,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="309"/>
         <source>Track 2:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Piste 2:</translation>
     </message>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="348"/>
@@ -497,22 +523,33 @@
 <context>
     <name>DIA_encodingQt4</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="159"/>
         <source>Shutting down</source>
-        <translation>Extinction en cours</translation>
+        <translation type="vanished">Extinction en cours</translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="57"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="77"/>
+        <source>Privileges Required</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="376"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="57"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="77"/>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="361"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>L&apos;encodage est en pause. Voulez vous reprendre ou abandonner ?</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="377"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="362"/>
         <source>Resume</source>
         <translation>Reprendre</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="377"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="362"/>
         <source>Abort</source>
         <translation>Abandonner</translation>
     </message>
@@ -525,6 +562,14 @@
     </message>
 </context>
 <context>
+    <name>DcaEnc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp" line="278"/>
+        <source>DcaEnc Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Decimate</name>
     <message>
         <source>Discard closer</source>
@@ -593,46 +638,50 @@
         <translation>Configuration des pistes audios</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="22"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="25"/>
         <source>Track 1</source>
         <translation>Piste 1</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="29"/>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="67"/>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="105"/>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="143"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="32"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="73"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="114"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="155"/>
         <source>Enabled</source>
         <translation>Activée</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="42"/>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="80"/>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="118"/>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="156"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="48"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="89"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="130"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="171"/>
         <source>Configure</source>
         <translation>Configurer</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="49"/>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="87"/>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="125"/>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="163"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="55"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="96"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="137"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="178"/>
+        <source>Filters</source>
+        <translation type="unfinished">Filtres</translation>
+    </message>
+    <message>
         <source>Audio Filters</source>
-        <translation>Filtres</translation>
+        <translation type="vanished">Filtres</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="60"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="66"/>
         <source>Track 2</source>
         <translation>Piste 2</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="98"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="107"/>
         <source>Track 3</source>
         <translation>Piste 3</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="136"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="148"/>
         <source>Track 4</source>
         <translation type="unfinished">Piste 4</translation>
     </message>
@@ -696,6 +745,49 @@
     </message>
 </context>
 <context>
+    <name>DialogProcessing</name>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="33"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="40"/>
+        <source>TimeLeft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="47"/>
+        <source>00:00:00</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="54"/>
+        <source>ProcessImages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="81"/>
+        <source>0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="88"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/processing.ui" line="95"/>
+        <source>0 fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DialogProgress</name>
     <message>
         <location filename="../ADM_jobs/src/uiProgress.ui" line="17"/>
@@ -726,7 +818,7 @@
 <context>
     <name>GUIPlayback</name>
     <message>
-        <location filename="../../common/gui_play.cpp" line="394"/>
+        <location filename="../../common/gui_play.cpp" line="410"/>
         <source>Trouble initializing audio device</source>
         <translation>Le device audio ne peut pas être initialisé</translation>
     </message>
@@ -734,13 +826,12 @@
 <context>
     <name>MP4Header</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="735"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp.orig" line="623"/>
+        <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>Impossible de lire l&apos;entete SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp" line="422"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp.orig" line="343"/>
         <source>No stts table</source>
         <translation>Pas d&apos;element STTS</translation>
@@ -814,283 +905,294 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="228"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="210"/>
         <source>Codec Options</source>
         <translation type="unfinished">Options</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="261"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="243"/>
         <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
         <translation type="unfinished">&lt;b&gt;Décodeur Vidéo&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="316"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="300"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="307"/>
         <source>XXXX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="332"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="456"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="607"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="779"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="325"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="449"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="600"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="772"/>
         <source>Configure</source>
         <translation type="unfinished">Configurer</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="371"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="364"/>
         <source>&lt;b&gt;Video Output&lt;/b&gt;</source>
         <translation type="unfinished">&lt;b&gt;Sortie Vidéo&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="439"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="590"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="432"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="583"/>
         <source>Copy</source>
         <translation type="unfinished">Copier</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="472"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="623"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="465"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="616"/>
         <source>Filters</source>
         <translation type="unfinished">Filtres</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="529"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="522"/>
         <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
         <translation type="unfinished">&lt;b&gt;Sortie Audio&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="539"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="532"/>
         <source>   (0 track(s))</source>
         <translation type="unfinished">   (0 piste(s))</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="641"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="634"/>
         <source>&amp;Shift:</source>
         <translation type="unfinished">&amp;Décal.:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="673"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="666"/>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="708"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="701"/>
         <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
         <translation type="unfinished">&lt;b&gt;Format de sortie&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="822"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="815"/>
         <source>Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="904"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="924"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="944"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="964"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="984"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1004"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1024"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1044"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1064"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1084"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1104"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1124"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1464"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="881"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="901"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="921"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="941"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="961"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="981"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1001"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1021"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1041"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1061"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1081"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1101"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1435"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1170"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1147"/>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1189"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1166"/>
         <source>00:00:00.000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1208"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1185"/>
         <source>/ 00:00:00.000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1237"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1214"/>
         <source>Frame type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1250"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1227"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1294"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1271"/>
         <source>Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1362"/>
-        <source>&lt;b&gt;Selection&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1390"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1344"/>
         <source>A:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1397"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1351"/>
         <source>B:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1404"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1411"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1358"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1365"/>
         <source>000000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1436"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1372"/>
+        <source>Display processed video on playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1382"/>
+        <source>Play filtered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1407"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1536"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1507"/>
         <source>Audio Metre</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1577"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1548"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Ouvrir...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1586"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1551"/>
+        <source>Open Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1560"/>
         <source>&amp;Information...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1589"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1563"/>
         <source>Alt+Return</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1598"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1572"/>
         <source>Save &amp;Video...</source>
         <translation type="unfinished">Sauver la &amp;Vidéo...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1601"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1604"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1575"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1578"/>
         <source>Save Video</source>
         <translation type="unfinished">Sauver</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1613"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1587"/>
         <source>&amp;Load/Run Project...</source>
         <translation type="unfinished">&amp;Lancer un projet...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1616"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1619"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1590"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1593"/>
         <source>Load/Run Project</source>
         <translation type="unfinished">Lancer un projet</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1628"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1602"/>
         <source>Save &amp;Project</source>
         <translation type="unfinished">Sauver un &amp;Projet</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1631"/>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1634"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1605"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1608"/>
         <source>Save Project</source>
         <translation type="unfinished">Sauver un Projet</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1643"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1617"/>
         <source>&amp;Calculator...</source>
         <translation type="unfinished">&amp;Calculatette...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1646"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1620"/>
         <source>F7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1661"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1635"/>
         <source>&amp;Input</source>
         <translation type="unfinished">Orig&amp;inal</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1673"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1647"/>
         <source>&amp;Output</source>
         <translation type="unfinished">M&amp;odifié</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1684"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1658"/>
         <source>&amp;Codec Options</source>
         <translation type="unfinished">Options du co&amp;dec</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1687"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1661"/>
         <source>Ctrl+Alt+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1698"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1672"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1701"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1675"/>
         <source>Ctrl+Alt+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1712"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1686"/>
         <source>&amp;Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1715"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1689"/>
         <source>Ctrl+Alt+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1726"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1700"/>
         <source>&amp;Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1729"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1703"/>
         <source>Ctrl+Alt+V</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1740"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1714"/>
         <source>&amp;Audio Metre</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1743"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1717"/>
         <source>Ctrl+Alt+M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1755"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1729"/>
         <source>&amp;Separate</source>
         <translation type="unfinished">&amp;Separer</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1767"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1741"/>
         <source>&amp;Top</source>
         <translation type="unfinished">Hau&amp;t</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1779"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="1753"/>
         <source>Si&amp;de</source>
         <translation type="unfinished">Cot&amp;e à cote</translation>
     </message>
@@ -1112,9 +1214,9 @@
 <context>
     <name>OpenDMLHeader</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="317"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="392"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="656"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="397"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="661"/>
         <source>Malformed header</source>
         <translation>En tete incorrecte</translation>
     </message>
@@ -1158,142 +1260,142 @@
 <context>
     <name>Telecide</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="185"/>
         <source>No strategy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="186"/>
         <source>3:2 pulldown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="188"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="187"/>
         <source>PAL/SECAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="189"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="188"/>
         <source>NTSC converted from PAL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="193"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="192"/>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="194"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="193"/>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="198"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="197"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="198"/>
         <source>If still combed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="200"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="199"/>
         <source>Always</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="204"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="203"/>
         <source>None</source>
         <translation type="unfinished">Aucun</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="205"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="204"/>
         <source>None but compute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="206"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="205"/>
         <source>Postproc on best match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="207"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="206"/>
         <source>Postproc and show zones (debug)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="208"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="207"/>
         <source>Process image (not fields)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="209"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="208"/>
         <source>Process image (not fields), debug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="213"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="212"/>
         <source>_Strategy:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="214"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="213"/>
         <source>_Field order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="215"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="214"/>
         <source>_Postprocessing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="216"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="215"/>
         <source>_Try backward:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="218"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="217"/>
         <source>_Direct threshold:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="219"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="218"/>
         <source>_Backward threshold:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="220"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="219"/>
         <source>_Noise threshold:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="221"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="220"/>
         <source>Postp_rocessing threshold:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="223"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="222"/>
         <source>_Use chroma to decide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="224"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="223"/>
         <source>Sho_w info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="225"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="224"/>
         <source>Debu_g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="226"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="225"/>
         <source>Bl_end</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="234"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="233"/>
         <source>Decomb Telecide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1315,6 +1417,14 @@
     </message>
 </context>
 <context>
+    <name>Webmmuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp" line="154"/>
+        <source>Saving Webm</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>aboutDialog</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="16"/>
@@ -1331,10 +1441,10 @@
         <source>Multi-platform Video Editor</source>
         <translation>Editeur vidéo multiplateformes</translation>
     </message>
-    <message utf8="both">
+    <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="120"/>
-        <source>© 2001 - 2012  Mean</source>
-        <translation></translation>
+        <source>© 2001 - 2016  Mean</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="139"/>
@@ -1393,239 +1503,269 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="182"/>
         <source>Decode video using VDPAU</source>
-        <translation type="unfinished">Utiliser VDPAU pour décoder</translation>
+        <translation type="obsolete">Utiliser VDPAU pour décoder</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="183"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="197"/>
+        <source>Decode video using VDPAU (NVIDIA)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="198"/>
+        <source>Decode video using XVBA (AMD)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="199"/>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="200"/>
         <source>Enable openGl support</source>
         <translation type="unfinished">Activer OpenGL</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="188"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="203"/>
+        <source>If you use Hw decoding, it is better to use the matching display driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="221"/>
         <source>_Use systray while encoding</source>
         <translation type="unfinished">Réduire dans la barre de taches</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="189"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="222"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">Accepter les fréquences non standard pour les DVDs</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="190"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="223"/>
         <source>Create _OpenDML files</source>
         <translation type="unfinished">Créer des fichiers OpenDML</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="194"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="227"/>
         <source>SIMD</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="196"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="229"/>
         <source>Enable all SIMD</source>
         <translation type="unfinished">Activer toutes les optimisations SIMD</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="197"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="230"/>
         <source>Enable MMX</source>
         <translation type="unfinished">Activer le MMX</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="198"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="231"/>
         <source>Enable MMXEXT</source>
         <translation type="unfinished">Activer le MMXEXT</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="199"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="232"/>
         <source>Enable 3DNOW</source>
         <translation type="unfinished">Activer le 3DNOW</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="200"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="233"/>
         <source>Enable 3DNOWEXT</source>
         <translation type="unfinished">Activer le 3DNOWEXT</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="201"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="234"/>
         <source>Enable SSE</source>
         <translation type="unfinished">Activer le SSE</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="202"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="235"/>
         <source>Enable SSE2</source>
         <translation type="unfinished">Activer le SSE2</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="203"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="236"/>
         <source>Enable SSE3</source>
         <translation type="unfinished">Activer le SSE3</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="204"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="237"/>
         <source>Enable SSSE3</source>
         <translation type="unfinished">Activer le SSSE3</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="225"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="258"/>
         <source>_lavc threads:</source>
         <translation type="unfinished">Threads lavc:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="227"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="260"/>
         <source>Multi-threading</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="231"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="264"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="47"/>
         <source>High</source>
         <translation type="unfinished">Haute</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="232"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="265"/>
         <source>Above normal</source>
         <translation type="unfinished">Plus que normale</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="233"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="266"/>
         <source>Normal</source>
         <translation type="unfinished">Normale</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="234"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="267"/>
         <source>Below normal</source>
         <translation type="unfinished">Sous normale</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="235"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="268"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="45"/>
         <source>Low</source>
         <translation type="unfinished">BAsse</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="237"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="270"/>
         <source>_Encoding priority:</source>
         <translation type="unfinished">Priorité de l&apos;encodage:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="238"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="271"/>
         <source>_Indexing/unpacking priority:</source>
         <translation type="unfinished">Priorité de l&apos;indexation:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="239"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="272"/>
         <source>_Playback priority:</source>
         <translation type="unfinished">Priorité de la lecture:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="241"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="274"/>
         <source>Prioritisation</source>
         <translation type="unfinished">Prioirités</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="246"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="279"/>
         <source>_Split MPEG files every (MB):</source>
         <translation type="unfinished">Créer un nouveau fichier MPEG tous les (MB):</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="248"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="281"/>
         <source>_Use alternative tag for MP3 in .mp4</source>
         <translation type="unfinished">Utiliser un tag alternatif pour les pistes mp3 (.mp4)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="253"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="286"/>
         <source>XVideo (best)</source>
         <translation type="unfinished">Xvideo (rapide)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="256"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="289"/>
         <source>VDPAU (best)</source>
         <translation type="unfinished">VDPAU (très rapide)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="259"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="296"/>
         <source>OpenGL (best)</source>
         <translation type="unfinished">OpenGL (rapide)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="264"/>
-        <source>MS Windows GDI (SDL)</source>
-        <translation></translation>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="299"/>
+        <source>LIBVA (best)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="265"/>
-        <source>MS Windows DirectX (SDL)</source>
-        <translation></translation>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="456"/>
+        <source>Display</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="267"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="459"/>
+        <source>HW Accel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="304"/>
         <source>SDL (good)</source>
         <translation type="unfinished">SDL (moyen)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="271"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="307"/>
         <source>Video _display:</source>
         <translation>Affichage vidéo:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="276"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="327"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="330"/>
+        <source>Sdl driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="336"/>
         <source>No alerts</source>
         <translation type="unfinished">Pas d&apos;alertes</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="277"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="337"/>
         <source>Display only error alerts</source>
         <translation type="unfinished">N&apos;afficher que les erreurs</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="278"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="338"/>
         <source>Display all alerts</source>
         <translation type="unfinished">Afficher tout</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="280"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="340"/>
         <source>_Message level:</source>
         <translation type="unfinished">Afficher les messagees:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="285"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="345"/>
         <source>PCM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="286"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="346"/>
         <source>Master</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="287"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="347"/>
         <source>_Volume control:</source>
         <translation type="unfinished">Contrôle du volume:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="292"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="352"/>
         <source>No downmixing</source>
         <translation type="unfinished">Pas de downmixing</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="294"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="354"/>
         <source>Pro Logic</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="295"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="355"/>
         <source>Pro Logic II</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="297"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="357"/>
         <source>_Local playback downmixing:</source>
         <translation type="unfinished">Downmixing pour la lecture:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="311"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="371"/>
         <source>_AudioDevice</source>
         <translation type="unfinished">Device audio</translation>
     </message>
@@ -1641,13 +1781,13 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="38"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="314"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="374"/>
         <source>_Horizontal deblocking</source>
         <translation type="unfinished">Deblocking horizontal</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="39"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="315"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="375"/>
         <source>_Vertical deblocking</source>
         <translation type="unfinished">Deblocking vertical</translation>
     </message>
@@ -1657,37 +1797,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="316"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="376"/>
         <source>De_ringing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="317"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="377"/>
         <source>_Strength:</source>
         <translation type="unfinished">Force:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="318"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="378"/>
         <source>Default Postprocessing</source>
         <translation type="unfinished">Postprocessing par défaut</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="328"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="413"/>
+        <source>_Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="421"/>
         <source>User Interface</source>
         <translation type="unfinished">Interface Utilisateur</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="335"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="428"/>
         <source>Output</source>
         <translation>Sortie</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="355"/>
-        <source>Video</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="363"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="467"/>
         <source>Threading</source>
         <translation></translation>
     </message>
@@ -1794,7 +1934,7 @@
         <translation type="unfinished">Mettre le marqueur B</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="376"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="488"/>
         <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="64"/>
         <source>Preferences</source>
         <translation></translation>
@@ -1959,7 +2099,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="48"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="293"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="353"/>
         <source>Stereo</source>
         <translation></translation>
     </message>
@@ -2020,6 +2160,11 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="66"/>
+        <source>Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="67"/>
         <source>_Gain mode:</source>
         <translation>Mode:</translation>
     </message>
@@ -2029,27 +2174,32 @@
         <translation>Valeur du gain:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="72"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="75"/>
         <source>_Mixer:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="74"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="77"/>
         <source>Remix:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="77"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="80"/>
+        <source>Mixer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="85"/>
         <source>Shift audio:</source>
         <translation>Décalage audio:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="77"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="85"/>
         <source>Shift Value (ms):</source>
         <translation type="unfinished">Valeur (ms):</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="80"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="88"/>
         <source>Audio Filters</source>
         <translation type="unfinished">Filtres</translation>
     </message>
@@ -2100,7 +2250,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="359"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="463"/>
         <source>CPU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2136,9 +2286,9 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="80"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="341"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="344"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="349"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="434"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="437"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="442"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2267,161 +2417,167 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="168"/>
+        <location filename="../../common/gui_main.cpp" line="175"/>
         <source>Select script to save</source>
         <translation>Choisir le script à sauvegarder</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="317"/>
+        <location filename="../../common/gui_main.cpp" line="325"/>
         <source>Not coded in this version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="328"/>
-        <location filename="../../common/gui_main.cpp" line="393"/>
-        <source>Select AVI File...</source>
+        <location filename="../../common/gui_main.cpp" line="336"/>
+        <location filename="../../common/gui_main.cpp" line="401"/>
+        <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="396"/>
-        <source>Select AVI File to Append...</source>
+        <location filename="../../common/gui_main.cpp" line="404"/>
+        <source>Select Video File to Append...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="482"/>
+        <location filename="../../common/gui_main.cpp" line="506"/>
         <source>Are you sure?</source>
         <translation>Etes vous sur ?</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="567"/>
+        <location filename="../../common/gui_main.cpp" line="593"/>
         <source>Permission error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="567"/>
+        <location filename="../../common/gui_main.cpp" line="593"/>
         <source>Cannot open &quot;%s&quot;.</source>
         <translation>Impossible d&apos;ouvrir &quot;%s&quot;.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="570"/>
+        <location filename="../../common/gui_main.cpp" line="597"/>
         <source>File error</source>
         <translation>Erreur de fichier</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="570"/>
+        <location filename="../../common/gui_main.cpp" line="597"/>
         <source>&quot;%s&quot; does not exist.</source>
         <translation>&quot;%s&quot; n&apos;existe pas.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="607"/>
+        <location filename="../../common/gui_main.cpp" line="635"/>
         <source>Cannot open project using the video loader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="608"/>
+        <location filename="../../common/gui_main.cpp" line="636"/>
         <source>Try &apos;File&apos; -&gt; &apos;Load/Run Project...&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="610"/>
+        <location filename="../../common/gui_main.cpp" line="640"/>
         <source>Could not open the file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="646"/>
+        <location filename="../../common/gui_main.cpp" line="680"/>
         <source>Multiple Audio Tracks</source>
         <translation>Plusieurs pistes audio</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="646"/>
+        <location filename="../../common/gui_main.cpp" line="680"/>
         <source>The file you just loaded contains several audio tracks.
 Go to Audio-&gt;MainTrack to select the active one.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="736"/>
+        <location filename="../../common/gui_main.cpp" line="769"/>
         <source>Something failed when appending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="745"/>
-        <location filename="../../common/gui_main.cpp" line="939"/>
+        <location filename="../../common/gui_main.cpp" line="778"/>
+        <location filename="../../common/gui_main.cpp" line="973"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="883"/>
+        <location filename="../../common/gui_main.cpp" line="917"/>
         <source>Checking video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="899"/>
+        <location filename="../../common/gui_main.cpp" line="933"/>
         <source>No error found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="903"/>
+        <location filename="../../common/gui_main.cpp" line="937"/>
         <source>Errors found in %u frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="919"/>
+        <location filename="../../common/gui_main.cpp" line="953"/>
         <source>Marker A &gt; B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="919"/>
+        <location filename="../../common/gui_main.cpp" line="953"/>
         <source>Cannot delete the selection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="924"/>
+        <location filename="../../common/gui_main.cpp" line="958"/>
         <source>You can&apos;t remove all frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="932"/>
+        <location filename="../../common/gui_main.cpp" line="966"/>
         <source>Something bad happened</source>
         <translation type="unfinished">Quelque chose d&apos;anormal c&apos;est produit</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="1020"/>
+        <location filename="../../common/gui_main.cpp" line="1054"/>
         <source>_Track from video:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="1023"/>
+        <location filename="../../common/gui_main.cpp" line="1057"/>
         <source>Main Audio Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="1169"/>
+        <location filename="../../common/gui_main.cpp" line="1086"/>
+        <location filename="../../common/gui_main.cpp" line="1093"/>
+        <source>Invalid audio index given</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/gui_main.cpp" line="1303"/>
         <source>AvsProxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="1169"/>
+        <location filename="../../common/gui_main.cpp" line="1303"/>
         <source>Failed to connect to avsproxy.
 Is it running ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="1174"/>
+        <location filename="../../common/gui_main.cpp" line="1308"/>
         <source>avsproxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="1208"/>
+        <location filename="../../common/gui_main.cpp" line="1342"/>
         <source>Frame type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="1209"/>
+        <location filename="../../common/gui_main.cpp" line="1343"/>
         <source>Frame size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="1211"/>
+        <location filename="../../common/gui_main.cpp" line="1345"/>
         <source>Frame Hex Dump</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2436,134 +2592,141 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="62"/>
+        <location filename="../../common/gui_save.cpp" line="68"/>
         <source>Output file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="63"/>
+        <location filename="../../common/gui_save.cpp" line="69"/>
         <source>Job name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="66"/>
+        <location filename="../../common/gui_save.cpp" line="72"/>
         <source>Queue job to jobList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="79"/>
+        <location filename="../../common/gui_save.cpp" line="87"/>
         <source>Select Workbench to Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="87"/>
+        <location filename="../../common/gui_save.cpp" line="95"/>
         <source>Select File to Save Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="92"/>
+        <location filename="../../common/gui_save.cpp" line="100"/>
         <source>Select JPEG Sequence to Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="95"/>
+        <location filename="../../common/gui_save.cpp" line="105"/>
         <source>Select BMP to Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="99"/>
+        <location filename="../../common/gui_save.cpp" line="111"/>
         <source>Select JPEG to Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="104"/>
+        <location filename="../../common/gui_save.cpp" line="119"/>
         <source>Select File to Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="164"/>
+        <location filename="../../common/gui_save.cpp" line="180"/>
         <source>Saving audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="310"/>
+        <location filename="../../common/gui_save.cpp" line="326"/>
         <source>Jpeg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="310"/>
+        <location filename="../../common/gui_save.cpp" line="326"/>
         <source>Fail to save as jpeg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="341"/>
+        <location filename="../../common/gui_save.cpp" line="357"/>
         <source>Saving as set of jpegs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="347"/>
+        <location filename="../../common/gui_save.cpp" line="363"/>
         <source>Cannot decode frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="347"/>
+        <location filename="../../common/gui_save.cpp" line="363"/>
         <source>Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="358"/>
-        <location filename="../../common/gui_save.cpp" line="396"/>
+        <location filename="../../common/gui_save.cpp" line="374"/>
+        <location filename="../../common/gui_save.cpp" line="412"/>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="358"/>
+        <location filename="../../common/gui_save.cpp" line="374"/>
         <source>Saved %d images.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="360"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="612"/>
+        <location filename="../../common/gui_save.cpp" line="376"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="360"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="612"/>
+        <source>You cannot remove *all* the video
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/gui_save.cpp" line="376"/>
         <source>Could not save all images.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="382"/>
+        <location filename="../../common/gui_save.cpp" line="398"/>
         <source>BMP op failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="382"/>
+        <location filename="../../common/gui_save.cpp" line="398"/>
         <source>Saving %s as a BMP file failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="396"/>
+        <location filename="../../common/gui_save.cpp" line="412"/>
         <source>File %s has been successfully saved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="400"/>
+        <location filename="../../common/gui_save.cpp" line="416"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="13"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_save.cpp" line="400"/>
+        <location filename="../../common/gui_save.cpp" line="416"/>
         <source>File %s was NOT saved correctly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="303"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="381"/>
         <source>Recent Files</source>
         <translation type="unfinished">Fichiers Récents</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="304"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="382"/>
         <source>Recent Projects</source>
         <translation type="unfinished">Projets Récents</translation>
     </message>
@@ -2815,29 +2978,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="418"/>
         <source>The filter is already partial</source>
-        <translation type="unfinished">The filtre est déjà partiel</translation>
-    </message>
-    <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="610"/>
-        <source>Partial Start Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="611"/>
-        <source>Partial End Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="612"/>
-        <source>Configure child</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="615"/>
-        <source>Partial Video Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">The filtre est déjà partiel</translation>
     </message>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="13"/>
@@ -2915,16 +3057,27 @@
         <source>This script has already been successfully executed.</source>
         <translation>Ce script a déjà été executé avec succés</translation>
     </message>
+    <message>
+        <location filename="../../common/gui_savenew.cpp" line="171"/>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="226"/>
+        <source>Saving</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>aften</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="239"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="240"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="245"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="246"/>
         <source>Aften Configuration</source>
         <translation>Configuration d&apos;Aften</translation>
     </message>
@@ -2945,14 +3098,18 @@
 <context>
     <name>ass</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="60"/>
-        <source>SSA.</source>
-        <translation type="unfinished"></translation>
+        <source>Hardcode ass/ssa subtitles using libass.</source>
+        <translation type="vanished">Incruster des sous titres ASS/SSA.</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="61"/>
-        <source>Hardcode ass/ssa subtitles using libass.</source>
-        <translation>Incruster des sous titres ASS/SSA.</translation>
+        <source>SSA/ASS/SRT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="62"/>
+        <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+        <translation type="unfinished">Incruster des sous titres SSA/ASS avec libass</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="170"/>
@@ -2993,47 +3150,65 @@
 <context>
     <name>avsfilter</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="551"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="593"/>
         <source>_wine app file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="552"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="594"/>
         <source>Select wine filenamewine/cedega/etc.</source>
         <translation type="unfinished">Choisir le nom de l&apos;éxécutable wine (wine/cedega/...)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="554"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="596"/>
         <source>_loader file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="555"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="597"/>
         <source>Select loader filenameavsload.exe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="557"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="599"/>
         <source>_avs file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="558"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="600"/>
         <source>Select avs filename*.avs</source>
         <translation type="unfinished">Choisir le fichier avisynth (*.avs)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="559"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="601"/>
         <source>_pipe timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="563"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="605"/>
         <source>AvsFilter config</source>
         <translation type="unfinished">Configuration AVSFilter</translation>
     </message>
 </context>
 <context>
+    <name>black</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp" line="48"/>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp" line="49"/>
+        <source>Replace a section by black.</source>
+        <translation type="unfinished">Remplacer une portion de la video par du noir</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp" line="64"/>
+        <source>Replace by Black</source>
+        <translation type="unfinished">Remplacer par du noir</translation>
+    </message>
+</context>
+<context>
     <name>blacken</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp" line="159"/>
@@ -3156,12 +3331,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp" line="34"/>
         <source>ChromaShift</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Decalage chroma</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp" line="35"/>
         <source>Shift chroma U/V to fix badly synced luma/chroma.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Decaler la chroma u/v pour corriger les couleurs non alignées</translation>
     </message>
 </context>
 <context>
@@ -3394,6 +3569,14 @@
     </message>
 </context>
 <context>
+    <name>dcaenc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp" line="272"/>
+        <source>_Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="56"/>
@@ -3416,9 +3599,13 @@
         <translation type="unfinished">Remplacer (interpoler)</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="76"/>
         <source>Discard longer dupe (animÃ©s)</source>
-        <translation type="unfinished">Eliminer la séquence répétée la plus longue (animés)</translation>
+        <translation type="obsolete">Eliminer la séquence répétée la plus longue (animés)</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="76"/>
+        <source>Discard longer dupe (animés)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="77"/>
@@ -3472,14 +3659,14 @@
     </message>
 </context>
 <context>
-    <name>delogo</name>
+    <name>delogo2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp" line="58"/>
-        <source>MPlayer delogo</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp" line="42"/>
+        <source>MPlayer delogo2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp" line="59"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp" line="43"/>
         <source>Blend a logo by interpolating its surrounding box.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3555,35 +3742,35 @@
 <context>
     <name>encodingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="14"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="26"/>
         <source>Encoding...</source>
         <translation type="unfinished">Encodage...</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="72"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="83"/>
         <source>Phase:</source>
         <translation type="unfinished">Phases:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="85"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="299"/>
         <source>Video Codec:</source>
         <translation type="unfinished">Codec Vidéo:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="92"/>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="99"/>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="123"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="70"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="252"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="276"/>
         <source>None</source>
         <translation type="unfinished">Aucun</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="106"/>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="174"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="53"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="269"/>
         <source>Unknown</source>
         <translation type="unfinished">Inconnu</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="113"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="283"/>
         <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;
@@ -3591,7 +3778,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="130"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="259"/>
         <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;
@@ -3599,19 +3786,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="167"/>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="336"/>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="363"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="424"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="461"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="512"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="181"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="505"/>
         <source>00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="188"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="495"/>
         <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;
@@ -3619,7 +3806,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="198"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="90"/>
         <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;
@@ -3627,7 +3814,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="208"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="519"/>
         <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;
@@ -3635,14 +3822,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="245"/>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="262"/>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="279"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="353"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="360"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="377"/>
         <source>0 MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="252"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="343"/>
         <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;
@@ -3650,7 +3837,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="269"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="333"/>
         <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;
@@ -3658,7 +3845,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="289"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="206"/>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="367"/>
         <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;
@@ -3666,7 +3858,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="326"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="434"/>
         <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;
@@ -3674,12 +3866,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="346"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="454"/>
         <source>0 kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="353"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="414"/>
         <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;
@@ -3687,7 +3879,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="370"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="444"/>
         <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;
@@ -3695,62 +3887,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="429"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="104"/>
         <source>Shut down computer when finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="449"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="42"/>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="124"/>
         <source>Priority:</source>
         <translation type="unfinished">Priorité:</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="460"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="135"/>
         <source>High</source>
         <translation type="unfinished">Haute</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="465"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="140"/>
         <source>Above Normal</source>
         <translation type="unfinished">Plus que normale</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="470"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="145"/>
         <source>Normal</source>
         <translation type="unfinished">Normale</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="475"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="150"/>
         <source>Below Normal</source>
         <translation type="unfinished">Sous normale</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="480"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="155"/>
         <source>Low</source>
         <translation type="unfinished">BAsse</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="554"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="193"/>
         <source>Pause / Abort</source>
         <translation type="unfinished">Pause/Abandon</translation>
     </message>
 </context>
 <context>
-    <name>encodingWindow</name>
-    <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="79"/>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="99"/>
-        <source>Privileges Required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="79"/>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="99"/>
-        <source>Root privileges are required to perform this operation.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>eq2</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp" line="59"/>
@@ -3766,255 +3948,273 @@
 <context>
     <name>fade</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="51"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="54"/>
         <source>Fade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="52"/>
-        <source>Fade in/out.</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="55"/>
+        <source>Fade.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="63"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="54"/>
+        <source>Fade to black in/out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="65"/>
         <source>Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="63"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="65"/>
         <source>Fade out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="63"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="65"/>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="63"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="65"/>
         <source>Fade in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="72"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="74"/>
         <source>_Fade type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="73"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp" line="61"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="74"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="75"/>
         <source>_Start time (ms):</source>
         <translation type="unfinished">Début (ms):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="74"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp" line="62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="75"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="76"/>
         <source>_End time (ms):</source>
         <translation type="unfinished">Fin(ms):</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="77"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="53"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="79"/>
         <source>Fade to black</source>
         <translation type="unfinished">Fondu au noir</translation>
     </message>
 </context>
 <context>
+    <name>fade to</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="78"/>
+        <source>Fade</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="200"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="208"/>
         <source>Normal (4:3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="201"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="209"/>
         <source>Wide (16:9)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="206"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="214"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="207"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="215"/>
         <source>Tmpgenc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="208"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="216"/>
         <source>Animes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="209"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="217"/>
         <source>KVCD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="213"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="221"/>
         <source>MB comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="214"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="222"/>
         <source>Fewest bits (vhq)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="215"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="223"/>
         <source>Rate distortion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="218"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="226"/>
         <source>One thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="219"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="227"/>
         <source>Two threads)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="220"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="228"/>
         <source>Three threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="221"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="229"/>
         <source>Auto (#cpu)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="225"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="233"/>
         <source>Progressive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="226"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="234"/>
         <source>Interlaced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="229"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="237"/>
         <source>Top Field First</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="230"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="238"/>
         <source>Bottom Field First</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="240"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="248"/>
         <source>Threading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="241"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="249"/>
         <source>Mi_n. quantizer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="242"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="250"/>
         <source>Ma_x. quantizer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="243"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="251"/>
         <source>Max. quantizer _difference:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="244"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="252"/>
         <source>VBV Buffer Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="245"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="253"/>
         <source>Max bitrate (kb/s):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="247"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="255"/>
         <source>_Trellis quantization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="249"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="257"/>
         <source>_Number of B frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="261"/>
         <source>_Macroblock decision:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="254"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="262"/>
         <source>Aspect ratio:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="255"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="263"/>
         <source>Matrices:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="256"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="264"/>
         <source>_Filesize tolerance (kb):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="258"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="266"/>
         <source>_Quantizer compression:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="259"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="267"/>
         <source>Quantizer _blur:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="261"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="269"/>
         <source>_Gop Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="263"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="271"/>
         <source>_Interlaced:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="264"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="272"/>
         <source>Field Order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="268"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="276"/>
         <source>Basic Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="272"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="280"/>
         <source>Adv. Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="276"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="284"/>
         <source>Interlacing</source>
         <translation type="unfinished">Entrelacement</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="281"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="289"/>
         <source>Quantization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="286"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="294"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="289"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="297"/>
         <source>libavcodec MPEG-2 configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4022,187 +4222,187 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="176"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="186"/>
         <source>None</source>
         <translation type="unfinished">Aucun</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="177"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="187"/>
         <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="188"/>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="189"/>
         <source>Phods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="180"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="190"/>
         <source>EPZS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="181"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="191"/>
         <source>X1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="185"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="195"/>
         <source>H.263</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="196"/>
         <source>MPEG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="190"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="200"/>
         <source>MB comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="191"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="201"/>
         <source>Fewest bits (vhq)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="192"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="202"/>
         <source>Rate distortion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="195"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="205"/>
         <source>One thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="196"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="206"/>
         <source>Two threads)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="197"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="207"/>
         <source>Three threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="198"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="208"/>
         <source>Auto (#cpu)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="208"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="218"/>
         <source>Matrices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="209"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="219"/>
         <source>Threading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="210"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="220"/>
         <source>Mi_n. quantizer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="211"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="221"/>
         <source>Ma_x. quantizer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="212"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="222"/>
         <source>Max. quantizer _difference:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="214"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="224"/>
         <source>4_MV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="215"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="225"/>
         <source>_Trellis quantization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="217"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="227"/>
         <source>_Quarter pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="218"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="228"/>
         <source>_GMC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="221"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="231"/>
         <source>_Number of B frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="222"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="232"/>
         <source>_Quantization type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="224"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="234"/>
         <source>_Macroblock decision:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="226"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="236"/>
         <source>_Filesize tolerance (kb):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="228"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="238"/>
         <source>_Quantizer compression:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="229"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="239"/>
         <source>Quantizer _blur:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="231"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="241"/>
         <source>_Gop Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="234"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="244"/>
         <source>User Interface</source>
         <translation type="unfinished">Interface Utilisateur</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="237"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="247"/>
         <source>Advanced Simple Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="244"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="254"/>
         <source>Motion Estimation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="248"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="258"/>
         <source>Quantization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="263"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="256"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="266"/>
         <source>libavcodec MPEG-4 configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4210,117 +4410,170 @@
 <context>
     <name>ffmsmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="214"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="224"/>
         <source>None</source>
         <translation type="unfinished">Aucun</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="215"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="225"/>
         <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="216"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="226"/>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="217"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="227"/>
         <source>Phods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="218"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="228"/>
         <source>EPZS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="219"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="229"/>
         <source>X1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="223"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="233"/>
         <source>H.263</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="224"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="234"/>
         <source>MPEG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="228"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="238"/>
         <source>MB comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="229"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="239"/>
         <source>Fewest bits (vhq)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="230"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="240"/>
         <source>Rate distortion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="239"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="249"/>
         <source>Mi_n. quantizer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="240"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="250"/>
         <source>Ma_x. quantizer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="241"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="251"/>
         <source>Max. quantizer _difference:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="242"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="252"/>
         <source>_Trellis quantization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="243"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="253"/>
         <source>_Filesize tolerance (kb):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="245"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="255"/>
         <source>_Quantizer compression:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="246"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="256"/>
         <source>Quantizer _blur:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="248"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="258"/>
         <source>_Gop Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="251"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="261"/>
         <source>User Interface</source>
         <translation type="unfinished">Interface Utilisateur</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="256"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="266"/>
         <source>Quantization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="261"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="271"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="264"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="274"/>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ffnvenc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEnc.cpp" line="192"/>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEnc.cpp" line="193"/>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEnc.cpp" line="194"/>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEnc.cpp" line="195"/>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEnc.cpp" line="196"/>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEnc.cpp" line="197"/>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEnc.cpp" line="204"/>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEnc.cpp" line="205"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEnc.cpp" line="206"/>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEnc.cpp" line="210"/>
         <source>libavcodec MPEG-4 configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4331,6 +4584,16 @@
         <source>The filter is already partial</source>
         <translation type="obsolete">The filtre est déjà partiel</translation>
     </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="552"/>
+        <source>Load video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="567"/>
+        <source>Save video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>flux</name>
@@ -4359,117 +4622,117 @@
 <context>
     <name>flv1</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="154"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="162"/>
         <source>None</source>
         <translation type="unfinished">Aucun</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="155"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="163"/>
         <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="156"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="164"/>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="157"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="165"/>
         <source>Phods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="158"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="166"/>
         <source>EPZS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="167"/>
         <source>X1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="163"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="171"/>
         <source>H.263</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="164"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="172"/>
         <source>MPEG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="168"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="176"/>
         <source>MB comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="169"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="177"/>
         <source>Fewest bits (vhq)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="170"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="178"/>
         <source>Rate distortion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="179"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="187"/>
         <source>Mi_n. quantizer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="180"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="188"/>
         <source>Ma_x. quantizer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="181"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="189"/>
         <source>Max. quantizer _difference:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="182"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="190"/>
         <source>_Trellis quantization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="183"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="191"/>
         <source>_Filesize tolerance (kb):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="185"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="193"/>
         <source>_Quantizer compression:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="186"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="194"/>
         <source>Quantizer _blur:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="188"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="196"/>
         <source>_Gop Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="191"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="199"/>
         <source>User Interface</source>
         <translation type="unfinished">Interface Utilisateur</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="196"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="204"/>
         <source>Quantization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="201"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="209"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="204"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="212"/>
         <source>libavcodec FLV1 configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4851,22 +5114,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="329"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="331"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="331"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="333"/>
         <source>_Quality:</source>
         <translation type="unfinished">_Qualité:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="334"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="336"/>
         <source>_Disable reservoir:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="338"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="340"/>
         <source>LAME Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5083,87 +5346,81 @@
         <translation type="unfinished">&lt;big&gt;&lt;b&gt;Filtres Actifs&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="121"/>
         <source>C&amp;onfigure</source>
-        <translation type="unfinished">C&amp;onfigurer</translation>
+        <translation type="obsolete">C&amp;onfigurer</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="134"/>
         <source>P&amp;artial</source>
-        <translation type="unfinished">P&amp;artiel</translation>
+        <translation type="obsolete">P&amp;artiel</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="141"/>
         <source>Down</source>
-        <translation type="unfinished">Plus bas</translation>
+        <translation type="obsolete">Plus bas</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="152"/>
         <source>Up</source>
-        <translation type="unfinished">Plus haut</translation>
+        <translation type="obsolete">Plus haut</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="176"/>
         <source>Remove</source>
-        <translation type="unfinished">Enlever</translation>
+        <translation type="obsolete">Enlever</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="210"/>
         <source>Add</source>
-        <translation type="unfinished">Ajouter</translation>
+        <translation type="obsolete">Ajouter</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="232"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="159"/>
         <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation type="unfinished">&lt;big&gt;&lt;b&gt;Filtres disponibles&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="273"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="200"/>
         <source>Transform</source>
         <translation type="unfinished">Transformation</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="282"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="209"/>
         <source>Interlacing</source>
         <translation type="unfinished">Entrelacement</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="291"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="218"/>
         <source>Colors</source>
         <translation type="unfinished">Couleurs</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="300"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="227"/>
         <source>Noise</source>
         <translation type="unfinished">Bruit</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="309"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="236"/>
         <source>Sharpness</source>
         <translation type="unfinished">Netteté</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="318"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="245"/>
         <source>Subtitles</source>
         <translation type="unfinished">Sous titre</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="327"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="254"/>
         <source>OpenGl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="336"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="263"/>
         <source>Miscellaneous</source>
         <translation type="unfinished">Divers</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="387"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="314"/>
         <source>&amp;Preview</source>
         <translation type="unfinished">&amp;Prévisualisation</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="398"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="325"/>
         <source>&amp;Close</source>
         <translation type="unfinished">&amp;Fermer</translation>
     </message>
@@ -5513,12 +5770,12 @@
 <context>
     <name>muxerMP4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="150"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="152"/>
         <source>Saving mp4</source>
         <translation type="unfinished">Sauvegarde au format MP4</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="151"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="153"/>
         <source>Saving PSP</source>
         <translation type="unfinished">Sauvegarde au format PSP</translation>
     </message>
@@ -5541,25 +5798,78 @@
 <context>
     <name>muxerffTS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="147"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="141"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished">Sauvegarde au format TS (ff)</translation>
     </message>
 </context>
 <context>
+    <name>nvenc</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc.cpp" line="136"/>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc.cpp" line="137"/>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc.cpp" line="138"/>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc.cpp" line="139"/>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc.cpp" line="140"/>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc.cpp" line="141"/>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc.cpp" line="148"/>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc.cpp" line="149"/>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc.cpp" line="150"/>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/nvEnc/nvEnc.cpp" line="154"/>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>openGlResize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="218"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="217"/>
         <source>Width :</source>
         <translation type="unfinished">Largeur:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="219"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="218"/>
         <source>Height :</source>
         <translation type="unfinished">Hauteur:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="223"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="222"/>
         <source>glResize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5667,12 +5977,12 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="23"/>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Non</translation>
     </message>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="23"/>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Oui</translation>
     </message>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="49"/>
@@ -5784,12 +6094,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="83"/>
         <source>Resample FPS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Changer le nombre d&apos;i/s</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="84"/>
         <source>Change and enforce FPS. Keep duration and sync.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Change le nombre d&apos;i/s, conserve la synchronisation et la durée</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="358"/>
@@ -5889,12 +6199,12 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="52"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="215"/>
         <source>Rotate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Rotation</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="53"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Angle de rotation (90/180/270);</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="208"/>
@@ -5908,27 +6218,27 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="209"/>
-        <source>90Â°</source>
+        <source>90°</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="210"/>
-        <source>180 degrees</source>
+        <source>180°</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="210"/>
-        <source>180Â°</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="211"/>
+        <source>270°</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="211"/>
-        <source>270 degrees</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="210"/>
+        <source>180 degrees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="211"/>
-        <source>270Â°</source>
+        <source>270 degrees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5947,12 +6257,12 @@
 <context>
     <name>rotateGl</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp" line="179"/>
-        <source>Angle (Â°):</source>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp" line="178"/>
+        <source>Angle (°):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp" line="184"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp" line="183"/>
         <source>glRotate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6018,37 +6328,37 @@
 <context>
     <name>uisupport</name>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="165"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="191"/>
         <source>X11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="167"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="193"/>
         <source>MS Windows GDI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="169"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="195"/>
         <source>Mac OS X Quartz 2D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="171"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="197"/>
         <source>Mac OS X QuickDraw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="173"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="199"/>
         <source>OpenGL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="176"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="202"/>
         <source>MS Windows Direct3D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ui_support.cpp" line="179"/>
+        <location filename="../ADM_userInterfaces/ui_support.cpp" line="205"/>
         <source>Default Raster</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6071,42 +6381,42 @@
 <context>
     <name>vdpauVideoFilterDeint</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="315"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="316"/>
         <source>Keep Top Field</source>
         <translation type="unfinished">Garder le champs supérieur</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="316"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="317"/>
         <source>Keep Bottom Field</source>
         <translation type="unfinished">Garder le champs inférieur</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="317"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="318"/>
         <source>Double framerate</source>
         <translation type="unfinished">Doubler le nombre d&apos;image par seconde</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="321"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="322"/>
         <source>_Resize:</source>
         <translation type="unfinished">_Redimensionner</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="322"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="323"/>
         <source>_Deint Mode:</source>
         <translation type="unfinished">Mode de _deentrelacement:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="323"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="324"/>
         <source>Width :</source>
         <translation type="unfinished">Largeur:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="324"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="325"/>
         <source>Height :</source>
         <translation type="unfinished">Hauteur:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="328"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp" line="329"/>
         <source>vdpau</source>
         <translation type="unfinished">vdpau</translation>
     </message>
@@ -6114,42 +6424,42 @@
 <context>
     <name>vdpaufilter</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="264"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="263"/>
         <source>Keep Top Field</source>
         <translation type="unfinished">Garder le champs supérieur</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="265"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="264"/>
         <source>Keep Bottom Field</source>
         <translation type="unfinished">Garder le champs inférieur</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="266"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="265"/>
         <source>Double framerate</source>
         <translation type="unfinished">Doubler le nombre d&apos;image par seconde</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="270"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="269"/>
         <source>_Resize:</source>
         <translation type="unfinished">_Redimensionner</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="271"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="270"/>
         <source>_Deint Mode:</source>
         <translation type="unfinished">Mode de _deentrelacement:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="272"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="271"/>
         <source>Width :</source>
         <translation type="unfinished">Largeur:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="273"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="272"/>
         <source>Height :</source>
         <translation type="unfinished">Hauteur:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="277"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="276"/>
         <source>vdpau</source>
         <translation type="unfinished">vdpau</translation>
     </message>
@@ -6157,17 +6467,17 @@
 <context>
     <name>vdpaufilter2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="198"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="203"/>
         <source>Width :</source>
         <translation type="unfinished">Largeur:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="204"/>
         <source>Height :</source>
         <translation type="unfinished">Hauteur:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="203"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp" line="208"/>
         <source>vdpau</source>
         <translation type="unfinished">vdpau</translation>
     </message>
@@ -6267,6 +6577,19 @@
     </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="68"/>
+        <source>VS File Files (*.vpy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="13"/>
@@ -6297,43 +6620,43 @@
 <context>
     <name>x264Dialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="479"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="630"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished">Bitrate cible :</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="480"/>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="499"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="631"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="650"/>
         <source>kbit/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="484"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="635"/>
         <source>Quantiser:</source>
         <translation type="unfinished">Quantisation:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="488"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="639"/>
         <source>Quality:</source>
         <translation type="unfinished">Qualité:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="493"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="644"/>
         <source>Target Video Size:</source>
         <translation type="unfinished">Taille vidéo cible:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="494"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="645"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="498"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="649"/>
         <source>Average Bitrate:</source>
         <translation type="unfinished">Bitrate moyen:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="561"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="717"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -6342,7 +6665,64 @@
 Voulez vous procéder ?</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="572"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="728"/>
+        <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 type="unfinished">L&apos; optimisation Macroblock-Tree  nécessite  Variance Adaptive Quantisation. Variance Adaptive Quantisation va être automatiquement activée.
+
+Voulez vous procéder ?</translation>
+    </message>
+</context>
+<context>
+    <name>x265Dialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="588"/>
+        <source>Target Bitrate:</source>
+        <translation type="unfinished">Bitrate cible :</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="589"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="609"/>
+        <source>kbit/s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="594"/>
+        <source>Quantiser:</source>
+        <translation type="unfinished">Quantisation:</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="598"/>
+        <source>Quality:</source>
+        <translation type="unfinished">Qualité:</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="603"/>
+        <source>Target Video Size:</source>
+        <translation type="unfinished">Taille vidéo cible:</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="604"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="608"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished">Bitrate moyen:</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="671"/>
+        <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 type="unfinished">L&apos; optimisation Macroblock-Tree  nécessite  Variance Adaptive Quantisation. Variance Adaptive Quantisation va être automatiquement activée.
+
+Voulez vous procéder ?</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="682"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Macroblock-Tree optimisation will automatically be disabled.
 
 Do you wish to continue?</source>
@@ -6367,12 +6747,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="39"/>
         <source>Medium</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Moyenne</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="40"/>
         <source>Full</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Complète</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="44"/>
@@ -6412,17 +6792,17 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="69"/>
         <source>One thread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Un thread</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="70"/>
         <source>Two threads)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Deux threads</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="71"/>
         <source>Three threads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Trois threads</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="72"/>
@@ -6430,72 +6810,122 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="76"/>
+        <source>1:1 (PC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="77"/>
+        <source>4:3 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="78"/>
+        <source>4:3 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="79"/>
-        <source>MotionEstimation</source>
+        <source>16:9 (PAL))</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="81"/>
-        <source>Threading</source>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="80"/>
+        <source>16:9 (NTSC))</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="87"/>
+        <source>MotionEstimation</source>
+        <translation type="unfinished">Estimation de mouvement</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="89"/>
+        <source>Threading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="91"/>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="92"/>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="96"/>
         <source>_Trellis quantization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="88"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="97"/>
         <source>_Number of B frames:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="90"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="99"/>
         <source>_Quantization type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="92"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="101"/>
         <source>_Macroblock decision:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="94"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="103"/>
         <source>Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="101"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="105"/>
+        <source>Aspect Ratio:</source>
+        <translation type="unfinished">Rapport h/l:</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="113"/>
         <source>_Gop Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="116"/>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="120"/>
         <source>Advanced Simple Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="112"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="129"/>
         <source>Motion Estimation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="117"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="134"/>
         <source>Quantization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="121"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="138"/>
         <source>Threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="124"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="145"/>
+        <source>Aspect Ratio</source>
+        <translation type="unfinished">Rapport hauteur/largeur</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="150"/>
         <source>Rate Control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="127"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="153"/>
         <source>Xvid4 MPEG-4 ASP configuration</source>
         <translation type="unfinished"></translation>
     </message>

avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/avidemux_it.ts -> avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/avidemux_it.ts Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="it">
+<TS version="2.1" language="it">
 <context>
     <name></name>
     <message>
@@ -2883,38 +2883,38 @@
     <name>ADMVideoDenoise</name>
     <message>
         <source>_Luma lock:</source>
-        <translation>Blocco _luma:</translation>
+        <translation type="vanished">Blocco _luma:</translation>
     </message>
     <message>
         <source>C_hroma lock:</source>
-        <translation>Blocco _croma:</translation>
+        <translation type="vanished">Blocco _croma:</translation>
     </message>
     <message>
         <source>L_uma threshold:</source>
-        <translation>Soglia l_uma:</translation>
+        <translation type="vanished">Soglia l_uma:</translation>
     </message>
     <message>
         <source>Ch_roma threshold:</source>
-        <translation>Soglia c_roma:</translation>
+        <translation type="vanished">Soglia c_roma:</translation>
     </message>
     <message>
         <source>_Scene change:</source>
-        <translation>Cambiamento _scena:</translation>
+        <translation type="vanished">Cambiamento _scena:</translation>
     </message>
     <message>
         <source>Denoise</source>
-        <translation>Rimozione rumore</translation>
+        <translation type="vanished">Rimozione rumore</translation>
     </message>
 </context>
 <context>
     <name>ADMVideoDropOut</name>
     <message>
         <source>DropOut Threshold</source>
-        <translation>Soglia Dropout</translation>
+        <translation type="vanished">Soglia Dropout</translation>
     </message>
     <message>
         <source>Drop Out</source>
-        <translation>Dropout</translation>
+        <translation type="vanished">Dropout</translation>
     </message>
 </context>
 <context>
@@ -2992,42 +2992,42 @@
     <name>ADMVideoFlux</name>
     <message>
         <source>_Temporal threshold:</source>
-        <translation>Soglia _temporale:</translation>
+        <translation type="vanished">Soglia _temporale:</translation>
     </message>
     <message>
         <source>_Spatial threshold:</source>
-        <translation>Soglia _spaziale:</translation>
+        <translation type="vanished">Soglia _spaziale:</translation>
     </message>
     <message>
         <source>FluxSmooth</source>
-        <translation>FluxSmooth</translation>
+        <translation type="vanished">FluxSmooth</translation>
     </message>
 </context>
 <context>
     <name>ADMVideoForcedPP</name>
     <message>
         <source>_Filter strength:</source>
-        <translation>Intensità _filtro:</translation>
+        <translation type="vanished">Intensità _filtro:</translation>
     </message>
     <message>
         <source>_Quantizer:</source>
-        <translation>_Quantizzatore:</translation>
+        <translation type="vanished">_Quantizzatore:</translation>
     </message>
     <message>
         <source>_Horizontal deblocking</source>
-        <translation>Deblocking o_rizzontale</translation>
+        <translation type="vanished">Deblocking o_rizzontale</translation>
     </message>
     <message>
         <source>_Vertical deblocking</source>
-        <translation>Deblocking _verticale</translation>
+        <translation type="vanished">Deblocking _verticale</translation>
     </message>
     <message>
         <source>_Deringing</source>
-        <translation>_Deringing</translation>
+        <translation type="vanished">_Deringing</translation>
     </message>
     <message>
         <source>Forced Postprocessing</source>
-        <translation>Postprocessing forzato</translation>
+        <translation type="vanished">Postprocessing forzato</translation>
     </message>
 </context>
 <context>
@@ -3174,15 +3174,15 @@
     <name>ADMVideoMPD3D</name>
     <message>
         <source>_Spatial luma strength:</source>
-        <translation>Intensità luma _spaziale:</translation>
+        <translation type="vanished">Intensità luma _spaziale:</translation>
     </message>
     <message>
         <source>S_patial chroma strength:</source>
-        <translation>Intensità croma s_paziale:</translation>
+        <translation type="vanished">Intensità croma s_paziale:</translation>
     </message>
     <message>
         <source>MPlayer denoise3d</source>
-        <translation>MPlayer denoise3d</translation>
+        <translation type="vanished">MPlayer denoise3d</translation>
     </message>
     <message>
         <source>_Temporal strength:</source>
@@ -3194,79 +3194,79 @@
     </message>
     <message>
         <source>Luma _Temporal strength:</source>
-        <translation>Intensità luma _temporale:</translation>
+        <translation type="vanished">Intensità luma _temporale:</translation>
     </message>
 </context>
 <context>
     <name>ADMVideoMPD3Dlow</name>
     <message>
         <source>_Spatial luma strength:</source>
-        <translation>Intensità luma _spaziale:</translation>
+        <translation type="vanished">Intensità luma _spaziale:</translation>
     </message>
     <message>
         <source>S_patial chroma strength:</source>
-        <translation>Intensità croma s_paziale:</translation>
+        <translation type="vanished">Intensità croma s_paziale:</translation>
     </message>
     <message>
         <source>_Temporal strength:</source>
-        <translation>Intensità _temporale:</translation>
+        <translation type="vanished">Intensità _temporale:</translation>
     </message>
     <message>
         <source>MPlayer denoise3d</source>
-        <translation>MPlayer denoise3d</translation>
+        <translation type="vanished">MPlayer denoise3d</translation>
     </message>
 </context>
 <context>
     <name>ADMVideoMaskedSoften</name>
     <message>
         <source>_Luma threshold:</source>
-        <translation>Soglia _luma:</translation>
+        <translation type="vanished">Soglia _luma:</translation>
     </message>
     <message>
         <source>C_hroma threshold:</source>
-        <translation>Soglia _croma:</translation>
+        <translation type="vanished">Soglia _croma:</translation>
     </message>
     <message>
         <source>_Radius:</source>
-        <translation>_Raggio:</translation>
+        <translation type="vanished">_Raggio:</translation>
     </message>
     <message>
         <source>Soften</source>
-        <translation>Attenuazione</translation>
+        <translation type="vanished">Attenuazione</translation>
     </message>
 </context>
 <context>
     <name>ADMVideoMosaic</name>
     <message>
         <source>_Horizontal stacking:</source>
-        <translation>_Colonne:</translation>
+        <translation type="vanished">_Colonne:</translation>
     </message>
     <message>
         <source>_Vertical stacking:</source>
-        <translation>_Righe:</translation>
+        <translation type="vanished">_Righe:</translation>
     </message>
     <message>
         <source>_Shrink factor:</source>
-        <translation>_Fattore di compressione:</translation>
+        <translation type="vanished">_Fattore di compressione:</translation>
     </message>
     <message>
         <source>Show _frame</source>
-        <translation>Mostra _numero fotogramma</translation>
+        <translation type="vanished">Mostra _numero fotogramma</translation>
     </message>
     <message>
         <source>Mosaic</source>
-        <translation>Mosaico</translation>
+        <translation type="vanished">Mosaico</translation>
     </message>
 </context>
 <context>
     <name>ADMVideoPalShift</name>
     <message>
         <source>_Try reverse</source>
-        <translation>_Prova contrario</translation>
+        <translation type="vanished">_Prova contrario</translation>
     </message>
     <message>
         <source>Pal Field Shift</source>
-        <translation>Pal Field Shift</translation>
+        <translation type="vanished">Pal Field Shift</translation>
     </message>
 </context>
 <context>
@@ -3402,11 +3402,11 @@
     <name>ADMVideoStabilize</name>
     <message>
         <source>Stabilize Threshold</source>
-        <translation>Soglia di stabilizzazione</translation>
+        <translation type="vanished">Soglia di stabilizzazione</translation>
     </message>
     <message>
         <source>Stabilize</source>
-        <translation>Stabilizzazione</translation>
+        <translation type="vanished">Stabilizzazione</translation>
     </message>
 </context>
 <context>
@@ -3444,11 +3444,11 @@
     <name>ADMVideoSubtitle</name>
     <message>
         <source>Could not open subtitle file</source>
-        <translation>Impossibile aprire il file sottotitoli</translation>
+        <translation type="vanished">Impossibile aprire il file sottotitoli</translation>
     </message>
     <message>
         <source>Cannot identify subtitle format</source>
-        <translation>Impossibile identificare il formato sottotitoli</translation>
+        <translation type="vanished">Impossibile identificare il formato sottotitoli</translation>
     </message>
 </context>
 <context>
@@ -3601,47 +3601,47 @@
     <name>ADMVideoTIsophote</name>
     <message>
         <source>Simple</source>
-        <translation>Semplice</translation>
+        <translation type="vanished">Semplice</translation>
     </message>
     <message>
         <source>Medium</source>
-        <translation>Medio</translation>
+        <translation type="vanished">Medio</translation>
     </message>
     <message>
         <source>Slow</source>
-        <translation>Lento</translation>
+        <translation type="vanished">Lento</translation>
     </message>
     <message>
         <source>_Type:</source>
-        <translation>_Tipo:</translation>
+        <translation type="vanished">_Tipo:</translation>
     </message>
     <message>
         <source>_Iterations:</source>
-        <translation>_Iterazioni:</translation>
+        <translation type="vanished">_Iterazioni:</translation>
     </message>
     <message>
         <source>Smaller means more deinterlacing</source>
-        <translation>Minore significa maggiore deiterlaccio</translation>
+        <translation type="vanished">Minore significa maggiore deiterlaccio</translation>
     </message>
     <message>
         <source>_Chroma:</source>
-        <translation>_Croma:</translation>
+        <translation type="vanished">_Croma:</translation>
     </message>
     <message>
         <source>Process chroma.</source>
-        <translation>Processa croma.</translation>
+        <translation type="vanished">Processa croma.</translation>
     </message>
     <message>
         <source>_Step:</source>
-        <translation>Pa_sso:</translation>
+        <translation type="vanished">Pa_sso:</translation>
     </message>
     <message>
         <source>Step.</source>
-        <translation>Passo.</translation>
+        <translation type="vanished">Passo.</translation>
     </message>
     <message>
         <source>KernelDeint</source>
-        <translation>KernelDeint</translation>
+        <translation type="vanished">KernelDeint</translation>
     </message>
 </context>
 <context>
@@ -3903,6 +3903,21 @@
     </message>
 </context>
 <context>
+    <name>ADM_Qt4CoreUIToolkit::DIA_processingQt4</name>
+    <message>
+        <source>_Resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The processing is paused.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_Qt4Factory::ADM_Qbitrate</name>
     <message>
         <source>Constant Bitrate</source>
@@ -3993,6 +4008,13 @@
     </message>
 </context>
 <context>
+    <name>ADM_ffDvEncoder</name>
+    <message>
+        <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_ogmWrite</name>
     <message>
         <source>File error</source>
@@ -4076,37 +4098,37 @@
     <name>ADM_qtScript::Editor</name>
     <message>
         <source>Unable to append %1</source>
-        <translation>Impossibile aggiungere %1</translation>
+        <translation type="vanished">Impossibile aggiungere %1</translation>
     </message>
     <message>
         <source>Unable to open %1</source>
-        <translation>Impossibile aprire %1</translation>
+        <translation type="vanished">Impossibile aprire %1</translation>
     </message>
     <message>
         <source>Video must contain an audio track to perform this operation.</source>
-        <translation>Il video deve contenere una traccia audio per eseguire questa operazione.</translation>
+        <translation type="vanished">Il video deve contenere una traccia audio per eseguire questa operazione.</translation>
     </message>
 </context>
 <context>
     <name>ADM_qtScript::QtScriptObject</name>
     <message>
         <source>Parameter %1 must be a number</source>
-        <translation>Il parametro %1 deve essere un numero</translation>
+        <translation type="vanished">Il parametro %1 deve essere un numero</translation>
     </message>
     <message>
         <source>Parameter %1 must be greater than %2</source>
-        <translation>Il parametro %1 deve essere maggiore di %2</translation>
+        <translation type="vanished">Il parametro %1 deve essere maggiore di %2</translation>
     </message>
     <message>
         <source>Parameter %1 must be less than %2</source>
-        <translation>Il parametro %1 deve essere minore di %2</translation>
+        <translation type="vanished">Il parametro %1 deve essere minore di %2</translation>
     </message>
 </context>
 <context>
     <name>ADM_qtScript::SegmentCollectionPrototype</name>
     <message>
         <source>A video must be open to perform this operation.</source>
-        <translation>Un video deve essere aperto per eseguire questa operazione.</translation>
+        <translation type="vanished">Un video deve essere aperto per eseguire questa operazione.</translation>
     </message>
 </context>
 <context>
@@ -4120,19 +4142,19 @@
     <name>AVDMFastVideoConvolution</name>
     <message>
         <source>_Process luma</source>
-        <translation>_Processa luma</translation>
+        <translation type="vanished">_Processa luma</translation>
     </message>
     <message>
         <source>Process luma plane</source>
-        <translation>Processa piano luma</translation>
+        <translation type="vanished">Processa piano luma</translation>
     </message>
     <message>
         <source>P_rocess chroma</source>
-        <translation>P_rocessa croma</translation>
+        <translation type="vanished">P_rocessa croma</translation>
     </message>
     <message>
         <source>Fast Convolution</source>
-        <translation>Convoluzione veloce</translation>
+        <translation type="vanished">Convoluzione veloce</translation>
     </message>
 </context>
 <context>
@@ -4177,47 +4199,47 @@
     <name>AVDMVideoMCDeint</name>
     <message>
         <source>Fast</source>
-        <translation>Veloce</translation>
+        <translation type="vanished">Veloce</translation>
     </message>
     <message>
         <source>Medium</source>
-        <translation>Medio</translation>
+        <translation type="vanished">Medio</translation>
     </message>
     <message>
         <source>Slow iterative motion search</source>
-        <translation>Lenta, ricerca movimento iterativa</translation>
+        <translation type="vanished">Lenta, ricerca movimento iterativa</translation>
     </message>
     <message>
         <source>Extra slow (same as 3+multiple reference frames)</source>
-        <translation>Extra lenta (come fotogrammi di riferimento multipli di 3)</translation>
+        <translation type="vanished">Extra lenta (come fotogrammi di riferimento multipli di 3)</translation>
     </message>
     <message>
         <source>Top</source>
-        <translation>Superiore</translation>
+        <translation type="vanished">Superiore</translation>
     </message>
     <message>
         <source>Bottom</source>
-        <translation>Inferiore</translation>
+        <translation type="vanished">Inferiore</translation>
     </message>
     <message>
         <source>_Mode:</source>
-        <translation>_Modalità:</translation>
+        <translation type="vanished">_Modalità:</translation>
     </message>
     <message>
         <source>_Field dominance:</source>
-        <translation>Preponderanza _semiquadro:</translation>
+        <translation type="vanished">Preponderanza _semiquadro:</translation>
     </message>
     <message>
         <source>_Qp:</source>
-        <translation>_Qp:</translation>
+        <translation type="vanished">_Qp:</translation>
     </message>
     <message>
         <source>mcDeinterlace</source>
-        <translation>mcDeinterlace</translation>
+        <translation type="vanished">mcDeinterlace</translation>
     </message>
     <message>
         <source>Bottom :</source>
-        <translation>Inferiore:</translation>
+        <translation type="vanished">Inferiore:</translation>
     </message>
 </context>
 <context>
@@ -4255,74 +4277,74 @@
     <name>AVDMVideoVlad</name>
     <message>
         <source>_Luma temporal threshold:</source>
-        <translation>Soglia temporale _luma:</translation>
+        <translation type="vanished">Soglia temporale _luma:</translation>
     </message>
     <message>
         <source>Ch_roma temporal threshold:</source>
-        <translation>Soglia temporale c_roma:</translation>
+        <translation type="vanished">Soglia temporale c_roma:</translation>
     </message>
     <message>
         <source>Temporal Cleaner</source>
-        <translation>Temporal Cleaner</translation>
+        <translation type="vanished">Temporal Cleaner</translation>
     </message>
 </context>
 <context>
     <name>AVDM_Fade</name>
     <message>
         <source>Out</source>
-        <translation>In uscita</translation>
+        <translation type="vanished">In uscita</translation>
     </message>
     <message>
         <source>Fade out</source>
-        <translation>Dissolvenza in uscita</translation>
+        <translation type="vanished">Dissolvenza in uscita</translation>
     </message>
     <message>
         <source>In</source>
-        <translation>In ingresso</translation>
+        <translation type="vanished">In ingresso</translation>
     </message>
     <message>
         <source>Fade in</source>
-        <translation>Dissolvenza in ingresso</translation>
+        <translation type="vanished">Dissolvenza in ingresso</translation>
     </message>
     <message>
         <source>_Fade type:</source>
-        <translation>Tipo di _dissolvenza:</translation>
+        <translation type="vanished">Tipo di _dissolvenza:</translation>
     </message>
     <message>
         <source>_Start frame:</source>
-        <translation>Fotogramma di _inizio:</translation>
+        <translation type="vanished">Fotogramma di _inizio:</translation>
     </message>
     <message>
         <source>_End frame:</source>
-        <translation>Fotogramma di _fine:</translation>
+        <translation type="vanished">Fotogramma di _fine:</translation>
     </message>
     <message>
         <source>Fade to _black</source>
-        <translation>Di_ssolvenza verso il nero</translation>
+        <translation type="vanished">Di_ssolvenza verso il nero</translation>
     </message>
     <message>
         <source>Fade</source>
-        <translation>Dissolvenza</translation>
+        <translation type="vanished">Dissolvenza</translation>
     </message>
     <message>
         <source>Parameter Error</source>
-        <translation>Errore parametro</translation>
+        <translation type="vanished">Errore parametro</translation>
     </message>
     <message>
         <source>Start must be before end, and both within video # of frames.</source>
-        <translation>L&apos;inizio deve essere prima della fine, ed entrambi minori del numero totale di fotogrammi.</translation>
+        <translation type="vanished">L&apos;inizio deve essere prima della fine, ed entrambi minori del numero totale di fotogrammi.</translation>
     </message>
     <message>
         <source>_Start time (ms):</source>
-        <translation>Tempo di _inizio (ms):</translation>
+        <translation type="vanished">Tempo di _inizio (ms):</translation>
     </message>
     <message>
         <source>_End time (ms):</source>
-        <translation>Tempo di _fine (ms):</translation>
+        <translation type="vanished">Tempo di _fine (ms):</translation>
     </message>
     <message>
         <source>Fade to black</source>
-        <translation>Dissolvenza verso il nero</translation>
+        <translation type="vanished">Dissolvenza verso il nero</translation>
     </message>
 </context>
 <context>
@@ -4663,23 +4685,23 @@
     <name>DGbob</name>
     <message>
         <source>Top</source>
-        <translation>Superiore</translation>
+        <translation type="vanished">Superiore</translation>
     </message>
     <message>
         <source>Bottom</source>
-        <translation>Inferiore</translation>
+        <translation type="vanished">Inferiore</translation>
     </message>
     <message>
         <source>Keep nb of frames and fps</source>
-        <translation>Mantieni numero di fotogrammi e fps</translation>
+        <translation type="vanished">Mantieni numero di fotogrammi e fps</translation>
     </message>
     <message>
         <source>Double nb of frames and fps</source>
-        <translation>Raddoppia fotogrammi e fps</translation>
+        <translation type="vanished">Raddoppia fotogrammi e fps</translation>
     </message>
     <message>
         <source>Double nb of frames (slow motion)</source>
-        <translation>Raddoppia fotogrammi (rallentatore)</translation>
+        <translation type="vanished">Raddoppia fotogrammi (rallentatore)</translation>
     </message>
     <message>
         <source>_Field order:</source>
@@ -4687,34 +4709,34 @@
     </message>
     <message>
         <source>_Mode:</source>
-        <translation>_Modalità:</translation>
+        <translation type="vanished">_Modalità:</translation>
     </message>
     <message>
         <source>_Threshold:</source>
-        <translation>_Soglia:</translation>
+        <translation type="vanished">_Soglia:</translation>
     </message>
     <message>
         <source>_Extra</source>
-        <translation>_Extra</translation>
+        <translation type="vanished">_Extra</translation>
     </message>
     <message>
         <source>Extra check, avoid using it</source>
-        <translation>Controllo supplementare, evitare l&apos;utilizzo</translation>
+        <translation type="vanished">Controllo supplementare, evitare l&apos;utilizzo</translation>
     </message>
     <message>
         <source>DGBob</source>
-        <translation>DGBob</translation>
+        <translation type="vanished">DGBob</translation>
     </message>
     <message>
         <source>_Top Field First:</source>
-        <translation>Prima il semiquadro _superiore:</translation>
+        <translation type="vanished">Prima il semiquadro _superiore:</translation>
     </message>
 </context>
 <context>
     <name>DIA_encodingQt4</name>
     <message>
         <source>Shutting down</source>
-        <translation>Arresto in corso</translation>
+        <translation type="vanished">Arresto in corso</translation>
     </message>
     <message>
         <source>The encoding is paused. Do you want to resume or abort?</source>
@@ -4728,16 +4750,24 @@
         <source>Abort</source>
         <translation>Annulla</translation>
     </message>
+    <message>
+        <source>Privileges Required</source>
+        <translation type="unfinished">Richiesti privilegi</translation>
+    </message>
+    <message>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation type="unfinished">Sono richesti i privilegi di amministratore per eseguire questa operazione.</translation>
+    </message>
 </context>
 <context>
     <name>DIA_progressIndexing</name>
     <message>
         <source># Images :%0</source>
-        <translation>Numero di immagini: %0</translation>
+        <translation type="vanished">Numero di immagini: %0</translation>
     </message>
     <message>
         <source>Time Left :%02d:%02d:%02d</source>
-        <translation>Tempo rimanente: %02d:%02d:%02d</translation>
+        <translation type="vanished">Tempo rimanente: %02d:%02d:%02d</translation>
     </message>
 </context>
 <context>
@@ -4763,18 +4793,25 @@
     </message>
 </context>
 <context>
+    <name>DcaEnc</name>
+    <message>
+        <source>DcaEnc Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Decimate</name>
     <message>
         <source>Discard closer</source>
-        <translation>Scarta il più vicino</translation>
+        <translation type="vanished">Scarta il più vicino</translation>
     </message>
     <message>
         <source>Replace (interpolate)</source>
-        <translation>Sostituisci (interpola)</translation>
+        <translation type="vanished">Sostituisci (interpola)</translation>
     </message>
     <message>
         <source>Discard longer dupe (animÃ©s)</source>
-        <translation>Scarta duplicati più lunghi (anime)</translation>
+        <translation type="vanished">Scarta duplicati più lunghi (anime)</translation>
     </message>
     <message>
         <source>Discard longer dupe (animés)</source>
@@ -4782,11 +4819,11 @@
     </message>
     <message>
         <source>Pulldown dupe removal</source>
-        <translation>Rimozione duplicati pulldown</translation>
+        <translation type="vanished">Rimozione duplicati pulldown</translation>
     </message>
     <message>
         <source>Fastest (no chroma, partial luma)</source>
-        <translation>Più veloce (senza croma, luma parziale)</translation>
+        <translation type="vanished">Più veloce (senza croma, luma parziale)</translation>
     </message>
     <message>
         <source>Fast (partial luma and chroma)</source>
@@ -4794,7 +4831,7 @@
     </message>
     <message>
         <source>Medium (full luma, no chroma)</source>
-        <translation>Media (luma completa, senza croma)</translation>
+        <translation type="vanished">Media (luma completa, senza croma)</translation>
     </message>
     <message>
         <source>Slow (full luma and chroma)</source>
@@ -4802,31 +4839,31 @@
     </message>
     <message>
         <source>_Mode:</source>
-        <translation>_Modalità:</translation>
+        <translation type="vanished">_Modalità:</translation>
     </message>
     <message>
         <source>_Quality:</source>
-        <translation>_Qualità:</translation>
+        <translation type="vanished">_Qualità:</translation>
     </message>
     <message>
         <source>_Threshold 1:</source>
-        <translation>_Soglia 1:</translation>
+        <translation type="vanished">_Soglia 1:</translation>
     </message>
     <message>
         <source>T_hreshold 2:</source>
-        <translation>So_glia 2:</translation>
+        <translation type="vanished">So_glia 2:</translation>
     </message>
     <message>
         <source>C_ycle:</source>
-        <translation>C_iclo:</translation>
+        <translation type="vanished">C_iclo:</translation>
     </message>
     <message>
         <source>Decomb Decimate</source>
-        <translation>Decimazione Decomb</translation>
+        <translation type="vanished">Decimazione Decomb</translation>
     </message>
     <message>
         <source>Sho_w</source>
-        <translation>M_ostra</translation>
+        <translation type="vanished">M_ostra</translation>
     </message>
 </context>
 <context>
@@ -4856,7 +4893,7 @@
     </message>
     <message>
         <source>Audio Filters</source>
-        <translation>Filtri audio</translation>
+        <translation type="vanished">Filtri audio</translation>
     </message>
     <message>
         <source>Track 2</source>
@@ -4878,6 +4915,10 @@
         <source>Enabled</source>
         <translation>Attiva</translation>
     </message>
+    <message>
+        <source>Filters</source>
+        <translation type="unfinished">Filtri</translation>
+    </message>
 </context>
 <context>
     <name>DialogOcr</name>
@@ -4927,6 +4968,41 @@
     </message>
 </context>
 <context>
+    <name>DialogProcessing</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished">Finestra</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Annulla</translation>
+    </message>
+    <message>
+        <source>TimeLeft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>00:00:00</source>
+        <translation type="unfinished">00:00:00</translation>
+    </message>
+    <message>
+        <source>ProcessImages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished">0</translation>
+    </message>
+    <message>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DialogProgress</name>
     <message>
         <source>1/1</source>
@@ -6097,7 +6173,7 @@
     </message>
     <message>
         <source>&lt;b&gt;Selection&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Selezione&lt;/b&gt;</translation>
+        <translation type="vanished">&lt;b&gt;Selezione&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Volume</source>
@@ -6143,6 +6219,18 @@
         <source>Ctrl+Alt+M</source>
         <translation>Ctrl+Alt+M</translation>
     </message>
+    <message>
+        <source>Display processed video on playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play filtered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Video</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MjpegEncoder</name>
@@ -6475,46 +6563,46 @@
     <name>Msharpen</name>
     <message>
         <source>_Mask</source>
-        <translation>_Maschera</translation>
+        <translation type="vanished">_Maschera</translation>
     </message>
     <message>
         <source>_High Q</source>
-        <translation>_Qualità alta</translation>
+        <translation type="vanished">_Qualità alta</translation>
     </message>
     <message>
         <source>_Threshold:</source>
-        <translation>_Soglia:</translation>
+        <translation type="vanished">_Soglia:</translation>
     </message>
     <message>
         <source>_Strength:</source>
-        <translation>_Intensità:</translation>
+        <translation type="vanished">_Intensità:</translation>
     </message>
     <message>
         <source>MSharpen</source>
-        <translation>MSharpen</translation>
+        <translation type="vanished">MSharpen</translation>
     </message>
 </context>
 <context>
     <name>Msmooth</name>
     <message>
         <source>_High quality</source>
-        <translation>_Qualità alta</translation>
+        <translation type="vanished">_Qualità alta</translation>
     </message>
     <message>
         <source>Show _mask</source>
-        <translation>Mostra _maschera</translation>
+        <translation type="vanished">Mostra _maschera</translation>
     </message>
     <message>
         <source>_Threshold:</source>
-        <translation>_Soglia:</translation>
+        <translation type="vanished">_Soglia:</translation>
     </message>
     <message>
         <source>_Strength:</source>
-        <translation>_Intensità:</translation>
+        <translation type="vanished">_Intensità:</translation>
     </message>
     <message>
         <source>MSmooth</source>
-        <translation>MSmooth</translation>
+        <translation type="vanished">MSmooth</translation>
     </message>
 </context>
 <context>
@@ -6559,11 +6647,11 @@
     <name>QtScriptEngine</name>
     <message>
         <source>Avidemux Script Debugger</source>
-        <translation>Avidemux Script Debugger</translation>
+        <translation type="vanished">Avidemux Script Debugger</translation>
     </message>
     <message>
         <source>Unable to open script file %1</source>
-        <translation>Impossibile aprire il file script %1</translation>
+        <translation type="vanished">Impossibile aprire il file script %1</translation>
     </message>
 </context>
 <context>
@@ -7222,6 +7310,13 @@
     </message>
 </context>
 <context>
+    <name>Webmmuxer</name>
+    <message>
+        <source>Saving Webm</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XvidConfigDialog</name>
     <message>
         <source>&lt;default&gt;</source>
@@ -7709,15 +7804,15 @@
         <source>Multi-platform Video Editor</source>
         <translation>Video editor multi-piattaforma</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>© 2001 - 2012  Mean</source>
-        <translation>© 2001 - 2012  Mean</translation>
+        <translation type="vanished">© 2001 - 2012  Mean</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>© 2001 - 2010  Mean</source>
         <translation type="obsolete">© 2001 - 2010  Mean</translation>
     </message>
@@ -7729,6 +7824,10 @@
         <source>&amp;License</source>
         <translation>&amp;Licenza</translation>
     </message>
+    <message>
+        <source>© 2001 - 2016  Mean</source>
+        <translation type="unfinished">© 2001 - 2010  Mean {2001 ?} {2016 ?}</translation>
+    </message>
 </context>
 <context>
     <name>addBorders</name>
@@ -7765,27 +7864,27 @@
     <name>addLogopFilter</name>
     <message>
         <source>_Logo (jpg file):</source>
-        <translation>_Logo (file jpg):</translation>
+        <translation type="vanished">_Logo (file jpg):</translation>
     </message>
     <message>
         <source>Select JPEG file</source>
-        <translation>Seleziona un file JPEG</translation>
+        <translation type="vanished">Seleziona un file JPEG</translation>
     </message>
     <message>
         <source>_X Position:</source>
-        <translation>Posizione _X:</translation>
+        <translation type="vanished">Posizione _X:</translation>
     </message>
     <message>
         <source>_Y Position:</source>
-        <translation>Posizione _Y:</translation>
+        <translation type="vanished">Posizione _Y:</translation>
     </message>
     <message>
         <source>_Alpha:</source>
-        <translation>Tr_asparenza:</translation>
+        <translation type="vanished">Tr_asparenza:</translation>
     </message>
     <message>
         <source>Logo</source>
-        <translation>Logo</translation>
+        <translation type="vanished">Logo</translation>
     </message>
 </context>
 <context>
@@ -7988,7 +8087,7 @@
     </message>
     <message>
         <source>Video</source>
-        <translation>Video</translation>
+        <translation type="vanished">Video</translation>
     </message>
     <message>
         <source>CPU</source>
@@ -8392,7 +8491,7 @@
     </message>
     <message>
         <source>Decode video using VDPAU</source>
-        <translation>Decodifica video usando VDPAU</translation>
+        <translation type="vanished">Decodifica video usando VDPAU</translation>
     </message>
     <message>
         <source>Enable openGl support</source>
@@ -8412,11 +8511,11 @@
     </message>
     <message>
         <source>MS Windows GDI (SDL)</source>
-        <translation>MS Windows GDI (SDL)</translation>
+        <translation type="vanished">MS Windows GDI (SDL)</translation>
     </message>
     <message>
         <source>MS Windows DirectX (SDL)</source>
-        <translation>MS Windows DirectX (SDL)</translation>
+        <translation type="vanished">MS Windows DirectX (SDL)</translation>
     </message>
     <message>
         <source>No audio track</source>
@@ -8474,11 +8573,11 @@
     </message>
     <message>
         <source>Select AVI File...</source>
-        <translation>Seleziona un file video...</translation>
+        <translation type="vanished">Seleziona un file video...</translation>
     </message>
     <message>
         <source>Select AVI File to Append...</source>
-        <translation>Seleziona il file video da aggiungere...</translation>
+        <translation type="vanished">Seleziona il file video da aggiungere...</translation>
     </message>
     <message>
         <source>Are you sure?</source>
@@ -8716,6 +8815,346 @@
         <source>Recent Projects</source>
         <translation>Progetti recenti</translation>
     </message>
+    <message>
+        <source>Gain</source>
+        <translation type="unfinished">Amplificazione</translation>
+    </message>
+    <message>
+        <source>Mixer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using VDPAU (NVIDIA)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using XVBA (AMD)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you use Hw decoding, it is better to use the matching display driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LIBVA (best)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sdl driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HW Accel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You cannot remove *all* the video
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File to Append...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid audio index given</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Interlaced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ca_rtoon mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Greyscale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turbo mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C_hroma optimizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation type="unfinished">Medio</translation>
+    </message>
+    <message>
+        <source>Very High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ultra High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Motion Search Precision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode Decision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limited Search</source>
+        <translation type="unfinished">Ricerca limitata</translation>
+    </message>
+    <message>
+        <source>Medium Search</source>
+        <translation type="unfinished">Ricerca media</translation>
+    </message>
+    <message>
+        <source>Wide Search</source>
+        <translation type="unfinished">Ricerca estesa</translation>
+    </message>
+    <message>
+        <source>VHQ Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max B Frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quarter Pixel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BVHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced Simple Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4MV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chroma ME</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HQ AC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Min Gop Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Gop Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GOP Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Motion</source>
+        <translation type="unfinished">Movimento</translation>
+    </message>
+    <message>
+        <source>H263</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mpeg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quantization Matrix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trellis Quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two Pass Tuning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key Frame Boost(%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>I-frames closer than...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>.. are reduced by(%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Overflow Improvement(%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Overglow Degradation(%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Curve Compression</source>
+        <translation type="unfinished">Compressione curva</translation>
+    </message>
+    <message>
+        <source>High Bitrate Scenes (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Bitrate Scenes (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Overflow Control Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two Pass</source>
+        <translation type="unfinished">Due passate</translation>
+    </message>
+    <message>
+        <source>Xvid4 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ready</source>
+        <translation type="unfinished">Pronto</translation>
+    </message>
+    <message>
+        <source>Succeeded</source>
+        <translation type="unfinished">Riuscito</translation>
+    </message>
+    <message>
+        <source>Deleted</source>
+        <translation type="unfinished">Eliminato</translation>
+    </message>
+    <message>
+        <source>Running</source>
+        <translation type="unfinished">In esecuzione</translation>
+    </message>
+    <message>
+        <source>Job Name</source>
+        <translation type="unfinished">Nome attività</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished">Stato</translation>
+    </message>
+    <message>
+        <source>Start Time</source>
+        <translation type="unfinished">Tempo di inizio</translation>
+    </message>
+    <message>
+        <source>End Time</source>
+        <translation type="unfinished">Tempo di fine</translation>
+    </message>
+    <message>
+        <source>Sure!</source>
+        <translation type="unfinished">Sicuro!</translation>
+    </message>
+    <message>
+        <source>Delete job</source>
+        <translation type="unfinished">Elimina attività</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete %s job?</source>
+        <translation type="unfinished">Sei sicuro di voler eliminare l&apos;attività %s?</translation>
+    </message>
+    <message>
+        <source>Delete *all* job</source>
+        <translation type="unfinished">Elimina *tutte* le attività</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete ALL jobs?</source>
+        <translation type="unfinished">Sei sicuro di voler eliminare TUTTE le attività?</translation>
+    </message>
+    <message>
+        <source>Already done</source>
+        <translation type="unfinished">Già fatto</translation>
+    </message>
+    <message>
+        <source>This script has already been successfully executed.</source>
+        <translation type="unfinished">Questo script è stato già eseguito con successo.</translation>
+    </message>
+    <message>
+        <source>Saving</source>
+        <translation type="unfinished">Salvataggio in corso</translation>
+    </message>
+</context>
+<context>
+    <name>aften</name>
+    <message>
+        <source>_Bitrate:</source>
+        <translation type="unfinished">_Bitrate:</translation>
+    </message>
+    <message>
+        <source>Aften Configuration</source>
+        <translation type="unfinished">Configurazione Aften</translation>
+    </message>
+</context>
+<context>
+    <name>asharp</name>
+    <message>
+        <source>Asharp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Adaptative sharpener by MarcFD.</source>
+        <translation type="unfinished">Nitidizzatore adattativo di MarcFD.</translation>
+    </message>
 </context>
 <context>
     <name>asharpDialog</name>
@@ -8741,6 +9180,45 @@
     </message>
 </context>
 <context>
+    <name>ass</name>
+    <message>
+        <source>SSA/ASS/SRT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Subtitle file (ASS/SSA):</source>
+        <translation type="unfinished">File _sottotitoli (ASS/SSA):</translation>
+    </message>
+    <message>
+        <source>Select Subtitle file</source>
+        <translation type="unfinished">Seleziona un file sottotitoli</translation>
+    </message>
+    <message>
+        <source>_Line spacing:</source>
+        <translation type="unfinished">Inter_linea:</translation>
+    </message>
+    <message>
+        <source>_Font scale:</source>
+        <translation type="unfinished">_Dimensione carattere:</translation>
+    </message>
+    <message>
+        <source>_Top margin:</source>
+        <translation type="unfinished">Margine s_uperiore:</translation>
+    </message>
+    <message>
+        <source>Botto_m margin</source>
+        <translation type="unfinished">_Margine inferiore</translation>
+    </message>
+    <message>
+        <source>ASS</source>
+        <translation type="unfinished">ASS</translation>
+    </message>
+</context>
+<context>
     <name>autoWizard</name>
     <message>
         <source>Resolution:</source>
@@ -8795,34 +9273,80 @@
     </message>
 </context>
 <context>
+    <name>black</name>
+    <message>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace a section by black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace by Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blacken</name>
+    <message>
+        <source>_Left border:</source>
+        <translation type="unfinished">Bordo _sinistro:</translation>
+    </message>
+    <message>
+        <source>_Right border:</source>
+        <translation type="unfinished">Bordo _destro:</translation>
+    </message>
+    <message>
+        <source>_Top border:</source>
+        <translation type="unfinished">Bordo s_uperiore:</translation>
+    </message>
+    <message>
+        <source>_Bottom border:</source>
+        <translation type="unfinished">Bordo _inferiore:</translation>
+    </message>
+    <message>
+        <source>Blacken Borders</source>
+        <translation type="unfinished">Annerimento bordi</translation>
+    </message>
+    <message>
+        <source>Incorrect parameters</source>
+        <translation type="unfinished">Parametri non corretti</translation>
+    </message>
+    <message>
+        <source>All parameters must be even and within range.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>blackenBorders</name>
     <message>
         <source>_Left border:</source>
-        <translation>Bordo _sinistro:</translation>
+        <translation type="vanished">Bordo _sinistro:</translation>
     </message>
     <message>
         <source>_Right border:</source>
-        <translation>Bordo _destro:</translation>
+        <translation type="vanished">Bordo _destro:</translation>
     </message>
     <message>
         <source>_Top border:</source>
-        <translation>Bordo s_uperiore:</translation>
+        <translation type="vanished">Bordo s_uperiore:</translation>
     </message>
     <message>
         <source>_Bottom border:</source>
-        <translation>Bordo _inferiore:</translation>
+        <translation type="vanished">Bordo _inferiore:</translation>
     </message>
     <message>
         <source>Blacken Borders</source>
-        <translation>Annerimento bordi</translation>
+        <translation type="vanished">Annerimento bordi</translation>
     </message>
     <message>
         <source>Incorrect parameters</source>
-        <translation>Parametri non corretti</translation>
+        <translation type="vanished">Parametri non corretti</translation>
     </message>
     <message>
         <source>All parameters must be even and within range.</source>
-        <translation>Tutti i parametri devono essere pari e interni al campo.</translation>
+        <translation type="vanished">Tutti i parametri devono essere pari e interni al campo.</translation>
     </message>
 </context>
 <context>
@@ -8847,6 +9371,56 @@
         <source>Change fps</source>
         <translation>Cambiamento fps</translation>
     </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished">Personalizzato</translation>
+    </message>
+    <message>
+        <source>25  (PAL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>23.976 (Film)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>29.97 (NTSC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>50 (Pal)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>59.93  (NTSC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>changefps</name>
+    <message>
+        <source>Change FPS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>chromashift</name>
+    <message>
+        <source>ChromaShift</source>
+        <translation type="unfinished">Traslazione croma</translation>
+    </message>
+    <message>
+        <source>Shift chroma U/V to fix badly synced luma/chroma.</source>
+        <translation type="unfinished">Trasla croma U/V per correggere luma/croma mal sincronizzate.</translation>
+    </message>
 </context>
 <context>
     <name>chromashiftDialog</name>
@@ -8864,6 +9438,136 @@
     </message>
 </context>
 <context>
+    <name>coloryuv</name>
+    <message>
+        <source>Avisynth color filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Color management filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AutoWhite</source>
+        <translation type="unfinished">Bianco automatico</translation>
+    </message>
+    <message>
+        <source>AutoGain</source>
+        <translation type="unfinished">Amplificazione automatica</translation>
+    </message>
+    <message>
+        <source>Clip to Tv Range (16-235)</source>
+        <translation type="unfinished">Riduci all&apos;intervallo TV (16-235)</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PC-&gt;TV</source>
+        <translation type="unfinished">PC-&gt;TV</translation>
+    </message>
+    <message>
+        <source>TV-&gt;PC</source>
+        <translation type="unfinished">TV-&gt;PC</translation>
+    </message>
+    <message>
+        <source>Levels:</source>
+        <translation type="unfinished">Livelli:</translation>
+    </message>
+    <message>
+        <source>Y gain</source>
+        <translation type="unfinished">Amplificazione Y</translation>
+    </message>
+    <message>
+        <source>Y Brightness</source>
+        <translation type="unfinished">Luminosità Y</translation>
+    </message>
+    <message>
+        <source>Y Gamma</source>
+        <translation type="unfinished">Gamma Y</translation>
+    </message>
+    <message>
+        <source>Y Contrast</source>
+        <translation type="unfinished">Contrasto Y</translation>
+    </message>
+    <message>
+        <source>U gain</source>
+        <translation type="unfinished">Amplificazione U</translation>
+    </message>
+    <message>
+        <source>U Brightness</source>
+        <translation type="unfinished">Luminosità U</translation>
+    </message>
+    <message>
+        <source>U Contrast</source>
+        <translation type="unfinished">Contrasto U</translation>
+    </message>
+    <message>
+        <source>V gain</source>
+        <translation type="unfinished">Amplificazione V</translation>
+    </message>
+    <message>
+        <source>V Brightness</source>
+        <translation type="unfinished">Luminosità V</translation>
+    </message>
+    <message>
+        <source>V Contrast</source>
+        <translation type="unfinished">Contrasto V</translation>
+    </message>
+    <message>
+        <source>Flags</source>
+        <translation type="unfinished">Opzioni</translation>
+    </message>
+    <message>
+        <source>Y</source>
+        <translation type="unfinished">Y</translation>
+    </message>
+    <message>
+        <source>U</source>
+        <translation type="unfinished">U</translation>
+    </message>
+    <message>
+        <source>V</source>
+        <translation type="unfinished">V</translation>
+    </message>
+    <message>
+        <source>colorYuv</source>
+        <translation type="unfinished">colorYuv</translation>
+    </message>
+</context>
+<context>
+    <name>contrast</name>
+    <message>
+        <source>Contrast</source>
+        <translation type="unfinished">Contrasto</translation>
+    </message>
+    <message>
+        <source>Adjust contrast, brightness and colors.</source>
+        <translation type="unfinished">Regola contrasto, luminosità e colori.</translation>
+    </message>
+    <message>
+        <source>U :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>V :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>L :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offset :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coef :</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>contrastDialog</name>
     <message>
         <source>Contrast</source>
@@ -8899,6 +9603,65 @@
     </message>
 </context>
 <context>
+    <name>convolution</name>
+    <message>
+        <source>_Process luma</source>
+        <translation type="unfinished">_Processa luma</translation>
+    </message>
+    <message>
+        <source>Process luma plane</source>
+        <translation type="unfinished">Processa piano luma</translation>
+    </message>
+    <message>
+        <source>P_rocess chroma</source>
+        <translation type="unfinished">P_rocessa croma</translation>
+    </message>
+    <message>
+        <source>Fast Convolution</source>
+        <translation type="unfinished">Convoluzione veloce</translation>
+    </message>
+</context>
+<context>
+    <name>crash</name>
+    <message>
+        <source>Load it</source>
+        <translation type="unfinished">Carica</translation>
+    </message>
+    <message>
+        <source>Crash file</source>
+        <translation type="unfinished">File di crash</translation>
+    </message>
+    <message>
+        <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 type="unfinished">Rilevato un file di crash.
+Vuoi caricarlo?
+(Sarà eliminato in ogni caso se non lo salvi)</translation>
+    </message>
+</context>
+<context>
+    <name>crop</name>
+    <message>
+        <source>crop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>crop filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning Cropping too much width ! Width reseted !
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning Cropping too much height ! Height reseted !
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>cropDialog</name>
     <message>
         <source>Crop</source>
@@ -8930,6 +9693,142 @@
     </message>
 </context>
 <context>
+    <name>dcaenc</name>
+    <message>
+        <source>_Bitrate:</source>
+        <translation type="unfinished">_Bitrate:</translation>
+    </message>
+</context>
+<context>
+    <name>decimate</name>
+    <message>
+        <source>Decomb decimate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Donald Graft decimate. Remove duplicate after telecide.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Discard closer</source>
+        <translation type="unfinished">Scarta il più vicino</translation>
+    </message>
+    <message>
+        <source>Replace (interpolate)</source>
+        <translation type="unfinished">Sostituisci (interpola)</translation>
+    </message>
+    <message>
+        <source>Discard longer dupe (animés)</source>
+        <translation type="unfinished">Scarta duplicati più lunghi (anime)</translation>
+    </message>
+    <message>
+        <source>Pulldown dupe removal</source>
+        <translation type="unfinished">Rimozione duplicati pulldown</translation>
+    </message>
+    <message>
+        <source>Fastest (no chroma, partial luma)</source>
+        <translation type="unfinished">Più veloce (senza croma, luma parziale)</translation>
+    </message>
+    <message>
+        <source>Medium (full luma, no chroma)</source>
+        <translation type="unfinished">Media (luma completa, senza croma)</translation>
+    </message>
+    <message>
+        <source>_Mode:</source>
+        <translation type="unfinished">_Modalità:</translation>
+    </message>
+    <message>
+        <source>_Quality:</source>
+        <translation type="unfinished">_Qualità:</translation>
+    </message>
+    <message>
+        <source>_Threshold 1:</source>
+        <translation type="unfinished">_Soglia 1:</translation>
+    </message>
+    <message>
+        <source>T_hreshold 2:</source>
+        <translation type="unfinished">So_glia 2:</translation>
+    </message>
+    <message>
+        <source>C_ycle:</source>
+        <translation type="unfinished">C_iclo:</translation>
+    </message>
+    <message>
+        <source>Sho_w</source>
+        <translation type="unfinished">M_ostra</translation>
+    </message>
+    <message>
+        <source>Decomb Decimate</source>
+        <translation type="unfinished">Decimazione Decomb</translation>
+    </message>
+</context>
+<context>
+    <name>delogo2</name>
+    <message>
+        <source>MPlayer delogo2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Blend a logo by interpolating its surrounding box.</source>
+        <translation type="unfinished">Nasconde un logo interpolando la casella circostante.</translation>
+    </message>
+</context>
+<context>
+    <name>dgbob</name>
+    <message>
+        <source>dgbob</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Donald Graft Bob.</source>
+        <translation type="unfinished">Filtro sdoppiamento di Donald Graft.</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished">Superiore</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished">Inferiore</translation>
+    </message>
+    <message>
+        <source>Keep nb of frames and fps</source>
+        <translation type="unfinished">Mantieni numero di fotogrammi e fps</translation>
+    </message>
+    <message>
+        <source>Double nb of frames and fps</source>
+        <translation type="unfinished">Raddoppia fotogrammi e fps</translation>
+    </message>
+    <message>
+        <source>Double nb of frames (slow motion)</source>
+        <translation type="unfinished">Raddoppia fotogrammi (rallentatore)</translation>
+    </message>
+    <message>
+        <source>_Top Field First:</source>
+        <translation type="unfinished">Prima il semiquadro _superiore:</translation>
+    </message>
+    <message>
+        <source>_Mode:</source>
+        <translation type="unfinished">_Modalità:</translation>
+    </message>
+    <message>
+        <source>_Threshold:</source>
+        <translation type="unfinished">_Soglia:</translation>
+    </message>
+    <message>
+        <source>_Extra</source>
+        <translation type="unfinished">_Extra</translation>
+    </message>
+    <message>
+        <source>Extra check, avoid using it</source>
+        <translation type="unfinished">Controllo supplementare, evitare l&apos;utilizzo</translation>
+    </message>
+    <message>
+        <source>DGBob</source>
+        <translation type="unfinished">DGBob</translation>
+    </message>
+</context>
+<context>
     <name>dmxHeader</name>
     <message>
         <source>Out of memory</source>
@@ -9172,16 +10071,24 @@
 &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;Quantizzatore:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished">Avanzate</translation>
+    </message>
 </context>
 <context>
     <name>encodingWindow</name>
     <message>
         <source>Privileges Required</source>
-        <translation>Richiesti privilegi</translation>
+        <translation type="vanished">Richiesti privilegi</translation>
     </message>
     <message>
         <source>Root privileges are required to perform this operation.</source>
-        <translation>Sono richesti i privilegi di amministratore per eseguire questa operazione.</translation>
+        <translation type="vanished">Sono richesti i privilegi di amministratore per eseguire questa operazione.</translation>
     </message>
     <message>
         <source>Shutting down</source>
@@ -9205,6 +10112,17 @@
     </message>
 </context>
 <context>
+    <name>eq2</name>
+    <message>
+        <source>MPlayer eq2</source>
+        <translation type="unfinished">MPlayer eq2</translation>
+    </message>
+    <message>
+        <source>Adjust contrast, brightness, saturation and gamma.</source>
+        <translation type="unfinished">Regola contrasto, luminosità, saturazione e gamma.</translation>
+    </message>
+</context>
+<context>
     <name>eq2Dialog</name>
     <message>
         <source>MPlayer eq2</source>
@@ -9260,10 +10178,516 @@
     </message>
 </context>
 <context>
+    <name>fade</name>
+    <message>
+        <source>_Start time (ms):</source>
+        <translation type="unfinished">Tempo di _inizio (ms):</translation>
+    </message>
+    <message>
+        <source>_End time (ms):</source>
+        <translation type="unfinished">Tempo di _fine (ms):</translation>
+    </message>
+    <message>
+        <source>Fade</source>
+        <translation type="unfinished">Dissolvenza</translation>
+    </message>
+    <message>
+        <source>Fade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fade to black</source>
+        <translation type="unfinished">Dissolvenza verso il nero</translation>
+    </message>
+    <message>
+        <source>Fade to black in/out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Out</source>
+        <translation type="unfinished">In uscita</translation>
+    </message>
+    <message>
+        <source>Fade out</source>
+        <translation type="unfinished">Dissolvenza in uscita</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished">In ingresso</translation>
+    </message>
+    <message>
+        <source>Fade in</source>
+        <translation type="unfinished">Dissolvenza in ingresso</translation>
+    </message>
+    <message>
+        <source>_Fade type:</source>
+        <translation type="unfinished">Tipo di _dissolvenza:</translation>
+    </message>
+</context>
+<context>
+    <name>fade to</name>
+    <message>
+        <source>Fade</source>
+        <translation type="unfinished">Dissolvenza</translation>
+    </message>
+</context>
+<context>
+    <name>ffmpeg2</name>
+    <message>
+        <source>Normal (4:3)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wide (16:9)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished">Predefinito</translation>
+    </message>
+    <message>
+        <source>Tmpgenc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Animes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KVCD</source>
+        <translation type="unfinished">KVCD</translation>
+    </message>
+    <message>
+        <source>MB comparison</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fewest bits (vhq)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate distortion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two threads)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Three threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto (#cpu)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progressive</source>
+        <translation type="unfinished">Progressivo</translation>
+    </message>
+    <message>
+        <source>Interlaced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top Field First</source>
+        <translation type="unfinished">Prima il semiquadro superiore</translation>
+    </message>
+    <message>
+        <source>Bottom Field First</source>
+        <translation type="unfinished">Prima il semiquadro inferiore</translation>
+    </message>
+    <message>
+        <source>Threading</source>
+        <translation type="unfinished">Threading</translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max. quantizer _difference:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VBV Buffer Size:</source>
+        <translation type="unfinished">Dimensione buffer VBV:</translation>
+    </message>
+    <message>
+        <source>Max bitrate (kb/s):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Trellis quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Number of B frames:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Macroblock decision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Matrices:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Filesize tolerance (kb):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Quantizer compression:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quantizer _blur:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Gop Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Interlaced:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Field Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Adv. Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Interlacing</source>
+        <translation type="unfinished">Interlacciamento</translation>
+    </message>
+    <message>
+        <source>Quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate Control</source>
+        <translation type="unfinished">Controllo bitrate</translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-2 configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ffmpeg4</name>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished">Completo</translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished">Log</translation>
+    </message>
+    <message>
+        <source>Phods</source>
+        <translation type="unfinished">Phods</translation>
+    </message>
+    <message>
+        <source>EPZS</source>
+        <translation type="unfinished">EPZS</translation>
+    </message>
+    <message>
+        <source>X1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>H.263</source>
+        <translation type="unfinished">H.263</translation>
+    </message>
+    <message>
+        <source>MPEG</source>
+        <translation type="unfinished">MPEG</translation>
+    </message>
+    <message>
+        <source>MB comparison</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fewest bits (vhq)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate distortion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two threads)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Three threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto (#cpu)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Matrices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Threading</source>
+        <translation type="unfinished">Threading</translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max. quantizer _difference:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4_MV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Trellis quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Quarter pixel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_GMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Number of B frames:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Quantization type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Macroblock decision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Filesize tolerance (kb):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Quantizer compression:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quantizer _blur:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Gop Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished">Interfaccia utente</translation>
+    </message>
+    <message>
+        <source>Advanced Simple Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Motion Estimation</source>
+        <translation type="unfinished">Stima movimento</translation>
+    </message>
+    <message>
+        <source>Quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate Control</source>
+        <translation type="unfinished">Controllo bitrate</translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ffmsmpeg4</name>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished">Completo</translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished">Log</translation>
+    </message>
+    <message>
+        <source>Phods</source>
+        <translation type="unfinished">Phods</translation>
+    </message>
+    <message>
+        <source>EPZS</source>
+        <translation type="unfinished">EPZS</translation>
+    </message>
+    <message>
+        <source>X1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>H.263</source>
+        <translation type="unfinished">H.263</translation>
+    </message>
+    <message>
+        <source>MPEG</source>
+        <translation type="unfinished">MPEG</translation>
+    </message>
+    <message>
+        <source>MB comparison</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fewest bits (vhq)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate distortion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max. quantizer _difference:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Trellis quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Filesize tolerance (kb):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Quantizer compression:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quantizer _blur:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Gop Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished">Interfaccia utente</translation>
+    </message>
+    <message>
+        <source>Quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate Control</source>
+        <translation type="unfinished">Controllo bitrate</translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ffnvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>filtermainWindow</name>
     <message>
         <source>The filter is already partial</source>
-        <translation>Il filtro è già parziale</translation>
+        <translation type="vanished">Il filtro è già parziale</translation>
     </message>
     <message>
         <source>Load set of filters</source>
@@ -9293,44 +10717,177 @@
         <source>Partial Video Filter</source>
         <translation type="obsolete">Filtro video parziale</translation>
     </message>
+    <message>
+        <source>Load video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flux</name>
+    <message>
+        <source>FluxSmooth</source>
+        <translation type="unfinished">FluxSmooth</translation>
+    </message>
+    <message>
+        <source>Spatio-temporal cleaner by Ross Thomas.</source>
+        <translation type="unfinished">Pulizia spazio-temporale di Ross Thomas.</translation>
+    </message>
+    <message>
+        <source>_Temporal threshold:</source>
+        <translation type="unfinished">Soglia _temporale:</translation>
+    </message>
+    <message>
+        <source>_Spatial threshold:</source>
+        <translation type="unfinished">Soglia _spaziale:</translation>
+    </message>
+</context>
+<context>
+    <name>flv1</name>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished">Completo</translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished">Log</translation>
+    </message>
+    <message>
+        <source>Phods</source>
+        <translation type="unfinished">Phods</translation>
+    </message>
+    <message>
+        <source>EPZS</source>
+        <translation type="unfinished">EPZS</translation>
+    </message>
+    <message>
+        <source>X1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>H.263</source>
+        <translation type="unfinished">H.263</translation>
+    </message>
+    <message>
+        <source>MPEG</source>
+        <translation type="unfinished">MPEG</translation>
+    </message>
+    <message>
+        <source>MB comparison</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fewest bits (vhq)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate distortion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max. quantizer _difference:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Trellis quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Filesize tolerance (kb):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Quantizer compression:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quantizer _blur:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Gop Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Interface</source>
+        <translation type="unfinished">Interfaccia utente</translation>
+    </message>
+    <message>
+        <source>Quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate Control</source>
+        <translation type="unfinished">Controllo bitrate</translation>
+    </message>
+    <message>
+        <source>libavcodec FLV1 configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>gaussian</name>
+    <message>
+        <source>Gaussian convolution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3x3 convolution filter :gaussian.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>glYadif</name>
     <message>
         <source>Temporal &amp; spatial check</source>
-        <translation>Verifica temporale e spaziale</translation>
+        <translation type="vanished">Verifica temporale e spaziale</translation>
     </message>
     <message>
         <source>Bob, temporal &amp; spatial check</source>
-        <translation>Sdoppia, verifica temporale e spaziale</translation>
+        <translation type="vanished">Sdoppia, verifica temporale e spaziale</translation>
     </message>
     <message>
         <source>Skip spatial temporal check</source>
-        <translation>Salta verifica temporale e spaziale</translation>
+        <translation type="vanished">Salta verifica temporale e spaziale</translation>
     </message>
     <message>
         <source>Bob, skip spatial temporal check</source>
-        <translation>Sdoppia, salta verifica temporale e spaziale</translation>
+        <translation type="vanished">Sdoppia, salta verifica temporale e spaziale</translation>
     </message>
     <message>
         <source>Bottom field first</source>
-        <translation>Prima il semiquadro inferiore</translation>
+        <translation type="vanished">Prima il semiquadro inferiore</translation>
     </message>
     <message>
         <source>Top field first</source>
-        <translation>Prima il semiquadro superiore</translation>
+        <translation type="vanished">Prima il semiquadro superiore</translation>
     </message>
     <message>
         <source>_Mode:</source>
-        <translation>_Modalità:</translation>
+        <translation type="vanished">_Modalità:</translation>
     </message>
     <message>
         <source>_Order:</source>
-        <translation>_Ordine:</translation>
+        <translation type="vanished">_Ordine:</translation>
     </message>
     <message>
         <source>yadif</source>
-        <translation>yadif</translation>
+        <translation type="vanished">yadif</translation>
     </message>
 </context>
 <context>
@@ -9341,6 +10898,63 @@
     </message>
 </context>
 <context>
+    <name>hflip</name>
+    <message>
+        <source>Horizontal Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>histogram</name>
+    <message>
+        <source>No data</source>
+        <translation type="unfinished">Nessun dato</translation>
+    </message>
+    <message>
+        <source>Max. bitrate:</source>
+        <translation type="unfinished">Bitrate massimo:</translation>
+    </message>
+    <message>
+        <source>Average bitrate:</source>
+        <translation type="unfinished">Bitrate medio:</translation>
+    </message>
+    <message>
+        <source>Number of I frames:</source>
+        <translation type="unfinished">Numero di fotogrammi I:</translation>
+    </message>
+    <message>
+        <source>Number of P frames:</source>
+        <translation type="unfinished">Numero di fotogrammi P:</translation>
+    </message>
+    <message>
+        <source>Number of B frames:</source>
+        <translation type="unfinished">Numero di fotogrammi B:</translation>
+    </message>
+    <message>
+        <source>Max. B frames:</source>
+        <translation type="unfinished">Numero massimo di fotogrammi B:</translation>
+    </message>
+    <message>
+        <source>Bitrate Histogram</source>
+        <translation type="unfinished">Istogramma bitrate</translation>
+    </message>
+</context>
+<context>
+    <name>hue</name>
+    <message>
+        <source>Mplayer Hue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Adjust hue and saturation.</source>
+        <translation type="unfinished">Regola tonalità e saturazione.</translation>
+    </message>
+</context>
+<context>
     <name>hueDialog</name>
     <message>
         <source>Hue</source>
@@ -9352,6 +10966,44 @@
     </message>
 </context>
 <context>
+    <name>huff</name>
+    <message>
+        <source>HUFFYUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FF HUFFYUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HuffYUV Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>indexing</name>
+    <message>
+        <source>Continue indexing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Abort Requested</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to abort indexing ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time Left :%02d:%02d:%02d</source>
+        <translation type="unfinished">Tempo rimanente: %02d:%02d:%02d</translation>
+    </message>
+</context>
+<context>
     <name>jobs</name>
     <message>
         <source>Avidemux Jobs</source>
@@ -9385,6 +11037,18 @@
         <source>Quit</source>
         <translation>Esci</translation>
     </message>
+    <message>
+        <source>Oops</source>
+        <translation type="unfinished">Ops</translation>
+    </message>
+    <message>
+        <source>Something very wrong happened when building joblist.</source>
+        <translation type="unfinished">Errore grave durante la costruzione della lista attività.</translation>
+    </message>
+    <message>
+        <source>There are no jobs stored</source>
+        <translation type="unfinished">Non ci sono attività immagazzinate</translation>
+    </message>
 </context>
 <context>
     <name>jobsDialog</name>
@@ -9413,19 +11077,19 @@
     <name>jobsWindow</name>
     <message>
         <source>Job Name</source>
-        <translation>Nome attività</translation>
+        <translation type="vanished">Nome attività</translation>
     </message>
     <message>
         <source>Status</source>
-        <translation>Stato</translation>
+        <translation type="vanished">Stato</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation>Tempo di inizio</translation>
+        <translation type="vanished">Tempo di inizio</translation>
     </message>
     <message>
         <source>End Time</source>
-        <translation>Tempo di fine</translation>
+        <translation type="vanished">Tempo di fine</translation>
     </message>
     <message>
         <source>%1:%2:%3</source>
@@ -9433,27 +11097,27 @@
     </message>
     <message>
         <source>Sure!</source>
-        <translation>Sicuro!</translation>
+        <translation type="vanished">Sicuro!</translation>
     </message>
     <message>
         <source>Delete job</source>
-        <translation>Elimina attività</translation>
+        <translation type="vanished">Elimina attività</translation>
     </message>
     <message>
         <source>Delete *all* job</source>
-        <translation>Elimina *tutte* le attività</translation>
+        <translation type="vanished">Elimina *tutte* le attività</translation>
     </message>
     <message>
         <source>Already done</source>
-        <translation>Già fatto</translation>
+        <translation type="vanished">Già fatto</translation>
     </message>
     <message>
         <source>This script has already been successfully executed.</source>
-        <translation>Questo script è stato già eseguito con successo.</translation>
+        <translation type="vanished">Questo script è stato già eseguito con successo.</translation>
     </message>
     <message>
         <source>Are you sure you want to delete %s job?</source>
-        <translation>Sei sicuro di voler eliminare l&apos;attività %s?</translation>
+        <translation type="vanished">Sei sicuro di voler eliminare l&apos;attività %s?</translation>
     </message>
     <message>
         <source>Ready</source>
@@ -9477,116 +11141,256 @@
     </message>
     <message>
         <source>Are you sure you want to delete ALL jobs?</source>
-        <translation>Sei sicuro di voler eliminare TUTTE le attività?</translation>
+        <translation type="vanished">Sei sicuro di voler eliminare TUTTE le attività?</translation>
+    </message>
+</context>
+<context>
+    <name>jpeg</name>
+    <message>
+        <source>YUV422</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>YUV420</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Quantizer:</source>
+        <translation type="unfinished">_Quantizzatore:</translation>
+    </message>
+    <message>
+        <source>_ColorSpace:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mjpeg Configuration</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>kernelDeint</name>
     <message>
         <source>Top</source>
-        <translation>Superiore</translation>
+        <translation type="vanished">Superiore</translation>
     </message>
     <message>
         <source>Bottom</source>
-        <translation>Inferiore</translation>
+        <translation type="vanished">Inferiore</translation>
     </message>
     <message>
         <source>_Field order:</source>
-        <translation>Ordine _semiquadri:</translation>
+        <translation type="vanished">Ordine _semiquadri:</translation>
     </message>
     <message>
         <source>_Threshold:</source>
-        <translation>_Soglia:</translation>
+        <translation type="vanished">_Soglia:</translation>
     </message>
     <message>
         <source>Smaller means more deinterlacing</source>
-        <translation>Minore significa maggiore deiterlaccio</translation>
+        <translation type="vanished">Minore significa maggiore deiterlaccio</translation>
     </message>
     <message>
         <source>_Sharper engine:</source>
-        <translation>Nitido</translation>
+        <translation type="vanished">Nitido</translation>
     </message>
     <message>
         <source>T_woway</source>
-        <translation>_Doppio senso</translation>
+        <translation type="vanished">_Doppio senso</translation>
     </message>
     <message>
         <source>Extrapolate better (better not to use it)</source>
-        <translation>Estrapola meglio (meglio non usarlo)</translation>
+        <translation type="vanished">Estrapola meglio (meglio non usarlo)</translation>
     </message>
     <message>
         <source>_Map</source>
-        <translation>_Mappa</translation>
+        <translation type="vanished">_Mappa</translation>
     </message>
     <message>
         <source>Show interlaced areas (for test!)</source>
-        <translation>Mostra aree interlacciate (per test!)</translation>
+        <translation type="vanished">Mostra aree interlacciate (per test!)</translation>
     </message>
     <message>
         <source>KernelDeint</source>
-        <translation>KernelDeint</translation>
+        <translation type="vanished">KernelDeint</translation>
     </message>
     <message>
         <source>_Sharp</source>
-        <translation>_Nitido</translation>
+        <translation type="vanished">_Nitido</translation>
+    </message>
+</context>
+<context>
+    <name>kerneldeint</name>
+    <message>
+        <source>Kernel Deint.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Port of Donald Graft Kernel Deinterlacer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished">Superiore</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished">Inferiore</translation>
+    </message>
+    <message>
+        <source>_Field order:</source>
+        <translation type="unfinished">Ordine _semiquadri:</translation>
+    </message>
+    <message>
+        <source>_Threshold:</source>
+        <translation type="unfinished">_Soglia:</translation>
+    </message>
+    <message>
+        <source>Smaller means more deinterlacing</source>
+        <translation type="unfinished">Minore significa maggiore deiterlaccio</translation>
+    </message>
+    <message>
+        <source>_Sharp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Sharper engine:</source>
+        <translation type="unfinished">Nitido</translation>
+    </message>
+    <message>
+        <source>T_woway</source>
+        <translation type="unfinished">_Doppio senso</translation>
+    </message>
+    <message>
+        <source>Extrapolate better (better not to use it)</source>
+        <translation type="unfinished">Estrapola meglio (meglio non usarlo)</translation>
+    </message>
+    <message>
+        <source>_Map</source>
+        <translation type="unfinished">_Mappa</translation>
+    </message>
+    <message>
+        <source>Show interlaced areas (for test!)</source>
+        <translation type="unfinished">Mostra aree interlacciate (per test!)</translation>
+    </message>
+    <message>
+        <source>KernelDeint</source>
+        <translation type="unfinished">KernelDeint</translation>
+    </message>
+</context>
+<context>
+    <name>lame</name>
+    <message>
+        <source>CBR</source>
+        <translation type="unfinished">CBR</translation>
+    </message>
+    <message>
+        <source>ABR</source>
+        <translation type="unfinished">ABR</translation>
+    </message>
+    <message>
+        <source>Bit_rate mode:</source>
+        <translation type="unfinished">Modalità bit_rate:</translation>
+    </message>
+    <message>
+        <source>_Bitrate:</source>
+        <translation type="unfinished">_Bitrate:</translation>
+    </message>
+    <message>
+        <source>_Quality:</source>
+        <translation type="unfinished">_Qualità:</translation>
+    </message>
+    <message>
+        <source>_Disable reservoir:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LAME Configuration</source>
+        <translation type="unfinished">Configurazione LAME</translation>
     </message>
 </context>
 <context>
     <name>largeMedian</name>
     <message>
         <source>_Process luma</source>
-        <translation>_Processa luma</translation>
+        <translation type="vanished">_Processa luma</translation>
+    </message>
+    <message>
+        <source>Process luma plane</source>
+        <translation type="vanished">Processa piano luma</translation>
+    </message>
+    <message>
+        <source>P_rocess chroma</source>
+        <translation type="vanished">P_rocessa croma</translation>
+    </message>
+    <message>
+        <source>Fast Convolution</source>
+        <translation type="vanished">Convoluzione veloce</translation>
+    </message>
+</context>
+<context>
+    <name>largemedian</name>
+    <message>
+        <source>Large Median (5x5).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Median filter on 5x5 matrix.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Process luma</source>
+        <translation type="unfinished">_Processa luma</translation>
     </message>
     <message>
         <source>Process luma plane</source>
-        <translation>Processa piano luma</translation>
+        <translation type="unfinished">Processa piano luma</translation>
     </message>
     <message>
         <source>P_rocess chroma</source>
-        <translation>P_rocessa croma</translation>
+        <translation type="unfinished">P_rocessa croma</translation>
     </message>
     <message>
         <source>Fast Convolution</source>
-        <translation>Convoluzione veloce</translation>
+        <translation type="unfinished">Convoluzione veloce</translation>
     </message>
 </context>
 <context>
     <name>lavDeint</name>
     <message>
         <source>Linear blend</source>
-        <translation>Miscela lineare</translation>
+        <translation type="vanished">Miscela lineare</translation>
     </message>
     <message>
         <source>Linear interpolate</source>
-        <translation>Interpolazione lineare</translation>
+        <translation type="vanished">Interpolazione lineare</translation>
     </message>
     <message>
         <source>Cubic interpolate</source>
-        <translation>Interpolazione cubica</translation>
+        <translation type="vanished">Interpolazione cubica</translation>
     </message>
     <message>
         <source>Median interpolate</source>
-        <translation>Interpolazione mediana</translation>
+        <translation type="vanished">Interpolazione mediana</translation>
     </message>
     <message>
         <source>FFmpeg deint</source>
-        <translation>Deint. FFmpeg</translation>
+        <translation type="vanished">Deint. FFmpeg</translation>
     </message>
     <message>
         <source>_Deinterlacing:</source>
-        <translation>_Deinterlacciamento:</translation>
+        <translation type="vanished">_Deinterlacciamento:</translation>
     </message>
     <message>
         <source>_Autolevel</source>
-        <translation>Livello _automatico</translation>
+        <translation type="vanished">Livello _automatico</translation>
     </message>
     <message>
         <source>libavcodec deinterlacer</source>
-        <translation>Deinterlacciatore libavcodec</translation>
+        <translation type="vanished">Deinterlacciatore libavcodec</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Nessuno</translation>
+        <translation type="vanished">Nessuno</translation>
     </message>
 </context>
 <context>
@@ -9601,6 +11405,53 @@
     </message>
 </context>
 <context>
+    <name>lavdeint</name>
+    <message>
+        <source>Libavdec Deinterlacers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lavcodec deinterlacer family.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Linear blend</source>
+        <translation type="unfinished">Miscela lineare</translation>
+    </message>
+    <message>
+        <source>Linear interpolate</source>
+        <translation type="unfinished">Interpolazione lineare</translation>
+    </message>
+    <message>
+        <source>Cubic interpolate</source>
+        <translation type="unfinished">Interpolazione cubica</translation>
+    </message>
+    <message>
+        <source>Median interpolate</source>
+        <translation type="unfinished">Interpolazione mediana</translation>
+    </message>
+    <message>
+        <source>FFmpeg deint</source>
+        <translation type="unfinished">Deint. FFmpeg</translation>
+    </message>
+    <message>
+        <source>_Deinterlacing:</source>
+        <translation type="unfinished">_Deinterlacciamento:</translation>
+    </message>
+    <message>
+        <source>_Autolevel</source>
+        <translation type="unfinished">Livello _automatico</translation>
+    </message>
+    <message>
+        <source>libavcodec deinterlacer</source>
+        <translation type="unfinished">Deinterlacciatore libavcodec</translation>
+    </message>
+</context>
+<context>
     <name>licenseDialog</name>
     <message>
         <source>License</source>
@@ -9612,6 +11463,52 @@
     </message>
 </context>
 <context>
+    <name>logo</name>
+    <message>
+        <source>Add logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Put a logo on top of video, with alpha blending.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Logo (jpg file):</source>
+        <translation type="unfinished">_Logo (file jpg):</translation>
+    </message>
+    <message>
+        <source>Select JPEG file</source>
+        <translation type="unfinished">Seleziona un file JPEG</translation>
+    </message>
+    <message>
+        <source>_X Position:</source>
+        <translation type="unfinished">Posizione _X:</translation>
+    </message>
+    <message>
+        <source>_Y Position:</source>
+        <translation type="unfinished">Posizione _Y:</translation>
+    </message>
+    <message>
+        <source>_Alpha:</source>
+        <translation type="unfinished">Tr_asparenza:</translation>
+    </message>
+    <message>
+        <source>Logo</source>
+        <translation type="unfinished">Logo</translation>
+    </message>
+</context>
+<context>
+    <name>lumaonly</name>
+    <message>
+        <source>GreyScale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove color, only key grey image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>mainFilterDialog</name>
     <message>
         <source>Video Filter Manager</source>
@@ -9659,11 +11556,11 @@
     </message>
     <message>
         <source>C&amp;onfigure</source>
-        <translation>C&amp;onfigura</translation>
+        <translation type="vanished">C&amp;onfigura</translation>
     </message>
     <message>
         <source>P&amp;artial</source>
-        <translation>P&amp;arziale</translation>
+        <translation type="vanished">P&amp;arziale</translation>
     </message>
     <message>
         <source>Open Script</source>
@@ -9687,7 +11584,7 @@
     </message>
     <message>
         <source>Down</source>
-        <translation>Giù</translation>
+        <translation type="vanished">Giù</translation>
     </message>
     <message>
         <source>Move Filter Up</source>
@@ -9695,7 +11592,7 @@
     </message>
     <message>
         <source>Up</source>
-        <translation>Su</translation>
+        <translation type="vanished">Su</translation>
     </message>
     <message>
         <source>Remove Filter</source>
@@ -9703,7 +11600,7 @@
     </message>
     <message>
         <source>Remove</source>
-        <translation>Rimuovi</translation>
+        <translation type="vanished">Rimuovi</translation>
     </message>
     <message>
         <source>Add Filter</source>
@@ -9711,7 +11608,7 @@
     </message>
     <message>
         <source>Add</source>
-        <translation>Aggiungi</translation>
+        <translation type="vanished">Aggiungi</translation>
     </message>
     <message>
         <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
@@ -9782,6 +11679,166 @@
     </message>
 </context>
 <context>
+    <name>mcdeint</name>
+    <message>
+        <source>MCDeint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Motion compensation deinterlacer. Ported from MPlayer.</source>
+        <translation type="unfinished">Deinterlacciatore compensazione movimento. Da MPlayer.</translation>
+    </message>
+    <message>
+        <source>Fast</source>
+        <translation type="unfinished">Veloce</translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation type="unfinished">Medio</translation>
+    </message>
+    <message>
+        <source>Slow iterative motion search</source>
+        <translation type="unfinished">Lenta, ricerca movimento iterativa</translation>
+    </message>
+    <message>
+        <source>Extra slow (same as 3+multiple reference frames)</source>
+        <translation type="unfinished">Extra lenta (come fotogrammi di riferimento multipli di 3)</translation>
+    </message>
+    <message>
+        <source>_Mode:</source>
+        <translation type="unfinished">_Modalità:</translation>
+    </message>
+    <message>
+        <source>Bottom :</source>
+        <translation type="unfinished">Inferiore:</translation>
+    </message>
+    <message>
+        <source>_Qp:</source>
+        <translation type="unfinished">_Qp:</translation>
+    </message>
+    <message>
+        <source>mcDeinterlace</source>
+        <translation type="unfinished">mcDeinterlace</translation>
+    </message>
+</context>
+<context>
+    <name>meadian</name>
+    <message>
+        <source>3x3 convolution filter :median.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>mean</name>
+    <message>
+        <source>Mean convolution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3x3 convolution filter :mean.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>median</name>
+    <message>
+        <source>Median convolution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>mkvmuxer</name>
+    <message>
+        <source>Saving Mkv</source>
+        <translation type="unfinished">Salvataggio Mkv in corso</translation>
+    </message>
+</context>
+<context>
+    <name>mp3d</name>
+    <message>
+        <source>Mplayer Denoise 3D HQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Spatial luma strength:</source>
+        <translation type="unfinished">Intensità luma _spaziale:</translation>
+    </message>
+    <message>
+        <source>S_patial chroma strength:</source>
+        <translation type="unfinished">Intensità croma s_paziale:</translation>
+    </message>
+    <message>
+        <source>Luma _Temporal strength:</source>
+        <translation type="unfinished">Intensità luma _temporale:</translation>
+    </message>
+    <message>
+        <source>MPlayer denoise3d</source>
+        <translation type="unfinished">MPlayer denoise3d</translation>
+    </message>
+</context>
+<context>
+    <name>mp3dlow</name>
+    <message>
+        <source>Mplayer Denoise 3D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reduce noise, smooth image, increase compressibility.</source>
+        <translation type="unfinished">Riduce il rumore, attenua l&apos;immagine, aumenta la comprimibilità.</translation>
+    </message>
+    <message>
+        <source>_Spatial luma strength:</source>
+        <translation type="unfinished">Intensità luma _spaziale:</translation>
+    </message>
+    <message>
+        <source>S_patial chroma strength:</source>
+        <translation type="unfinished">Intensità croma s_paziale:</translation>
+    </message>
+    <message>
+        <source>_Temporal strength:</source>
+        <translation type="unfinished">Intensità _temporale:</translation>
+    </message>
+    <message>
+        <source>MPlayer denoise3d</source>
+        <translation type="unfinished">MPlayer denoise3d</translation>
+    </message>
+</context>
+<context>
+    <name>msharpen</name>
+    <message>
+        <source>Msharpen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
+    <message>
+        <source>_Mask</source>
+        <translation type="unfinished">_Maschera</translation>
+    </message>
+    <message>
+        <source>_High Q</source>
+        <translation type="unfinished">_Qualità alta</translation>
+    </message>
+    <message>
+        <source>_Threshold:</source>
+        <translation type="unfinished">_Soglia:</translation>
+    </message>
+    <message>
+        <source>_Strength:</source>
+        <translation type="unfinished">_Intensità:</translation>
+    </message>
+    <message>
+        <source>MSharpen</source>
+        <translation type="unfinished">MSharpen</translation>
+    </message>
+</context>
+<context>
     <name>muxerMP4</name>
     <message>
         <source>Saving mp4</source>
@@ -9796,7 +11853,7 @@
     <name>muxerMkv</name>
     <message>
         <source>Saving Mkv</source>
-        <translation>Salvataggio Mkv in corso</translation>
+        <translation type="vanished">Salvataggio Mkv in corso</translation>
     </message>
 </context>
 <context>
@@ -9837,6 +11894,49 @@
     </message>
 </context>
 <context>
+    <name>nvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>oggHeader</name>
     <message>
         <source>Take second track ?</source>
@@ -9932,15 +12032,15 @@
     </message>
     <message>
         <source>%</source>
-        <translation>%</translation>
+        <translation type="vanished">%</translation>
     </message>
     <message>
         <source>Mono</source>
-        <translation>Mono</translation>
+        <translation type="vanished">Mono</translation>
     </message>
     <message>
         <source>Stereo</source>
-        <translation>Stereo</translation>
+        <translation type="vanished">Stereo</translation>
     </message>
     <message>
         <source>%1 Hz</source>
@@ -9956,15 +12056,15 @@
     </message>
     <message>
         <source>%2.3f fps</source>
-        <translation>%2.3f fps</translation>
+        <translation type="vanished">%2.3f fps</translation>
     </message>
     <message>
         <source>%02d:%02d:%02d.%03d</source>
-        <translation>%02d:%02d:%02d.%03d</translation>
+        <translation type="vanished">%02d:%02d:%02d.%03d</translation>
     </message>
     <message>
         <source>%s (%u:%u)</source>
-        <translation>%s (%u:%u)</translation>
+        <translation type="vanished">%s (%u:%u)</translation>
     </message>
 </context>
 <context>
@@ -10063,34 +12163,104 @@
     </message>
 </context>
 <context>
+    <name>qprops</name>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">No</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished">Sì</translation>
+    </message>
+    <message>
+        <source>%2.3f fps</source>
+        <translation type="unfinished">%2.3f fps</translation>
+    </message>
+    <message>
+        <source>%02d:%02d:%02d.%03d</source>
+        <translation type="unfinished">%02d:%02d:%02d.%03d</translation>
+    </message>
+    <message>
+        <source>%s (%u:%u)</source>
+        <translation type="unfinished">%s (%u:%u)</translation>
+    </message>
+    <message>
+        <source>Mono</source>
+        <translation type="unfinished">Mono</translation>
+    </message>
+    <message>
+        <source>Stereo</source>
+        <translation type="unfinished">Stereo</translation>
+    </message>
+</context>
+<context>
     <name>removePlaneFilter</name>
     <message>
         <source>Process luma plane</source>
-        <translation>Processa piano luma</translation>
+        <translation type="vanished">Processa piano luma</translation>
     </message>
     <message>
         <source>Keep Y Plane</source>
-        <translation>Mantieni piano Y</translation>
+        <translation type="vanished">Mantieni piano Y</translation>
     </message>
     <message>
         <source>Keep U Plane</source>
-        <translation>Mantieni piano U</translation>
+        <translation type="vanished">Mantieni piano U</translation>
     </message>
     <message>
         <source>Process chromaU plane</source>
-        <translation>Processa piano croma U</translation>
+        <translation type="vanished">Processa piano croma U</translation>
     </message>
     <message>
         <source>Keep V Plane</source>
-        <translation>Mantieni piano V</translation>
+        <translation type="vanished">Mantieni piano V</translation>
     </message>
     <message>
         <source>Process chromaV plane</source>
-        <translation>Processa piano croma V</translation>
+        <translation type="vanished">Processa piano croma V</translation>
     </message>
     <message>
         <source>Remove plane</source>
-        <translation>Rimuovi piano</translation>
+        <translation type="vanished">Rimuovi piano</translation>
+    </message>
+</context>
+<context>
+    <name>removeplane</name>
+    <message>
+        <source>Remove  Plane</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Y,U or V plane (used mainly to debug other filters).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep Y Plane</source>
+        <translation type="unfinished">Mantieni piano Y</translation>
+    </message>
+    <message>
+        <source>Process luma plane</source>
+        <translation type="unfinished">Processa piano luma</translation>
+    </message>
+    <message>
+        <source>Keep U Plane</source>
+        <translation type="unfinished">Mantieni piano U</translation>
+    </message>
+    <message>
+        <source>Process chromaU plane</source>
+        <translation type="unfinished">Processa piano croma U</translation>
+    </message>
+    <message>
+        <source>Keep V Plane</source>
+        <translation type="unfinished">Mantieni piano V</translation>
+    </message>
+    <message>
+        <source>Process chromaV plane</source>
+        <translation type="unfinished">Processa piano croma V</translation>
+    </message>
+    <message>
+        <source>Remove plane</source>
+        <translation type="unfinished">Rimuovi piano</translation>
     </message>
 </context>
 <context>
@@ -10107,6 +12277,49 @@
         <source>Resample fps</source>
         <translation>Ricampionamento fps</translation>
     </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished">Personalizzato</translation>
+    </message>
+    <message>
+        <source>25  (PAL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>23.976 (Film)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>29.97 (NTSC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>50 (Pal)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>59.93  (NTSC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resample FPS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change and enforce FPS. Keep duration and sync.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>resize</name>
+    <message>
+        <source>swsResize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>swScale Resizer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>resizeDialog</name>
@@ -10203,54 +12416,101 @@
     </message>
 </context>
 <context>
+    <name>rotate</name>
+    <message>
+        <source>Rotate</source>
+        <translation type="unfinished">Rotazione</translation>
+    </message>
+    <message>
+        <source>Rotate the image by 90/180/270 degrees.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>90 degrees</source>
+        <translation type="unfinished">90 gradi</translation>
+    </message>
+    <message>
+        <source>90°</source>
+        <translation type="unfinished">90°</translation>
+    </message>
+    <message>
+        <source>180 degrees</source>
+        <translation type="unfinished">180 gradi</translation>
+    </message>
+    <message>
+        <source>180°</source>
+        <translation type="unfinished">180°</translation>
+    </message>
+    <message>
+        <source>270 degrees</source>
+        <translation type="unfinished">270 gradi</translation>
+    </message>
+    <message>
+        <source>270°</source>
+        <translation type="unfinished">270°</translation>
+    </message>
+    <message>
+        <source>_Angle:</source>
+        <translation type="unfinished">_Angolo:</translation>
+    </message>
+</context>
+<context>
     <name>rotateFilter</name>
     <message>
         <source>90 degrees</source>
-        <translation>90 gradi</translation>
+        <translation type="vanished">90 gradi</translation>
     </message>
     <message>
         <source>90Â°</source>
-        <translation>90°</translation>
+        <translation type="vanished">90°</translation>
     </message>
     <message>
         <source>180 degrees</source>
-        <translation>180 gradi</translation>
+        <translation type="vanished">180 gradi</translation>
     </message>
     <message>
         <source>180Â°</source>
-        <translation>180°</translation>
+        <translation type="vanished">180°</translation>
     </message>
     <message>
         <source>270 degrees</source>
-        <translation>270 gradi</translation>
+        <translation type="vanished">270 gradi</translation>
     </message>
     <message>
         <source>270Â°</source>
-        <translation>270°</translation>
+        <translation type="vanished">270°</translation>
     </message>
     <message>
         <source>_Angle:</source>
-        <translation>_Angolo:</translation>
+        <translation type="vanished">_Angolo:</translation>
     </message>
     <message>
         <source>Rotate</source>
-        <translation>Rotazione</translation>
+        <translation type="vanished">Rotazione</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Nessuno</translation>
+        <translation type="vanished">Nessuno</translation>
     </message>
 </context>
 <context>
     <name>rotateGl</name>
     <message>
         <source>Angle (Â°):</source>
-        <translation>Angolo (°):</translation>
+        <translation type="vanished">Angolo (°):</translation>
     </message>
     <message>
         <source>glRotate</source>
         <translation>glRotate</translation>
     </message>
+    <message>
+        <source>Angle (°):</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>seekablePreviewDialog</name>
@@ -10282,46 +12542,88 @@
     <name>subAss</name>
     <message>
         <source>_Subtitle file (ASS/SSA):</source>
-        <translation>File _sottotitoli (ASS/SSA):</translation>
+        <translation type="vanished">File _sottotitoli (ASS/SSA):</translation>
     </message>
     <message>
         <source>Select Subtitle file</source>
-        <translation>Seleziona un file sottotitoli</translation>
+        <translation type="vanished">Seleziona un file sottotitoli</translation>
     </message>
     <message>
         <source>_Line spacing:</source>
-        <translation>Inter_linea:</translation>
+        <translation type="vanished">Inter_linea:</translation>
     </message>
     <message>
         <source>_Font scale:</source>
-        <translation>_Dimensione carattere:</translation>
+        <translation type="vanished">_Dimensione carattere:</translation>
     </message>
     <message>
         <source>_Top margin:</source>
-        <translation>Margine s_uperiore:</translation>
+        <translation type="vanished">Margine s_uperiore:</translation>
     </message>
     <message>
         <source>Botto_m margin</source>
-        <translation>_Margine inferiore</translation>
+        <translation type="vanished">_Margine inferiore</translation>
     </message>
     <message>
         <source>ASS</source>
-        <translation>ASS</translation>
+        <translation type="vanished">ASS</translation>
+    </message>
+</context>
+<context>
+    <name>swapuv</name>
+    <message>
+        <source>Swap UV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swap the U and V planes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>uisupport</name>
+    <message>
+        <source>X11</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MS Windows GDI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mac OS X Quartz 2D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mac OS X QuickDraw</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MS Windows Direct3D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Raster</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>vdpauVideoFilter</name>
     <message>
         <source>Width :</source>
-        <translation>Larghezza:</translation>
+        <translation type="vanished">Larghezza:</translation>
     </message>
     <message>
         <source>Height :</source>
-        <translation>Altezza:</translation>
+        <translation type="vanished">Altezza:</translation>
     </message>
     <message>
         <source>vdpau</source>
-        <translation>vdpau</translation>
+        <translation type="vanished">vdpau</translation>
     </message>
 </context>
 <context>
@@ -10360,180 +12662,252 @@
     </message>
 </context>
 <context>
+    <name>vdpaufilter</name>
+    <message>
+        <source>Keep Top Field</source>
+        <translation type="unfinished">Mantieni semiquadro superiore</translation>
+    </message>
+    <message>
+        <source>Keep Bottom Field</source>
+        <translation type="unfinished">Mantieni semiquadro inferiore</translation>
+    </message>
+    <message>
+        <source>Double framerate</source>
+        <translation type="unfinished">Doppio frame rate</translation>
+    </message>
+    <message>
+        <source>_Resize:</source>
+        <translation type="unfinished">_Ridimensiona:</translation>
+    </message>
+    <message>
+        <source>_Deint Mode:</source>
+        <translation type="unfinished">Modalità _deint.:</translation>
+    </message>
+    <message>
+        <source>Width :</source>
+        <translation type="unfinished">Larghezza:</translation>
+    </message>
+    <message>
+        <source>Height :</source>
+        <translation type="unfinished">Altezza:</translation>
+    </message>
+    <message>
+        <source>vdpau</source>
+        <translation type="unfinished">vdpau</translation>
+    </message>
+</context>
+<context>
+    <name>vdpaufilter2</name>
+    <message>
+        <source>Width :</source>
+        <translation type="unfinished">Larghezza:</translation>
+    </message>
+    <message>
+        <source>Height :</source>
+        <translation type="unfinished">Altezza:</translation>
+    </message>
+    <message>
+        <source>vdpau</source>
+        <translation type="unfinished">vdpau</translation>
+    </message>
+</context>
+<context>
+    <name>vdpresize</name>
+    <message>
+        <source>vdpau: Resize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>vdpau: Resize image using vdpau.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>vflip</name>
+    <message>
+        <source>Vertical Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertically flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>vidBlendRemoval</name>
     <message>
         <source>_Threshold:</source>
-        <translation>_Soglia:</translation>
+        <translation type="vanished">_Soglia:</translation>
     </message>
     <message>
         <source>If value is smaller than threshold it is considered valid.Smaller value might mean more false positive.</source>
-        <translation>Se il valore è minore della soglia è considerato valido. Valori più piccoli potrebbero produrre più falsi positivi.</translation>
+        <translation type="vanished">Se il valore è minore della soglia è considerato valido. Valori più piccoli potrebbero produrre più falsi positivi.</translation>
     </message>
     <message>
         <source>_Noise:</source>
-        <translation>_Rumore:</translation>
+        <translation type="vanished">_Rumore:</translation>
     </message>
     <message>
         <source>If pixels are closer than noise, they are considered to be the same</source>
-        <translation>Se i pixel sono più vicini del rumore, sono considerati identici</translation>
+        <translation type="vanished">Se i pixel sono più vicini del rumore, sono considerati identici</translation>
     </message>
     <message>
         <source>I_dentical:</source>
-        <translation>I_dentità:</translation>
+        <translation type="vanished">I_dentità:</translation>
     </message>
     <message>
         <source>If metric is less than identical, images are considered identical</source>
-        <translation>Se le misure sono minori dell&apos;identità, le immagini sono considerate identiche</translation>
+        <translation type="vanished">Se le misure sono minori dell&apos;identità, le immagini sono considerate identiche</translation>
     </message>
     <message>
         <source>_Show metrics</source>
-        <translation>_Mostra misure</translation>
+        <translation type="vanished">_Mostra misure</translation>
     </message>
     <message>
         <source>Show metric in image (debug)</source>
-        <translation>Mostra misure nell&apos;immagine (debug)</translation>
+        <translation type="vanished">Mostra misure nell&apos;immagine (debug)</translation>
     </message>
     <message>
         <source>Blend Removal</source>
-        <translation>Rimozione miscela</translation>
+        <translation type="vanished">Rimozione miscela</translation>
     </message>
 </context>
 <context>
     <name>vidColorYuv</name>
     <message>
         <source>AutoWhite</source>
-        <translation>Bianco automatico</translation>
+        <translation type="vanished">Bianco automatico</translation>
     </message>
     <message>
         <source>AutoGain</source>
-        <translation>Amplificazione automatica</translation>
+        <translation type="vanished">Amplificazione automatica</translation>
     </message>
     <message>
         <source>Clip to Tv Range (16-235)</source>
-        <translation>Riduci all&apos;intervallo TV (16-235)</translation>
+        <translation type="vanished">Riduci all&apos;intervallo TV (16-235)</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Nessuno</translation>
+        <translation type="vanished">Nessuno</translation>
     </message>
     <message>
         <source>PC-&gt;TV</source>
-        <translation>PC-&gt;TV</translation>
+        <translation type="vanished">PC-&gt;TV</translation>
     </message>
     <message>
         <source>TV-&gt;PC</source>
-        <translation>TV-&gt;PC</translation>
+        <translation type="vanished">TV-&gt;PC</translation>
     </message>
     <message>
         <source>Levels:</source>
-        <translation>Livelli:</translation>
+        <translation type="vanished">Livelli:</translation>
     </message>
     <message>
         <source>Y gain</source>
-        <translation>Amplificazione Y</translation>
+        <translation type="vanished">Amplificazione Y</translation>
     </message>
     <message>
         <source>Y Brightness</source>
-        <translation>Luminosità Y</translation>
+        <translation type="vanished">Luminosità Y</translation>
     </message>
     <message>
         <source>Y Gamma</source>
-        <translation>Gamma Y</translation>
+        <translation type="vanished">Gamma Y</translation>
     </message>
     <message>
         <source>Y Contrast</source>
-        <translation>Contrasto Y</translation>
+        <translation type="vanished">Contrasto Y</translation>
     </message>
     <message>
         <source>U gain</source>
-        <translation>Amplificazione U</translation>
+        <translation type="vanished">Amplificazione U</translation>
     </message>
     <message>
         <source>U Brightness</source>
-        <translation>Luminosità U</translation>
+        <translation type="vanished">Luminosità U</translation>
     </message>
     <message>
         <source>U Contrast</source>
-        <translation>Contrasto U</translation>
+        <translation type="vanished">Contrasto U</translation>
     </message>
     <message>
         <source>V gain</source>
-        <translation>Amplificazione V</translation>
+        <translation type="vanished">Amplificazione V</translation>
     </message>
     <message>
         <source>V Brightness</source>
-        <translation>Luminosità V</translation>
+        <translation type="vanished">Luminosità V</translation>
     </message>
     <message>
         <source>V Contrast</source>
-        <translation>Contrasto V</translation>
+        <translation type="vanished">Contrasto V</translation>
     </message>
     <message>
         <source>Flags</source>
-        <translation>Opzioni</translation>
+        <translation type="vanished">Opzioni</translation>
     </message>
     <message>
         <source>Y</source>
-        <translation>Y</translation>
+        <translation type="vanished">Y</translation>
     </message>
     <message>
         <source>U</source>
-        <translation>U</translation>
+        <translation type="vanished">U</translation>
     </message>
     <message>
         <source>V</source>
-        <translation>V</translation>
+        <translation type="vanished">V</translation>
     </message>
     <message>
         <source>colorYuv</source>
-        <translation>colorYuv</translation>
+        <translation type="vanished">colorYuv</translation>
     </message>
 </context>
 <context>
     <name>vidHardPDRemoval</name>
     <message>
         <source>_Threshold:</source>
-        <translation>_Soglia:</translation>
+        <translation type="vanished">_Soglia:</translation>
     </message>
     <message>
         <source>If value is smaller than threshold it is considered valid. Smaller value might mean more false positive</source>
-        <translation>Se il valore è minore della soglia è considerato valido. Valori più piccoli potrebbero produrre più falsi positivi</translation>
+        <translation type="vanished">Se il valore è minore della soglia è considerato valido. Valori più piccoli potrebbero produrre più falsi positivi</translation>
     </message>
     <message>
         <source>_Noise:</source>
-        <translation>_Rumore:</translation>
+        <translation type="vanished">_Rumore:</translation>
     </message>
     <message>
         <source>If pixels are closer than noise, they are considered to be the same</source>
-        <translation>Se i pixel sono più vicini del rumore, sono considerati identici</translation>
+        <translation type="vanished">Se i pixel sono più vicini del rumore, sono considerati identici</translation>
     </message>
     <message>
         <source>_Identical:</source>
-        <translation>I_dentità:</translation>
+        <translation type="vanished">I_dentità:</translation>
     </message>
     <message>
         <source>If metric is less than identical, images are considered identical</source>
-        <translation>Se le misure sono minori dell&apos;identità, le immagini sono considerate identiche</translation>
+        <translation type="vanished">Se le misure sono minori dell&apos;identità, le immagini sono considerate identiche</translation>
     </message>
     <message>
         <source>_Show metrics</source>
-        <translation>_Mostra misure</translation>
+        <translation type="vanished">_Mostra misure</translation>
     </message>
     <message>
         <source>Show metric in image (debug)</source>
-        <translation>Mostra misure nell&apos;immagine (debug)</translation>
+        <translation type="vanished">Mostra misure nell&apos;immagine (debug)</translation>
     </message>
     <message>
         <source>Hard IVTC Removal</source>
-        <translation>Rimozione forte IVTC</translation>
+        <translation type="vanished">Rimozione forte IVTC</translation>
     </message>
     <message>
         <source>Metrics</source>
-        <translation>Misure</translation>
+        <translation type="vanished">Misure</translation>
     </message>
     <message>
         <source>Do you want to print metrics on screen ?</source>
-        <translation>Vuoi stampare le misure sullo schermo?</translation>
+        <translation type="vanished">Vuoi stampare le misure sullo schermo?</translation>
     </message>
 </context>
 <context>
@@ -10576,6 +12950,44 @@
     </message>
 </context>
 <context>
+    <name>vorbis</name>
+    <message>
+        <source>VBR</source>
+        <translation type="unfinished">VBR</translation>
+    </message>
+    <message>
+        <source>Quality based</source>
+        <translation type="unfinished">Basato sulla qualità</translation>
+    </message>
+    <message>
+        <source>_Mode:</source>
+        <translation type="unfinished">_Modalità:</translation>
+    </message>
+    <message>
+        <source>_Bitrate:</source>
+        <translation type="unfinished">_Bitrate:</translation>
+    </message>
+    <message>
+        <source>_Quality:</source>
+        <translation type="unfinished">_Qualità:</translation>
+    </message>
+    <message>
+        <source>Vorbis Configuration</source>
+        <translation type="unfinished">Configurazione Vorbis</translation>
+    </message>
+</context>
+<context>
+    <name>vsWindow</name>
+    <message>
+        <source>Open VapourSynth File 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VS File Files (*.vpy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <source>Processing</source>
@@ -11692,42 +14104,244 @@
     </message>
 </context>
 <context>
+    <name>x265Dialog</name>
+    <message>
+        <source>Target Bitrate:</source>
+        <translation type="unfinished">Bitrate finale:</translation>
+    </message>
+    <message>
+        <source>kbit/s</source>
+        <translation type="unfinished">kbit/s</translation>
+    </message>
+    <message>
+        <source>Quantiser:</source>
+        <translation type="unfinished">Quantizzatore:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="unfinished">Qualità:</translation>
+    </message>
+    <message>
+        <source>Target Video Size:</source>
+        <translation type="unfinished">Dimensione video finale:</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished">MB</translation>
+    </message>
+    <message>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished">Bitrate medio:</translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>xvid4</name>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation type="unfinished">Bassa</translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation type="unfinished">Medio</translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished">Completo</translation>
+    </message>
+    <message>
+        <source>H.263</source>
+        <translation type="unfinished">H.263</translation>
+    </message>
+    <message>
+        <source>MPEG</source>
+        <translation type="unfinished">MPEG</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="unfinished">Personalizzato</translation>
+    </message>
+    <message>
+        <source>DCT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qpel16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qpel8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Square</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two threads)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Three threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto (#cpu)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1:1 (PC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MotionEstimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Threading</source>
+        <translation type="unfinished">Threading</translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Trellis quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Number of B frames:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Quantization type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Macroblock decision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio:</source>
+        <translation type="unfinished">Proporzioni:</translation>
+    </message>
+    <message>
+        <source>_Gop Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced Simple Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Motion Estimation</source>
+        <translation type="unfinished">Stima movimento</translation>
+    </message>
+    <message>
+        <source>Quantization</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Threads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio</source>
+        <translation type="unfinished">Proporzioni</translation>
+    </message>
+    <message>
+        <source>Rate Control</source>
+        <translation type="unfinished">Controllo bitrate</translation>
+    </message>
+    <message>
+        <source>Xvid4 MPEG-4 ASP configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>yadifFilter</name>
     <message>
         <source>Temporal &amp; spatial check</source>
-        <translation>Verifica temporale e spaziale</translation>
+        <translation type="vanished">Verifica temporale e spaziale</translation>
     </message>
     <message>
         <source>Bob, temporal &amp; spatial check</source>
-        <translation>Sdoppia, verifica temporale e spaziale</translation>
+        <translation type="vanished">Sdoppia, verifica temporale e spaziale</translation>
     </message>
     <message>
         <source>Skip spatial temporal check</source>
-        <translation>Salta verifica temporale e spaziale</translation>
+        <translation type="vanished">Salta verifica temporale e spaziale</translation>
     </message>
     <message>
         <source>Bob, skip spatial temporal check</source>
-        <translation>Sdoppia, salta verifica temporale e spaziale</translation>
+        <translation type="vanished">Sdoppia, salta verifica temporale e spaziale</translation>
     </message>
     <message>
         <source>Bottom field first</source>
-        <translation>Prima il semiquadro inferiore</translation>
+        <translation type="vanished">Prima il semiquadro inferiore</translation>
     </message>
     <message>
         <source>Top field first</source>
-        <translation>Prima il semiquadro superiore</translation>
+        <translation type="vanished">Prima il semiquadro superiore</translation>
     </message>
     <message>
         <source>_Mode:</source>
-        <translation>_Modalità:</translation>
+        <translation type="vanished">_Modalità:</translation>
     </message>
     <message>
         <source>_Order:</source>
-        <translation>_Ordine:</translation>
+        <translation type="vanished">_Ordine:</translation>
     </message>
     <message>
         <source>yadif</source>
-        <translation>yadif</translation>
+        <translation type="vanished">yadif</translation>
     </message>
 </context>
 </TS>

avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/avidemux_ja.ts -> avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/avidemux_ja.ts Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1">
 <context>
     <name></name>
     <message>
@@ -2494,6 +2494,21 @@
     </message>
 </context>
 <context>
+    <name>ADM_Qt4CoreUIToolkit::DIA_processingQt4</name>
+    <message>
+        <source>_Resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The processing is paused.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_Qt4Factory::ADM_Qbitrate</name>
     <message>
         <source>Bitrate</source>
@@ -2549,6 +2564,13 @@
     </message>
 </context>
 <context>
+    <name>ADM_ffDvEncoder</name>
+    <message>
+        <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_ogmWrite</name>
     <message>
         <source>None</source>
@@ -2929,7 +2951,7 @@
     <name>DIA_encodingQt4</name>
     <message>
         <source>Shutting down</source>
-        <translation type="unfinished">シャットダウン中</translation>
+        <translation type="obsolete">シャットダウン中</translation>
     </message>
     <message>
         <source>Resume</source>
@@ -2943,6 +2965,14 @@
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Privileges Required</source>
+        <translation type="unfinished">特権が要求される</translation>
+    </message>
+    <message>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation type="unfinished">この操作を実行するにはRoot特権が要求される</translation>
+    </message>
 </context>
 <context>
     <name>DVEncoder</name>
@@ -2952,6 +2982,13 @@
     </message>
 </context>
 <context>
+    <name>DcaEnc</name>
+    <message>
+        <source>DcaEnc Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Decimate</name>
     <message>
         <source>Discard closer</source>
@@ -3021,7 +3058,7 @@
     </message>
     <message>
         <source>Audio Filters</source>
-        <translation type="unfinished">音声フィルタ</translation>
+        <translation type="obsolete">音声フィルタ</translation>
     </message>
     <message>
         <source>Audio Tracks Configuration</source>
@@ -3047,6 +3084,10 @@
         <source>Track 4</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Filters</source>
+        <translation type="unfinished">フィルタ</translation>
+    </message>
 </context>
 <context>
     <name>DialogOcr</name>
@@ -3096,6 +3137,41 @@
     </message>
 </context>
 <context>
+    <name>DialogProcessing</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TimeLeft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>00:00:00</source>
+        <translation type="unfinished">00:00:00</translation>
+    </message>
+    <message>
+        <source>ProcessImages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished">0</translation>
+    </message>
+    <message>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DialogProgress</name>
     <message>
         <source>1/1</source>
@@ -3488,10 +3564,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;b&gt;Selection&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3603,6 +3675,18 @@
         <source>Si&amp;de</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display processed video on playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play filtered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Video</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Mpeg1Encoder</name>
@@ -4003,6 +4087,13 @@
     </message>
 </context>
 <context>
+    <name>Webmmuxer</name>
+    <message>
+        <source>Saving Webm</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XvidConfigDialog</name>
     <message>
         <source>Rate Control</source>
@@ -4065,10 +4156,6 @@
         <source>Multi-platform Video Editor</source>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <source>© 2001 - 2012  Mean</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>&amp;License</source>
         <translation type="unfinished"></translation>
@@ -4077,6 +4164,10 @@
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>© 2001 - 2016  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>addBorders</name>
@@ -4345,7 +4436,7 @@
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished">映像</translation>
+        <translation type="obsolete">映像</translation>
     </message>
     <message>
         <source>CPU</source>
@@ -4749,10 +4840,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Decode video using VDPAU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4769,14 +4856,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MS Windows GDI (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MS Windows DirectX (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_AudioDevice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4833,11 +4912,11 @@
     </message>
     <message>
         <source>Select AVI File...</source>
-        <translation type="unfinished">AVIファイルの選択...</translation>
+        <translation type="obsolete">AVIファイルの選択...</translation>
     </message>
     <message>
         <source>Select AVI File to Append...</source>
-        <translation type="unfinished">追加するAVIファイルの選択...</translation>
+        <translation type="obsolete">追加するAVIファイルの選択...</translation>
     </message>
     <message>
         <source>Are you sure?</source>
@@ -5183,23 +5262,7 @@
     </message>
     <message>
         <source>The filter is already partial</source>
-        <translation type="unfinished">フィルタは既に部分的です</translation>
-    </message>
-    <message>
-        <source>Partial Start Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial End Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure child</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial Video Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">フィルタは既に部分的です</translation>
     </message>
     <message>
         <source>_Interlaced</source>
@@ -5438,6 +5501,76 @@
         <source>This script has already been successfully executed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Gain</source>
+        <translation type="unfinished">利得</translation>
+    </message>
+    <message>
+        <source>Mixer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using VDPAU (NVIDIA)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using XVBA (AMD)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you use Hw decoding, it is better to use the matching display driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LIBVA (best)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sdl driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HW Accel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You cannot remove *all* the video
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File to Append...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid audio index given</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>aften</name>
@@ -5464,14 +5597,6 @@
 <context>
     <name>ass</name>
     <message>
-        <source>SSA.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardcode ass/ssa subtitles using libass.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Subtitle file (ASS/SSA):</source>
         <translation type="unfinished">字幕ファイル(_S) (ASS/SSA):</translation>
     </message>
@@ -5499,6 +5624,14 @@
         <source>ASS</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>SSA/ASS/SRT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>autoWizard</name>
@@ -5543,6 +5676,21 @@
     </message>
 </context>
 <context>
+    <name>black</name>
+    <message>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace a section by black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace by Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>blacken</name>
     <message>
         <source>_Left border:</source>
@@ -5875,6 +6023,13 @@
     </message>
 </context>
 <context>
+    <name>dcaenc</name>
+    <message>
+        <source>_Bitrate:</source>
+        <translation type="unfinished">ビットレート(_B):</translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <source>Decomb decimate</source>
@@ -5893,10 +6048,6 @@
         <translation type="unfinished">置換(補間)</translation>
     </message>
     <message>
-        <source>Discard longer dupe (animÃ©s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Pulldown dupe removal</source>
         <translation type="unfinished">プルダウンdupe除去</translation>
     </message>
@@ -5936,11 +6087,15 @@
         <source>Decomb Decimate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Discard longer dupe (animés)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>delogo</name>
+    <name>delogo2</name>
     <message>
-        <source>MPlayer delogo</source>
+        <source>MPlayer delogo2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6165,6 +6320,14 @@
 &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 type="unfinished"></translation>
     </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished">拡張</translation>
+    </message>
 </context>
 <context>
     <name>encodingWindow</name>
@@ -6182,11 +6345,11 @@
     </message>
     <message>
         <source>Privileges Required</source>
-        <translation type="unfinished">特権が要求される</translation>
+        <translation type="obsolete">特権が要求される</translation>
     </message>
     <message>
         <source>Root privileges are required to perform this operation.</source>
-        <translation type="unfinished">この操作を実行するにはRoot特権が要求される</translation>
+        <translation type="obsolete">この操作を実行するにはRoot特権が要求される</translation>
     </message>
     <message>
         <source>Shutting down</source>
@@ -6232,10 +6395,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fade in/out.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Out</source>
         <translation type="unfinished">アウト</translation>
     </message>
@@ -6267,6 +6426,21 @@
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Fade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fade to black in/out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fade to</name>
+    <message>
+        <source>Fade</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ffmpeg2</name>
@@ -6684,6 +6858,49 @@
     </message>
 </context>
 <context>
+    <name>ffnvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>filtermainWindow</name>
     <message>
         <source>The filter is already partial</source>
@@ -6701,6 +6918,14 @@
         <source>Save set of filters</source>
         <translation type="obsolete">フィルタの組を保存</translation>
     </message>
+    <message>
+        <source>Load video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>flux</name>
@@ -7459,30 +7684,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;onfigure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>P&amp;artial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7723,6 +7924,49 @@
     </message>
 </context>
 <context>
+    <name>nvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>oggHeader</name>
     <message>
         <source>Take second track ?</source>
@@ -8056,29 +8300,29 @@
         <translation type="unfinished">90 度</translation>
     </message>
     <message>
-        <source>90Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>180 degrees</source>
         <translation type="unfinished">180 度</translation>
     </message>
     <message>
-        <source>180Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>270 degrees</source>
         <translation type="unfinished">270 度</translation>
     </message>
     <message>
-        <source>270Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Angle:</source>
         <translation type="unfinished">角度(_A):</translation>
     </message>
+    <message>
+        <source>90°</source>
+        <translation type="unfinished">90°</translation>
+    </message>
+    <message>
+        <source>180°</source>
+        <translation type="unfinished">180°</translation>
+    </message>
+    <message>
+        <source>270°</source>
+        <translation type="unfinished">270°</translation>
+    </message>
 </context>
 <context>
     <name>rotateFilter</name>
@@ -8110,11 +8354,11 @@
 <context>
     <name>rotateGl</name>
     <message>
-        <source>Angle (Â°):</source>
+        <source>glRotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>glRotate</source>
+        <source>Angle (°):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8445,6 +8689,17 @@
     </message>
 </context>
 <context>
+    <name>vsWindow</name>
+    <message>
+        <source>Open VapourSynth File 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VS File Files (*.vpy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <source>Processing</source>
@@ -8660,6 +8915,49 @@
     </message>
 </context>
 <context>
+    <name>x265Dialog</name>
+    <message>
+        <source>Target Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kbit/s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quantiser:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Target Video Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>xvid4</name>
     <message>
         <source>None</source>
@@ -8779,6 +9077,46 @@
         <source>Xvid4 MPEG-4 ASP configuration</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>1:1 (PC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio:</source>
+        <translation type="unfinished">アスペクト比:</translation>
+    </message>
+    <message>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>yadifFilter</name>

avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/avidemux_pl.ts -> avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/avidemux_pl.ts Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1">
 <context>
     <name></name>
     <message>
@@ -3732,6 +3732,21 @@
     </message>
 </context>
 <context>
+    <name>ADM_Qt4CoreUIToolkit::DIA_processingQt4</name>
+    <message>
+        <source>_Resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The processing is paused.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_Qt4Factory::ADM_Qbitrate</name>
     <message>
         <source>Quantiser</source>
@@ -3818,6 +3833,13 @@
     </message>
 </context>
 <context>
+    <name>ADM_ffDvEncoder</name>
+    <message>
+        <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_ogmWrite</name>
     <message>
         <source>None</source>
@@ -4321,7 +4343,7 @@
     <name>DIA_encodingQt4</name>
     <message>
         <source>Shutting down</source>
-        <translation type="unfinished">Już w trakcie zamykania.</translation>
+        <translation type="obsolete">Już w trakcie zamykania.</translation>
     </message>
     <message>
         <source>Resume</source>
@@ -4335,6 +4357,21 @@
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Privileges Required</source>
+        <translation type="unfinished">Wymagane uprawnienia</translation>
+    </message>
+    <message>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation type="unfinished">Aby wykonać to działanie wymagane są uprawnienia administracyjne.</translation>
+    </message>
+</context>
+<context>
+    <name>DcaEnc</name>
+    <message>
+        <source>DcaEnc Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Decimate</name>
@@ -4414,7 +4451,7 @@
     </message>
     <message>
         <source>Audio Filters</source>
-        <translation type="unfinished">Filtry dźwięku</translation>
+        <translation type="obsolete">Filtry dźwięku</translation>
     </message>
     <message>
         <source>Audio Tracks Configuration</source>
@@ -4440,6 +4477,10 @@
         <source>Track 4</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Filters</source>
+        <translation type="unfinished">Filtry</translation>
+    </message>
 </context>
 <context>
     <name>DialogOcr</name>
@@ -4489,6 +4530,41 @@
     </message>
 </context>
 <context>
+    <name>DialogProcessing</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TimeLeft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>00:00:00</source>
+        <translation type="unfinished">00:00:00</translation>
+    </message>
+    <message>
+        <source>ProcessImages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished">0</translation>
+    </message>
+    <message>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DialogProgress</name>
     <message>
         <source>1/1</source>
@@ -4928,10 +5004,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;b&gt;Selection&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5043,6 +5115,18 @@
         <source>Si&amp;de</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display processed video on playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play filtered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Video</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Mpeg1Encoder</name>
@@ -5461,6 +5545,13 @@
     </message>
 </context>
 <context>
+    <name>Webmmuxer</name>
+    <message>
+        <source>Saving Webm</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XvidConfigDialog</name>
     <message>
         <source>&lt;default&gt;</source>
@@ -5576,10 +5667,6 @@
         <source>Avidemux </source>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <source>© 2001 - 2012  Mean</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>http://www.avidemux.org</source>
         <translation type="unfinished"></translation>
@@ -5592,6 +5679,10 @@
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>© 2001 - 2016  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>addBorders</name>
@@ -5851,7 +5942,7 @@
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished">Obraz</translation>
+        <translation type="obsolete">Obraz</translation>
     </message>
     <message>
         <source>CPU</source>
@@ -6254,10 +6345,6 @@
         <translation type="unfinished">Informacje o wtyczkach</translation>
     </message>
     <message>
-        <source>Decode video using VDPAU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6274,14 +6361,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MS Windows GDI (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MS Windows DirectX (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>No audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6334,11 +6413,11 @@
     </message>
     <message>
         <source>Select AVI File...</source>
-        <translation type="unfinished">Wybierz plik AVI...</translation>
+        <translation type="obsolete">Wybierz plik AVI...</translation>
     </message>
     <message>
         <source>Select AVI File to Append...</source>
-        <translation type="unfinished">Wybierz plik AVI aby dołączyć...</translation>
+        <translation type="obsolete">Wybierz plik AVI aby dołączyć...</translation>
     </message>
     <message>
         <source>Are you sure?</source>
@@ -6694,23 +6773,7 @@
     </message>
     <message>
         <source>The filter is already partial</source>
-        <translation type="unfinished">Filtr jest już częściowy</translation>
-    </message>
-    <message>
-        <source>Partial Start Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial End Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure child</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial Video Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Filtr jest już częściowy</translation>
     </message>
     <message>
         <source>_Interlaced</source>
@@ -6948,6 +7011,76 @@
         <source>This script has already been successfully executed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Gain</source>
+        <translation type="unfinished">Normalizacja głośności</translation>
+    </message>
+    <message>
+        <source>Mixer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using VDPAU (NVIDIA)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using XVBA (AMD)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you use Hw decoding, it is better to use the matching display driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LIBVA (best)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sdl driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HW Accel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You cannot remove *all* the video
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File to Append...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid audio index given</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving</source>
+        <translation type="unfinished">Zapisywanie</translation>
+    </message>
 </context>
 <context>
     <name>aften</name>
@@ -6981,14 +7114,6 @@
 <context>
     <name>ass</name>
     <message>
-        <source>SSA.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardcode ass/ssa subtitles using libass.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Subtitle file (ASS/SSA):</source>
         <translation type="unfinished">Plik z _napisami (ASS/SSA):</translation>
     </message>
@@ -7016,6 +7141,14 @@
         <source>ASS</source>
         <translation type="unfinished">ASS</translation>
     </message>
+    <message>
+        <source>SSA/ASS/SRT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>autoWizard</name>
@@ -7060,6 +7193,21 @@
     </message>
 </context>
 <context>
+    <name>black</name>
+    <message>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace a section by black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace by Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>blacken</name>
     <message>
         <source>_Left border:</source>
@@ -7429,6 +7577,13 @@
     </message>
 </context>
 <context>
+    <name>dcaenc</name>
+    <message>
+        <source>_Bitrate:</source>
+        <translation type="unfinished">_Przepływność:</translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <source>Decomb decimate</source>
@@ -7447,10 +7602,6 @@
         <translation type="unfinished">Zastąp (interpoluj)</translation>
     </message>
     <message>
-        <source>Discard longer dupe (animÃ©s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Pulldown dupe removal</source>
         <translation type="unfinished">Usuwanie duplikatów z konwersji pulldown</translation>
     </message>
@@ -7490,12 +7641,27 @@
         <source>Decomb Decimate</source>
         <translation type="unfinished">Decomb Decimate</translation>
     </message>
+    <message>
+        <source>Discard longer dupe (animés)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>delogo</name>
     <message>
         <source>MPlayer delogo</source>
-        <translation type="unfinished">MPlayer delogo</translation>
+        <translation type="obsolete">MPlayer delogo</translation>
+    </message>
+    <message>
+        <source>Blend a logo by interpolating its surrounding box.</source>
+        <translation type="obsolete">Nanieś logo przez interpolowanie jego otaczających krawędzi.</translation>
+    </message>
+</context>
+<context>
+    <name>delogo2</name>
+    <message>
+        <source>MPlayer delogo2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blend a logo by interpolating its surrounding box.</source>
@@ -7727,6 +7893,14 @@
 &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 type="unfinished"></translation>
     </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>encodingWindow</name>
@@ -7736,11 +7910,11 @@
     </message>
     <message>
         <source>Privileges Required</source>
-        <translation type="unfinished">Wymagane uprawnienia</translation>
+        <translation type="obsolete">Wymagane uprawnienia</translation>
     </message>
     <message>
         <source>Root privileges are required to perform this operation.</source>
-        <translation type="unfinished">Aby wykonać to działanie wymagane są uprawnienia administracyjne.</translation>
+        <translation type="obsolete">Aby wykonać to działanie wymagane są uprawnienia administracyjne.</translation>
     </message>
     <message>
         <source>Resume</source>
@@ -7793,7 +7967,7 @@
     </message>
     <message>
         <source>Fade in/out.</source>
-        <translation type="unfinished">Zanikanie/wyłanianie</translation>
+        <translation type="obsolete">Zanikanie/wyłanianie</translation>
     </message>
     <message>
         <source>Out</source>
@@ -7827,6 +8001,21 @@
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Fade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fade to black in/out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fade to</name>
+    <message>
+        <source>Fade</source>
+        <translation type="unfinished">Zanikanie</translation>
+    </message>
 </context>
 <context>
     <name>ffmpeg2</name>
@@ -8238,6 +8427,49 @@
     </message>
 </context>
 <context>
+    <name>ffnvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>filtermainWindow</name>
     <message>
         <source>The filter is already partial</source>
@@ -8255,6 +8487,14 @@
         <source>Save set of filters</source>
         <translation type="obsolete">Zapisz zestaw filtrów</translation>
     </message>
+    <message>
+        <source>Load video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>flux</name>
@@ -9017,30 +9257,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;onfigure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>P&amp;artial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9297,6 +9513,49 @@
     </message>
 </context>
 <context>
+    <name>nvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>oggHeader</name>
     <message>
         <source>Take second track ?</source>
@@ -9635,29 +9894,29 @@
         <translation type="unfinished">90 stopni</translation>
     </message>
     <message>
-        <source>90Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>180 degrees</source>
         <translation type="unfinished">180 stopni</translation>
     </message>
     <message>
-        <source>180Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>270 degrees</source>
         <translation type="unfinished">270 stopni</translation>
     </message>
     <message>
-        <source>270Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Angle:</source>
         <translation type="unfinished">_Kąt:</translation>
     </message>
+    <message>
+        <source>90°</source>
+        <translation type="unfinished">90°</translation>
+    </message>
+    <message>
+        <source>180°</source>
+        <translation type="unfinished">180°</translation>
+    </message>
+    <message>
+        <source>270°</source>
+        <translation type="unfinished">270°</translation>
+    </message>
 </context>
 <context>
     <name>rotateFilter</name>
@@ -9689,11 +9948,11 @@
 <context>
     <name>rotateGl</name>
     <message>
-        <source>Angle (Â°):</source>
+        <source>glRotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>glRotate</source>
+        <source>Angle (°):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10040,6 +10299,17 @@
     </message>
 </context>
 <context>
+    <name>vsWindow</name>
+    <message>
+        <source>Open VapourSynth File 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VS File Files (*.vpy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <source>Processing</source>
@@ -10362,6 +10632,49 @@
     </message>
 </context>
 <context>
+    <name>x265Dialog</name>
+    <message>
+        <source>Target Bitrate:</source>
+        <translation type="unfinished">Przepływność docelowa:</translation>
+    </message>
+    <message>
+        <source>kbit/s</source>
+        <translation type="unfinished">kbit/s</translation>
+    </message>
+    <message>
+        <source>Quantiser:</source>
+        <translation type="unfinished">Kwantyzator:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="unfinished">Jakość:</translation>
+    </message>
+    <message>
+        <source>Target Video Size:</source>
+        <translation type="unfinished">Rozmiar docelowego obrazu wideo:</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished">MB</translation>
+    </message>
+    <message>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished">Średnia przepływność:</translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>xvid4</name>
     <message>
         <source>None</source>
@@ -10479,6 +10792,46 @@
         <source>Xvid4 MPEG-4 ASP configuration</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>1:1 (PC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio:</source>
+        <translation type="unfinished">Proporcje obrazu:</translation>
+    </message>
+    <message>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>yadifFilter</name>

avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/avidemux_pt_BR.ts -> avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/avidemux_pt_BR.ts Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1">
 <context>
     <name></name>
     <message>
@@ -2951,6 +2951,21 @@
     </message>
 </context>
 <context>
+    <name>ADM_Qt4CoreUIToolkit::DIA_processingQt4</name>
+    <message>
+        <source>_Resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The processing is paused.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_Qt4Factory::ADM_Qbitrate</name>
     <message>
         <source>Bitrate</source>
@@ -3008,6 +3023,13 @@
     </message>
 </context>
 <context>
+    <name>ADM_ffDvEncoder</name>
+    <message>
+        <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_ogmWrite</name>
     <message>
         <source>None</source>
@@ -3444,7 +3466,7 @@
     <name>DIA_encodingQt4</name>
     <message>
         <source>Shutting down</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
             </translation>
     </message>
     <message>
@@ -3461,6 +3483,16 @@
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Privileges Required</source>
+        <translation type="unfinished">
+            </translation>
+    </message>
+    <message>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation type="unfinished">
+            </translation>
+    </message>
 </context>
 <context>
     <name>DVEncoder</name>
@@ -3471,6 +3503,13 @@
     </message>
 </context>
 <context>
+    <name>DcaEnc</name>
+    <message>
+        <source>DcaEnc Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Decimate</name>
     <message>
         <source>Discard closer</source>
@@ -3553,7 +3592,7 @@
     </message>
     <message>
         <source>Audio Filters</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
             </translation>
     </message>
     <message>
@@ -3580,6 +3619,11 @@
         <source>Track 4</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Filters</source>
+        <translation type="unfinished">
+            </translation>
+    </message>
 </context>
 <context>
     <name>DialogOcr</name>
@@ -3635,6 +3679,43 @@
     </message>
 </context>
 <context>
+    <name>DialogProcessing</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TimeLeft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>00:00:00</source>
+        <translation type="unfinished">
+            </translation>
+    </message>
+    <message>
+        <source>ProcessImages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished">
+            </translation>
+    </message>
+    <message>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DialogProgress</name>
     <message>
         <source>1/1</source>
@@ -4078,10 +4159,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;b&gt;Selection&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4193,6 +4270,18 @@
         <source>Si&amp;de</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display processed video on playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play filtered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Video</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Mpeg1Encoder</name>
@@ -4671,6 +4760,13 @@
     </message>
 </context>
 <context>
+    <name>Webmmuxer</name>
+    <message>
+        <source>Saving Webm</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XvidConfigDialog</name>
     <message>
         <source>Rate Control</source>
@@ -4742,10 +4838,6 @@
         <source>Multi-platform Video Editor</source>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <source>© 2001 - 2012  Mean</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>&amp;License</source>
         <translation type="unfinished"></translation>
@@ -4754,6 +4846,10 @@
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>© 2001 - 2016  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>addBorders</name>
@@ -5052,7 +5148,7 @@
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
             </translation>
     </message>
     <message>
@@ -5491,10 +5587,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Decode video using VDPAU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5511,14 +5603,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MS Windows GDI (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MS Windows DirectX (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_AudioDevice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5577,12 +5661,12 @@
     </message>
     <message>
         <source>Select AVI File...</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
             </translation>
     </message>
     <message>
         <source>Select AVI File to Append...</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
             </translation>
     </message>
     <message>
@@ -5998,26 +6082,10 @@
     </message>
     <message>
         <source>The filter is already partial</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
             </translation>
     </message>
     <message>
-        <source>Partial Start Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial End Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure child</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial Video Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Interlaced</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6259,6 +6327,77 @@
         <source>This script has already been successfully executed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Gain</source>
+        <translation type="unfinished">
+            </translation>
+    </message>
+    <message>
+        <source>Mixer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using VDPAU (NVIDIA)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using XVBA (AMD)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you use Hw decoding, it is better to use the matching display driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LIBVA (best)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sdl driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HW Accel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You cannot remove *all* the video
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File to Append...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid audio index given</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>aften</name>
@@ -6286,14 +6425,6 @@
 <context>
     <name>ass</name>
     <message>
-        <source>SSA.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardcode ass/ssa subtitles using libass.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Subtitle file (ASS/SSA):</source>
         <translation type="unfinished">
             </translation>
@@ -6326,6 +6457,14 @@
         <source>ASS</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>SSA/ASS/SRT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>autoWizard</name>
@@ -6371,6 +6510,21 @@
     </message>
 </context>
 <context>
+    <name>black</name>
+    <message>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace a section by black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace by Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>blacken</name>
     <message>
         <source>_Left border:</source>
@@ -6712,6 +6866,14 @@
     </message>
 </context>
 <context>
+    <name>dcaenc</name>
+    <message>
+        <source>_Bitrate:</source>
+        <translation type="unfinished">
+            </translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <source>Decomb decimate</source>
@@ -6732,10 +6894,6 @@
             </translation>
     </message>
     <message>
-        <source>Discard longer dupe (animÃ©s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Pulldown dupe removal</source>
         <translation type="unfinished">
             </translation>
@@ -6782,11 +6940,15 @@
         <source>Decomb Decimate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Discard longer dupe (animés)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>delogo</name>
+    <name>delogo2</name>
     <message>
-        <source>MPlayer delogo</source>
+        <source>MPlayer delogo2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7037,6 +7199,15 @@
 &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 type="unfinished"></translation>
     </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished">
+            </translation>
+    </message>
 </context>
 <context>
     <name>encodingWindow</name>
@@ -7057,12 +7228,12 @@
     </message>
     <message>
         <source>Privileges Required</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
             </translation>
     </message>
     <message>
         <source>Root privileges are required to perform this operation.</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
             </translation>
     </message>
     <message>
@@ -7113,10 +7284,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fade in/out.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Out</source>
         <translation type="unfinished">
             </translation>
@@ -7153,6 +7320,21 @@
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Fade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fade to black in/out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fade to</name>
+    <message>
+        <source>Fade</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ffmpeg2</name>
@@ -7588,6 +7770,49 @@
     </message>
 </context>
 <context>
+    <name>ffnvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>filtermainWindow</name>
     <message>
         <source>The filter is already partial</source>
@@ -7609,6 +7834,14 @@
         <translation type="obsolete">
             </translation>
     </message>
+    <message>
+        <source>Load video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>flux</name>
@@ -8449,30 +8682,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;onfigure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>P&amp;artial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8736,6 +8945,49 @@
     </message>
 </context>
 <context>
+    <name>nvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>oggHeader</name>
     <message>
         <source>Take second track ?</source>
@@ -9108,31 +9360,34 @@
             </translation>
     </message>
     <message>
-        <source>90Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>180 degrees</source>
         <translation type="unfinished">
             </translation>
     </message>
     <message>
-        <source>180Â°</source>
-        <translation type="unfinished"></translation>
+        <source>270 degrees</source>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <source>270 degrees</source>
+        <source>_Angle:</source>
         <translation type="unfinished">
             </translation>
     </message>
     <message>
-        <source>270Â°</source>
-        <translation type="unfinished"></translation>
+        <source>90°</source>
+        <translation type="unfinished">
+             {90°?}</translation>
     </message>
     <message>
-        <source>_Angle:</source>
+        <source>180°</source>
         <translation type="unfinished">
-            </translation>
+             {180°?}</translation>
+    </message>
+    <message>
+        <source>270°</source>
+        <translation type="unfinished">
+             {270°?}</translation>
     </message>
 </context>
 <context>
@@ -9170,11 +9425,11 @@
 <context>
     <name>rotateGl</name>
     <message>
-        <source>Angle (Â°):</source>
+        <source>glRotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>glRotate</source>
+        <source>Angle (°):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9535,6 +9790,17 @@
     </message>
 </context>
 <context>
+    <name>vsWindow</name>
+    <message>
+        <source>Open VapourSynth File 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VS File Files (*.vpy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <source>Processing</source>
@@ -9784,6 +10050,49 @@
     </message>
 </context>
 <context>
+    <name>x265Dialog</name>
+    <message>
+        <source>Target Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kbit/s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quantiser:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Target Video Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>xvid4</name>
     <message>
         <source>None</source>
@@ -9910,6 +10219,47 @@
         <source>Xvid4 MPEG-4 ASP configuration</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>1:1 (PC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio:</source>
+        <translation type="unfinished">
+            </translation>
+    </message>
+    <message>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>yadifFilter</name>

avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/avidemux_ru.ts -> avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/avidemux_ru.ts Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ru_RU">
+<TS version="2.1" language="ru_RU">
 <context>
     <name></name>
     <message>
@@ -2387,6 +2387,21 @@
     </message>
 </context>
 <context>
+    <name>ADM_Qt4CoreUIToolkit::DIA_processingQt4</name>
+    <message>
+        <source>_Resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The processing is paused.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_Qt4Factory::ADM_Qbitrate</name>
     <message>
         <source>Constant Bitrate</source>
@@ -2442,6 +2457,13 @@
     </message>
 </context>
 <context>
+    <name>ADM_ffDvEncoder</name>
+    <message>
+        <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_ogmWrite</name>
     <message>
         <source>None</source>
@@ -2680,11 +2702,6 @@
         <translation type="unfinished">Калькулятор</translation>
     </message>
     <message>
-        <source>00:00:00</source>
-        <translation type="unfinished">
-             {00:00:00?}</translation>
-    </message>
-    <message>
         <source>Duration:</source>
         <translation type="unfinished">Длительность:</translation>
     </message>
@@ -2859,7 +2876,7 @@
     <name>DIA_encodingQt4</name>
     <message>
         <source>Shutting down</source>
-        <translation type="unfinished">Завершение работы</translation>
+        <translation type="obsolete">Завершение работы</translation>
     </message>
     <message>
         <source>Resume</source>
@@ -2873,6 +2890,14 @@
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Privileges Required</source>
+        <translation type="unfinished">Требуются права</translation>
+    </message>
+    <message>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation type="unfinished">Для выполнения этой операции требуются права root.</translation>
+    </message>
 </context>
 <context>
     <name>DVEncoder</name>
@@ -2882,6 +2907,13 @@
     </message>
 </context>
 <context>
+    <name>DcaEnc</name>
+    <message>
+        <source>DcaEnc Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Decimate</name>
     <message>
         <source>Replace (interpolate)</source>
@@ -2962,7 +2994,7 @@
     </message>
     <message>
         <source>Audio Filters</source>
-        <translation type="unfinished">Звуковые фильтры</translation>
+        <translation type="obsolete">Звуковые фильтры</translation>
     </message>
     <message>
         <source>Audio Tracks Configuration</source>
@@ -2988,6 +3020,10 @@
         <source>Track 4</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Filters</source>
+        <translation type="unfinished">Фильтры</translation>
+    </message>
 </context>
 <context>
     <name>DialogOcr</name>
@@ -3005,8 +3041,7 @@
     </message>
     <message>
         <source>00:00:00/000</source>
-        <translation type="unfinished">
-             {00:00:00/000?}</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timecode:</source>
@@ -3014,8 +3049,7 @@
     </message>
     <message>
         <source>0/0</source>
-        <translation type="unfinished">
-             {0/0?}</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calibrate</source>
@@ -3039,11 +3073,41 @@
     </message>
 </context>
 <context>
+    <name>DialogProcessing</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished">Диалог</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TimeLeft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ProcessImages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DialogProgress</name>
     <message>
         <source>1/1</source>
-        <translation type="unfinished">
-             {1/1?}</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
@@ -3207,11 +3271,6 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <source>Avidemux</source>
-        <translation type="unfinished">
-            </translation>
-    </message>
-    <message>
         <source>&lt;b&gt;Video&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Видео&lt;/b&gt;</translation>
     </message>
@@ -3253,11 +3312,6 @@
         <translation type="unfinished">Время:</translation>
     </message>
     <message>
-        <source>00:00:00.000</source>
-        <translation type="unfinished">
-             {00:00:00.000?}</translation>
-    </message>
-    <message>
         <source>Frame Type:</source>
         <translation type="obsolete">Тип кадра:</translation>
     </message>
@@ -3266,11 +3320,6 @@
         <translation type="unfinished">Выделено</translation>
     </message>
     <message>
-        <source>000000</source>
-        <translation type="unfinished">
-             {000000?}</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation type="unfinished">&amp;Помощь</translation>
     </message>
@@ -3731,10 +3780,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;b&gt;Selection&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>A:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3798,6 +3843,18 @@
         <source>Ctrl+Alt+M</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display processed video on playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play filtered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Video</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Mpeg1Encoder</name>
@@ -4116,6 +4173,13 @@
     </message>
 </context>
 <context>
+    <name>Webmmuxer</name>
+    <message>
+        <source>Saving Webm</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XvidConfigDialog</name>
     <message>
         <source>Rate Control</source>
@@ -4180,10 +4244,6 @@
         <source>Avidemux </source>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <source>© 2001 - 2012  Mean</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>http://www.avidemux.org</source>
         <translation type="unfinished"></translation>
@@ -4196,6 +4256,10 @@
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>© 2001 - 2016  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>addBorders</name>
@@ -4406,8 +4470,12 @@
         <translation type="unfinished">Вертикальный деблокинг</translation>
     </message>
     <message>
-        <source>_Strength:</source>
-        <translation type="unfinished">Уровень:</translation>
+        <source>_Limit Refresh Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh Rate Cap (ms)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Postprocessing</source>
@@ -4427,13 +4495,21 @@
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished">Видео</translation>
+        <translation type="obsolete">Видео</translation>
     </message>
     <message>
         <source>Threading</source>
         <translation type="unfinished">Многопоточность</translation>
     </message>
     <message>
+        <source>_Always ask which port to use</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default port to use</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Preferences</source>
         <translation type="unfinished">Свойства</translation>
     </message>
@@ -4662,11 +4738,6 @@
         <translation type="unfinished">5 каналов  </translation>
     </message>
     <message>
-        <source>5.1</source>
-        <translation type="unfinished">
-             {5.1?}</translation>
-    </message>
-    <message>
         <source>Dolby Pro Logic</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4831,10 +4902,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Decode video using VDPAU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4855,14 +4922,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MS Windows GDI (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MS Windows DirectX (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>PCM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4935,11 +4994,11 @@
     </message>
     <message>
         <source>Select AVI File...</source>
-        <translation type="unfinished">Выберите файл</translation>
+        <translation type="obsolete">Выберите файл</translation>
     </message>
     <message>
         <source>Select AVI File to Append...</source>
-        <translation type="unfinished">Выберите файл для присоединения</translation>
+        <translation type="obsolete">Выберите файл для присоединения</translation>
     </message>
     <message>
         <source>Are you sure?</source>
@@ -5247,23 +5306,7 @@
     </message>
     <message>
         <source>The filter is already partial</source>
-        <translation type="unfinished">Фильтр уже частично применён</translation>
-    </message>
-    <message>
-        <source>Partial Start Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial End Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure child</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial Video Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Фильтр уже частично применён</translation>
     </message>
     <message>
         <source>_Interlaced</source>
@@ -5501,6 +5544,76 @@
         <source>This script has already been successfully executed.</source>
         <translation type="unfinished">Этот скрипт уже был выполнен</translation>
     </message>
+    <message>
+        <source>Gain</source>
+        <translation type="unfinished">Уровень нормализации</translation>
+    </message>
+    <message>
+        <source>Mixer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using VDPAU (NVIDIA)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using XVBA (AMD)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you use Hw decoding, it is better to use the matching display driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LIBVA (best)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sdl driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HW Accel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You cannot remove *all* the video
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File to Append...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid audio index given</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>aften</name>
@@ -5542,14 +5655,6 @@
 <context>
     <name>ass</name>
     <message>
-        <source>SSA.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardcode ass/ssa subtitles using libass.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Subtitle file (ASS/SSA):</source>
         <translation type="unfinished">Файл субтитров (ASS/SSA):</translation>
     </message>
@@ -5578,6 +5683,14 @@
         <translation type="unfinished">
             </translation>
     </message>
+    <message>
+        <source>SSA/ASS/SRT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>autoWizard</name>
@@ -5622,6 +5735,21 @@
     </message>
 </context>
 <context>
+    <name>black</name>
+    <message>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace a section by black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace by Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>blacken</name>
     <message>
         <source>_Left border:</source>
@@ -5988,6 +6116,13 @@
     </message>
 </context>
 <context>
+    <name>dcaenc</name>
+    <message>
+        <source>_Bitrate:</source>
+        <translation type="unfinished">Битрейт:</translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <source>Decomb decimate</source>
@@ -6007,10 +6142,6 @@
             </translation>
     </message>
     <message>
-        <source>Discard longer dupe (animÃ©s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Pulldown dupe removal</source>
         <translation type="unfinished">
             </translation>
@@ -6054,11 +6185,15 @@
         <translation type="unfinished">
             </translation>
     </message>
+    <message>
+        <source>Discard longer dupe (animés)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>delogo</name>
+    <name>delogo2</name>
     <message>
-        <source>MPlayer delogo</source>
+        <source>MPlayer delogo2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6160,11 +6295,6 @@
             </translation>
     </message>
     <message>
-        <source>00:00:00</source>
-        <translation type="unfinished">
-             {00:00:00?}</translation>
-    </message>
-    <message>
         <source>Time Remaining:</source>
         <translation type="obsolete">Осталось времени:</translation>
     </message>
@@ -6293,6 +6423,14 @@
 &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 type="unfinished"></translation>
     </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished">Дополнительно</translation>
+    </message>
 </context>
 <context>
     <name>encodingWindow</name>
@@ -6310,11 +6448,11 @@
     </message>
     <message>
         <source>Privileges Required</source>
-        <translation type="unfinished">Требуются права</translation>
+        <translation type="obsolete">Требуются права</translation>
     </message>
     <message>
         <source>Root privileges are required to perform this operation.</source>
-        <translation type="unfinished">Для выполнения этой операции требуются права root.</translation>
+        <translation type="obsolete">Для выполнения этой операции требуются права root.</translation>
     </message>
     <message>
         <source>Shutting down</source>
@@ -6359,7 +6497,7 @@
     </message>
     <message>
         <source>Fade in/out.</source>
-        <translation type="unfinished">Плавное затемнение или появление картинки.</translation>
+        <translation type="obsolete">Плавное затемнение или появление картинки.</translation>
     </message>
     <message>
         <source>Out</source>
@@ -6393,6 +6531,21 @@
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Fade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fade to black in/out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fade to</name>
+    <message>
+        <source>Fade</source>
+        <translation type="unfinished">Затемнение   </translation>
+    </message>
 </context>
 <context>
     <name>ffmpeg2</name>
@@ -6804,6 +6957,49 @@
     </message>
 </context>
 <context>
+    <name>ffnvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>filtermainWindow</name>
     <message>
         <source>Load set of filters</source>
@@ -6821,6 +7017,14 @@
         <source>The filter is already partial</source>
         <translation type="obsolete">Фильтр уже частично применён</translation>
     </message>
+    <message>
+        <source>Load video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>flux</name>
@@ -7549,11 +7753,11 @@
     </message>
     <message>
         <source>Down</source>
-        <translation type="unfinished">Вниз</translation>
+        <translation type="obsolete">Вниз</translation>
     </message>
     <message>
         <source>Up</source>
-        <translation type="unfinished">Вверх</translation>
+        <translation type="obsolete">Вверх</translation>
     </message>
     <message>
         <source>Transform</source>
@@ -7596,22 +7800,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;onfigure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>P&amp;artial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7880,6 +8068,49 @@
     </message>
 </context>
 <context>
+    <name>nvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>oggHeader</name>
     <message>
         <source>Take second track ?</source>
@@ -8157,31 +8388,6 @@
         <translation type="obsolete">Изменить размер</translation>
     </message>
     <message>
-        <source>1:1</source>
-        <translation type="obsolete">
-             {1:1?}</translation>
-    </message>
-    <message>
-        <source>4:3</source>
-        <translation type="obsolete">
-             {4:3?}</translation>
-    </message>
-    <message>
-        <source>16:9</source>
-        <translation type="obsolete">
-             {16:9?}</translation>
-    </message>
-    <message>
-        <source>1%</source>
-        <translation type="obsolete">
-             {1%?}</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">
-             {200%?}</translation>
-    </message>
-    <message>
         <source>Bicubic</source>
         <translation type="obsolete">Бикубическая</translation>
     </message>
@@ -8212,26 +8418,14 @@
         <translation type="unfinished">90 градусов</translation>
     </message>
     <message>
-        <source>90Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>180 degrees</source>
         <translation type="unfinished">180 градусов</translation>
     </message>
     <message>
-        <source>180Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>270 degrees</source>
         <translation type="unfinished">270 градусов</translation>
     </message>
     <message>
-        <source>270Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Angle:</source>
         <translation type="unfinished">Угол:</translation>
     </message>
@@ -8266,11 +8460,11 @@
 <context>
     <name>rotateGl</name>
     <message>
-        <source>Angle (Â°):</source>
+        <source>glRotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>glRotate</source>
+        <source>Angle (°):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8281,11 +8475,6 @@
         <translation type="unfinished">Предпросмотр</translation>
     </message>
     <message>
-        <source>00:00:00.000</source>
-        <translation type="unfinished">
-             {00:00:00.000?}</translation>
-    </message>
-    <message>
         <source>next</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8603,6 +8792,17 @@
     </message>
 </context>
 <context>
+    <name>vsWindow</name>
+    <message>
+        <source>Open VapourSynth File 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VS File Files (*.vpy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <source>Processing</source>
@@ -8613,11 +8813,6 @@
         <translation type="unfinished">Осталось времени:</translation>
     </message>
     <message>
-        <source>00:00:00</source>
-        <translation type="unfinished">
-             {00:00:00?}</translation>
-    </message>
-    <message>
         <source>Elapsed:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8677,115 +8872,67 @@
         <translation type="obsolete">Вывод</translation>
     </message>
     <message>
-        <source>1</source>
-        <translation type="obsolete">
-             {1?}</translation>
-    </message>
-    <message>
-        <source>1.1</source>
-        <translation type="obsolete">
-             {1.1?}</translation>
-    </message>
-    <message>
-        <source>1.2</source>
-        <translation type="obsolete">
-             {1.2?}</translation>
-    </message>
-    <message>
-        <source>1.3</source>
-        <translation type="obsolete">
-             {1.3?}</translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="obsolete">
-             {2?}</translation>
-    </message>
-    <message>
-        <source>2.1</source>
-        <translation type="obsolete">
-             {2.1?}</translation>
-    </message>
-    <message>
-        <source>2.2</source>
-        <translation type="obsolete">
-             {2.2?}</translation>
-    </message>
-    <message>
-        <source>3</source>
-        <translation type="obsolete">
-             {3?}</translation>
-    </message>
-    <message>
-        <source>3.1</source>
-        <translation type="obsolete">
-             {3.1?}</translation>
-    </message>
-    <message>
-        <source>3.2</source>
-        <translation type="obsolete">
-             {3.2?}</translation>
+        <source>0</source>
+        <translation type="obsolete"></translation>
     </message>
     <message>
-        <source>4</source>
-        <translation type="obsolete">
-             {4?}</translation>
+        <source>Normal</source>
+        <translation type="obsolete">Нормальный</translation>
     </message>
     <message>
-        <source>4.1</source>
-        <translation type="obsolete">
-             {4.1?}</translation>
+        <source>Pixel Aspect Ratio</source>
+        <translation type="obsolete">Cоотношение сторон:</translation>
     </message>
     <message>
-        <source>4.2</source>
-        <translation type="obsolete">
-             {4.2?}</translation>
+        <source>Crop</source>
+        <translation type="obsolete">Обрезка   </translation>
     </message>
+</context>
+<context>
+    <name>x264Dialog</name>
     <message>
-        <source>5</source>
-        <translation type="obsolete">
-             {5?}</translation>
+        <source>Target Bitrate:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>5.1</source>
-        <translation type="obsolete">
-             {5.1?}</translation>
+        <source>kbit/s</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>0</source>
-        <translation type="obsolete">
-            </translation>
+        <source>Quantiser:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>7</source>
-        <translation type="obsolete">
-             {7?}</translation>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>15</source>
-        <translation type="obsolete">
-             {15?}</translation>
+        <source>Target Video Size:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>31</source>
-        <translation type="obsolete">
-             {31?}</translation>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation type="obsolete">Нормальный</translation>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pixel Aspect Ratio</source>
-        <translation type="obsolete">Cоотношение сторон:</translation>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <source>Crop</source>
-        <translation type="obsolete">Обрезка   </translation>
+        <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 type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>x264Dialog</name>
+    <name>x265Dialog</name>
     <message>
         <source>Target Bitrate:</source>
         <translation type="unfinished"></translation>
@@ -8945,6 +9092,46 @@
         <source>Xvid4 MPEG-4 ASP configuration</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>1:1 (PC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio:</source>
+        <translation type="unfinished">Соотношение сторон:</translation>
+    </message>
+    <message>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>yadifFilter</name>

avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/avidemux_sr.ts -> avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/avidemux_sr.ts Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1">
 <context>
     <name></name>
     <message>
@@ -2402,6 +2402,21 @@
     </message>
 </context>
 <context>
+    <name>ADM_Qt4CoreUIToolkit::DIA_processingQt4</name>
+    <message>
+        <source>_Resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The processing is paused.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_Qt4Factory::ADM_Qbitrate</name>
     <message>
         <source>Bitrate</source>
@@ -2457,6 +2472,13 @@
     </message>
 </context>
 <context>
+    <name>ADM_ffDvEncoder</name>
+    <message>
+        <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_ogmWrite</name>
     <message>
         <source>None</source>
@@ -2835,7 +2857,7 @@
     <name>DIA_encodingQt4</name>
     <message>
         <source>Shutting down</source>
-        <translation type="unfinished">Гасим рачунар</translation>
+        <translation type="obsolete">Гасим рачунар</translation>
     </message>
     <message>
         <source>Resume</source>
@@ -2849,6 +2871,14 @@
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Privileges Required</source>
+        <translation type="unfinished">Потребна овлашћења</translation>
+    </message>
+    <message>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation type="unfinished">Администраторска овлашћења су потребна за извршавање ове операције.</translation>
+    </message>
 </context>
 <context>
     <name>DVEncoder</name>
@@ -2858,6 +2888,13 @@
     </message>
 </context>
 <context>
+    <name>DcaEnc</name>
+    <message>
+        <source>DcaEnc Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Decimate</name>
     <message>
         <source>Discard closer</source>
@@ -2927,7 +2964,7 @@
     </message>
     <message>
         <source>Audio Filters</source>
-        <translation type="unfinished">Звучни филтери</translation>
+        <translation type="obsolete">Звучни филтери</translation>
     </message>
     <message>
         <source>Audio Tracks Configuration</source>
@@ -2953,6 +2990,10 @@
         <source>Track 4</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Filters</source>
+        <translation type="unfinished">Филтери</translation>
+    </message>
 </context>
 <context>
     <name>DialogOcr</name>
@@ -3002,6 +3043,41 @@
     </message>
 </context>
 <context>
+    <name>DialogProcessing</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TimeLeft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>00:00:00</source>
+        <translation type="unfinished">00:00:00</translation>
+    </message>
+    <message>
+        <source>ProcessImages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished">0</translation>
+    </message>
+    <message>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DialogProgress</name>
     <message>
         <source>1/1</source>
@@ -3392,10 +3468,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;b&gt;Selection&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3507,6 +3579,18 @@
         <source>Si&amp;de</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display processed video on playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play filtered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Video</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Mpeg1Encoder</name>
@@ -3905,6 +3989,13 @@
     </message>
 </context>
 <context>
+    <name>Webmmuxer</name>
+    <message>
+        <source>Saving Webm</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XvidConfigDialog</name>
     <message>
         <source>Rate Control</source>
@@ -3965,10 +4056,6 @@
         <source>Multi-platform Video Editor</source>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <source>© 2001 - 2012  Mean</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>&amp;License</source>
         <translation type="unfinished"></translation>
@@ -3977,6 +4064,10 @@
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>© 2001 - 2016  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>addBorders</name>
@@ -4224,7 +4315,7 @@
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished">Видео</translation>
+        <translation type="obsolete">Видео</translation>
     </message>
     <message>
         <source>CPU</source>
@@ -4627,10 +4718,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Decode video using VDPAU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4647,14 +4734,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MS Windows GDI (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MS Windows DirectX (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_AudioDevice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4711,11 +4790,11 @@
     </message>
     <message>
         <source>Select AVI File...</source>
-        <translation type="unfinished">Изабери AVI датотеку...</translation>
+        <translation type="obsolete">Изабери AVI датотеку...</translation>
     </message>
     <message>
         <source>Select AVI File to Append...</source>
-        <translation type="unfinished">Изабери датотеку да додам...</translation>
+        <translation type="obsolete">Изабери датотеку да додам...</translation>
     </message>
     <message>
         <source>Are you sure?</source>
@@ -5059,23 +5138,7 @@
     </message>
     <message>
         <source>The filter is already partial</source>
-        <translation type="unfinished">Филтер је већ половичан</translation>
-    </message>
-    <message>
-        <source>Partial Start Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial End Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure child</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial Video Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Филтер је већ половичан</translation>
     </message>
     <message>
         <source>_Interlaced</source>
@@ -5313,6 +5376,76 @@
         <source>This script has already been successfully executed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Gain</source>
+        <translation type="unfinished">Појачај</translation>
+    </message>
+    <message>
+        <source>Mixer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using VDPAU (NVIDIA)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using XVBA (AMD)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you use Hw decoding, it is better to use the matching display driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LIBVA (best)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sdl driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HW Accel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You cannot remove *all* the video
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File to Append...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid audio index given</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>aften</name>
@@ -5339,14 +5472,6 @@
 <context>
     <name>ass</name>
     <message>
-        <source>SSA.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardcode ass/ssa subtitles using libass.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Subtitle file (ASS/SSA):</source>
         <translation type="unfinished">Датотека са _титлом (ASS/SSA):</translation>
     </message>
@@ -5374,6 +5499,14 @@
         <source>ASS</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>SSA/ASS/SRT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>autoWizard</name>
@@ -5418,6 +5551,21 @@
     </message>
 </context>
 <context>
+    <name>black</name>
+    <message>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace a section by black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace by Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>blacken</name>
     <message>
         <source>_Left border:</source>
@@ -5749,6 +5897,13 @@
     </message>
 </context>
 <context>
+    <name>dcaenc</name>
+    <message>
+        <source>_Bitrate:</source>
+        <translation type="unfinished">_Битски проток:</translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <source>Decomb decimate</source>
@@ -5767,10 +5922,6 @@
         <translation type="unfinished">Замени (уметни)</translation>
     </message>
     <message>
-        <source>Discard longer dupe (animÃ©s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Pulldown dupe removal</source>
         <translation type="unfinished">Уклањање пулдаун превара</translation>
     </message>
@@ -5810,11 +5961,15 @@
         <source>Decomb Decimate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Discard longer dupe (animés)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>delogo</name>
+    <name>delogo2</name>
     <message>
-        <source>MPlayer delogo</source>
+        <source>MPlayer delogo2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6039,6 +6194,14 @@
 &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 type="unfinished"></translation>
     </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished">Напредније</translation>
+    </message>
 </context>
 <context>
     <name>encodingWindow</name>
@@ -6056,11 +6219,11 @@
     </message>
     <message>
         <source>Privileges Required</source>
-        <translation type="unfinished">Потребна овлашћења</translation>
+        <translation type="obsolete">Потребна овлашћења</translation>
     </message>
     <message>
         <source>Root privileges are required to perform this operation.</source>
-        <translation type="unfinished">Администраторска овлашћења су потребна за извршавање ове операције.</translation>
+        <translation type="obsolete">Администраторска овлашћења су потребна за извршавање ове операције.</translation>
     </message>
     <message>
         <source>Shutting down</source>
@@ -6104,10 +6267,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fade in/out.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Out</source>
         <translation type="unfinished">Излаз</translation>
     </message>
@@ -6139,6 +6298,21 @@
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Fade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fade to black in/out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fade to</name>
+    <message>
+        <source>Fade</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ffmpeg2</name>
@@ -6550,6 +6724,49 @@
     </message>
 </context>
 <context>
+    <name>ffnvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>filtermainWindow</name>
     <message>
         <source>The filter is already partial</source>
@@ -6567,6 +6784,14 @@
         <source>Save set of filters</source>
         <translation type="obsolete">Сачувај сет филтера</translation>
     </message>
+    <message>
+        <source>Load video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>flux</name>
@@ -7318,30 +7543,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;onfigure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>P&amp;artial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7582,6 +7783,49 @@
     </message>
 </context>
 <context>
+    <name>nvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>oggHeader</name>
     <message>
         <source>Take second track ?</source>
@@ -7913,29 +8157,29 @@
         <translation type="unfinished">90 степени</translation>
     </message>
     <message>
-        <source>90Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>180 degrees</source>
         <translation type="unfinished">180 степени</translation>
     </message>
     <message>
-        <source>180Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>270 degrees</source>
         <translation type="unfinished">270 степени</translation>
     </message>
     <message>
-        <source>270Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Angle:</source>
         <translation type="unfinished">_Угао:</translation>
     </message>
+    <message>
+        <source>90°</source>
+        <translation type="unfinished">90°</translation>
+    </message>
+    <message>
+        <source>180°</source>
+        <translation type="unfinished">180°</translation>
+    </message>
+    <message>
+        <source>270°</source>
+        <translation type="unfinished">270°</translation>
+    </message>
 </context>
 <context>
     <name>rotateFilter</name>
@@ -7967,11 +8211,11 @@
 <context>
     <name>rotateGl</name>
     <message>
-        <source>Angle (Â°):</source>
+        <source>glRotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>glRotate</source>
+        <source>Angle (°):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8302,6 +8546,17 @@
     </message>
 </context>
 <context>
+    <name>vsWindow</name>
+    <message>
+        <source>Open VapourSynth File 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VS File Files (*.vpy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <source>Processing</source>
@@ -8515,6 +8770,49 @@
     </message>
 </context>
 <context>
+    <name>x265Dialog</name>
+    <message>
+        <source>Target Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kbit/s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quantiser:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Target Video Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>xvid4</name>
     <message>
         <source>None</source>
@@ -8632,6 +8930,46 @@
         <source>Xvid4 MPEG-4 ASP configuration</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>1:1 (PC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio:</source>
+        <translation type="unfinished">Размера:</translation>
+    </message>
+    <message>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>yadifFilter</name>

avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/avidemux_sr@latin.ts -> avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/avidemux_sr@latin.ts Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1">
 <context>
     <name></name>
     <message>
@@ -2402,6 +2402,21 @@
     </message>
 </context>
 <context>
+    <name>ADM_Qt4CoreUIToolkit::DIA_processingQt4</name>
+    <message>
+        <source>_Resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The processing is paused.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_Qt4Factory::ADM_Qbitrate</name>
     <message>
         <source>Bitrate</source>
@@ -2457,6 +2472,13 @@
     </message>
 </context>
 <context>
+    <name>ADM_ffDvEncoder</name>
+    <message>
+        <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_ogmWrite</name>
     <message>
         <source>None</source>
@@ -2835,7 +2857,7 @@
     <name>DIA_encodingQt4</name>
     <message>
         <source>Shutting down</source>
-        <translation type="unfinished">Gasim računar</translation>
+        <translation type="obsolete">Gasim računar</translation>
     </message>
     <message>
         <source>Resume</source>
@@ -2849,6 +2871,14 @@
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Privileges Required</source>
+        <translation type="unfinished">Potrebna ovlašćenja</translation>
+    </message>
+    <message>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation type="unfinished">Administratorska ovlašćenja su potrebna za izvršavanje ove operacije.</translation>
+    </message>
 </context>
 <context>
     <name>DVEncoder</name>
@@ -2858,6 +2888,13 @@
     </message>
 </context>
 <context>
+    <name>DcaEnc</name>
+    <message>
+        <source>DcaEnc Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Decimate</name>
     <message>
         <source>Discard closer</source>
@@ -2927,7 +2964,7 @@
     </message>
     <message>
         <source>Audio Filters</source>
-        <translation type="unfinished">Zvučni filteri</translation>
+        <translation type="obsolete">Zvučni filteri</translation>
     </message>
     <message>
         <source>Audio Tracks Configuration</source>
@@ -2953,6 +2990,10 @@
         <source>Track 4</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Filters</source>
+        <translation type="unfinished">Filteri</translation>
+    </message>
 </context>
 <context>
     <name>DialogOcr</name>
@@ -3002,6 +3043,41 @@
     </message>
 </context>
 <context>
+    <name>DialogProcessing</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TimeLeft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>00:00:00</source>
+        <translation type="unfinished">00:00:00</translation>
+    </message>
+    <message>
+        <source>ProcessImages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished">0</translation>
+    </message>
+    <message>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DialogProgress</name>
     <message>
         <source>1/1</source>
@@ -3392,10 +3468,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;b&gt;Selection&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3507,6 +3579,18 @@
         <source>Si&amp;de</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display processed video on playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play filtered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Video</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Mpeg1Encoder</name>
@@ -3905,6 +3989,13 @@
     </message>
 </context>
 <context>
+    <name>Webmmuxer</name>
+    <message>
+        <source>Saving Webm</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XvidConfigDialog</name>
     <message>
         <source>Rate Control</source>
@@ -3965,10 +4056,6 @@
         <source>Multi-platform Video Editor</source>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <source>© 2001 - 2012  Mean</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>&amp;License</source>
         <translation type="unfinished"></translation>
@@ -3977,6 +4064,10 @@
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>© 2001 - 2016  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>addBorders</name>
@@ -4224,7 +4315,7 @@
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished">Video</translation>
+        <translation type="obsolete">Video</translation>
     </message>
     <message>
         <source>CPU</source>
@@ -4627,10 +4718,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Decode video using VDPAU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4647,14 +4734,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MS Windows GDI (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MS Windows DirectX (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_AudioDevice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4711,11 +4790,11 @@
     </message>
     <message>
         <source>Select AVI File...</source>
-        <translation type="unfinished">Izaberi AVI datoteku...</translation>
+        <translation type="obsolete">Izaberi AVI datoteku...</translation>
     </message>
     <message>
         <source>Select AVI File to Append...</source>
-        <translation type="unfinished">Izaberi datoteku da dodam...</translation>
+        <translation type="obsolete">Izaberi datoteku da dodam...</translation>
     </message>
     <message>
         <source>Are you sure?</source>
@@ -5059,23 +5138,7 @@
     </message>
     <message>
         <source>The filter is already partial</source>
-        <translation type="unfinished">Filter je već polovičan</translation>
-    </message>
-    <message>
-        <source>Partial Start Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial End Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure child</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial Video Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Filter je već polovičan</translation>
     </message>
     <message>
         <source>_Interlaced</source>
@@ -5313,6 +5376,76 @@
         <source>This script has already been successfully executed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Gain</source>
+        <translation type="unfinished">Pojačaj</translation>
+    </message>
+    <message>
+        <source>Mixer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using VDPAU (NVIDIA)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using XVBA (AMD)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you use Hw decoding, it is better to use the matching display driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LIBVA (best)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sdl driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HW Accel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You cannot remove *all* the video
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File to Append...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid audio index given</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>aften</name>
@@ -5339,14 +5472,6 @@
 <context>
     <name>ass</name>
     <message>
-        <source>SSA.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardcode ass/ssa subtitles using libass.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Subtitle file (ASS/SSA):</source>
         <translation type="unfinished">Datoteka sa _titlom (ASS/SSA):</translation>
     </message>
@@ -5374,6 +5499,14 @@
         <source>ASS</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>SSA/ASS/SRT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>autoWizard</name>
@@ -5418,6 +5551,21 @@
     </message>
 </context>
 <context>
+    <name>black</name>
+    <message>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace a section by black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace by Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>blacken</name>
     <message>
         <source>_Left border:</source>
@@ -5749,6 +5897,13 @@
     </message>
 </context>
 <context>
+    <name>dcaenc</name>
+    <message>
+        <source>_Bitrate:</source>
+        <translation type="unfinished">_Bitski protok:</translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <source>Decomb decimate</source>
@@ -5767,10 +5922,6 @@
         <translation type="unfinished">Zameni (umetni)</translation>
     </message>
     <message>
-        <source>Discard longer dupe (animÃ©s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Pulldown dupe removal</source>
         <translation type="unfinished">Uklanjanje puldaun prevara</translation>
     </message>
@@ -5810,11 +5961,15 @@
         <source>Decomb Decimate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Discard longer dupe (animés)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>delogo</name>
+    <name>delogo2</name>
     <message>
-        <source>MPlayer delogo</source>
+        <source>MPlayer delogo2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6039,6 +6194,14 @@
 &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 type="unfinished"></translation>
     </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished">Naprednije</translation>
+    </message>
 </context>
 <context>
     <name>encodingWindow</name>
@@ -6056,11 +6219,11 @@
     </message>
     <message>
         <source>Privileges Required</source>
-        <translation type="unfinished">Potrebna ovlašćenja</translation>
+        <translation type="obsolete">Potrebna ovlašćenja</translation>
     </message>
     <message>
         <source>Root privileges are required to perform this operation.</source>
-        <translation type="unfinished">Administratorska ovlašćenja su potrebna za izvršavanje ove operacije.</translation>
+        <translation type="obsolete">Administratorska ovlašćenja su potrebna za izvršavanje ove operacije.</translation>
     </message>
     <message>
         <source>Shutting down</source>
@@ -6104,10 +6267,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fade in/out.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Out</source>
         <translation type="unfinished">Izlaz</translation>
     </message>
@@ -6139,6 +6298,21 @@
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Fade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fade to black in/out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fade to</name>
+    <message>
+        <source>Fade</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ffmpeg2</name>
@@ -6550,6 +6724,49 @@
     </message>
 </context>
 <context>
+    <name>ffnvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>filtermainWindow</name>
     <message>
         <source>The filter is already partial</source>
@@ -6567,6 +6784,14 @@
         <source>Save set of filters</source>
         <translation type="obsolete">Sačuvaj set filtera</translation>
     </message>
+    <message>
+        <source>Load video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>flux</name>
@@ -7318,30 +7543,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;onfigure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>P&amp;artial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7582,6 +7783,49 @@
     </message>
 </context>
 <context>
+    <name>nvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>oggHeader</name>
     <message>
         <source>Take second track ?</source>
@@ -7913,29 +8157,29 @@
         <translation type="unfinished">90 stepeni</translation>
     </message>
     <message>
-        <source>90Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>180 degrees</source>
         <translation type="unfinished">180 stepeni</translation>
     </message>
     <message>
-        <source>180Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>270 degrees</source>
         <translation type="unfinished">270 stepeni</translation>
     </message>
     <message>
-        <source>270Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Angle:</source>
         <translation type="unfinished">_Ugao:</translation>
     </message>
+    <message>
+        <source>90°</source>
+        <translation type="unfinished">90°</translation>
+    </message>
+    <message>
+        <source>180°</source>
+        <translation type="unfinished">180°</translation>
+    </message>
+    <message>
+        <source>270°</source>
+        <translation type="unfinished">270°</translation>
+    </message>
 </context>
 <context>
     <name>rotateFilter</name>
@@ -7967,11 +8211,11 @@
 <context>
     <name>rotateGl</name>
     <message>
-        <source>Angle (Â°):</source>
+        <source>glRotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>glRotate</source>
+        <source>Angle (°):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8302,6 +8546,17 @@
     </message>
 </context>
 <context>
+    <name>vsWindow</name>
+    <message>
+        <source>Open VapourSynth File 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VS File Files (*.vpy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <source>Processing</source>
@@ -8515,6 +8770,49 @@
     </message>
 </context>
 <context>
+    <name>x265Dialog</name>
+    <message>
+        <source>Target Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kbit/s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quantiser:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Target Video Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>xvid4</name>
     <message>
         <source>None</source>
@@ -8632,6 +8930,46 @@
         <source>Xvid4 MPEG-4 ASP configuration</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>1:1 (PC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio:</source>
+        <translation type="unfinished">Razmera:</translation>
+    </message>
+    <message>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>yadifFilter</name>

avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/avidemux_tr.ts -> avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/avidemux_tr.ts Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1">
 <context>
     <name></name>
     <message>
@@ -2669,6 +2669,21 @@
     </message>
 </context>
 <context>
+    <name>ADM_Qt4CoreUIToolkit::DIA_processingQt4</name>
+    <message>
+        <source>_Resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The processing is paused.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_Qt4Factory::ADM_Qbitrate</name>
     <message>
         <source>Bitrate</source>
@@ -2725,6 +2740,13 @@
     </message>
 </context>
 <context>
+    <name>ADM_ffDvEncoder</name>
+    <message>
+        <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_ogmWrite</name>
     <message>
         <source>None</source>
@@ -3107,7 +3129,7 @@
     <name>DIA_encodingQt4</name>
     <message>
         <source>Shutting down</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
             </translation>
     </message>
     <message>
@@ -3122,6 +3144,16 @@
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Privileges Required</source>
+        <translation type="unfinished">
+            </translation>
+    </message>
+    <message>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation type="unfinished">
+            </translation>
+    </message>
 </context>
 <context>
     <name>DVEncoder</name>
@@ -3131,6 +3163,13 @@
     </message>
 </context>
 <context>
+    <name>DcaEnc</name>
+    <message>
+        <source>DcaEnc Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Decimate</name>
     <message>
         <source>Discard closer</source>
@@ -3208,7 +3247,7 @@
     </message>
     <message>
         <source>Audio Filters</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
             </translation>
     </message>
     <message>
@@ -3235,6 +3274,10 @@
         <source>Track 4</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Filters</source>
+        <translation type="unfinished">Süzgeçler</translation>
+    </message>
 </context>
 <context>
     <name>DialogOcr</name>
@@ -3285,6 +3328,41 @@
     </message>
 </context>
 <context>
+    <name>DialogProcessing</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TimeLeft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>00:00:00</source>
+        <translation type="unfinished">00:00:00</translation>
+    </message>
+    <message>
+        <source>ProcessImages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished">0</translation>
+    </message>
+    <message>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DialogProgress</name>
     <message>
         <source>1/1</source>
@@ -3692,10 +3770,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;b&gt;Selection&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3807,6 +3881,18 @@
         <source>Si&amp;de</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display processed video on playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play filtered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Video</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Mpeg1Encoder</name>
@@ -4246,6 +4332,13 @@
     </message>
 </context>
 <context>
+    <name>Webmmuxer</name>
+    <message>
+        <source>Saving Webm</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XvidConfigDialog</name>
     <message>
         <source>Rate Control</source>
@@ -4310,10 +4403,6 @@
         <source>Multi-platform Video Editor</source>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <source>© 2001 - 2012  Mean</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>&amp;License</source>
         <translation type="unfinished"></translation>
@@ -4322,6 +4411,10 @@
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>© 2001 - 2016  Mean</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>addBorders</name>
@@ -4606,7 +4699,7 @@
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished">Video</translation>
+        <translation type="obsolete">Video</translation>
     </message>
     <message>
         <source>CPU</source>
@@ -5035,10 +5128,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Decode video using VDPAU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5055,14 +5144,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MS Windows GDI (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MS Windows DirectX (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_AudioDevice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5119,12 +5200,12 @@
     </message>
     <message>
         <source>Select AVI File...</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
             </translation>
     </message>
     <message>
         <source>Select AVI File to Append...</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
             </translation>
     </message>
     <message>
@@ -5490,23 +5571,7 @@
     </message>
     <message>
         <source>The filter is already partial</source>
-        <translation type="unfinished">Süzgeç zaten kısmî</translation>
-    </message>
-    <message>
-        <source>Partial Start Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial End Frame:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure child</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial Video Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Süzgeç zaten kısmî</translation>
     </message>
     <message>
         <source>_Interlaced</source>
@@ -5744,6 +5809,76 @@
         <source>This script has already been successfully executed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Gain</source>
+        <translation type="unfinished">Kazanım</translation>
+    </message>
+    <message>
+        <source>Mixer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using VDPAU (NVIDIA)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using XVBA (AMD)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you use Hw decoding, it is better to use the matching display driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LIBVA (best)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sdl driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HW Accel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You cannot remove *all* the video
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File to Append...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid audio index given</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>aften</name>
@@ -5771,14 +5906,6 @@
 <context>
     <name>ass</name>
     <message>
-        <source>SSA.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardcode ass/ssa subtitles using libass.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Subtitle file (ASS/SSA):</source>
         <translation type="unfinished">
             </translation>
@@ -5811,6 +5938,14 @@
         <source>ASS</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>SSA/ASS/SRT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>autoWizard</name>
@@ -5856,6 +5991,21 @@
     </message>
 </context>
 <context>
+    <name>black</name>
+    <message>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace a section by black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace by Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>blacken</name>
     <message>
         <source>_Left border:</source>
@@ -6187,6 +6337,14 @@
     </message>
 </context>
 <context>
+    <name>dcaenc</name>
+    <message>
+        <source>_Bitrate:</source>
+        <translation type="unfinished">
+            </translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <source>Decomb decimate</source>
@@ -6206,10 +6364,6 @@
         <translation type="unfinished">Değiştir (aradeğerleme)</translation>
     </message>
     <message>
-        <source>Discard longer dupe (animÃ©s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Pulldown dupe removal</source>
         <translation type="unfinished">
             </translation>
@@ -6254,11 +6408,15 @@
         <source>Decomb Decimate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Discard longer dupe (animés)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>delogo</name>
+    <name>delogo2</name>
     <message>
-        <source>MPlayer delogo</source>
+        <source>MPlayer delogo2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6494,6 +6652,14 @@
 &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 type="unfinished"></translation>
     </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished">Gelişmiş</translation>
+    </message>
 </context>
 <context>
     <name>encodingWindow</name>
@@ -6511,12 +6677,12 @@
     </message>
     <message>
         <source>Privileges Required</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
             </translation>
     </message>
     <message>
         <source>Root privileges are required to perform this operation.</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
             </translation>
     </message>
     <message>
@@ -6562,10 +6728,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fade in/out.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Out</source>
         <translation type="unfinished">Dışarı</translation>
     </message>
@@ -6597,6 +6759,21 @@
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Fade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fade to black in/out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fade to</name>
+    <message>
+        <source>Fade</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ffmpeg2</name>
@@ -7012,6 +7189,49 @@
     </message>
 </context>
 <context>
+    <name>ffnvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>filtermainWindow</name>
     <message>
         <source>The filter is already partial</source>
@@ -7029,6 +7249,14 @@
         <source>Save set of filters</source>
         <translation type="obsolete">Süzgeç kümesini kaydet</translation>
     </message>
+    <message>
+        <source>Load video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>flux</name>
@@ -7797,30 +8025,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;onfigure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>P&amp;artial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8062,6 +8266,49 @@
     </message>
 </context>
 <context>
+    <name>nvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>oggHeader</name>
     <message>
         <source>Take second track ?</source>
@@ -8413,30 +8660,30 @@
         <translation type="unfinished">90 derece</translation>
     </message>
     <message>
-        <source>90Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>180 degrees</source>
         <translation type="unfinished">180 derece</translation>
     </message>
     <message>
-        <source>180Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>270 degrees</source>
         <translation type="unfinished">270 derece</translation>
     </message>
     <message>
-        <source>270Â°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Angle:</source>
         <translation type="unfinished">
             </translation>
     </message>
+    <message>
+        <source>90°</source>
+        <translation type="unfinished">90°</translation>
+    </message>
+    <message>
+        <source>180°</source>
+        <translation type="unfinished">180°</translation>
+    </message>
+    <message>
+        <source>270°</source>
+        <translation type="unfinished">270°</translation>
+    </message>
 </context>
 <context>
     <name>rotateFilter</name>
@@ -8470,11 +8717,11 @@
 <context>
     <name>rotateGl</name>
     <message>
-        <source>Angle (Â°):</source>
+        <source>glRotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>glRotate</source>
+        <source>Angle (°):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8815,6 +9062,17 @@
     </message>
 </context>
 <context>
+    <name>vsWindow</name>
+    <message>
+        <source>Open VapourSynth File 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VS File Files (*.vpy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <source>Processing</source>
@@ -9032,6 +9290,49 @@
     </message>
 </context>
 <context>
+    <name>x265Dialog</name>
+    <message>
+        <source>Target Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kbit/s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quantiser:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Target Video Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>xvid4</name>
     <message>
         <source>None</source>
@@ -9152,6 +9453,47 @@
         <source>Xvid4 MPEG-4 ASP configuration</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>1:1 (PC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio:</source>
+        <translation type="unfinished">
+            </translation>
+    </message>
+    <message>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>yadifFilter</name>

avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/avidemux_zh_TW.ts -> avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/avidemux_zh_TW.ts Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="zh_TW" sourcelanguage="zh_TW">
+<TS version="2.1" language="zh_TW" sourcelanguage="zh_TW">
 <context>
     <name></name>
     <message>
@@ -3674,6 +3674,21 @@
     </message>
 </context>
 <context>
+    <name>ADM_Qt4CoreUIToolkit::DIA_processingQt4</name>
+    <message>
+        <source>_Resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The processing is paused.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_Qt4Factory::ADM_Qbitrate</name>
     <message>
         <source>Constant Bitrate</source>
@@ -3760,6 +3775,13 @@
     </message>
 </context>
 <context>
+    <name>ADM_ffDvEncoder</name>
+    <message>
+        <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ADM_ogmWrite</name>
     <message>
         <source>None</source>
@@ -4371,7 +4393,7 @@
     <name>DIA_encodingQt4</name>
     <message>
         <source>Shutting down</source>
-        <translation type="unfinished">正在關機</translation>
+        <translation type="obsolete">正在關機</translation>
     </message>
     <message>
         <source>The encoding is paused. Do you want to resume or abort?</source>
@@ -4385,6 +4407,14 @@
         <source>Abort</source>
         <translation type="unfinished">中止</translation>
     </message>
+    <message>
+        <source>Privileges Required</source>
+        <translation type="unfinished">需要特殊權限</translation>
+    </message>
+    <message>
+        <source>Root privileges are required to perform this operation.</source>
+        <translation type="unfinished">需要 Root 權限來實行這項操作。</translation>
+    </message>
 </context>
 <context>
     <name>DVEncoder</name>
@@ -4394,6 +4424,13 @@
     </message>
 </context>
 <context>
+    <name>DcaEnc</name>
+    <message>
+        <source>DcaEnc Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Decimate</name>
     <message>
         <source>Discard closer</source>
@@ -4479,7 +4516,7 @@
     </message>
     <message>
         <source>Audio Filters</source>
-        <translation type="unfinished">音訊濾鏡</translation>
+        <translation type="obsolete">音訊濾鏡</translation>
     </message>
     <message>
         <source>Track 2</source>
@@ -4501,6 +4538,10 @@
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Filters</source>
+        <translation type="unfinished">濾鏡</translation>
+    </message>
 </context>
 <context>
     <name>DialogOcr</name>
@@ -4550,6 +4591,41 @@
     </message>
 </context>
 <context>
+    <name>DialogProcessing</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished">對話窗</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TimeLeft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>00:00:00</source>
+        <translation type="unfinished">00:00:00</translation>
+    </message>
+    <message>
+        <source>ProcessImages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished">0</translation>
+    </message>
+    <message>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 fps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DialogProgress</name>
     <message>
         <source>1/1</source>
@@ -5568,10 +5644,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;b&gt;Selection&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5615,6 +5687,18 @@
         <source>Ctrl+Alt+M</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display processed video on playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play filtered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Video</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MjpegEncoder</name>
@@ -6052,6 +6136,13 @@
     </message>
 </context>
 <context>
+    <name>Webmmuxer</name>
+    <message>
+        <source>Saving Webm</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XvidConfigDialog</name>
     <message>
         <source>&lt;default&gt;</source>
@@ -6172,12 +6263,12 @@
         <source>&amp;License</source>
         <translation type="unfinished">授權(&amp;L)</translation>
     </message>
-    <message utf8="true">
-        <source>© 2001 - 2012  Mean</source>
+    <message>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>© 2001 - 2016  Mean</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -6439,7 +6530,7 @@
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished">視訊</translation>
+        <translation type="obsolete">視訊</translation>
     </message>
     <message>
         <source>CPU</source>
@@ -6842,10 +6933,6 @@
         <translation type="unfinished">外掛模組資訊</translation>
     </message>
     <message>
-        <source>Decode video using VDPAU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6862,14 +6949,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MS Windows GDI (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MS Windows DirectX (SDL)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>No audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6922,11 +7001,11 @@
     </message>
     <message>
         <source>Select AVI File...</source>
-        <translation type="unfinished">選擇 AVI 檔案...</translation>
+        <translation type="obsolete">選擇 AVI 檔案...</translation>
     </message>
     <message>
         <source>Select AVI File to Append...</source>
-        <translation type="unfinished">選擇 AVI 檔進行添加...</translation>
+        <translation type="obsolete">選擇 AVI 檔進行添加...</translation>
     </message>
     <message>
         <source>Are you sure?</source>
@@ -7278,23 +7357,23 @@
     </message>
     <message>
         <source>The filter is already partial</source>
-        <translation type="unfinished">此濾鏡已經是區段性</translation>
+        <translation type="obsolete">此濾鏡已經是區段性</translation>
     </message>
     <message>
         <source>Partial Start Frame:</source>
-        <translation type="unfinished">區段起始畫格:</translation>
+        <translation type="obsolete">區段起始畫格:</translation>
     </message>
     <message>
         <source>Partial End Frame:</source>
-        <translation type="unfinished">區段結束畫格:</translation>
+        <translation type="obsolete">區段結束畫格:</translation>
     </message>
     <message>
         <source>Configure child</source>
-        <translation type="unfinished">設定子項目</translation>
+        <translation type="obsolete">設定子項目</translation>
     </message>
     <message>
         <source>Partial Video Filter</source>
-        <translation type="unfinished">區段性視訊濾鏡</translation>
+        <translation type="obsolete">區段性視訊濾鏡</translation>
     </message>
     <message>
         <source>_Interlaced</source>
@@ -7532,6 +7611,76 @@
         <source>This script has already been successfully executed.</source>
         <translation type="unfinished">這個腳本已經成功執行。</translation>
     </message>
+    <message>
+        <source>Gain</source>
+        <translation type="unfinished">增益</translation>
+    </message>
+    <message>
+        <source>Mixer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using VDPAU (NVIDIA)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using XVBA (AMD)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decode video using LIBVA (INTEL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you use Hw decoding, it is better to use the matching display driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LIBVA (best)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sdl driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>_Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HW Accel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You cannot remove *all* the video
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Video File to Append...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid audio index given</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reuse previous first pass data ?
+Warning, the settings must be close.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>aften</name>
@@ -7577,14 +7726,6 @@
 <context>
     <name>ass</name>
     <message>
-        <source>SSA.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardcode ass/ssa subtitles using libass.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>_Subtitle file (ASS/SSA):</source>
         <translation type="unfinished">字幕檔(A_SS/SSA):</translation>
     </message>
@@ -7612,6 +7753,14 @@
         <source>ASS</source>
         <translation type="unfinished">ASS</translation>
     </message>
+    <message>
+        <source>SSA/ASS/SRT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardcode ass/ssa/srt subtitles using libass.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>autoWizard</name>
@@ -7656,6 +7805,21 @@
     </message>
 </context>
 <context>
+    <name>black</name>
+    <message>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace a section by black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace by Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>blacken</name>
     <message>
         <source>_Left border:</source>
@@ -8061,6 +8225,13 @@
     </message>
 </context>
 <context>
+    <name>dcaenc</name>
+    <message>
+        <source>_Bitrate:</source>
+        <translation type="unfinished">位元率(_B):</translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <source>Decomb decimate</source>
@@ -8080,7 +8251,7 @@
     </message>
     <message>
         <source>Discard longer dupe (animÃ©s)</source>
-        <translation type="unfinished">丟棄 longer dupe (animés)</translation>
+        <translation type="obsolete">丟棄 longer dupe (animés)</translation>
     </message>
     <message>
         <source>Pulldown dupe removal</source>
@@ -8122,12 +8293,27 @@
         <source>Decomb Decimate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Discard longer dupe (animés)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>delogo</name>
     <message>
         <source>MPlayer delogo</source>
-        <translation type="unfinished">Mplayer 去圖標</translation>
+        <translation type="obsolete">Mplayer 去圖標</translation>
+    </message>
+    <message>
+        <source>Blend a logo by interpolating its surrounding box.</source>
+        <translation type="obsolete">利用插值它的包圍框來混合一個圖標。</translation>
+    </message>
+</context>
+<context>
+    <name>delogo2</name>
+    <message>
+        <source>MPlayer delogo2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blend a logo by interpolating its surrounding box.</source>
@@ -8399,16 +8585,24 @@
 &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 type="unfinished"></translation>
     </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>encodingWindow</name>
     <message>
         <source>Privileges Required</source>
-        <translation type="unfinished">需要特殊權限</translation>
+        <translation type="obsolete">需要特殊權限</translation>
     </message>
     <message>
         <source>Root privileges are required to perform this operation.</source>
-        <translation type="unfinished">需要 Root 權限來實行這項操作。</translation>
+        <translation type="obsolete">需要 Root 權限來實行這項操作。</translation>
     </message>
     <message>
         <source>Pause / Abort</source>
@@ -8493,7 +8687,7 @@
     </message>
     <message>
         <source>Fade in/out.</source>
-        <translation type="unfinished">淡入/出。</translation>
+        <translation type="obsolete">淡入/出。</translation>
     </message>
     <message>
         <source>Out</source>
@@ -8527,6 +8721,21 @@
         <source>Fade to black</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Fade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fade to black in/out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fade to</name>
+    <message>
+        <source>Fade</source>
+        <translation type="unfinished">淡化</translation>
+    </message>
 </context>
 <context>
     <name>ffmpeg2</name>
@@ -8938,6 +9147,49 @@
     </message>
 </context>
 <context>
+    <name>ffnvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>libavcodec MPEG-4 configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>filtermainWindow</name>
     <message>
         <source>The filter is already partial</source>
@@ -8971,6 +9223,14 @@
         <source>Partial Video Filter</source>
         <translation type="obsolete">區段性視訊濾鏡</translation>
     </message>
+    <message>
+        <source>Load video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save video filters..</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>flux</name>
@@ -9778,11 +10038,11 @@
     </message>
     <message>
         <source>C&amp;onfigure</source>
-        <translation type="unfinished">設定(&amp;O)</translation>
+        <translation type="obsolete">設定(&amp;O)</translation>
     </message>
     <message>
         <source>P&amp;artial</source>
-        <translation type="unfinished">局部性(&amp;A)</translation>
+        <translation type="obsolete">局部性(&amp;A)</translation>
     </message>
     <message>
         <source>Open Script</source>
@@ -9806,7 +10066,7 @@
     </message>
     <message>
         <source>Down</source>
-        <translation type="unfinished">↓</translation>
+        <translation type="obsolete">↓</translation>
     </message>
     <message>
         <source>Move Filter Up</source>
@@ -9814,7 +10074,7 @@
     </message>
     <message>
         <source>Up</source>
-        <translation type="unfinished">↑</translation>
+        <translation type="obsolete">↑</translation>
     </message>
     <message>
         <source>Remove Filter</source>
@@ -9822,7 +10082,7 @@
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished">移除</translation>
+        <translation type="obsolete">移除</translation>
     </message>
     <message>
         <source>Add Filter</source>
@@ -9830,7 +10090,7 @@
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished">加入</translation>
+        <translation type="obsolete">加入</translation>
     </message>
     <message>
         <source>&lt;big&gt;&lt;b&gt;Available Filters&lt;/b&gt;&lt;/big&gt;</source>
@@ -10113,6 +10373,49 @@
     </message>
 </context>
 <context>
+    <name>nvenc</name>
+    <message>
+        <source>Low Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BluRay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (LQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Latency (HQ)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preset:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Max Bitrate (kbps):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nvidia H264 Encoder configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>oggHeader</name>
     <message>
         <source>Take second track ?</source>
@@ -10508,7 +10811,7 @@
     </message>
     <message>
         <source>90Â°</source>
-        <translation type="unfinished">90Â°</translation>
+        <translation type="obsolete">90Â°</translation>
     </message>
     <message>
         <source>180 degrees</source>
@@ -10516,7 +10819,7 @@
     </message>
     <message>
         <source>180Â°</source>
-        <translation type="unfinished">180Â°</translation>
+        <translation type="obsolete">180Â°</translation>
     </message>
     <message>
         <source>270 degrees</source>
@@ -10524,12 +10827,24 @@
     </message>
     <message>
         <source>270Â°</source>
-        <translation type="unfinished">270Â°</translation>
+        <translation type="obsolete">270Â°</translation>
     </message>
     <message>
         <source>_Angle:</source>
         <translation type="unfinished">角度(_A):</translation>
     </message>
+    <message>
+        <source>90°</source>
+        <translation type="unfinished">90°</translation>
+    </message>
+    <message>
+        <source>180°</source>
+        <translation type="unfinished">180°</translation>
+    </message>
+    <message>
+        <source>270°</source>
+        <translation type="unfinished">270°</translation>
+    </message>
 </context>
 <context>
     <name>rotateFilter</name>
@@ -10573,11 +10888,11 @@
 <context>
     <name>rotateGl</name>
     <message>
-        <source>Angle (Â°):</source>
+        <source>glRotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>glRotate</source>
+        <source>Angle (°):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10947,6 +11262,17 @@
     </message>
 </context>
 <context>
+    <name>vsWindow</name>
+    <message>
+        <source>Open VapourSynth File 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VS File Files (*.vpy)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <source>Processing</source>
@@ -11243,6 +11569,49 @@
     </message>
 </context>
 <context>
+    <name>x265Dialog</name>
+    <message>
+        <source>Target Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kbit/s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quantiser:</source>
+        <translation type="unfinished">量化值:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Target Video Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished">MB</translation>
+    </message>
+    <message>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished">平均位元率:</translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>xvid4</name>
     <message>
         <source>None</source>
@@ -11360,6 +11729,46 @@
         <source>Xvid4 MPEG-4 ASP configuration</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>1:1 (PC)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4:3 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (PAL))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16:9 (NTSC))</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mi_n. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ma_x. quantizer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio:</source>
+        <translation type="unfinished">外觀比例:</translation>
+    </message>
+    <message>
+        <source>Use XVID fcc (else DIVX)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aspect Ratio</source>
+        <translation type="unfinished">外觀比例</translation>
+    </message>
 </context>
 <context>
     <name>yadifFilter</name>

avidemux_2.6.12.tar.gz/avidemux/qt4/i18n/qt_update_pro.sh -> avidemux_2.6.13.tar.gz/avidemux/qt4/i18n/qt_update_pro.sh Changed

@@ -1,6 +1,8 @@
 #!/bin/bash
 # Manually generate project file so GTK sources can be excluded.
 # Otherwise use: qmake -project -o avidemux.pro2
+export QT_SELECT=5
+
 function findHeader()
 {
 find "$1" -name "*.h*"  -printf "\"%p\" \\\ \n"   >> avidemux.pro2
@@ -17,33 +19,38 @@
 
 }
 #*******************************
+export PRODIR=$PWD
+cd ../../..
 echo "Finding HEADERS..."
 echo "HEADERS = \\" > avidemux.pro2
-findHeader ..
-findHeader ../../common
+findHeader avidemux_core 
+findHeader avidemux/qt4
+findHeader avidemux_plugins/
 echo "" >> avidemux.pro2
 echo "" >> avidemux.pro2
 
 echo "Finding SOURCES..."
 echo "SOURCES = \\" >> avidemux.pro2
-findSource ..
-findSource ../../common
-findSource ../../../avidemux_plugins
+findSource avidemux_core 
+findSource avidemux/qt4
+findSource avidemux_plugins/
 echo "" >> avidemux.pro2
 echo "" >> avidemux.pro2
 echo "Finding FORMS..."
 echo "FORMS = \\" >> avidemux.pro2
-findUI ..
+findUI avidemux_plugins/
+findUI avidemux/qt4/
 echo "" >> avidemux.pro2
 echo "" >> avidemux.pro2
 
 echo "Finding TRANSLATIONS..."
 echo "TRANSLATIONS = \\" >> avidemux.pro2
+cd $PRODIR
 find . -iname 'avidemux_*.ts' -printf "\"%p\" \\\ \n" >> avidemux.pro2
 echo "" >> avidemux.pro2
 echo "" >> avidemux.pro2
 
 cat avidemux.pro2 | sed 's/"//g' | grep -v "ADM_videoFilters\/" | grep -v qtScript | grep -v html |  grep -v build | grep -v cmake  | grep -v gtk | grep -vi yadif | grep -vi spidermon>     avidemux.pro
 #
-lupdate-qt4 -pro avidemux.pro 
+lupdate -pro avidemux.pro 
 echo "DONE."

avidemux_2.6.12.tar.gz/avidemux/qt4/qt4PackageDebian.cmake -> avidemux_2.6.13.tar.gz/avidemux/qt4/qt4PackageDebian.cmake Changed

avidemux_2.6.12.tar.gz/avidemux/winInstaller/avidemux_cross32Qt5.nsi -> avidemux_2.6.13.tar.gz/avidemux/winInstaller/avidemux_cross32Qt5.nsi Changed

avidemux_2.6.12.tar.gz/avidemux/winInstaller/avidemux_cross64Qt5.nsi -> avidemux_2.6.13.tar.gz/avidemux/winInstaller/avidemux_cross64Qt5.nsi Changed

avidemux_2.6.12.tar.gz/avidemux/winInstaller/avidemux_crossQt5.nsi -> avidemux_2.6.13.tar.gz/avidemux/winInstaller/avidemux_crossQt5.nsi Changed

@@ -13,8 +13,6 @@
 !include WinVer.nsh
 !include WordFunc.nsh
 !include AvidemuxVersion.nsh
-#!include revision.nsh
-
 SetCompressor /SOLID lzma
 SetCompressorDictSize 96
 RequestExecutionLevel user
@@ -22,8 +20,6 @@
 ##########################
 # Defines
 ##########################
-#!define NSIDIR "/home/fx/hudson/workspace/mingw_2.6.2_nsis/avidemux/winInstaller"
-#!define SVN_VERSION 6
 !define REVISION ${SVN_VERSION}
 !define EXEDIR "${NSIDIR}/install"
 
@@ -32,11 +28,11 @@
 !define PRODUCT_FULLNAME "Avidemux ${PRODUCT_VERSION} (${BUILD_BITS}-bit Release)"
 
 !if ${BUILD_BITS} == 64
-	!define SHORTCUT_NAME "${PRODUCT_NAME}"
-	!define REG_GROUPNAME "${PRODUCT_NAME} (${BUILD_BITS}-bit)"
+    !define SHORTCUT_NAME "${PRODUCT_NAME}"
+    !define REG_GROUPNAME "${PRODUCT_NAME} (${BUILD_BITS}-bit)"
 !else
-	!define SHORTCUT_NAME "${PRODUCT_NAME} (${BUILD_BITS}-bit)"
-	!define REG_GROUPNAME "${PRODUCT_NAME}"
+    !define SHORTCUT_NAME "${PRODUCT_NAME} (${BUILD_BITS}-bit)"
+    !define REG_GROUPNAME "${PRODUCT_NAME}"
 !endif
 
 !define REGKEY "SOFTWARE\${REG_GROUPNAME}"
@@ -122,9 +118,9 @@
 # Installer attributes
 ##########################
 !if ${BUILD_BITS} == 64
-	InstallDir "$PROGRAMFILES64\${PRODUCT_NAME}"
+    InstallDir "$PROGRAMFILES64\${PRODUCT_NAME}"
 !else
-	InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
+    InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
 !endif
 
 CRCCheck on
@@ -138,7 +134,7 @@
 VIAddVersionKey FileDescription ""
 VIAddVersionKey LegalCopyright ""
 InstallDirRegKey HKLM "${REGKEY}" Path
-BrandingText "Packaged by Gruntster"
+BrandingText "Packaged by Mean/Gruntster"
 InstType Standard
 InstType Full
 #########################################
@@ -185,52 +181,52 @@
 # Regexep Does not work with cross
 # Use only one file at a time
 !macro InstallFile FILEZ
-	File "${FILEZ}"
-	Push "${FILEZ}"
-	Push "/"
-	Call GetAfterChar
-	Pop $R0
-	FileWrite $UninstallLogHandle "$OUTDIR\$R0$\r$\n"
+    File "${FILEZ}"
+    Push "${FILEZ}"
+    Push "/"
+    Call GetAfterChar
+    Pop $R0
+    FileWrite $UninstallLogHandle "$OUTDIR\$R0$\r$\n"
 !macroend
 !define File "!insertmacro InstallFile"
  
 !macro InstallFolder FILEREGEX
-	File /r "${FILEREGEX}/*"
-	Push "$OUTDIR"
-	Call InstallFolderInternal
+    File /r "${FILEREGEX}/*"
+    Push "$OUTDIR"
+    Call InstallFolderInternal
 !macroend
 !define Folder "!insertmacro InstallFolder"
  
 Function InstallFolderInternal
-	Pop $9
-	!define Index 'Line${__LINE__}'
-	FindFirst $0 $1 "$9/*"
-	StrCmp $0 "" "${Index}-End"
+    Pop $9
+    !define Index 'Line${__LINE__}'
+    FindFirst $0 $1 "$9/*"
+    StrCmp $0 "" "${Index}-End"
 "${Index}-Loop:"
-	StrCmp $1 "" "${Index}-End"
-	StrCmp $1 "." "${Index}-Next"
-	StrCmp $1 ".." "${Index}-Next"
-	IfFileExists "$9\$1\*" 0 "${Index}-Write"
-		Push $0
-		Push $9
-		Push "$9\$1"
-		Call InstallFolderInternal
-		Pop $9
-		Pop $0
-		Goto "${Index}-Next"
+    StrCmp $1 "" "${Index}-End"
+    StrCmp $1 "." "${Index}-Next"
+    StrCmp $1 ".." "${Index}-Next"
+    IfFileExists "$9\$1\*" 0 "${Index}-Write"
+        Push $0
+        Push $9
+        Push "$9\$1"
+        Call InstallFolderInternal
+        Pop $9
+        Pop $0
+        Goto "${Index}-Next"
 "${Index}-Write:"
-	FileWrite $UninstallLogHandle "$9\$1$\r$\n"
+    FileWrite $UninstallLogHandle "$9\$1$\r$\n"
 "${Index}-Next:"
-	FindNext $0 $1
-	Goto "${Index}-Loop"
+    FindNext $0 $1
+    Goto "${Index}-Loop"
 "${Index}-End:"
-	!undef Index
+    !undef Index
 FunctionEnd
 
 ; WriteUninstaller macro
 !macro WriteUninstaller Path
-	WriteUninstaller "${Path}"
-	FileWrite $UninstallLogHandle "${Path}$\r$\n"
+    WriteUninstaller "${Path}"
+    FileWrite $UninstallLogHandle "${Path}$\r$\n"
 !macroend
 !define WriteUninstaller "!insertmacro WriteUninstaller"
 
@@ -239,832 +235,149 @@
 ##########################
 
 !macro InstallQtLanguage LANG_NAME LANG_CODE
-	SetOverwrite on
+    SetOverwrite on
 
-	!insertmacro SectionFlagIsSet ${SecUiQt} ${SF_SELECTED} installQt${LANG_CODE} endQt${LANG_CODE}
+    !insertmacro SectionFlagIsSet ${SecUiQt} ${SF_SELECTED} installQt${LANG_CODE} endQt${LANG_CODE}
 
 installQt${LANG_CODE}:
-	SetOutPath $INSTDIR\qt5\i18n
+    SetOutPath $INSTDIR\qt5\i18n
     ${File} qt5/i18n/avidemux_${LANG_CODE}.qm
     ${File} qt5/i18n/qt_${LANG_CODE}.qm
 
 endQt${LANG_CODE}:
 !macroend
+#
+!macro InstallDev xname
+         SetOutPath $INSTDIR\include\avidemux\2.6\${xname}
+         ${File} ${DEV_FOLDER}/include/avidemux/2.6/${xname}/*
+!macroend
+!macro InstallDevQt5 xname
+         SetOutPath $INSTDIR\include\avidemux\2.6\qt5\${xname}
+         ${File} ${DEV_FOLDER}/include/avidemux/2.6/qt5/${xname}/*
+!macroend
+
+
 
 ##########################
 # Installer sections
 ##########################
 Section -OpenLogFile
-	CreateDirectory "$INSTDIR"
-	FileOpen $UninstallLogHandle ${UninstallLogPath} a
-	FileSeek $UninstallLogHandle 0 END
+    CreateDirectory "$INSTDIR"
+    FileOpen $UninstallLogHandle ${UninstallLogPath} a
+    FileSeek $UninstallLogHandle 0 END
 SectionEnd
-SectionGroup /e "User interfaces" SecGrpUI
-    ${MementoUnselectedSection} "Command Line" SecUiCli
-        SectionIn 2
+Section  "User interfaces" SecGrpUI
+        SectionIn  1 2 RO
         SetOutPath $INSTDIR
         SetOverwrite on
         ${File} ${ROOT_FOLDER}/avidemux_cli.exe
-        ${File} ${ROOT_FOLDER}/libADM_render6_cli.dll
-        ${File} ${ROOT_FOLDER}/libADM_UI_Cli6.dll
-    ${MementoSectionEnd}
-
-    ${MementoSection} Qt SecUiQt
-	SectionIn 1 2 RO
-        SetOutPath $INSTDIR
-        SetOverwrite on
         ${File} ${ROOT_FOLDER}/avidemux.exe
         ${File} ${ROOT_FOLDER}/avidemux_jobs.exe
-        ${File} ${ROOT_FOLDER}/libADM_render6_QT5.dll
-        ${File} ${ROOT_FOLDER}/libADM_UIQT56.dll
-        ${File} ${ROOT_FOLDER}/libADM_openGLQT56.dll
-
         SetOutPath $INSTDIR\qt5\i18n
         ${File} ${ROOT_FOLDER}/qt5/i18n/*.qm
-    ${MementoSectionEnd}
-SectionGroupEnd
-
-SectionGroup "Audio Decoders" SecGrpAudioDecoder
-	${MementoSection} "µ-law" SecAudDecUlaw
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioDecoder
-		${File} ${ROOT_FOLDER}/plugins/audioDecoder/libADM_ad_ulaw.dll
-	${MementoSectionEnd}
-	${MementoSection} "AAC (FAAD)" SecAudDecFaad
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioDecoder
-		${File} ${ROOT_FOLDER}/plugins/audioDecoder/libADM_ad_faad.dll
-		#SetOutPath $INSTDIR
-		#${File} ${ROOT_FOLDER}/libfaad2.dll
-	${MementoSectionEnd}
-	${MementoSection} "Opus (libOpus)" SecAudDecOpus
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioDecoder
-		${File} ${ROOT_FOLDER}/plugins/audioDecoder/libADM_ad_opus.dll
-		SetOutPath $INSTDIR
-		${File} ${ROOT_FOLDER}/libopus-0.dll
-	${MementoSectionEnd}
-	${MementoSection} "AAC, AC-3, ADPCM IMA AMV, DTS, E-AC-3, MP2, MP3, Nellymoser, QDesign, WMA (libavcodec)" SecAudDecAvcodec
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioDecoder
-		${File} ${ROOT_FOLDER}/plugins/audioDecoder/libADM_ad_lav.dll
-	${MementoSectionEnd}
-	${MementoSection} "AC-3 (liba52)" SecAudDecA52
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioDecoder
-		${File} ${ROOT_FOLDER}/plugins/audioDecoder/libADM_ad_a52.dll
-	${MementoSectionEnd}
-	${MementoSection} "ADPCM IMA" SecAudDecImaAdpcm
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioDecoder
-		${File} ${ROOT_FOLDER}/plugins/audioDecoder/libADM_ad_ima_adpcm.dll
-	${MementoSectionEnd}
-	${MementoSection} "ADPCM Microsoft" SecAudDecMsAdpcm
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioDecoder
-		${File} ${ROOT_FOLDER}/plugins/audioDecoder/libADM_ad_ms_adpcm.dll
-	${MementoSectionEnd}
-	${MementoSection} "AMR-NB" SecAudDecOpencoreAmrNb
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioDecoder
-		${File} ${ROOT_FOLDER}/plugins/audioDecoder/libADM_ad_opencore_amrnb.dll
-		SetOutPath $INSTDIR
-		${File} ${ROOT_FOLDER}/libopencore-amrnb-*.dll
-	${MementoSectionEnd}
-	${MementoSection} "AMR-WB" SecAudDecOpencoreAmrWb
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioDecoder
-		${File} ${ROOT_FOLDER}/plugins/audioDecoder/libADM_ad_opencore_amrwb.dll
-		SetOutPath $INSTDIR
-		${File} ${ROOT_FOLDER}/libopencore-amrwb-*.dll
-	${MementoSectionEnd}
-	${MementoSection} "MP2, MP3 (MAD)" SecAudDecMad
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioDecoder
-		${File} ${ROOT_FOLDER}/plugins/audioDecoder/libADM_ad_Mad.dll
-	${MementoSectionEnd}
-	${MementoSection} "Vorbis" SecAudDecVorbis
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioDecoder
-		${File} ${ROOT_FOLDER}/plugins/audioDecoder/libADM_ad_vorbis.dll
-		SetOutPath $INSTDIR
-		${File} ${ROOT_FOLDER}/libogg-0.dll
-		${File} ${ROOT_FOLDER}/libvorbis-0.dll
-	${MementoSectionEnd}
-SectionGroupEnd
-SectionGroup "Audio Devices" SecGrpAudioDevice
-	${MementoSection} "Waveform" SecAudDevWaveform
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioDevices
-		${File} ${ROOT_FOLDER}/plugins/audioDevices/libADM_av_win32.dll
-	${MementoSectionEnd}
-SectionGroupEnd
-SectionGroup "Audio Encoders" SecGrpAudioEncoder
-	${MementoSection} "AAC (FAAC)" SecAudEncFaac
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioEncoders
-		${File} ${ROOT_FOLDER}/plugins/audioEncoders/libADM_ae_faac.dll
-		#SetOutPath $INSTDIR
-		#${File} ${ROOT_FOLDER}libfaac.dll
-	${MementoSectionEnd}
-	${MementoSection} "AAC (libavcodec)" SecAudEncLavAac
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioEncoders
-		${File} ${ROOT_FOLDER}/plugins/audioEncoders/libADM_ae_lav_aac.dll
-	${MementoSectionEnd}
-	${MementoSection} "AC-3 (Aften)" SecAudDecAften
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioEncoders
-		${File} ${ROOT_FOLDER}/plugins/audioEncoders/libADM_ae_aften.dll
-		SetOutPath $INSTDIR
-		${File} ${ROOT_FOLDER}/libaften.dll
-	${MementoSectionEnd}
-	${MementoSection} "AC-3 (libavcodec)" SecAudEncLavAc3
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioEncoders
-		${File} ${ROOT_FOLDER}/plugins/audioEncoders/libADM_ae_lav_ac3.dll
-	${MementoSectionEnd}
-	#${MementoSection} "DTS (dcaenc)" SecAudDecDcaEnc
-		#SectionIn 1 2
-		#SetOverwrite on
-		#SetOutPath $INSTDIR\plugins\audioEncoders
-		#${File} ${ROOT_FOLDER}/plugins/audioEncoders/libADM_ae_dcaenc.dll
-		#SetOutPath $INSTDIR
-		#${File} libdcaenc-0.dll
-	#${MementoSectionEnd}
-	${MementoSection} "MP2 (libavcodec)" SecAudEncLavMp2
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioEncoders
-		${File} ${ROOT_FOLDER}/plugins/audioEncoders/libADM_ae_lav_mp2.dll
-		SetOutPath $INSTDIR
-		#${File} ${ROOT_FOLDER}/libtwolame-*.dll
-	${MementoSectionEnd}
-	${MementoSection} "MP2 (TwoLAME)" SecAudEncTwoLame
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioEncoders
-		${File} ${ROOT_FOLDER}/plugins/audioEncoders/libADM_ae_twolame.dll
-		SetOutPath $INSTDIR
-		${File} ${ROOT_FOLDER}/libtwolame.dll
-	${MementoSectionEnd}
-	${MementoSection} "MP3" SecAudEncLame
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioEncoders
-		${File} ${ROOT_FOLDER}/plugins/audioEncoders/libADM_ae_lame.dll
-		SetOutPath $INSTDIR
-		${File} ${ROOT_FOLDER}/libmp3lame-0.dll
-	${MementoSectionEnd}
-	${MementoSection} "PCM" SecAudEncPcm
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioEncoders
-		${File} ${ROOT_FOLDER}/plugins/audioEncoders/libADM_ae_pcm.dll
-	${MementoSectionEnd}
-	${MementoSection} "Vorbis" SecAudEncVorbis
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\audioEncoders
-		${File} ${ROOT_FOLDER}/plugins/audioEncoders/libADM_ae_vorbis.dll
-		SetOutPath $INSTDIR
-		${File} ${ROOT_FOLDER}/libogg-0.dll
-		${File} ${ROOT_FOLDER}/libvorbis-0.dll
-		${File} ${ROOT_FOLDER}/libvorbisenc-2.dll
-		${File} ${ROOT_FOLDER}/libvorbisfile-3.dll
-	${MementoSectionEnd}
-SectionGroupEnd
-SectionGroup "Avisynth_VapourSynth" SecGrpAvisynth
-	${MementoUnselectedSection} "Avisynth Proxy" SecAvsProxy
-		SectionIn 2
-		SetOutPath $INSTDIR
-		SetOverwrite on
-		${File} ${ROOT_FOLDER}/avsproxy.exe
-		${File} ${ROOT_FOLDER}/avsproxy_gui.exe
-	${MementoSectionEnd}
-	${MementoUnselectedSection} "Avisynth Proxy Demuxer" SecDemuxAvisynth
-		SectionIn 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\demuxers
-		${File} ${ROOT_FOLDER}/plugins/demuxers/libADM_dm_avsproxy.dll
-	${MementoSectionEnd}
-        ${MementoUnselectedSection} "VapourSynth Proxy (cli)" SecDemuxVS_cli
-		SectionIn 2
-		SetOverwrite on
-		SetOutPath $INSTDIR
-		${File} ${ROOT_FOLDER}/vsProxy.exe
-	${MementoSectionEnd}
-        ${MementoUnselectedSection} "VapourSynth Proxy (Qt5)" SecDemuxVS_Qt5
-		SectionIn 2
-		SetOverwrite on
-		SetOutPath $INSTDIR
-		${File} ${ROOT_FOLDER}/vsProxy_gui_qt5.exe
-	${MementoSectionEnd}
-SectionGroupEnd
-SectionGroup "Demuxers" SecGrpDemuxers
-	${MementoSection} "ASF" SecDemuxAsf
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\demuxers
-		${File} ${ROOT_FOLDER}/plugins/demuxers/libADM_dm_asf.dll
-	${MementoSectionEnd}
-	${MementoSection} "BMP, JPEG, PNG Images" SecDemuxImage
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\demuxers
-		${File} ${ROOT_FOLDER}/plugins/demuxers/libADM_dm_pic.dll
-	${MementoSectionEnd}
-	${MementoSection} "Flash Video" SecDemuxFlv
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\demuxers
-		${File} ${ROOT_FOLDER}/plugins/demuxers/libADM_dm_flv.dll
-	${MementoSectionEnd}
-	${MementoSection} "Matroska" SecDemuxMatroska
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\demuxers
-		${File} ${ROOT_FOLDER}/plugins/demuxers/libADM_dm_matroska.dll
-	${MementoSectionEnd}
-	${MementoSection} "MP4" SecDemuxMp4
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\demuxers
-		${File} ${ROOT_FOLDER}/plugins/demuxers/libADM_dm_mp4.dll
-	${MementoSectionEnd}
-	${MementoSection} "MPEG-PS" SecDemuxMpegPs
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\demuxers
-		${File} ${ROOT_FOLDER}/plugins/demuxers/libADM_dm_ps.dll
-	${MementoSectionEnd}
-	${MementoSection} "MPEG-TS" SecDemuxMpegTs
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\demuxers
-		${File} ${ROOT_FOLDER}/plugins/demuxers/libADM_dm_ts.dll
-	${MementoSectionEnd}
-	${MementoSection} "MXF" SecDemuxMxf
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\demuxers
-		${File} ${ROOT_FOLDER}/plugins/demuxers/libADM_dm_mxf.dll
-	${MementoSectionEnd}
-	${MementoSection} "OpenDML AVI" SecDemuxOpenDml
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\demuxers
-		${File} ${ROOT_FOLDER}/plugins/demuxers/libADM_dm_opendml.dll
-	${MementoSectionEnd}
-SectionGroupEnd
-SectionGroup "Muxers" SecGrpMuxers
-	${MementoSection} "Dummy Raw Audio/Video" SecMuxDummy
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\muxers
-		${File} ${ROOT_FOLDER}/plugins/muxers/libADM_mx_dummy.dll
-	${MementoSectionEnd}
-	${MementoSection} "Flash Video" SecMuxLavFlv
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\muxers
-		${File} ${ROOT_FOLDER}/plugins/muxers/libADM_mx_flv.dll
-	${MementoSectionEnd}
-	${MementoSection} "Matroska" SecMuxLavMatroska
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\muxers
-		${File} ${ROOT_FOLDER}/plugins/muxers/libADM_mx_Mkv.dll
-	${MementoSectionEnd}
-	${MementoSection} "MP4 (libavcodec)" SecMuxLavMp4
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\muxers
-		${File} ${ROOT_FOLDER}/plugins/muxers/libADM_mx_mp4.dll
-	${MementoSectionEnd}
-	${MementoSection} "MP4 (MP4v2)" SecMuxMp4v2
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\muxers
-		${File} ${ROOT_FOLDER}/plugins/muxers/libADM_mx_mp4v2.dll
-	${MementoSectionEnd}
-	${MementoSection} "MPEG-PS" SecMuxLavMpegPs
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\muxers
-		${File} ${ROOT_FOLDER}/plugins/muxers/libADM_mx_ffPS.dll
-	${MementoSectionEnd}
-	${MementoSection} "MPEG-TS" SecMuxLavMpegTs
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\muxers
-		${File} ${ROOT_FOLDER}/plugins/muxers/libADM_mx_ffTS.dll
-	${MementoSectionEnd}
-	${MementoSection} "OpenDML AVI" SecMuxOpenDml
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\muxers
-		${File} ${ROOT_FOLDER}/plugins/muxers/libADM_mx_avi.dll
-	${MementoSectionEnd}
-	${MementoSection} "Raw Video" SecMuxRaw
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\muxers
-		${File} ${ROOT_FOLDER}/plugins/muxers/libADM_mx_raw.dll
-	${MementoSectionEnd}
-	${MementoSection} "Raw Video" SecMuxWebm
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\muxers
-		${File} ${ROOT_FOLDER}/plugins/muxers/libADM_mx_Webm.dll
-	${MementoSectionEnd}
-SectionGroupEnd
-SectionGroup "Script Engines" SecGrpScriptEngine
-	#${MementoSection} "QtScript" SecScriptQt
-		#SectionIn 1 2
-		#SetOverwrite on
-		#SetOutPath $INSTDIR
-		#${File} ${ROOT_FOLDER}/QtScript4.dll
-		#${File} ${ROOT_FOLDER}/QtScriptTools4.dll
-		#SetOutPath $INSTDIR\plugins\scriptEngines
-		#${File} ${ROOT_FOLDER}/plugins/scriptEngines/libADM_script_qt.dll
-		#SetOutPath $INSTDIR\help\QtScript
-		#${Folder} help/QtScript
-	#${MementoSectionEnd}
-	${MementoSection} "Tinypy" SecScriptTinypy
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\scriptEngines
-		${File} ${ROOT_FOLDER}/plugins/scriptEngines/libADM_script_tinyPy.dll
-		SetOutPath $INSTDIR\plugins\autoScripts
-		${Folder} ${ROOT_FOLDER}/plugins/autoScripts
-	${MementoSectionEnd}
-SectionGroupEnd
-#SectionGroup "Video Decoders" SecGrpVideoDecoder
-	#${MementoSection} "VP8" SecVidDecVpx
-		#SectionIn 1 2
-		#SetOverwrite on
-		#SetOutPath $INSTDIR\plugins\videoDecoders
-		#${File} ${ROOT_FOLDER}/plugins/videoDecoders/libADM_vd_vpx.dll
-	#${MementoSectionEnd}
-#SectionGroupEnd
-SectionGroup "Video Encoders" SecGrpVideoEncoder
-	${MementoSection} "Null" SecVidEncNull
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\videoEncoders
-		${File} ${ROOT_FOLDER}/plugins/videoEncoders/libADM_ve_null.dll
-	${MementoSectionEnd}
-	${MementoSection} "Huffyuv, FFVHuff" SecVidEncLavHuffyuv
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\videoEncoders
-		${File} ${ROOT_FOLDER}/plugins/videoEncoders/libADM_ve_huff.dll
-	${MementoSectionEnd}
-	${MementoSection} "JPEG" SecVidEncLavJpeg
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\videoEncoders
-		${File} ${ROOT_FOLDER}/plugins/videoEncoders/libADM_ve_jpeg.dll
-	${MementoSectionEnd}
-	${MementoSection} "MPEG-2" SecVidEncLavMpeg2
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\videoEncoders
-		${File} ${ROOT_FOLDER}/plugins/videoEncoders/libADM_ve_ffMpeg2.dll
-	${MementoSectionEnd}
-	${MementoSection} "MPEG-4 ASP (libavcodec)" SecVidEncLavMpeg4asp
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\videoEncoders
-		${File} ${ROOT_FOLDER}/plugins/videoEncoders/libADM_ve_ffMpeg4.dll
-	${MementoSectionEnd}
-	${MementoSection} "MPEG-4 ASP (Xvid)" SecVidEncXvid
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\videoEncoders
-		${File} ${ROOT_FOLDER}/plugins/videoEncoders/libADM_ve_xvid4.dll
-		SetOutPath $INSTDIR
-		${File} ${ROOT_FOLDER}/xvidcore.dll
-	${MementoSectionEnd}
-	${MementoSection} "MPEG-4 AVC" SecVidEncX264
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\videoEncoders
-
-		${File} ${ROOT_FOLDER}/plugins/videoEncoders/libADM_ve_x264_other.dll
-
-		SetOutPath $INSTDIR\plugins\videoEncoders\qt5
-		${File} ${ROOT_FOLDER}/plugins/videoEncoders/qt5/libADM_ve_x264_QT5.dll
-
-		SetOutPath $INSTDIR\plugins\pluginSettings\x264
-		${Folder} ${ROOT_FOLDER}/plugins/pluginSettings/x264
-		SetOutPath $INSTDIR
-		${File} ${ROOT_FOLDER}/libx264-*.dll
-		#${File} ${ROOT_FOLDER}/pthreadGC2-w64.dll
-	${MementoSectionEnd}
-	${MementoSection} "MPEG-4 HEC" SecVidEncX265
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\videoEncoders
-
-		${File} ${ROOT_FOLDER}/plugins/videoEncoders/libADM_ve_x265_other.dll
-
-		SetOutPath $INSTDIR\plugins\videoEncoders\qt5
-		${File} ${ROOT_FOLDER}/plugins/videoEncoders/qt5/libADM_ve_x265_QT5.dll
+SectionEnd
+# !!
+Section "Plugins" SecGrpPlugins
+        SectionIn 1 2 RO
+        SetOverwrite on
+        SetOutPath $INSTDIR\plugins\audioDevices
+        ${File} ${ROOT_FOLDER}/plugins/audioDevices/*.dll
+        SetOutPath $INSTDIR\plugins\audioDecoder
+        ${File} ${ROOT_FOLDER}/plugins/audioDecoder/*.dll
+        SetOutPath $INSTDIR\plugins\audioEncoders
+        ${File} ${ROOT_FOLDER}/plugins/audioEncoders/*.dll
+        SetOutPath $INSTDIR\plugins\demuxers
+        ${File} ${ROOT_FOLDER}/plugins/demuxers/*.dll
+        SetOutPath $INSTDIR\plugins\muxers
+        ${File} ${ROOT_FOLDER}/plugins/muxers/*.dll
+        SetOutPath $INSTDIR\plugins\scriptEngines
+        ${File} ${ROOT_FOLDER}/plugins/scriptEngines/libADM_script_tinyPy.dll
+        SetOutPath $INSTDIR\plugins\autoScripts
+        ${Folder} ${ROOT_FOLDER}/plugins/autoScripts
+        SetOutPath $INSTDIR\plugins\videoEncoders
+        ${File} ${ROOT_FOLDER}/plugins/videoEncoders/*.dll
+        SetOutPath $INSTDIR\plugins\videoEncoders\qt5
+        ${File} ${ROOT_FOLDER}/plugins/videoEncoders/qt5/*.dll
+        #SetOutPath $INSTDIR\plugins\videoEncoders\cli
+        #${File} ${ROOT_FOLDER}/plugins/videoEncoders/cli/*.dll
+        SetOutPath $INSTDIR\plugins\videoFilters
+        ${File} ${ROOT_FOLDER}/plugins/videoFilters/*.dll
+        SetOutPath $INSTDIR\plugins\videoFilters\qt5
+        ${File} ${ROOT_FOLDER}/plugins/videoFilters/qt5/*.dll
+        SetOutPath $INSTDIR\plugins\videoFilters\cli
+        ${File} ${ROOT_FOLDER}/plugins/videoFilters/cli/*.dll
+        # Fonts
+        SetOutPath $INSTDIR\etc\fonts
+        ${Folder} ${ROOT_FOLDER}/etc/fonts
+SectionEnd
+# !!
+Section "Avisynth_VapourSynth" SecGrpAvisynth
+        SectionIn 2
+        SetOutPath $INSTDIR
+        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
+SectionEnd
+#
+Section "ShaderDemo" SecShaderDemo
+        SectionIn  1 2 RO
+        SetOutPath $INSTDIR\shaderDemo
+        SetOverwrite on
+        ${File} ${ROOT_FOLDER}/ADM_plugins6/shaderDemo/1/*.shader # FIXME
+SectionEnd
+#
+#
+Section "Support libs" SecGrpSupport
+        SectionIn  1 2 RO
+        SetOutPath $INSTDIR
+        SetOverwrite on
+        ${File} ${ROOT_FOLDER}/*.dll
+SectionEnd
+#
+Section "SDK (to write plugins)" SecGrpDev
+        SectionIn 2
+        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/*
+        !insertmacro InstallDev ADM_core
+        !insertmacro InstallDev ADM_coreAudio
+        !insertmacro InstallDev ADM_coreAudioDevice
+        !insertmacro InstallDev ADM_coreAudioEncoder
+        !insertmacro InstallDev ADM_coreAudioFilter
+        !insertmacro InstallDev ADM_coreAudioParser
+        !insertmacro InstallDev ADM_coreDemuxer
+        !insertmacro InstallDev ADM_coreDemuxerMpeg
+        !insertmacro InstallDev ADM_coreImage
+        !insertmacro InstallDev ADM_coreImageLoader
+        !insertmacro InstallDev ADM_coreJobs
+        !insertmacro InstallDev ADM_coreMuxer
+        !insertmacro InstallDev ADM_coreScript
+        !insertmacro InstallDev ADM_coreSocket
+        !insertmacro InstallDev ADM_coreSqlLight3
+        !insertmacro InstallDev ADM_coreSubtitles
+        !insertmacro InstallDev ADM_coreUI
+        !insertmacro InstallDev ADM_coreUtils
+        !insertmacro InstallDev ADM_coreVideoCodec
+        !insertmacro InstallDev ADM_coreVideoEncoder
+        !insertmacro InstallDev ADM_coreVideoFilter
+
+        !insertmacro InstallDev libavcodec
+        !insertmacro InstallDev libavformat
+        !insertmacro InstallDev libavutil
+        !insertmacro InstallDev libswscale
+        !insertmacro InstallDev libpostproc
+
+        !insertmacro InstallDev libpostproc
+        !insertmacro InstallDev qt5
+        !insertmacro InstallDevQt5 ADM_openGL
+        !insertmacro InstallDevQt5 ADM_UIs
 
-		SetOutPath $INSTDIR
-		${File} ${ROOT_FOLDER}/libx265*.dll
-		#${File} ${ROOT_FOLDER}/pthreadGC2-w64.dll
-	${MementoSectionEnd}
-${MementoSection} "PNG" SecVidEncLavPng
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\videoEncoders
-		${File} ${ROOT_FOLDER}/plugins/videoEncoders/libADM_ve_png.dll
-	${MementoSectionEnd}
-	${MementoSection} "Sorenson Spark" SecVidEncSorenson
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\videoEncoders
-		${File} ${ROOT_FOLDER}/plugins/videoEncoders/libADM_ve_ffFlv1.dll
-	${MementoSectionEnd}
-	${MementoSection} "YV12" SecVidEncYv12
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\videoEncoders
-		${File} ${ROOT_FOLDER}/plugins/videoEncoders/libADM_ve_yv12.dll
-	${MementoSectionEnd}
-	${MementoSection} "DV" SecVidEncDV
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\videoEncoders
-		${File} ${ROOT_FOLDER}/plugins/videoEncoders/libADM_ve_ffDv.dll
-	${MementoSectionEnd}
-	${MementoSection} "NVenc" SecVidEncffNvenc
-		SectionIn 1 2
-		SetOverwrite on
-		SetOutPath $INSTDIR\plugins\videoEncoders
-		${File} ${ROOT_FOLDER}/plugins/videoEncoders/libADM_ve_ffNvenc.dll
-	${MementoSectionEnd}
-SectionGroupEnd
-SectionGroup "Video Filters" SecGrpVideoFilter
-	SectionGroup "Transform Filters" SecGrpVideoFilterTransform
-		${MementoSection} "Add Black Borders" SecVidFltBlackBorders
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_addBorders.dll
-		${MementoSectionEnd}
-		${MementoSection} "Add Logo" SecVidFltLogo
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_logo.dll
-		${MementoSectionEnd}
-                ${MementoSection} "Black" SecVidFltBlack
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_black.dll
-		${MementoSectionEnd}
+SectionEnd
 
-		${MementoSection} "Blacken Borders" SecVidFltBlackenBorders
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_blackenBorders.dll
-		${MementoSectionEnd}
-		${MementoSection} "Change FPS" SecVidFltChangeFps
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_changeFps.dll
-		${MementoSectionEnd}
-		${MementoSection} "Crop" SecVidFltCrop
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters\cli
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/cli/libADM_vf_CropCli.dll
-			SetOutPath $INSTDIR\plugins\videoFilters\qt5
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/qt5/libADM_vf_cropQT5.dll
-		${MementoSectionEnd}
-		${MementoSection} "Fade" SecVidFltFade
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_fadeToBlack.dll
-		${MementoSectionEnd}
-		${MementoSection} "Greyscale" SecVidFltLumaOnly
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_lumaOnly.dll
-		${MementoSectionEnd}
-		${MementoSection} "Horizontal Flip" SecVidFltHorizontalFlip
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_hf_hflip.dll
-		${MementoSectionEnd}
-		${MementoSection} "libswscale Resize" SecVidFltSwscaleResize
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters\cli
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/cli/libADM_vf_swscaleResize_cli.dll
-			SetOutPath $INSTDIR\plugins\videoFilters\qt5
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/qt5/libADM_vf_swscaleResizeQT5.dll
-		${MementoSectionEnd}
-		${MementoSection} "OpenGl test filters " SecVidFltOpenGl
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters\qt5
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/qt5/libADM_vf_glBenchmark.dll
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/qt5/libADM_vf_glResize.dll
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/qt5/libADM_vf_sampleGlFrag2.dll
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/qt5/libADM_vf_sampleGlVertex.dll
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/qt5/libADM_vf_rotateGlFrag2.dll
-		${MementoSectionEnd}
-${MementoSection} "Resample FPS" SecVidFltResampleFps
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_resampleFps.dll
-		${MementoSectionEnd}
-		${MementoSection} "Rotate" SecVidFltRotate
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_rotate.dll
-		${MementoSectionEnd}
-		${MementoSection} "Vertical Flip" SecVidFltVerticalFlip
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_vflip.dll
-		${MementoSectionEnd}
-	SectionGroupEnd
-	SectionGroup "Interlacing Filters" SecGrpVideoFilterInterlacing
-		${MementoSection} "Decomb Decimate" SecVidFltDecombDecimate
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_decimate.dll
-		${MementoSectionEnd}
-		${MementoSection} "Decomb Telecide" SecVidFltDecombTelecide
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_telecide.dll
-		${MementoSectionEnd}
-		${MementoSection} "DGBob" SecVidFltDgbob
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_DgBob.dll
-		${MementoSectionEnd}
-		${MementoSection} "Horizontal Stack Fields" SecVidFltHzStackFields
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_hzstackField.dll
-		${MementoSectionEnd}
-		${MementoSection} "Kernel Deint" SecVidFltKernelDeint
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_kernelDeint.dll
-		${MementoSectionEnd}
-		${MementoSection} "libavcodec Deinterlacers" SecVidFltLavDeinterlacers
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_lavDeint.dll
-		${MementoSectionEnd}
-		${MementoSection} "Merge Fields" SecVidFltMergeFields
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_mergeField.dll
-		${MementoSectionEnd}
-		${MementoSection} "Separate Fields" SecVidFltSeparateFields
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_separateField.dll
-		${MementoSectionEnd}
-		${MementoSection} "Stack Fields" SecVidFltStackFields
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_stackField.dll
-		${MementoSectionEnd}
-		${MementoSection} "Unstack Fields" SecVidFltUnstackFields
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_unstackField.dll
-		${MementoSectionEnd}
-		${MementoSection} "Yadif" SecVidFltYadif
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_yadif.dll
-		${MementoSectionEnd}
-	SectionGroupEnd
-	SectionGroup "Colour Filters" SecGrpVideoFilterColour
-		${MementoSection} "Avisynth Colour YUV" SecVidFltAvisynthColourYuv
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_colorYuv.dll
-		${MementoSectionEnd}
-		${MementoSection} "ChromaShift" SecVidFltChromaShift
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters\cli
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/cli/libADM_vf_chromaShiftCli.dll
-			SetOutPath $INSTDIR\plugins\videoFilters\qt5
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/qt5/libADM_vf_chromaShiftQT5.dll
-		${MementoSectionEnd}
-		${MementoSection} "Contrast" SecVidFltContrast
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters\cli
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/cli/libADM_vf_contrastCli.dll
-			SetOutPath $INSTDIR\plugins\videoFilters\qt5
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/qt5/libADM_vf_contrastQT5.dll
-		${MementoSectionEnd}
-		${MementoSection} "MPlater Eq2" SecVidFltMplayerEq2
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters\cli
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/cli/libADM_vf_eq2Cli.dll
-			SetOutPath $INSTDIR\plugins\videoFilters\qt5
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/qt5/libADM_vf_eq2QT5.dll
-		${MementoSectionEnd}
-		${MementoSection} "MPlater Hue" SecVidFltMplayerHue
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters\cli
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/cli/libADM_vf_HueCli.dll
-			SetOutPath $INSTDIR\plugins\videoFilters\qt5
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/qt5/libADM_vf_HueQT5.dll
-		${MementoSectionEnd}
-		${MementoSection} "Remove Plane" SecVidFltRemovePlane
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_removePlane.dll
-		${MementoSectionEnd}
-		${MementoSection} "Swap U and V" SecVidFltSwapUandV
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_swapUV.dll
-		${MementoSectionEnd}
-	SectionGroupEnd
-	SectionGroup "Noise Filters" SecGrpVideoFilterNoise
-		${MementoSection} "FluxSmooth" SecVidFltFluxSmooth
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_FluxSmooth.dll
-		${MementoSectionEnd}
-		${MementoSection} "Gaussian Convolution" SecVidFltGauss
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_gauss.dll
-		${MementoSectionEnd}
-		${MementoSection} "Large Median (5x5)" SecVidFltMediam5x5
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_largeMedian.dll
-		${MementoSectionEnd}
-		${MementoSection} "Mean Convolution" SecVidFltMean
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_mean.dll
-		${MementoSectionEnd}
-		${MementoSection} "Median Convolution" SecVidFltMedian
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_median.dll
-		${MementoSectionEnd}
-		${MementoSection} "MPlayer Denoise 3D" SecVidFltMPlayerDenoise3d
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_denoise3d.dll
-		${MementoSectionEnd}
-		${MementoSection} "MPlayer Denoise 3D HQ" SecVidFltMPlayerDenoise3dHq
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_denoise3dhq.dll
-		${MementoSectionEnd}
-		${MementoSection} "MSharpen" SecVidFltMSharpen
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_msharpen.dll
-		${MementoSectionEnd}
-	SectionGroupEnd
-	SectionGroup "Sharpness Filters" SecGrpVideoFilterSharpness
-		${MementoSection} "asharp" SecVidFltAsharp
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			SetOutPath $INSTDIR\plugins\videoFilters\qt5
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/qt5/libADM_vf_asharpQT5.dll
-		${MementoSectionEnd}
-		${MementoSection} "MPlayer Delogo" SecVidFltMPlayerDelogo
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters\cli
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/cli/libADM_vf_mpdelogoCli.dll
-			SetOutPath $INSTDIR\plugins\videoFilters\qt5
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/qt5/libADM_vf_mpdelogoQT5.dll
-		${MementoSectionEnd}
-		${MementoSection} "Sharpen" SecVidFltSharpen
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_sharpen.dll
-		${MementoSectionEnd}
-	SectionGroupEnd
-	SectionGroup "Subtitle Filters" SecGrpVideoFilterSubtitle
-		${MementoSection} "ASS, SSA" SecVidFltAssSsa
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_ssa.dll
-			SetOutPath $INSTDIR
-			${File} ${ROOT_FOLDER}/libfribidi-0.dll
-			${File} ${ROOT_FOLDER}/libfontconfig-1.dll
-			SetOutPath $INSTDIR\etc\fonts
-			${Folder} ${ROOT_FOLDER}/etc/fonts
-		${MementoSectionEnd}
-	SectionGroupEnd
-	#SectionGroup "OpenGL Filters" SecGrpVideoFilterOpenGl
-		#${MementoSection} "Fragment Shader" SecVidFltOpenGlFragmentShader
-			#SectionIn 1 2
-			#SetOverwrite on
-			#SetOutPath $INSTDIR\plugins\videoFilters
-			#${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_sampleGlFrag2.dll
-		#${MementoSectionEnd}
-		#${MementoSection} "Read Back Benchmark" SecVidFltOpenGlReadBack
-			#SectionIn 1 2
-			#SetOverwrite on
-			#SetOutPath $INSTDIR\plugins\videoFilters
-			#${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_glBenchmark.dll
-		#${MementoSectionEnd}
-		#${MementoSection} "Resize" SecVidFltOpenGlResize
-			#SectionIn 1 2
-			#SetOverwrite on
-			#SetOutPath $INSTDIR\plugins\videoFilters
-			#${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_glResize.dll
-		#${MementoSectionEnd}
-		#${MementoSection} "Rotate" SecVidFltOpenGlRotate
-			#SectionIn 1 2
-			#SetOverwrite on
-			#SetOutPath $INSTDIR\plugins\videoFilters
-			#${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_rotateGlFrag2.dll
-		#${MementoSectionEnd}
-		#${MementoSection} "Wave" SecVidFltOpenGlWave
-			#SectionIn 1 2
-			#SetOverwrite on
-			#SetOutPath $INSTDIR\plugins\videoFilters
-			#${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_sampleGlVertex.dll
-		#${MementoSectionEnd}
-	#SectionGroupEnd
-	SectionGroup "Miscellaneous Filters" SecGrpVideoFilterMiscellaneous
-		${MementoSection} "Print Information" SecVidFltPrintInfo
-			SectionIn 1 2
-			SetOverwrite on
-			SetOutPath $INSTDIR\plugins\videoFilters
-			${File} ${ROOT_FOLDER}/plugins/videoFilters/libADM_vf_printInfo.dll
-		${MementoSectionEnd}
-	SectionGroupEnd
-SectionGroupEnd

avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/include/ADM_cpuCap.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_core/include/ADM_cpuCap.h Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/include/ADM_crashdump_unix.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_core/include/ADM_crashdump_unix.h Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/include/ADM_files.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_core/include/ADM_files.h Changed

@@ -14,25 +14,27 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef ADM_FILES_H
-#define ADM_FILES_H
-
+#pragma once
 #include "ADM_core6_export.h"
 
 #ifdef __cplusplus
-ADM_CORE6_EXPORT void ADM_initBaseDir(bool portableMode);
+ADM_CORE6_EXPORT void ADM_initBaseDir(int argc, char *argv);
 #endif
 // Returns dir to ~/.avidemux, no need to free it
-ADM_CORE6_EXPORT char *ADM_getBaseDir(void);
+ADM_CORE6_EXPORT const char *ADM_getBaseDir(void);
 // Returns dir to ~/.avidemux/jobs, no need to free it
-ADM_CORE6_EXPORT char *ADM_getJobDir(void);
+ADM_CORE6_EXPORT const char *ADM_getJobDir(void);
 // Returns dir to ~/.avidemux/custom, no need to free it
-ADM_CORE6_EXPORT char *ADM_getCustomDir(void);
+ADM_CORE6_EXPORT const char *ADM_getCustomDir(void);
 // Returns dir to ~/.avidemux/autoScript, no need to free it
-ADM_CORE6_EXPORT char *ADM_getAutoDir(void);
+ADM_CORE6_EXPORT const char *ADM_getAutoDir(void);
 // Returns dir to ~/.avidemux/autoScript, no need to free it
 ADM_CORE6_EXPORT const char *ADM_getUserPluginSettingsDir(void);
 ADM_CORE6_EXPORT const char *ADM_getSystemPluginSettingsDir(void);
+#ifdef __cplusplus
+ADM_CORE6_EXPORT const std::string ADM_getI8NDir(const std::string &flavor);
+#endif
+
 //
 ADM_CORE6_EXPORT uint8_t ADM_copyFile(const char *source, const char *target);
 ADM_CORE6_EXPORT uint8_t ADM_renameFile(const char *source, const char *target);
@@ -52,5 +54,8 @@
 #define ADM_SEPARATOR "/"
 #endif
 
-
+#ifdef __cplusplus
+    ADM_CORE6_EXPORT std::string ADM_getPluginDir(const char *subfolder);
+    ADM_CORE6_EXPORT bool        isPortableMode(int argc, char *argv);
 #endif
+

avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/include/ADM_mangle.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_core/include/ADM_mangle.h Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/include/ADM_misc.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_core/include/ADM_misc.h Changed

@@ -12,6 +12,7 @@
 #include "ADM_core6_export.h"
 #include "ADM_coreConfig.h"
 #include "ADM_inttype.h"
+#include <string>
 
 typedef struct 
 {
@@ -21,6 +22,7 @@
 ADM_CORE6_EXPORT void            TLK_getDate(ADM_date *date);
 // /dir/file.ext -> /dir/file and ext returned values are copies
 ADM_CORE6_EXPORT void            ADM_PathSplit(const char *str, char **root, char **ext);
+ADM_CORE6_EXPORT void            ADM_PathSplit(const std::string &in,std::string &root, std::string &ext);
 // Returns path only /foo/bar.avi -> /foo INPLACE, no copy done
 ADM_CORE6_EXPORT void	        ADM_PathStripName(char *str);
 // Get the filename without path. /foo/bar.avi -> bar.avi INPLACE, NO COPY
@@ -28,10 +30,10 @@
 //  Canonize the path, returns a copy of the absolute path given as parameter
 ADM_CORE6_EXPORT char            *ADM_PathCanonize(const char *tmpname);
 // change to lower case in place the string
-void            ADM_LowerCase(char *string);
+void                            ADM_LowerCase(char *string);
 
-uint32_t        getTime( int called );
-uint32_t 	    getTimeOfTheDay(void);
+                uint32_t        getTime( int called );
+                uint32_t 	getTimeOfTheDay(void);
 
 ADM_CORE6_EXPORT uint64_t        ADM_getSecondsSinceEpoch(void);
 ADM_CORE6_EXPORT const char      *ADM_epochToString(uint64_t epoch);

avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/src/ADM_cpuCap.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_core/src/ADM_cpuCap.cpp Changed

@@ -22,25 +22,21 @@
 #include <sched.h>
 #endif
 
-//#include "prefs.h"
-
 uint32_t CpuCaps::myCpuCaps=0;
 uint32_t CpuCaps::myCpuMask=0xffffffff;
 
-/* Cpu caps interface to other libs */
-extern "C"{ 
-	int ADM_lavcodec_mm_support(void);
-	int ADM_mpeg2dec_mm_support(void);
-	
+extern "C"
+{
+#include "libavutil/cpu.h"
 }
 
 
 
 #define cpuid(index,eax,ebx,ecx,edx)\
     __asm __volatile\
-        ("mov %%"REG_b", %%"REG_S"\n\t"\
+        ("mov %%" REG_b", %%" REG_S"\n\t"\
          "cpuid\n\t"\
-         "xchg %%"REG_b", %%"REG_S\
+         "xchg %%" REG_b", %%" REG_S\
          : "=a" (eax), "=S" (ebx),\
            "=c" (ecx), "=d" (edx)\
          : "0" (index));
@@ -52,19 +48,18 @@
  */
   void 	CpuCaps::init( void)
 {
-	printf("cpuCapsChecking CPU capabilities\n");
-	myCpuCaps=0;
-	myCpuMask=0xffffffff;
-	// FIXME prefs->get(FEATURE_CPU_CAPS,&myCpuMask);
-
+    printf("cpuCapsChecking CPU capabilities\n");
+    myCpuCaps=0;
+    myCpuMask=0xffffffff;
+   
 #ifdef ADM_CPU_X86
- int eax, ebx, ecx, edx;
- int max_std_level, max_ext_level;
+    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;
+    long a, c;
 
- __asm__ __volatile__ (
+    __asm__ __volatile__ (
                        /* See if CPUID instruction is supported ... */
                        /* ... Get copies of EFLAGS into eax and ecx */
                        "pushf\n\t"
@@ -129,18 +124,18 @@
  }
 #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(MMX);
+    CHECK(3DNOW);
     CHECK(3DNOWEXT);
-	CHECK(MMXEXT);
-	CHECK(SSE);
-	CHECK(SSE2);
-	CHECK(SSE3);
-	CHECK(SSSE3);
+    CHECK(MMXEXT);
+    CHECK(SSE);
+    CHECK(SSE2);
+    CHECK(SSE3);
+    CHECK(SSSE3);
 
 #endif // X86
-	printf("cpuCapsEnd of CPU capabilities check (cpuMask :%x, cpuCaps :%x)\n",myCpuMask,myCpuCaps);
-	return ;
+    printf("cpuCapsEnd of CPU capabilities check (cpuMask :%x, cpuCaps :%x)\n",myCpuMask,myCpuCaps);
+    return ;
 }
 
 
@@ -179,3 +174,51 @@
 	return 1;
 #endif
 }
+/**
+ * 
+ * @param admMask
+ * @return 
+ */
+static int Cpu2Lav(uint32_t admMask)
+{
+   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);
+    	LAV_CPU_CAPS(3DNOWEXT);
+    	LAV_CPU_CAPS(SSE);
+    	LAV_CPU_CAPS(SSE2);
+    	LAV_CPU_CAPS(SSE3);
+    	LAV_CPU_CAPS(SSSE3);
+        return out;
+}
+
+/**
+ * 
+ * @param mask
+ * @return 
+ */
+bool     CpuCaps::setMask(uint32_t mask)
+{
+    ADM_info("CpuCaps Setting mask to 0x%x\n",mask);
+    myCpuMask=mask;
+    
+    int lavCpuMask=Cpu2Lav(myCpuMask);
+    av_set_cpu_flags_mask(lavCpuMask);
+    
+    return true;
+}
+/**
+ * 
+ * @param mask
+ * @return 
+ */
+uint32_t     CpuCaps::getMask( )
+{
+    return myCpuMask;
+}
+

avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/src/ADM_debug.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_core/src/ADM_debug.cpp Changed

@@ -1,5 +1,5 @@
 /***************************************************************************
-                    Dully function to redirect unwanted printf
+                    Dummy function to redirect unwanted printf
 
 
     begin                : Fri Apr 20 2003
@@ -21,71 +21,15 @@
 #include <math.h>
 
 
-#include "ADM_debugID.h"
-#define MODULE_NAME MODULE_DEBUG
-#include "ADM_debug.h"
-
-// put here the module you want to be verbose (MODULE_xxx + MODULE_yyyy+  ....)
-#ifndef masked
-#define masked  (MODULE_3GP*0+ 1*MODULE_FILTER) //+MODULE_3GP) //(MODULE_AUDIO_EDITOR) MODULE_OGM_AUDIO MODULE_REQUANT MODULE_CODEC
-#endif
-
-#ifndef thresholdLevel
-#define thresholdLevel ADM_PRINT_DEBUG
-#endif
-
-// If the entitty is in masked we actually print the string
-// else we silently drop it
-extern "C"
-{
- void indirect_printf(int entity, const char *prf, ...)
-  {
-  	if(masked & entity)
-	{
-		static char print_buffer1024;
-
-		va_list 	list;
-		va_start(list,	prf);
-		vsnprintf(print_buffer,1023,prf,list);
-		va_end(list);
-		print_buffer1023=0; // ensure the string is terminated
-		printf("%s",print_buffer);
-
-	}
-	else
-  	{
-		return;
-	}
-  }
-
-
-void indirect_printf_long(int level,const char *modname,int entity,const char *prf,  ...)
-{
-        if(level>thresholdLevel) return;
-  	if(1) //masked & entity)
-	{
-		static char print_buffer1024;
-
-		va_list 	list;
-		va_start(list,	prf);
-		vsnprintf(print_buffer,1023,prf,list);
-		va_end(list);
-		print_buffer1023=0; // ensure the string is terminated
-		printf("%s LVL:%d %s",modname,level,print_buffer);
-
-	}
-	else
-  	{
-		return;
-	}
-}
 
 
 #define ADM_COLOR_YELLOW  "\e33m"
 #define ADM_COLOR_RED     "\e31m"
 #define ADM_COLOR_GREEN   "\e32m"
 #define ADM_DEFAULT_COLOR "\em"
-
+ 
+extern "C"
+{
 
 static void ADM_prettyPrint(const char *func,const char *color, const char *p)
 {

avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/src/ADM_fileio.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_core/src/ADM_fileio.cpp Changed

@@ -16,6 +16,7 @@
 #include <dirent.h>
 #include <errno.h>
 #include <sys/stat.h>
+#include <string>
 
 #if defined(__APPLE__)
 #	include <Carbon/Carbon.h>
@@ -34,18 +35,16 @@
 
 #include "ADM_default.h"
 
-static char ADM_basedir1024 = {0};
-static char *ADM_jobdir = NULL;
-static char *ADM_customdir = NULL;
-static char *ADM_autodir = NULL;
-static char *ADM_systemPluginSettings=NULL;
-static char *ADM_userPluginSettings=NULL;
 
 #undef fread
 #undef fwrite
 #undef fopen
 #undef fclose
-
+static void AddSeparator(char *path)
+{
+	if (path && (strlen(path) < strlen(ADM_SEPARATOR) || strncmp(path + strlen(path) - strlen(ADM_SEPARATOR), ADM_SEPARATOR, strlen(ADM_SEPARATOR)) != 0))
+		strcat(path, ADM_SEPARATOR);
+}
 size_t ADM_fread (void *ptr, size_t size, size_t n, FILE *sstream)
 {
 	return fread(ptr,size,n,sstream);
@@ -77,225 +76,144 @@
     fclose(f);
     return v;
 }
-/**
-    \fn ADM_fopen
-    \brief utf8 aware fopen, so that we can use utf8 string even on win32
-*/
-FILE *ADM_fopen(const char *file, const char *mode)
-{
-#ifdef _WIN32
-	// Override fopen to handle Unicode filenames and to ensure exclusive access when initially writing to a file.
-	int fileNameLength = utf8StringToWideChar(file, -1, NULL);
-	wchar_t *wcFile = new wchar_tfileNameLength;
-	int creation = 0, access = 0;
-	HANDLE hFile;
-
-	utf8StringToWideChar(file, -1, wcFile);
-
-	while (true)
-	{
-		if (strchr(mode, 'w'))
-		{
-			creation = CREATE_ALWAYS;
-			access = GENERIC_WRITE;
-
-			if (strchr(mode, '+'))
-				access |= GENERIC_READ;
-		}
-		else if (strchr(mode, 'r'))
-		{
-			creation = OPEN_EXISTING;
-			access = GENERIC_READ;
-
-			if (strchr(mode, '+'))
-				access = GENERIC_WRITE;
-		}
-		else if (strchr(mode, 'a'))
-		{
-			creation = OPEN_ALWAYS;
-			access = GENERIC_WRITE;
-
-			if (strchr(mode, '+'))
-				access |= GENERIC_READ;
-		}
-
-		if (creation & GENERIC_WRITE)
-		{
-			hFile = CreateFileW(wcFile, access, 0, NULL, creation, 0, NULL);
-
-			if (hFile == INVALID_HANDLE_VALUE)
-				break;
-			else
-				CloseHandle(hFile);
-		}
-
-		hFile = CreateFileW(wcFile, access, FILE_SHARE_READ, NULL, creation, 0, NULL);
-		break;
-	}
-
-	delete  wcFile;
-
-	if (hFile == INVALID_HANDLE_VALUE)
-		return NULL;
-	else
-		return _fdopen(_open_osfhandle((intptr_t)hFile, 0), mode);
-#else
-	return fopen(file, mode);
-#endif
-}
-
-#if _WIN32
-extern "C"
-{
-	// libavformat uses open (in the file_open function) so we need to override that too.
-	// Following the same rules as ADM_fopen.
-	int ADM_open(const char *path, int oflag, ...)
-	{
-		int fileNameLength = utf8StringToWideChar(path, -1, NULL);
-		wchar_t *wcFile = new wchar_tfileNameLength;
-		int creation = 0, access = 0;
-		HANDLE hFile;
-
-		utf8StringToWideChar(path, -1, wcFile);
-
-		delete  wcFile;
-
-		if (oflag & O_WRONLY || oflag & O_RDWR)
-		{
-			access = GENERIC_WRITE;
-
-			if (oflag & O_RDWR)
-				access |= GENERIC_READ;
-
-			if (oflag & O_CREAT)
-			{
-				if (oflag & O_EXCL)
-					creation = CREATE_NEW;
-				else if (oflag & O_TRUNC)
-					creation = CREATE_ALWAYS;
-				else
-					creation = OPEN_ALWAYS;
-			}
-			else if (oflag & O_TRUNC)
-				creation = TRUNCATE_EXISTING;
-		}
-		else if (oflag & O_RDONLY)
-			creation = OPEN_EXISTING;
-
-		if (creation & GENERIC_WRITE)
-		{
-			hFile = CreateFileW(wcFile, access, 0, NULL, creation, 0, NULL);
-
-			if (hFile == INVALID_HANDLE_VALUE)
-				return -1;
-			else
-				CloseHandle(hFile);
-		}
-
-		hFile = CreateFileW(wcFile, access, FILE_SHARE_READ, NULL, creation, 0, NULL);
-
-		if (hFile == INVALID_HANDLE_VALUE)
-			return -1;
-		else
-			return _open_osfhandle((intptr_t)hFile, oflag);
-	}
-}
-#endif
 
 int ADM_fclose(FILE *file)
 {
 	return fclose(file); 
 }
 
-/*
-      Get the  directory where jobs are stored
-******************************************************/
-char *ADM_getCustomDir(void)
-{
-	if (ADM_customdir)
-		return ADM_customdir;
-
-	ADM_customdir = ADM_getHomeRelativePath("custom");
 
-	if (!ADM_mkdir(ADM_customdir))
-	{
-		printf("can't create custom directory (%s).\n", ADM_customdir);
-		return NULL;
-	}
-
-	return ADM_customdir;
-}
-/**
-    \fn ADM_getAutoDir
-    \brief  Get the  directory where auto script are stored. No need to free the string.
-******************************************************/
-char *ADM_getAutoDir(void)
-{
-    if (ADM_autodir )
-        return ADM_autodir;
-#ifdef __APPLE__
-    const char *startDir="../lib";
-#else
-    const char *startDir=ADM_RELATIVE_LIB_DIR;
+#ifdef _WIN32
+#define DIR _WDIR
+#define dirent _wdirent
+#define opendir _wopendir
+#define readdir _wreaddir
+#define closedir _wclosedir
 #endif
-    ADM_autodir = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "autoScripts");
-	return ADM_autodir;
-}
+
 /**
-    \fn ADM_getPluginSettingsDir
-    \brief Get the folder containing the plugin settings (presets etc..)
+    \fn clearDirectoryContent
 */
-const char *ADM_getSystemPluginSettingsDir(void)
+uint8_t    clearDirectoryContent(const uint32_t nb, char *jobName)
 {
-    if(ADM_systemPluginSettings) return ADM_systemPluginSettings;
-#ifdef __APPLE__
-    const char *startDir="../lib";
-#else
-    const char *startDir=ADM_RELATIVE_LIB_DIR;
-#endif
-    ADM_systemPluginSettings=ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "pluginSettings");
-    return ADM_systemPluginSettings;
+    for(int i=0;i<nb;i++)
+        if(jobNamei)
+        {
+            ADM_dealloc(jobNamei);
+            jobNamei=NULL;
+        }
+    return true;
 }
+//------------------------------------------------------------------
+
+
 /**
+    \fn ADM_PathSplit
+    \brief Split path into absolute path+name and extention i.e. /foo/bar/zee.avi -> /foo/bar/zee,avi.             Copy are returned
 
 */
-const char *ADM_getUserPluginSettingsDir(void)
-{
-    if(ADM_userPluginSettings) return ADM_userPluginSettings;
-    ADM_userPluginSettings=ADM_getHomeRelativePath("pluginSettings");
-    return ADM_userPluginSettings;
-}
-
-/*
-      Get the  directory where jobs are stored
-******************************************************/
-char *ADM_getJobDir(void)
+void ADM_PathSplit(const char *str, char **root, char **ext)
 {
-	if (ADM_jobdir)
-		return ADM_jobdir;
+	char *full;
+	uint32_t l;
 
-	ADM_jobdir = ADM_getHomeRelativePath("jobs");
+	full = ADM_PathCanonize(str);
+	// Search the last
+	l = strlen(full);
+	l--;
+	ADM_assert(l > 0);
 
+	while (*(full + l) != '.' && l)
+		l--;
 
-	if (!ADM_mkdir(ADM_jobdir))
+	if (!l || l == (strlen(full) - 1))
 	{
-		printf("can't create custom directory (%s).\n", ADM_jobdir);
-		return NULL;
+		if (l == (strlen(full) - 1))
+			*(full + l) = 0;  // remove trailing
+
+		*ext = new char2;
+		*root = full;
+		strcpy(*ext, "");
+
+		return;
 	}
+	// else we do get an extension
+	// starting at l+1
+	uint32_t suff;
 
-	return ADM_jobdir;
+	suff = strlen(full) - l - 1;
+	*ext = new charsuff + 1;
+	strcpy(*ext, full + l + 1);
+	*(full + l) = 0;
+	*root = full;
 }
+/**
+ * \fn ADM_PathSplit
+ * \brief std::string version of the above
+ * @param in
+ * @param root
+ * @param ext
+ */
+void            ADM_PathSplit(const std::string &in,std::string &root, std::string &ext)
+{
+  	char *full;
+    std::string canonized;
 
-static void AddSeparator(char *path)
+	full = ADM_PathCanonize(in.c_str());
+    canonized=std::string(full);
+    delete  full;full=NULL;
+    
+    size_t pos=canonized.find_last_of(".");
+    
+    
+    // no "." ?
+    if(pos==std::string::npos)
+      {
+        root=canonized;
+        ext=std::string("");
+        return;
+      }
+    
+    // else split
+    root=canonized.substr(0,pos);
+    ext=canonized.substr(pos+1);
+}
+/**
+    \fn ADM_copyFile
+*/
+uint8_t ADM_copyFile(const char *source, const char *target)
 {
-	if (path && (strlen(path) < strlen(ADM_SEPARATOR) || strncmp(path + strlen(path) - strlen(ADM_SEPARATOR), ADM_SEPARATOR, strlen(ADM_SEPARATOR)) != 0))
-		strcat(path, ADM_SEPARATOR);
+    FILE *fin=ADM_fopen(source,"rb");
+    if(!fin)
+    {
+        ADM_error("Cannot open %s for reading\n",source);
+        return false;
+    }
+    FILE *fout=ADM_fopen(target,"wb");
+    if(!fout)
+    {
+        fclose(fin);
+        ADM_error("Cannot open %s for writting\n",target);
+        return false;
+    }
+    uint8_t buffer1024;
+    while(!feof(fin))
+    {
+        int r=fread(buffer,1,1024,fin);
+        fwrite(buffer,1,r,fout);
+        if(r!=1024) break;
+    }
+
+    fclose(fin);
+    fclose(fout);
+    return true;
 }
 
+
 /**
  * 	\fn ADM_getRelativePath
  */
-static char *ADM_getRelativePath(const char *base0, const char *base1, const char *base2, const char *base3)
+char *ADM_getRelativePath(const char *base0, const char *base1, const char *base2, const char *base3)
 {
 	char *result;
 	int length = strlen(base0) + 2;
@@ -340,549 +258,110 @@
 	return result;
 }
 
-/**
- * 	\fn char *ADM_getHomeRelativePath(const char *base1, const char *base2=NULL,const char *base3=NULL);
- *  \brief Returns home directory +base 1 + base 2... The return value is a copy, and must be deleted 
- */
-char *ADM_getHomeRelativePath(const char *base1, const char *base2, const char *base3)
-{
-	return ADM_getRelativePath(ADM_getBaseDir(), base1, base2, base3);
-}
-
-char *ADM_getInstallRelativePath(const char *base1, const char *base2, const char *base3)
-{
-#ifdef _WIN32
-	wchar_t wcModuleNameMAX_PATH;
-
-	GetModuleFileNameW(0, wcModuleName, sizeof(wcModuleName) / sizeof(wchar_t));
-
-	int len = wideCharStringToUtf8(wcModuleName, -1, NULL);
-	char *moduleName = new charlen;
-
-	wideCharStringToUtf8(wcModuleName, -1, moduleName);
-
-	char *slash = strrchr(moduleName, '\\');
-		
-	if (slash)
-		*slash = '\0';
-
-	char *relativePath = ADM_getRelativePath(moduleName, base1, base2, base3);
-
-	delete  moduleName;
-
-	return relativePath;
-
-#elif defined(__APPLE__)
-#define MAX_PATH_SIZE 1024
-
-	char bufferMAX_PATH_SIZE;
-
-	CFURLRef url(CFBundleCopyExecutableURL(CFBundleGetMainBundle()));
-	buffer0 = '\0';
-
-	if (url)
-	{
-		CFURLGetFileSystemRepresentation(url, true, (UInt8*)buffer, MAX_PATH_SIZE);
-		CFRelease(url);
-
-		char *slash = strrchr(buffer, '/');
-		
-		if (slash)
-			*slash = '\0';
-	}
-
-	return ADM_getRelativePath(buffer, base1, base2, base3);
-#else
-	return ADM_getRelativePath(ADM_INSTALL_DIR, base1, base2, base3);
-#endif
-}
-
-/*
-      Get the root directory for .avidemux stuff
-******************************************************/
-char *ADM_getBaseDir(void)
-{
-	return ADM_basedir;
-}
-
-void ADM_initBaseDir(bool portableMode)
-{
-	char *home = NULL;
-
-	// Get the base directory
-#ifdef _WIN32
-    if (portableMode)
-    {
-        // Portable mode...
-        home = ADM_getInstallRelativePath(NULL, NULL, NULL);
-    }
-	else
-    {
-        wchar_t wcHomeMAX_PATH;
-
-        if (SHGetFolderPathW(NULL, CSIDL_APPDATA, NULL, 0, wcHome) == S_OK)
-        {
-            int len = wideCharStringToUtf8(wcHome, -1, NULL);
-            home = new charlen;
-
-            wideCharStringToUtf8(wcHome, -1, home);
-        }
-        else
-        {
-            printf("Oops: can't determine the Application Data folder.");
-            home=new char10;
-            strcpy(home,"c:\\");
-        }
-    }
-#else
-	const char* homeEnv = getenv("HOME");
-
-	if (homeEnv)
-	{
-		home = new charstrlen(homeEnv) + 2;
-		strcpy(home, homeEnv);
-	}
-	else
-	{
-		printf("Oops: can't determine $HOME.");
-	}
-#endif
-
-	// Try to open the .avidemux directory
-
-	if (home)
-	{
-		strcpy(ADM_basedir, home);
-		AddSeparator(ADM_basedir);
-
-#ifdef _WIN32
-		const char *ADM_DIR_NAME;
-
-		if (portableMode)
-			ADM_DIR_NAME = "settings";
-		else
-			ADM_DIR_NAME = "avidemux";
-#elif defined __HAIKU__
-		const char *ADM_DIR_NAME = "config/settings/avidemux6";
-#else
-		const char *ADM_DIR_NAME = ".avidemux6";
-#endif
-
-		strcat(ADM_basedir, ADM_DIR_NAME);
-		strcat(ADM_basedir, ADM_SEPARATOR);
-
-		delete  home;
-
-		if (ADM_mkdir(ADM_basedir))
-		{
-			printf("Using %s as base directory for prefs, jobs, etc.\n", ADM_basedir);
-		}
-		else
-		{
-			ADM_error("Oops: cannot create the .avidemux directoryi (%s)\n", ADM_basedir);
-		}
-	}
-}
-
-#ifdef _WIN32
-#define DIR _WDIR
-#define dirent _wdirent
-#define opendir _wopendir
-#define readdir _wreaddir
-#define closedir _wclosedir
-#endif
-
-/*----------------------------------------
-      Create a directory
-      If it already exists, do nothing
-------------------------------------------*/
-uint8_t ADM_mkdir(const char *dirname)
-{
-	DIR *dir = NULL;
-	uint8_t retVal = 0;
-
-#ifdef _WIN32
-	int dirNameLength = utf8StringToWideChar(dirname, -1, NULL);
-	wchar_t *dirname2 = new wchar_tdirNameLength;
-
-	utf8StringToWideChar(dirname, -1, dirname2);
-#else
-	const char* dirname2 = dirname;
-#endif
 
-	while (true)
-	{
-		// Check it already exists ?
-		dir = opendir(dirname2);
-
-		if (dir)
-		{
-			printf("Directory %s exists.Good.\n", dirname);
-			closedir(dir);
-
-			retVal = 1;
-			break;
-		}
-#ifdef _WIN32
-		if (_wmkdir(dirname2))
-		{
-			printf("Oops: mkdir failed on %s\n", dirname);
-			break;
-		}
-#else
-		printf("Creating dir :%s\n", dirname2);
-		mkdir(dirname2,0755);
-#endif
-
-		if ((dir = opendir(dirname2)) == NULL)
-			break;
-
-		closedir(dir);
-
-		retVal = 1;
-
-		break;
-	}
-
-#ifdef _WIN32
-	delete  dirname2;
-#endif
-
-	return retVal;
-}
 /**
- *  \fn buildDirectoryContent
- * 	\brief Returns the content of a dir with the extension ext. The receiving array must be allocated by caller
- * (just the array, not the names themselves)
- */
-uint8_t buildDirectoryContent(uint32_t *outnb, const char *base, char *jobName, int maxElems, const char *ext)
+ * \fn ADM_getCustomDir
+ * \brief      Get the  directory where jobs are stored
+*/
+static char *ADM_customdir = NULL;
+const char *ADM_getCustomDir(void)
 {
-	DIR *dir;
-	struct dirent *direntry;
-	int dirmax = 0, len;
-	int extlen = strlen(ext);
-
-	ADM_assert(extlen);
-
-#ifdef _WIN32
-	int dirNameLength = utf8StringToWideChar(base, -1, NULL);
-	wchar_t *base2 = new wchar_tdirNameLength;
-
-	utf8StringToWideChar(base, -1, base2);
-#else
-	const char *base2 = base;
-#endif
-
-	dir = opendir(base2);
-
-#ifdef _WIN32
-	delete  base2;
-#endif
-
-	if (!dir)
-	{
-		return 0;
-	}
+	if (ADM_customdir)
+		return ADM_customdir;
 
-#ifdef _WIN32
-	char *d_name = NULL;
-#endif
+	ADM_customdir = ADM_getHomeRelativePath("custom");
 
-	while ((direntry = readdir(dir)))
+	if (!ADM_mkdir(ADM_customdir))
 	{
-#ifdef _WIN32
-		delete  d_name;
-
-		int dirLength = wideCharStringToUtf8(direntry->d_name, -1, NULL);
-		d_name = new chardirLength;
-
-		wideCharStringToUtf8(direntry->d_name, -1, d_name);
-#else
-		const char *d_name = direntry->d_name;
-#endif
-
-		len = strlen(d_name);
-
-		if (len < (extlen + 1))
-			continue;
-
-		int xbase = len - extlen;
-
-		if (memcmp(d_name + xbase, ext, extlen))
-		{
-			printf("ignored: %s\n", d_name);
-			continue;
-		}
-
-		jobNamedirmax = (char *)ADM_alloc(strlen(base) + strlen(d_name) + 2);
-		strcpy(jobNamedirmax, base);
-		AddSeparator(jobNamedirmax);
-		strcat(jobNamedirmax, d_name);
-		dirmax++;
-
-		if (dirmax >= maxElems)
-		{
-			printf("jobs: Max # of jobs exceeded\n");
-			break;
-		}
+		printf("can't create custom directory (%s).\n", ADM_customdir);
+		return NULL;
 	}
 
-#ifdef _WIN32
-	delete  d_name;
-#endif
-
-	closedir(dir);
-	*outnb = dirmax;
-
-	return 1;
-}
-/**
-    \fn clearDirectoryContent
-*/
-uint8_t    clearDirectoryContent(const uint32_t nb, char *jobName)
-{
-    for(int i=0;i<nb;i++)
-        if(jobNamei)
-        {
-            ADM_dealloc(jobNamei);
-            jobNamei=NULL;
-        }
-    return true;
+	return ADM_customdir;
 }
-//------------------------------------------------------------------
 
-/*
-
-** note: it modifies it's first argument
-*/
-void simplify_path(char **buf)
-{
-	unsigned int last1slash = 0;
-	unsigned int last2slash = 0;
-
-	while (!strncmp(*buf, "/../", 4))
-		memmove(*buf, *buf + 3, strlen(*buf + 3) + 1);
-
-	for (unsigned int i = 0; i < strlen(*buf) - 2; i++)
-		while (!strncmp(*buf + i, "/./", 3))
-			memmove(*buf + i, *buf + i + 2, strlen(*buf + i + 2) + 1);
-
-	for (unsigned int i = 0; i < strlen(*buf) - 3; i++)
-	{
-		if (*(*buf + i) == '/')
-		{
-			last2slash = last1slash;
-			last1slash = i;
-		}
-
-		if (!strncmp(*buf + i, "/../", 4))
-		{
-			memmove(*buf + last2slash, *buf + i + 3, strlen(*buf + i + 3) + 1);
-
-			return simplify_path(buf);
-		}
-	}
-}
 
 /**
-        \fn ADM_PathCanonize
-        \brief Canonize the path, returns a copy of the absolute path given as parameter
+ *      \fn ADM_getJobDir
+      \brief Get the  directory where jobs are stored
 */
-char *ADM_PathCanonize(const char *tmpname)
+static char *ADM_jobdir = NULL;
+const char *ADM_getJobDir(void)
 {
-	char path300;
-	char *out;
+	if (ADM_jobdir)
+		return ADM_jobdir;
 
-	if (!getcwd(path, 300))
-	{
-		fprintf(stderr, "\ngetcwd() failed with: %s (%u)\n", strerror(errno), errno);
-		path0 = '\0';
-	}
+	ADM_jobdir = ADM_getHomeRelativePath("jobs");
 
-	if (!tmpname || tmpname0 == 0)
-	{
-		out = new charstrlen(path) + 2;
-		strcpy(out, path);
-#ifndef _WIN32
-		strcat(out, "/");
-#else
-		strcat(out, "\\");
-#endif
-		printf("\n Canonizing null string ??? (%s)\n", out);
-	}
-	else if (tmpname0 == '/'
-#if defined(_WIN32)
-		|| tmpname1 == ':'
-#endif
-		)
-	{
-		out = new charstrlen(tmpname) + 1;
-		strcpy(out, tmpname);
 
-		return out;
-	}
-	else
+	if (!ADM_mkdir(ADM_jobdir))
 	{
-		out = new charstrlen(path) + strlen(tmpname) + 6;
-		strcpy(out, path);
-#ifndef _WIN32
-		strcat(out, "/");
-#else
-		strcat(out, "\\");
-#endif
-		strcat(out, tmpname);
+		printf("can't create custom directory (%s).\n", ADM_jobdir);
+		return NULL;
 	}
 
-	simplify_path(&out);
-
-	return out;
-}
-
-/**
-        \fn ADM_PathStripName
-	\brief Returns path only /foo/bar.avi -> /foo INPLACE, no copy done
-
-*/
-void ADM_PathStripName(char *str)
-{
-	int len = strlen(str);
-
-	if (len <= 1)
-		return;
-
-	len--;
-
-#ifndef _WIN32
-	while (*(str + len) != '/' && len)
-#else
-	while (*(str + len) != '\\' && len)
-#endif
-	{
-		*(str + len) = 0;
-		len--;
-	}
+	return ADM_jobdir;
 }
 
 /**
-    \fn ADM_GetFileName
-    \brief Get the filename without path. /foo/bar.avi -> bar.avi INPLACE, NO COPY
-
+ * \fn  ADM_getUserPluginSettingsDir
+ * \brief returns the user plugin setting 
 */
-const char *ADM_GetFileName(const char *str)
+static char *ADM_userPluginSettings=NULL;
+const char *ADM_getUserPluginSettingsDir(void)
 {
-	const char *filename;
-
-#ifndef _WIN32
-	filename = strrchr(str, '/');
-#else
-	const char *filename2;
-
-	filename = strrchr(str, '\\');
-	filename2 = strrchr(str, '/');
-
-	if (filename2 && filename)
-		if (filename2 > filename)
-			filename = filename2;
-#endif
-
-	if (filename)
-		return filename + 1;
-	else
-		return str;
+    if(ADM_userPluginSettings) return ADM_userPluginSettings;
+    ADM_userPluginSettings=ADM_getHomeRelativePath("pluginSettings");
+    return ADM_userPluginSettings;
 }
 
-/**
-    \fn ADM_PathSplit
-    \brief Split path into absolute path+name and extention i.e. /foo/bar/zee.avi -> /foo/bar/zee,avi.             Copy are returned
-
-*/
-void ADM_PathSplit(const char *str, char **root, char **ext)
-{
-	char *full;
-	uint32_t l;
-
-	full = ADM_PathCanonize(str);
-	// Search the last
-	l = strlen(full);
-	l--;
-	ADM_assert(l > 0);
-
-	while (*(full + l) != '.' && l)
-		l--;
-
-	if (!l || l == (strlen(full) - 1))
-	{
-		if (l == (strlen(full) - 1))
-			*(full + l) = 0;  // remove trailing
-
-		*ext = new char2;
-		*root = full;
-		strcpy(*ext, "");
-
-		return;
-	}
-	// else we do get an extension
-	// starting at l+1
-	uint32_t suff;
 
-	suff = strlen(full) - l - 1;
-	*ext = new charsuff + 1;
-	strcpy(*ext, full + l + 1);
-	*(full + l) = 0;
-	*root = full;
-}
 /**
-    \fn ADM_copyFile
+    \fn isPortableMode
+    \brief returns true if we are in portable mode
 */
-uint8_t ADM_copyFile(const char *source, const char *target)
+bool isPortableMode(int argc, char *argv)
 {
-    FILE *fin=ADM_fopen(source,"rb");
-    if(!fin)
+	bool portableMode = false;
+    std::string mySelf=argv0;
+    // if the name ends by "_portable.exe" => portable
+    int match=mySelf.find("portable");
+    if(match!=-1)
     {
-        ADM_error("Cannot open %s for reading\n",source);
-        return false;
-    }
-    FILE *fout=ADM_fopen(target,"wb");
-    if(!fout)
-    {
-        fclose(fin);
-        ADM_error("Cannot open %s for writting\n",target);
-        return false;
+        ADM_info("Portable mode\n");
+        return true;
     }
-    uint8_t buffer1024;
-    while(!feof(fin))
+
+    for (int i = 0; i < argc; i++)
     {
-        int r=fread(buffer,1,1024,fin);
-        fwrite(buffer,1,r,fout);
-        if(r!=1024) break;
+            if (!strcmp(argvi, "--portable"))
+            {
+                    portableMode = true;
+                    break;
+            }
     }
 
-    fclose(fin);
-    fclose(fout);
-    return true;
+    return portableMode;
 }
-
 /**
-    \fn ADM_copyFile
-*/
-uint8_t ADM_renameFile(const char *source, const char *target)
+ */
+std::string pluginDir;
+std::string ADM_getPluginDir(const char *subfolder)
 {
-#ifdef __MINGW32__
-	int sourceFileNameLength = utf8StringToWideChar(source, -1, NULL);
-    int targetFileNameLength = utf8StringToWideChar(target, -1, NULL);
-    wchar_t wcFileSourcesourceFileNameLength;
-    wchar_t wcFileTargettargetFileNameLength;
-    
-    utf8StringToWideChar(source, -1, wcFileSource);
-    utf8StringToWideChar(target, -1, wcFileTarget);
-   
-    if(!_wrename(wcFileSource,wcFileTarget)) return true;
-    ADM_error("Failed to rename %s to %s\n",source,target);
-    return false;
-#else
-    if(!rename(source,target)) return true;
-    return false;
-#endif
-}
+    std::string out;
+    if(!pluginDir.size())      
+    {
+            #ifdef __APPLE__
+                const char *startDir="../lib";
+            #else
+                const char *startDir=ADM_RELATIVE_LIB_DIR;
+            #endif
+        
+            char *p=ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR,"");
+            pluginDir = std::string(p);
+            delete  p;p=NULL;
+    }
+    return pluginDir+std::string(ADM_SEPARATOR)+std::string(subfolder);
+}            
 
 // EOF

avidemux_2.6.13.tar.gz/avidemux_core/ADM_core/src/ADM_folder_linux.cpp Added

@@ -0,0 +1,176 @@
+/***************************************************************************
+                    
+    copyright            : (C) 2006/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 <dirent.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <string>
+#include <stdlib.h>
+#include <unistd.h>
+#include "ADM_default.h"
+
+static bool isPortable=false;
+extern std::string pluginDir;
+
+char *ADM_getRelativePath(const char *base0, const char *base1, const char *base2, const char *base3);
+
+static char ADM_basedir1024 = {0};
+
+static char *ADM_autodir = NULL;
+static char *ADM_systemPluginSettings=NULL;
+static std::string ADM_i18nDir;
+/**
+ * 
+ * @param in
+ * @return 
+ */
+static std::string canonize(const std::string &in)
+{
+    std::string out;
+    char *simple2=canonicalize_file_name(in.c_str());
+    if(simple2)
+    {
+        out=std::string(simple2)+std::string("/");
+        free(simple2);simple2=NULL;
+    }else
+    {
+         out=in;
+    }
+    return out;
+}
+
+
+static void AddSeparator(char *path)
+{
+	if (path && (strlen(path) < strlen(ADM_SEPARATOR) || strncmp(path + strlen(path) - strlen(ADM_SEPARATOR), ADM_SEPARATOR, strlen(ADM_SEPARATOR)) != 0))
+		strcat(path, ADM_SEPARATOR);
+}
+
+/**
+    \fn ADM_getAutoDir
+    \brief  Get the  directory where auto script are stored. No need to free the string.
+******************************************************/
+const char *ADM_getAutoDir(void)
+{
+    if (ADM_autodir )
+        return ADM_autodir;
+    const char *startDir=ADM_RELATIVE_LIB_DIR;
+    ADM_autodir = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "autoScripts");
+	return ADM_autodir;
+}
+/**
+    \fn ADM_getPluginSettingsDir
+    \brief Get the folder containing the plugin settings (presets etc..)
+*/
+const char *ADM_getSystemPluginSettingsDir(void)
+{
+    if(ADM_systemPluginSettings) return ADM_systemPluginSettings;
+    const char *startDir=ADM_RELATIVE_LIB_DIR;
+    ADM_systemPluginSettings=ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "pluginSettings");
+    return ADM_systemPluginSettings;
+}
+/**
+ * 	\fn char *ADM_getHomeRelativePath(const char *base1, const char *base2=NULL,const char *base3=NULL);
+ *  \brief Returns home directory +base 1 + base 2... The return value is a copy, and must be deleted 
+ */
+char *ADM_getHomeRelativePath(const char *base1, const char *base2, const char *base3)
+{
+	return ADM_getRelativePath(ADM_getBaseDir(), base1, base2, base3);
+}
+
+char *ADM_getInstallRelativePath(const char *base1, const char *base2, const char *base3)
+{
+	return ADM_getRelativePath(ADM_INSTALL_DIR, base1, base2, base3);
+}
+const std::string ADM_getI8NDir(const std::string &flavor)
+{
+    if(ADM_i18nDir.size())
+        return ADM_i18nDir;
+    //
+    // 181n
+    if(isPortable)
+    {
+        std::string i18n=pluginDir;
+        i18n+=std::string("/../../share/avidemux6/")+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/");
+        char *ppath=ADM_getInstallRelativePath("share","avidemux6",partialPath.c_str());
+        ADM_i18nDir=std::string(ppath);
+        delete  ppath;
+        ppath=NULL;
+    }
+    return ADM_i18nDir;
+}
+/*
+      Get the root directory for .avidemux stuff
+******************************************************/
+const char *ADM_getBaseDir(void)
+{
+	return ADM_basedir;
+}
+/**
+ * 
+ * @param argc
+ * @param argv
+ */
+
+void ADM_initBaseDir(int argc, char *argv)
+{
+	char *home = NULL;
+	const char* homeEnv = getenv("HOME");
+
+	if (!homeEnv)
+	{
+        ADM_warning("Cannot locate HOME...\n");
+        return;
+    }
+    strcpy(ADM_basedir, homeEnv);
+    AddSeparator(ADM_basedir);
+
+    const char *ADM_DIR_NAME = ".avidemux6";
+
+    strcat(ADM_basedir, ADM_DIR_NAME);
+    strcat(ADM_basedir, ADM_SEPARATOR);
+
+    if (ADM_mkdir(ADM_basedir))
+    {
+        printf("Using %s as base directory for prefs, jobs, etc.\n", ADM_basedir);
+    }
+    else
+    {
+        ADM_error("Oops: cannot create the .avidemux directoryi (%s)\n", ADM_basedir);
+    }	
+    
+    if(isPortableMode(argc,argv))
+    {
+        ADM_info("Portable mode\n");
+        isPortable=true;
+        char *copy=ADM_PathCanonize(argv0);
+        ADM_PathStripName(copy); // small leak
+        std::string p=std::string(copy);
+        delete  copy;copy=NULL;
+        std::string plugins=p;
+        plugins+=std::string("/../lib/")+std::string(ADM_PLUGIN_DIR);
+        pluginDir=canonize(plugins);
+        ADM_info("Relative to install plugin mode : <%s>\n",pluginDir.c_str());
+    }
+    
+}
+#include "ADM_folder_unix.cpp"
+// EOF

avidemux_2.6.13.tar.gz/avidemux_core/ADM_core/src/ADM_folder_mac.cpp Added

@@ -0,0 +1,157 @@
+/***************************************************************************
+                    
+    copyright            : (C) 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 <dirent.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <string>
+#include <Carbon/Carbon.h>
+#include <unistd.h>
+
+#include "ADM_default.h"
+char *ADM_getRelativePath(const char *base0, const char *base1, const char *base2, const char *base3);
+static char ADM_basedir1024 = {0};
+static char *ADM_autodir = NULL;
+static char *ADM_systemPluginSettings=NULL;
+
+
+#undef fread
+#undef fwrite
+#undef fopen
+#undef fclose
+
+/**
+    \fn ADM_getAutoDir
+    \brief  Get the  directory where auto script are stored. No need to free the string.
+******************************************************/
+const char *ADM_getAutoDir(void)
+{
+    if (ADM_autodir )
+        return ADM_autodir;
+
+    const char *startDir="../lib";
+    ADM_autodir = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "autoScripts");
+    return ADM_autodir;
+}
+/**
+    \fn ADM_getPluginSettingsDir
+    \brief Get the folder containing the plugin settings (presets etc..)
+*/
+const char *ADM_getSystemPluginSettingsDir(void)
+{
+    if(ADM_systemPluginSettings) return ADM_systemPluginSettings;
+    const char *startDir="../lib";
+    ADM_systemPluginSettings=ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "pluginSettings");
+    return ADM_systemPluginSettings;
+}
+
+
+static void AddSeparator(char *path)
+{
+    if (path && (strlen(path) < strlen(ADM_SEPARATOR) || strncmp(path + strlen(path) - strlen(ADM_SEPARATOR), ADM_SEPARATOR, strlen(ADM_SEPARATOR)) != 0))
+        strcat(path, ADM_SEPARATOR);
+}
+
+/**
+ *     \fn char *ADM_getHomeRelativePath(const char *base1, const char *base2=NULL,const char *base3=NULL);
+ *  \brief Returns home directory +base 1 + base 2... The return value is a copy, and must be deleted 
+ */
+char *ADM_getHomeRelativePath(const char *base1, const char *base2, const char *base3)
+{
+    return ADM_getRelativePath(ADM_getBaseDir(), base1, base2, base3);
+}
+
+char *ADM_getInstallRelativePath(const char *base1, const char *base2, const char *base3)
+{
+
+#define MAX_PATH_SIZE 1024
+
+    char bufferMAX_PATH_SIZE;
+
+    CFURLRef url(CFBundleCopyExecutableURL(CFBundleGetMainBundle()));
+    buffer0 = '\0';
+
+    if (url)
+    {
+        CFURLGetFileSystemRepresentation(url, true, (UInt8*)buffer, MAX_PATH_SIZE);
+        CFRelease(url);
+
+        char *slash = strrchr(buffer, '/');
+        
+        if (slash)
+            *slash = '\0';
+    }
+
+    return ADM_getRelativePath(buffer, base1, base2, base3);
+}
+
+/*
+      Get the root directory for .avidemux stuff
+******************************************************/
+const char *ADM_getBaseDir(void)
+{
+    return ADM_basedir;
+}
+/**
+ */
+void ADM_initBaseDir(int argc, char *argv)
+{
+    char *home = NULL;
+
+    // Get the base directory
+
+    const char* homeEnv = getenv("HOME");
+
+    if (!homeEnv)
+    {
+        printf("Oops: can't determine $HOME.");
+        return;
+    }
+    // Try to open the .avidemux directory
+
+    strcpy(ADM_basedir, homeEnv);
+    AddSeparator(ADM_basedir);
+
+    const char *ADM_DIR_NAME = ".avidemux6";
+
+    strcat(ADM_basedir, ADM_DIR_NAME);
+    strcat(ADM_basedir, ADM_SEPARATOR);
+
+    if (ADM_mkdir(ADM_basedir))
+    {
+        printf("Using %s as base directory for prefs, jobs, etc.\n", ADM_basedir);
+    }
+    else
+    {
+        ADM_error("Oops: cannot create the .avidemux directoryi (%s)\n", ADM_basedir);
+    }
+}
+/**
+ * \fn ADM_getI8NDir
+ */
+const std::string ADM_getI8NDir(const std::string &flavor)
+{    
+    
+    std::string partialPath=flavor+std::string("/i18n/");
+    char *ppath=ADM_getInstallRelativePath("../share","avidemux6",partialPath.c_str());
+    std::string r=std::string(ppath);
+    delete  ppath;
+    ppath=NULL;
+    return  r;
+    
+}
+
+#include "ADM_folder_unix.cpp"
+// EOF

avidemux_2.6.13.tar.gz/avidemux_core/ADM_core/src/ADM_folder_unix.cpp Added

@@ -0,0 +1,267 @@
+/***************************************************************************
+ * \name ADM_folder_unix.cpp
+ * \author mean (c) 2006/2016
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 <dirent.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <string>
+
+#if defined(__APPLE__)
+#	include <Carbon/Carbon.h>
+#else
+#	include <fcntl.h>
+#endif
+#include "ADM_default.h"
+
+#undef fopen
+#undef mkdir
+
+/*
+
+** note: it modifies it's first argument
+*/
+void simplify_path(char **buf)
+{
+	unsigned int last1slash = 0;
+	unsigned int last2slash = 0;
+
+	while (!strncmp(*buf, "/../", 4))
+		memmove(*buf, *buf + 3, strlen(*buf + 3) + 1);
+
+	for (unsigned int i = 0; i < strlen(*buf) - 2; i++)
+		while (!strncmp(*buf + i, "/./", 3))
+			memmove(*buf + i, *buf + i + 2, strlen(*buf + i + 2) + 1);
+
+	for (unsigned int i = 0; i < strlen(*buf) - 3; i++)
+	{
+		if (*(*buf + i) == '/')
+		{
+			last2slash = last1slash;
+			last1slash = i;
+		}
+
+		if (!strncmp(*buf + i, "/../", 4))
+		{
+			memmove(*buf + last2slash, *buf + i + 3, strlen(*buf + i + 3) + 1);
+
+			return simplify_path(buf);
+		}
+	}
+}
+/**
+    \fn ADM_fopen
+    \brief utf8 aware fopen, so that we can use utf8 string even on win32
+*/
+FILE *ADM_fopen(const char *file, const char *mode)
+{
+	return fopen(file, mode);
+}
+
+
+/*----------------------------------------
+      Create a directory
+      If it already exists, do nothing
+------------------------------------------*/
+uint8_t ADM_mkdir(const char *dirname)
+{
+	DIR *dir = NULL;
+	uint8_t retVal = 0;
+
+	const char* dirname2 = dirname;
+
+	while (true)
+	{
+		// Check it already exists ?
+		dir = opendir(dirname2);
+
+		if (dir)
+		{
+			printf("Directory %s exists.Good.\n", dirname);
+			closedir(dir);
+
+			retVal = 1;
+			break;
+		}
+		printf("Creating dir :%s\n", dirname2);
+		mkdir(dirname2,0755);
+
+		if ((dir = opendir(dirname2)) == NULL)
+			break;
+
+		closedir(dir);
+
+		retVal = 1;
+
+		break;
+	}
+
+	return retVal;
+}
+/**
+ *  \fn buildDirectoryContent
+ * 	\brief Returns the content of a dir with the extension ext. The receiving array must be allocated by caller
+ * (just the array, not the names themselves)
+ */
+uint8_t buildDirectoryContent(uint32_t *outnb, const char *base, char *jobName, int maxElems, const char *ext)
+{
+	DIR *dir;
+	struct dirent *direntry;
+	int dirmax = 0, len;
+	int extlen = strlen(ext);
+
+	ADM_assert(extlen);
+
+	const char *base2 = base;
+
+	dir = opendir(base2);
+
+
+	if (!dir)
+	{
+		return 0;
+	}
+
+
+	while ((direntry = readdir(dir)))
+	{
+		const char *d_name = direntry->d_name;
+
+		len = strlen(d_name);
+
+		if (len < (extlen + 1))
+			continue;
+
+		int xbase = len - extlen;
+
+		if (memcmp(d_name + xbase, ext, extlen))
+		{
+			printf("ignored: %s\n", d_name);
+			continue;
+		}
+
+		jobNamedirmax = (char *)ADM_alloc(strlen(base) + strlen(d_name) + 2);
+		strcpy(jobNamedirmax, base);
+		AddSeparator(jobNamedirmax);
+		strcat(jobNamedirmax, d_name);
+		dirmax++;
+
+		if (dirmax >= maxElems)
+		{
+			printf("jobs: Max # of jobs exceeded\n");
+			break;
+		}
+	}
+
+
+	closedir(dir);
+	*outnb = dirmax;
+
+	return 1;
+}
+
+/**
+        \fn ADM_PathCanonize
+        \brief Canonize the path, returns a copy of the absolute path given as parameter
+*/
+char *ADM_PathCanonize(const char *tmpname)
+{
+	char path300;
+	char *out;
+
+	if (!getcwd(path, 300))
+	{
+		fprintf(stderr, "\ngetcwd() failed with: %s (%u)\n", strerror(errno), errno);
+		path0 = '\0';
+	}
+
+	if (!tmpname || tmpname0 == 0)
+	{
+		out = new charstrlen(path) + 2;
+		strcpy(out, path);
+		strcat(out, "/");
+		printf("\n Canonizing null string ??? (%s)\n", out);
+	}
+	else if (tmpname0 == '/'		)
+	{
+		out = new charstrlen(tmpname) + 1;
+		strcpy(out, tmpname);
+
+		return out;
+	}
+	else
+	{
+		out = new charstrlen(path) + strlen(tmpname) + 6;
+		strcpy(out, path);
+		strcat(out, "/");
+		strcat(out, tmpname);
+	}
+
+	simplify_path(&out);
+
+	return out;
+}
+
+/**
+        \fn ADM_PathStripName
+	\brief Returns path only /foo/bar.avi -> /foo INPLACE, no copy done
+
+*/
+void ADM_PathStripName(char *str)
+{
+	int len = strlen(str);
+
+	if (len <= 1)
+		return;
+
+	len--;
+
+        
+	while (*(str + len) != '/' && len)
+	{
+		*(str + len) = 0;
+		len--;
+	}
+}
+
+/**
+    \fn ADM_GetFileName
+    \brief Get the filename without path. /foo/bar.avi -> bar.avi INPLACE, NO COPY
+
+*/
+const char *ADM_GetFileName(const char *str)
+{
+	const char *filename;
+
+
+	filename = strrchr(str, '/');
+
+
+	if (filename)
+		return filename + 1;
+	else
+		return str;
+}
+
+
+/**
+    \fn ADM_copyFile
+*/
+uint8_t ADM_renameFile(const char *source, const char *target)
+{
+    if(!rename(source,target)) return true;
+    return false;
+}
+       
+
+// EOF

avidemux_2.6.13.tar.gz/avidemux_core/ADM_core/src/ADM_folder_win32.cpp Added

@@ -0,0 +1,600 @@
+/***************************************************************************
+                    
+    copyright            : (C) 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 <dirent.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <string>
+#include <io.h>
+#include <direct.h>
+#include <shlobj.h>
+#include "ADM_win32.h"
+
+#include "ADM_default.h"
+
+extern void simplify_path(char **buf);
+char *ADM_getRelativePath(const char *base0, const char *base1, const char *base2, const char *base3);
+static char ADM_basedir1024 = {0};
+static char *ADM_autodir = NULL;
+static char *ADM_systemPluginSettings=NULL;
+
+
+#undef fread
+#undef fwrite
+#undef fopen
+#undef fclose
+
+/**
+    \fn ADM_getAutoDir
+    \brief  Get the  directory where auto script are stored. No need to free the string.
+******************************************************/
+const char *ADM_getAutoDir(void)
+{
+    if (ADM_autodir )
+        return ADM_autodir;
+    const char *startDir=ADM_RELATIVE_LIB_DIR;
+    ADM_autodir = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "autoScripts");
+	return ADM_autodir;
+}
+/**
+    \fn ADM_getPluginSettingsDir
+    \brief Get the folder containing the plugin settings (presets etc..)
+*/
+const char *ADM_getSystemPluginSettingsDir(void)
+{
+    if(ADM_systemPluginSettings) return ADM_systemPluginSettings;
+    const char *startDir=ADM_RELATIVE_LIB_DIR;
+    ADM_systemPluginSettings=ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "pluginSettings");
+    return ADM_systemPluginSettings;
+}
+
+
+static void AddSeparator(char *path)
+{
+	if (path && (strlen(path) < strlen(ADM_SEPARATOR) || strncmp(path + strlen(path) - strlen(ADM_SEPARATOR), ADM_SEPARATOR, strlen(ADM_SEPARATOR)) != 0))
+		strcat(path, ADM_SEPARATOR);
+}
+
+/**
+ * 	\fn char *ADM_getHomeRelativePath(const char *base1, const char *base2=NULL,const char *base3=NULL);
+ *  \brief Returns home directory +base 1 + base 2... The return value is a copy, and must be deleted 
+ */
+char *ADM_getHomeRelativePath(const char *base1, const char *base2, const char *base3)
+{
+	return ADM_getRelativePath(ADM_getBaseDir(), base1, base2, base3);
+}
+
+char *ADM_getInstallRelativePath(const char *base1, const char *base2, const char *base3)
+{
+
+	wchar_t wcModuleNameMAX_PATH;
+
+	GetModuleFileNameW(0, wcModuleName, sizeof(wcModuleName) / sizeof(wchar_t));
+
+	int len = wideCharStringToUtf8(wcModuleName, -1, NULL);
+	char *moduleName = new charlen;
+
+	wideCharStringToUtf8(wcModuleName, -1, moduleName);
+
+	char *slash = strrchr(moduleName, '\\');
+		
+	if (slash)
+		*slash = '\0';
+
+	char *relativePath = ADM_getRelativePath(moduleName, base1, base2, base3);
+
+	delete  moduleName;
+
+	return relativePath;
+}
+
+/*
+      Get the root directory for .avidemux stuff
+******************************************************/
+const char *ADM_getBaseDir(void)
+{
+	return ADM_basedir;
+}
+
+/**
+ * \fn ADM_initBaseDir
+ * \brief ADM_initBaseDir
+ */
+void ADM_initBaseDir(int argc, char *argv)
+{
+	char *home = NULL;
+
+    bool portableMode=isPortableMode(argc,argv);
+	// Get the base directory
+
+    if (portableMode)
+    {
+        // Portable mode...
+        home = ADM_getInstallRelativePath(NULL, NULL, NULL);
+    }
+	else
+    {
+        wchar_t wcHomeMAX_PATH;
+
+        if (SHGetFolderPathW(NULL, CSIDL_APPDATA, NULL, 0, wcHome) == S_OK)
+        {
+            int len = wideCharStringToUtf8(wcHome, -1, NULL);
+            home = new charlen;
+
+            wideCharStringToUtf8(wcHome, -1, home);
+        }
+        else
+        {
+            printf("Oops: can't determine the Application Data folder.");
+            home=new char10;
+            strcpy(home,"c:\\");
+        }
+    }
+
+
+	// Try to open the .avidemux directory
+
+	if (home)
+	{
+		strcpy(ADM_basedir, home);
+		AddSeparator(ADM_basedir);
+
+
+		const char *ADM_DIR_NAME;
+
+		if (portableMode)
+			ADM_DIR_NAME = "settings";
+		else
+			ADM_DIR_NAME = "avidemux";
+
+		strcat(ADM_basedir, ADM_DIR_NAME);
+		strcat(ADM_basedir, ADM_SEPARATOR);
+
+		delete  home;
+
+		if (ADM_mkdir(ADM_basedir))
+		{
+			printf("Using %s as base directory for prefs, jobs, etc.\n", ADM_basedir);
+		}
+		else
+		{
+			ADM_error("Oops: cannot create the .avidemux directoryi (%s)\n", ADM_basedir);
+		}
+	}
+}
+/**
+ * \fn ADM_getI8NDir
+ */
+const std::string ADM_getI8NDir(const std::string &flavor)
+{
+    //
+    char *home = ADM_getInstallRelativePath(flavor.c_str(), "i18n", NULL);
+    std::string r=std::string(home);
+    delete  home;
+    return r;
+}
+//--- 8< 8< 8<
+
+#	include <io.h>
+#	include <direct.h>
+#	include <shlobj.h>
+#	include <fcntl.h>
+#	include "ADM_win32.h"
+
+/*
+
+** note: it modifies it's first argument
+*/
+void simplify_path(char **buf)
+{
+	unsigned int last1slash = 0;
+	unsigned int last2slash = 0;
+
+	while (!strncmp(*buf, "/../", 4))
+		memmove(*buf, *buf + 3, strlen(*buf + 3) + 1);
+
+	for (unsigned int i = 0; i < strlen(*buf) - 2; i++)
+		while (!strncmp(*buf + i, "/./", 3))
+			memmove(*buf + i, *buf + i + 2, strlen(*buf + i + 2) + 1);
+
+	for (unsigned int i = 0; i < strlen(*buf) - 3; i++)
+	{
+		if (*(*buf + i) == '/')
+		{
+			last2slash = last1slash;
+			last1slash = i;
+		}
+
+		if (!strncmp(*buf + i, "/../", 4))
+		{
+			memmove(*buf + last2slash, *buf + i + 3, strlen(*buf + i + 3) + 1);
+
+			return simplify_path(buf);
+		}
+	}
+}
+/**
+    \fn ADM_fopen
+    \brief utf8 aware fopen, so that we can use utf8 string even on win32
+*/
+FILE *ADM_fopen(const char *file, const char *mode)
+{
+
+	// Override fopen to handle Unicode filenames and to ensure exclusive access when initially writing to a file.
+	int fileNameLength = utf8StringToWideChar(file, -1, NULL);
+	wchar_t *wcFile = new wchar_tfileNameLength;
+	int creation = 0, access = 0;
+	HANDLE hFile;
+
+	utf8StringToWideChar(file, -1, wcFile);
+
+	while (true)
+	{
+		if (strchr(mode, 'w'))
+		{
+			creation = CREATE_ALWAYS;
+			access = GENERIC_WRITE;
+
+			if (strchr(mode, '+'))
+				access |= GENERIC_READ;
+		}
+		else if (strchr(mode, 'r'))
+		{
+			creation = OPEN_EXISTING;
+			access = GENERIC_READ;
+
+			if (strchr(mode, '+'))
+				access = GENERIC_WRITE;
+		}
+		else if (strchr(mode, 'a'))
+		{
+			creation = OPEN_ALWAYS;
+			access = GENERIC_WRITE;
+
+			if (strchr(mode, '+'))
+				access |= GENERIC_READ;
+		}
+
+		if (creation & GENERIC_WRITE)
+		{
+			hFile = CreateFileW(wcFile, access, 0, NULL, creation, 0, NULL);
+
+			if (hFile == INVALID_HANDLE_VALUE)
+				break;
+			else
+				CloseHandle(hFile);
+		}
+
+		hFile = CreateFileW(wcFile, access, FILE_SHARE_READ, NULL, creation, 0, NULL);
+		break;
+	}
+
+	delete  wcFile;
+
+	if (hFile == INVALID_HANDLE_VALUE)
+		return NULL;
+	else
+		return _fdopen(_open_osfhandle((intptr_t)hFile, 0), mode);
+}
+
+
+extern "C"
+{
+	// libavformat uses open (in the file_open function) so we need to override that too.
+	// Following the same rules as ADM_fopen.
+	int ADM_open(const char *path, int oflag, ...)
+	{
+		int fileNameLength = utf8StringToWideChar(path, -1, NULL);
+		wchar_t *wcFile = new wchar_tfileNameLength;
+		int creation = 0, access = 0;
+		HANDLE hFile;
+
+		utf8StringToWideChar(path, -1, wcFile);
+
+		delete  wcFile;
+
+		if (oflag & O_WRONLY || oflag & O_RDWR)
+		{
+			access = GENERIC_WRITE;
+
+			if (oflag & O_RDWR)
+				access |= GENERIC_READ;
+
+			if (oflag & O_CREAT)
+			{
+				if (oflag & O_EXCL)
+					creation = CREATE_NEW;
+				else if (oflag & O_TRUNC)
+					creation = CREATE_ALWAYS;
+				else
+					creation = OPEN_ALWAYS;
+			}
+			else if (oflag & O_TRUNC)
+				creation = TRUNCATE_EXISTING;
+		}
+		else if (oflag & O_RDONLY)
+			creation = OPEN_EXISTING;
+
+		if (creation & GENERIC_WRITE)
+		{
+			hFile = CreateFileW(wcFile, access, 0, NULL, creation, 0, NULL);
+
+			if (hFile == INVALID_HANDLE_VALUE)
+				return -1;
+			else
+				CloseHandle(hFile);
+		}
+
+		hFile = CreateFileW(wcFile, access, FILE_SHARE_READ, NULL, creation, 0, NULL);
+
+		if (hFile == INVALID_HANDLE_VALUE)
+			return -1;
+		else
+			return _open_osfhandle((intptr_t)hFile, oflag);
+	}
+}
+
+
+
+#define DIR _WDIR
+#define dirent _wdirent
+#define opendir _wopendir
+#define readdir _wreaddir
+#define closedir _wclosedir
+
+/*----------------------------------------
+      Create a directory
+      If it already exists, do nothing
+------------------------------------------*/
+uint8_t ADM_mkdir(const char *dirname)
+{
+	DIR *dir = NULL;
+	uint8_t retVal = 0;
+
+
+	int dirNameLength = utf8StringToWideChar(dirname, -1, NULL);
+	wchar_t *dirname2 = new wchar_tdirNameLength;
+
+	utf8StringToWideChar(dirname, -1, dirname2);
+
+	while (true)
+	{
+		// Check it already exists ?
+		dir = opendir(dirname2);
+
+		if (dir)
+		{
+			printf("Directory %s exists.Good.\n", dirname);
+			closedir(dir);
+
+			retVal = 1;
+			break;
+		}
+
+		if (_wmkdir(dirname2))
+		{
+			printf("Oops: mkdir failed on %s\n", dirname);
+			break;
+		}
+
+		if ((dir = opendir(dirname2)) == NULL)
+			break;
+
+		closedir(dir);
+
+		retVal = 1;
+
+		break;
+	}
+
+
+	delete  dirname2;
+
+	return retVal;
+}
+/**
+ *  \fn buildDirectoryContent
+ * 	\brief Returns the content of a dir with the extension ext. The receiving array must be allocated by caller
+ * (just the array, not the names themselves)
+ */
+uint8_t buildDirectoryContent(uint32_t *outnb, const char *base, char *jobName, int maxElems, const char *ext)
+{
+	DIR *dir;
+	struct dirent *direntry;
+	int dirmax = 0, len;
+	int extlen = strlen(ext);
+
+	ADM_assert(extlen);
+
+
+	int dirNameLength = utf8StringToWideChar(base, -1, NULL);
+	wchar_t *base2 = new wchar_tdirNameLength;
+
+	utf8StringToWideChar(base, -1, base2);
+
+	dir = opendir(base2);
+
+
+	delete  base2;
+
+	if (!dir)
+	{
+		return 0;
+	}
+
+
+	char *d_name = NULL;
+
+	while ((direntry = readdir(dir)))
+	{
+		delete  d_name;
+
+		int dirLength = wideCharStringToUtf8(direntry->d_name, -1, NULL);
+		d_name = new chardirLength;
+
+		wideCharStringToUtf8(direntry->d_name, -1, d_name);
+
+		len = strlen(d_name);
+
+		if (len < (extlen + 1))
+			continue;
+
+		int xbase = len - extlen;
+
+		if (memcmp(d_name + xbase, ext, extlen))
+		{
+			printf("ignored: %s\n", d_name);
+			continue;
+		}
+
+		jobNamedirmax = (char *)ADM_alloc(strlen(base) + strlen(d_name) + 2);
+		strcpy(jobNamedirmax, base);
+		AddSeparator(jobNamedirmax);
+		strcat(jobNamedirmax, d_name);
+		dirmax++;
+
+		if (dirmax >= maxElems)
+		{
+			printf("jobs: Max # of jobs exceeded\n");
+			break;
+		}
+	}
+
+
+	delete  d_name;
+
+	closedir(dir);
+	*outnb = dirmax;
+
+	return 1;
+}
+
+/**
+        \fn ADM_PathCanonize
+        \brief Canonize the path, returns a copy of the absolute path given as parameter
+*/
+char *ADM_PathCanonize(const char *tmpname)
+{
+	char path300;
+	char *out;
+
+	if (!getcwd(path, 300))
+	{
+		fprintf(stderr, "\ngetcwd() failed with: %s (%u)\n", strerror(errno), errno);
+		path0 = '\0';
+	}
+
+	if (!tmpname || tmpname0 == 0)
+	{
+		out = new charstrlen(path) + 2;
+		strcpy(out, path);
+#ifndef _WIN32
+		strcat(out, "/");
+#else
+		strcat(out, "\\");
+#endif
+		printf("\n Canonizing null string ??? (%s)\n", out);
+	}
+	else if (tmpname0 == '/'
+#if defined(_WIN32)
+		|| tmpname1 == ':'
+#endif
+		)
+	{
+		out = new charstrlen(tmpname) + 1;
+		strcpy(out, tmpname);
+
+		return out;
+	}
+	else
+	{
+		out = new charstrlen(path) + strlen(tmpname) + 6;
+		strcpy(out, path);
+#ifndef _WIN32
+		strcat(out, "/");
+#else
+		strcat(out, "\\");
+#endif
+		strcat(out, tmpname);
+	}
+
+	simplify_path(&out);
+
+	return out;
+}
+
+/**
+        \fn ADM_PathStripName
+	\brief Returns path only /foo/bar.avi -> /foo INPLACE, no copy done
+
+*/
+void ADM_PathStripName(char *str)
+{
+	int len = strlen(str);
+	if (len <= 1)
+		return;
+	len--;
+	while (*(str + len) != '\\' && len)
+	{
+		*(str + len) = 0;
+		len--;
+	}
+}
+
+/**
+    \fn ADM_GetFileName
+    \brief Get the filename without path. /foo/bar.avi -> bar.avi INPLACE, NO COPY
+
+*/
+const char *ADM_GetFileName(const char *str)
+{
+	const char *filename;
+
+	const char *filename2;
+
+	filename = strrchr(str, '\\');
+	filename2 = strrchr(str, '/');
+
+	if (filename2 && filename)
+		if (filename2 > filename)
+			filename = filename2;
+
+	if (filename)
+		return filename + 1;
+	else
+		return str;
+}
+
+/**
+    \fn ADM_copyFile
+*/
+uint8_t ADM_renameFile(const char *source, const char *target)
+{
+
+    int sourceFileNameLength = utf8StringToWideChar(source, -1, NULL);
+    int targetFileNameLength = utf8StringToWideChar(target, -1, NULL);
+    wchar_t wcFileSourcesourceFileNameLength;
+    wchar_t wcFileTargettargetFileNameLength;
+    
+    utf8StringToWideChar(source, -1, wcFileSource);
+    utf8StringToWideChar(target, -1, wcFileTarget);
+   
+    if(!_wrename(wcFileSource,wcFileTarget)) return true;
+    ADM_error("Failed to rename %s to %s\n",source,target);
+    return false;
+}
+
+
+// EOF

avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/src/ADM_misc.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_core/src/ADM_misc.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/src/ADM_win32.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_core/src/ADM_win32.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/src/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_core/src/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_core/src/TLK_clock.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_core/src/TLK_clock.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioAccessFile.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioAccessFile.h Changed

avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioAccessFileAACADTS.h Added

@@ -0,0 +1,94 @@
+/***************************************************************************
+    \file ADM_audioAccessfileAACADTS
+    \brief read audio from a file, AAC inside ADTS
+    \author mean (c) 2012 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_coreAudio6_export.h"
+#include "ADM_audioStream.h"
+#include "vector"
+#include "ADM_audioClock.h"
+#include "ADM_aacadts.h"
+#include <vector>
+
+/**
+        \fn      ADM_audioAccessFile
+        \brief   Input is a plain file
+*/
+
+class aacAdtsSeek
+{
+public:
+    uint64_t position;
+    uint64_t dts;
+};
+
+class ADM_COREAUDIO6_EXPORT ADM_audioAccessFileAACADTS  : public ADM_audioAccess
+{
+protected:
+                FILE            *_fd;
+                uint64_t        payloadSize;
+                uint64_t        fileSize;
+                uint64_t        durationUs;
+                bool            inited;
+                audioClock      *clock;
+                ADM_adts2aac    *aac;
+                bool            refill(void);
+                WAVHeader       headerInfo;
+                 std::vector<aacAdtsSeek>seekPoints;
+
+protected:
+                bool            init(void);
+
+public:
+                                  ADM_audioAccessFileAACADTS(const char *fileName,int offset);
+                virtual           ~ADM_audioAccessFileAACADTS() ;
+                
+            const WAVHeader       &getHeaderInfo() {return headerInfo;};
+                
+                virtual bool        getPacket(uint8_t *buffer, uint32_t *size, uint32_t maxSize,
+                            uint64_t *dts);
+                                    /// Go to a given time
+                virtual bool      goToTime(uint64_t timeUs);
+
+                // stubs
+                                    /// Hint, the stream is pure CBR (AC3,MP2,MP3)
+                virtual bool      isCBR(void) { return false;}
+                                    /// Return true if the demuxer can seek in time
+                virtual bool      canSeekTime(void) {return true;};
+                                    /// Return true if the demuxer can seek by offser
+                virtual bool      canSeekOffset(void) {return false;};
+                                    /// Return true if we can have the audio duration
+                virtual bool      canGetDuration(void) {return true;};
+                                    /// Returns audio duration in us
+                virtual uint64_t  getDurationInUs(void) {return durationUs;}
+
+                                    /// Grab extra data
+                virtual bool      getExtraData(uint32_t *l, uint8_t **d)
+                                    {
+                                            *l=extraDataLen;    
+                                            *d=extraData;
+                                            return true;
+                                    };
+                                    /// Returns length in bytes of the audio stream
+                virtual uint32_t  getLength(void) {return payloadSize;};
+
+                                    /// Set position in bytes
+                virtual bool      setPos(uint64_t pos) { ADM_assert(0);return true;};
+                                    /// Get position in bytes
+                virtual uint64_t  getPos() { ADM_assert(0);return true;};
+
+                
+};
+
+// EOF
+

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioWrite.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioWrite.h Changed

@@ -14,23 +14,26 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef ADM_AUDIO_WRITE_H
-#define ADM_AUDIO_WRITE_H
-
+#pragma once
 #include "ADM_coreAudio6_export.h"
+/**
+ * \class class ADM_audioWrite
 
+ */
 class ADM_audioWrite
 {
 protected:
     FILE *_file;
 
 public:
-            ADM_audioWrite();
-virtual     ~ADM_audioWrite();
-virtual      bool close(void);
-virtual      bool init(ADM_audioStream *stream, const char *fileName);
-virtual      bool write(uint32_t size, uint8_t *buffer);
+                    ADM_audioWrite();
+virtual             ~ADM_audioWrite();
+virtual      bool   close(void);
+virtual      bool   init(ADM_audioStream *stream, const char *fileName);
+virtual      bool   write(uint32_t size, uint8_t *buffer);
+virtual      bool   canBeBuffered() {return true;}; // if false, it is packet oriented, else it is stream oriented like PCM
 };
 
 ADM_COREAUDIO6_EXPORT ADM_audioWrite *admCreateAudioWriter(ADM_audioStream *stream);
-#endif
\ No newline at end of file
+
+// EOF
\ No newline at end of file

avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioWriteAAC.h Added

@@ -0,0 +1,42 @@
+/**
+    \file  ADM_audioWriteAAC
+    \brief Writer
+
+    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_audioWrite.h"
+/**
+ * 
+ * @param stream
+ * @return 
+ */
+class ADM_audioWriteAAC: public ADM_audioWrite
+{
+protected:
+             bool          writeHeader(ADM_audioStream *stream);
+             bool          updateHeader(void);
+
+public:
+                  ADM_audioWriteAAC();
+virtual      bool close(void);
+virtual      bool init(ADM_audioStream *stream, const char *fileName);
+                  
+virtual      bool canBeBuffered() {return false;}; 
+virtual      bool write(uint32_t size, uint8_t *buffer);
+
+protected:
+            uint8_t  aacHeader7;
+};
+
+

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioWriteWav.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioWriteWav.h Changed

avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS.cpp Added

@@ -0,0 +1,212 @@
+/**
+    \file ADM_audioAccessFileAACADTS
+    \brief Source is a AAC audio file, wrapped in ADTS container
+
+*/
+
+/***************************************************************************
+ *                                                                         *
+ *   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_audioStream.h"
+#include "ADM_audioAccessFileAACADTS.h"
+#include "ADM_vidMisc.h"
+#include "ADM_audioAccessFileAACADTS_indexer.cpp"
+
+/**
+ * 
+ * @return 
+ */
+bool ADM_audioAccessFileAACADTS::init(void)
+{
+    aac=new  ADM_adts2aac();    
+    // ----- extract data frequency etc.. to initialize clock
+#define PROBE_SIZE 8000
+    uint8_t bufferPROBE_SIZE+1;
+    int n=fread(buffer,1,PROBE_SIZE,_fd);
+    if(n<=0) return false;
+    fseek(_fd,0,SEEK_SET);
+    ADM_info("Probing AAC/ADTS with %d bytes\n",n);
+    aac->addData(n,buffer);
+    if(ADM_adts2aac::ADTS_OK!=aac->getAACFrame(NULL,NULL))
+    {
+        ADM_warning("Cannot sync\n");
+        return false;
+    }
+    // ----- Get extraData
+    uint8_t *p=NULL;
+    aac->getExtraData(&extraDataLen,&p);
+    if(extraDataLen)
+    {
+        extraData=new uint8_textraDataLen;
+        memcpy(extraData,p,extraDataLen);
+    }
+    // -----  fillup header
+    headerInfo.encoding=WAV_AAC;
+    headerInfo.frequency=aac->getFrequency();
+    headerInfo.channels=aac->getChannels();
+    headerInfo.bitspersample=16;
+    headerInfo.blockalign=0;
+    
+    
+    aac->reset();
+    
+    clock= new audioClock(headerInfo.frequency);
+    
+    // ----- build time map
+    fseek(_fd,0,SEEK_SET);
+    adtsIndexer dexer(_fd,headerInfo.frequency,headerInfo.channels);
+    ADM_info("Indexing adts/aac file\n");
+    dexer.index(seekPoints );  
+    ADM_info("found %d seekPoints\n",seekPoints.size());
+    fseek(_fd,0,SEEK_SET);
+    payloadSize=dexer.getPayloadSize();
+    // 
+    // compute duration
+    audioClock ck(headerInfo.frequency);
+    ck.advanceBySample(1024*dexer.getNbPackets());
+    durationUs=ck.getTimeUs();
+    double byteRate=dexer.getPayloadSize();
+    byteRate=byteRate/(1+durationUs);
+    headerInfo.byterate=byteRate*1000000.; // b/us -> b/ss
+
+    ADM_info("AAC total duration %s\n",ADM_us2plain(durationUs));
+    ADM_info("# of packets found : %d\n",dexer.getNbPackets());
+    ADM_info("Byterate : %d\n",headerInfo.byterate);
+    return true;
+}
+
+/**
+    \fn
+    \brief
+*/
+
+ADM_audioAccessFileAACADTS::ADM_audioAccessFileAACADTS(const char *fileName,int offset)
+{
+        fileSize=ADM_fileSize(fileName)-offset;
+        _fd=ADM_fopen(fileName,"rb");
+        ADM_assert(_fd);
+        clock=NULL;
+        inited=init();;
+        
+        
+}
+/**
+    \fn
+    \brief
+*/
+
+ADM_audioAccessFileAACADTS::~ADM_audioAccessFileAACADTS()
+{
+        if(_fd) ADM_fclose(_fd);
+        _fd=NULL;
+        if(clock) delete clock;
+        clock=NULL;
+        if(aac) delete aac;
+        aac=NULL;
+}
+/**
+ * 
+ * @param buffer
+ * @param size
+ * @param maxSize
+ * @param dts
+ * @return 
+ */
+bool ADM_audioAccessFileAACADTS::refill(void)
+{
+    // Read in temp buffer
+    uint8_t tmp4024;
+    int n=fread(tmp,1,4024,_fd);
+    if(n<1) return false;
+    // feed
+    aac->addData(n,tmp);
+    return true;
+}
+/**
+    \fn
+    \brief
+*/
+
+bool    ADM_audioAccessFileAACADTS::getPacket(uint8_t *buffer, uint32_t *size, uint32_t maxSize,uint64_t *dts)
+{
+    if(!inited) return false;
+    // Search sync
+    bool keepGoing=false;
+    int  outSize;
+    ADM_adts2aac::ADTS_STATE state;
+    
+    do{
+        state=aac->getAACFrame(&outSize,buffer);
+        switch(state)
+        {
+            case ADM_adts2aac::ADTS_MORE_DATA_NEEDED: 
+                    keepGoing=refill();
+                    break;
+            case ADM_adts2aac::ADTS_ERROR: 
+                    inited=false;
+                    keepGoing=false;
+                    ADM_warning("AAC/ADTS parser gone to error\n");
+                    break;
+            case ADM_adts2aac::ADTS_OK: 
+                    keepGoing=false;
+                    break;
+            default: 
+                    ADM_assert(0); 
+                    break;
+        }
+    }while(keepGoing);
+    
+    if(state!=ADM_adts2aac::ADTS_OK)
+    {
+        ADM_warning("AAC/ADTS : Cannot get packet\n");
+        return false;
+    }
+    // Now do it
+       //ADTS_STATE convert2(int incomingLen,const uint8_t *intData,int *outLen,uint8_t *out);
+    *size=outSize;
+    ADM_assert(outSize<maxSize);
+    *dts=clock->getTimeUs();
+    //printf("Time = %s\n",ADM_us2plain(*dts));
+    clock->advanceBySample(1024);
+    return true;         
+}
+/**
+ * 
+ * @param timeUs
+ * \brief We can be off by one frame (~ 10 ms)
+ * @return 
+ */
+bool      ADM_audioAccessFileAACADTS::goToTime(uint64_t timeUs)
+{
+    if(!inited)
+        return false;
+
+    // Search for the seek point just before timeUS
+    int n=seekPoints.size();
+    if(!n) return false;
+    int s=n-1;
+    for(int i=0;i<n-1;i++)
+    {
+        if(seekPointsi+1.dts>timeUs)
+        {
+            s=i;
+            break;
+        }
+    }
+    aacAdtsSeek seek=seekPointss;
+    ADM_info("AAC/ADTS seek to %s requested \n",ADM_us2plain(timeUs));
+    ADM_info(" done at index %d,  %s requested \n",s,ADM_us2plain(seek.dts));
+    clock->setTimeUs(seek.dts);
+    fseek(_fd,seek.position,SEEK_SET);
+    aac->reset();
+    return true;
+}
+
+// EOF
+

avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioAccessFileAACADTS_indexer.cpp Added

@@ -0,0 +1,123 @@
+/***************************************************************************
+    \file   ADM_audioAccessfileAACADTS_indexer
+    \brief  build a map to seek into the file
+    \author mean (c) 2016 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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#define AAC_SEEK_PERIOD (10000000LL) // 10 sec
+
+/**
+ * \class adtsIndexer
+ * @param fd
+ */
+class adtsIndexer
+{
+public:
+    
+            adtsIndexer(FILE *fd,int fq,int chan)
+            {
+                f=fd;
+                this->fq=fq;
+                this->channels=chan;
+                payload=0;
+                nbPackets=0;
+            }
+           
+    virtual ~adtsIndexer()
+            {
+                
+            }
+    int     getPayloadSize() {return payload;}    
+    bool    index(std::vector<aacAdtsSeek> &seekPoints);    
+    int     getNbPackets() {return nbPackets;}
+    
+protected:
+    FILE *f;
+    int  fq;
+    int  channels;
+    int  payload;
+    int  nbPackets;
+    
+};
+/**
+ * \fn index
+ * @param seekPoints
+ * @return 
+ */
+bool adtsIndexer::index(std::vector<aacAdtsSeek>& seekPoints)
+{
+#define CHUNK_SIZE (5*1024)
+   uint8_t  bufferCHUNK_SIZE;
+   int      fileOffset=0;;
+   uint64_t lastPoint=0;
+   int      len;
+   
+   audioClock   clk(fq);
+   ADM_adts2aac aac;
+   aacAdtsSeek  start;
+   int offset;
+
+   int      beginningOfBuffer=0;
+   int      endOfBuffer=0;
+   
+   start.dts=0;
+   start.position=0;
+   seekPoints.push_back(start); // initial start
+   
+   while(1)
+   {
+       ADM_adts2aac::ADTS_STATE s=aac.getAACFrame(&len,buffer,&offset);
+       switch(s)
+       {
+           case ADM_adts2aac::ADTS_OK:
+            {
+               uint64_t currentPoint=clk.getTimeUs();
+               if( (currentPoint-lastPoint)>AAC_SEEK_PERIOD) // one seek point every 10 s
+               {
+                   start.dts=currentPoint;
+                   start.position=offset;
+                   seekPoints.push_back(start);
+                   lastPoint=currentPoint;   
+               }
+                payload+=len;
+                clk.advanceBySample(1024);
+                nbPackets++;
+                //printf("Found %d packet, len is %d, offset is %d, time is %s\n",nbPackets,len,offset,ADM_us2plain(clk.getTimeUs()));
+                continue;
+                break;
+            }
+           case ADM_adts2aac::ADTS_ERROR:
+           {
+               return true;
+               break;
+           }
+           case ADM_adts2aac::ADTS_MORE_DATA_NEEDED:
+           {
+              
+               int n=fread(buffer,1,CHUNK_SIZE,f);
+               if(n<=0)
+                   return true;
+               beginningOfBuffer=endOfBuffer;
+               endOfBuffer+=n;
+               aac.addData(n,buffer);
+               break;
+           }
+           default:
+               ADM_assert(0);
+               break;
+       }
+    
+   }
+   return true; 
+}
+// EOF
+

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioClock.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioClock.cpp Changed

@@ -38,25 +38,23 @@
  * */
 uint64_t       audioClock::getTimeUs(void)
 {
-        float f=_nbSamples;
-                f=f*1000*1000;
-                f/=_frequency;
-                return _baseClock+(uint64_t)(f+0.5);
+double  f=_nbSamples;
+        f=f*1000*1000;
+        f/=_frequency;
+        return _baseClock+(uint64_t)(f+0.5);
 }
 /**
  *
  * */
 bool           audioClock::setTimeUs(uint64_t clk)
 {
-                uint64_t curTime=getTimeUs();
-                int64_t delta=(int64_t)clk-(int64_t)curTime;
-                if(labs((long int)delta)<2000) return true;
-                printf("audioClock Drift detected :%"PRIu64" vs %"PRIu64", delta=%"PRId64"\n",curTime,clk,delta);
-                _nbSamples=0;
-                _baseClock=clk;
-                return true; 
-
-
+        uint64_t curTime=getTimeUs();
+        int64_t  delta=(int64_t)clk-(int64_t)curTime;
+        if(labs((long int)delta)<2000) return true;
+        printf("audioClock Drift detected :%" PRIu64" vs %" PRIu64", delta=%" PRId64"\n",curTime,clk,delta);
+        _nbSamples=0;
+        _baseClock=clk;
+        return true; 
 }
 
 // EOF

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioIdentify.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioIdentify.cpp Changed

@@ -21,6 +21,7 @@
 #include "ADM_audioCodecEnum.h"
 #include "ADM_audioIdentify.h"
 #include "fourcc.h"
+#include "ADM_aacadts.h"
 
 extern void Endian_WavHeader(WAVHeader *w);
 #define INVALID_OFFSET 0XFFFFFFF
@@ -211,6 +212,53 @@
     return false;
 }
 /**
+ * 
+ * @param bufferSize
+ * @param data
+ * @param info
+ * @param offset
+ * @return 
+ */
+static bool idAAACADTS(int bufferSize,const uint8_t *data,WAVHeader &info,uint32_t &offset)
+{
+    ADM_adts2aac aac;
+    const uint8_t *start=data;
+    const uint8_t *end=data+bufferSize;
+    while(start<end)
+    {
+        int incoming=500;
+        int outLen;
+        if(start+500>end) incoming=end-start;
+        ADM_adts2aac::ADTS_STATE state=aac.convert2(incoming,start,&outLen,NULL);
+        start+=incoming;
+        switch(state)
+        {
+            case ADM_adts2aac::ADTS_ERROR: 
+                    return false;
+                    break;
+            case ADM_adts2aac::ADTS_MORE_DATA_NEEDED: 
+                    continue;
+                    break;
+            case ADM_adts2aac::ADTS_OK:
+                    // Got sync
+                    info.encoding=WAV_AAC;
+                    info.channels=aac.getChannels();
+                    info.blockalign=0;
+                    info.bitspersample=16;
+                    info.byterate=128000>>3;
+                    info.frequency=aac.getFrequency();
+                    ADM_info("Detected as AAC, fq=%d, channels=%d\n",info.frequency,info.channels);
+                    return true;
+                    break;
+            default:
+                ADM_assert(0);
+                break;
+        }
+    }
+    return false;
+}
+
+/**
     \fn ADM_identifyAudioStream
     \param bufferSize : nb of bytes available for scanning
     \param buffer     : buffer containing the data to scan
@@ -222,7 +270,9 @@
     memset(&info,0,sizeof(info));
     if(idWAV(bufferSize,buffer,info,offset)) return true;
     if(idMP2(bufferSize,buffer,info,offset)) return true;
+    if(idAAACADTS(bufferSize,buffer,info,offset)) return true;
     if(idAC3(bufferSize,buffer,info,offset)) return true;
+    
 
     return false;
 }

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamConstantChunk.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamConstantChunk.cpp Changed

@@ -23,15 +23,15 @@
         ADM_warning("ADM_audioStreamConstantChunk Blockalign is null expect problems\n");
         chunkSize=8192; // dummy value
     }
-    ADM_info("ADM_audioStreamConstantChunk Chunk size %"PRIu32"\n",chunkSize);
-    ADM_info("ADM_audioStreamConstantChunk Byterate   %"PRIu32"\n",header->byterate);
+    ADM_info("ADM_audioStreamConstantChunk Chunk size %" PRIu32"\n",chunkSize);
+    ADM_info("ADM_audioStreamConstantChunk Byterate   %" PRIu32"\n",header->byterate);
     // Compute sample per chunk from wavHeader...
     float f;
     f=chunkSize;
     f/=header->byterate; // F is in seconds
     f*=header->frequency; // in sample
     samplesPerChunk=(uint32_t)f;
-    ADM_info("ADM_audioStreamConstantChunk About %"PRIu32" samples per chunk\n",samplesPerChunk);
+    ADM_info("ADM_audioStreamConstantChunk About %" PRIu32" samples per chunk\n",samplesPerChunk);
     //samplesPerChunk=16;
     // If hinted..., compute the duration ourselves
     if(access->isCBR()==true && access->canSeekOffset()==true)

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioUtils.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioUtils.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioWrite.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioWrite.cpp Changed

avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioWriteAAC.cpp Added

@@ -0,0 +1,146 @@
+/**
+    \file  ADM_audioWriteAAC
+    \brief Write AAC packets inside ADTS container
+    copyright            : (C) 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_audioStream.h"
+#include "ADM_audioWriteAAC.h"
+
+/**
+ */
+static 	int aacSampleRate16=
+{
+	96000, 88200, 64000, 48000,
+	44100, 32000, 24000, 22050,
+	16000, 12000, 11025,  8000,
+	0,     0,     0,     0 
+};
+/**
+ * \fn frequency2index
+ * @param frequency
+ * @return 
+ */
+int frequency2index(int frequency)
+{
+    
+    int dex=0;
+    while(aacSampleRatedex)
+    {
+        if(aacSampleRatedex==frequency)
+            return dex;
+        dex++;
+    }
+    return -1;
+    
+}
+
+/**
+    \fn ctor
+*/
+ADM_audioWriteAAC::ADM_audioWriteAAC()
+{
+
+}
+/**
+    \fn writeHeader
+*/
+bool ADM_audioWriteAAC::writeHeader(ADM_audioStream *stream)
+{
+
+          return true;
+}
+
+
+/**
+    \fn close
+*/
+
+bool ADM_audioWriteAAC::close(void)
+{
+    return ADM_audioWrite::close();
+}
+/**
+    \fn init
+    \brief write wavHeader
+*/
+
+bool ADM_audioWriteAAC::init(ADM_audioStream *stream, const char *fileName)
+{
+    WAVHeader *hdr=stream->getInfo();
+    if(hdr->encoding!=WAV_AAC)
+    {
+        ADM_warning("Not AAC!\n");
+        return false;
+    }
+    int samplingFrequencyIndex=frequency2index(hdr->frequency);
+    if(samplingFrequencyIndex==-1)
+    {
+        ADM_warning("Invalid frequency \n");
+        return false;
+    }
+    uint32_t l;
+    uint8_t *d;
+    int profileMinus1=0;
+    if(stream->getExtraData(&l,&d))
+    {
+        if(l>0)
+        {
+            profileMinus1=d0>>5;
+            if(profileMinus1)
+                profileMinus1--;
+            ADM_info("AAC profile minus 1= %d\n",profileMinus1);
+        }else
+            ADM_warning("No valid AAC extra data");
+    }else
+    {
+        ADM_warning("Cannot get profile!\n");
+    }
+    
+    
+    int channel=hdr->channels;
+    
+    aacHeader0=0xff;
+    aacHeader1=0xf1;
+    aacHeader2=(profileMinus1<<6);
+    aacHeader2|=(samplingFrequencyIndex)<<2;
+    aacHeader2|=channel>>2;
+    aacHeader3=(channel&3)<<6; // Channel configuration+frameLength
+    aacHeader4=0; // frame length
+    aacHeader5=0; // frame length + buffer fullness
+    aacHeader6=0; // buffer fullness  + only one frame
+    
+    if(false==ADM_audioWrite::init(stream,fileName)) return false;
+    return true;
+}
+
+
+/**
+ * \fn write
+ * \brief incoming is one packet
+*/
+bool ADM_audioWriteAAC::write(uint32_t size, uint8_t *buffer)
+{
+    int totalLength=size+7;
+      // update header
+      aacHeader3&=0xc0;
+      aacHeader3|=totalLength>>11;
+      aacHeader4=totalLength>>3;
+      aacHeader5=(totalLength&7)<<5;
+      // Buffer fullness
+      fwrite(aacHeader,7,1,_file);
+      return ADM_audioWrite::write(size,buffer);
+}
+
+//EOF

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudio/src/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudio/src/CMakeLists.txt Changed

avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudioCodec Added

avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudioCodec/include Added

avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudioCodec/include/ADM_ad_plugin.h Changed

avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudioCodec/include/ADM_audiocodec.h Changed

avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudioCodec/include/ADM_audiocodeclist.h Changed

avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudioCodec/include/adm_ogg.h Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudioDevice/src/ADM_audioDeviceThreaded.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudioDevice/src/ADM_audioDeviceThreaded.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudioDevice/src/ADM_audiodevice.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudioDevice/src/ADM_audiodevice.cpp Changed

@@ -73,32 +73,32 @@
     \brief Try loading the file given as argument as an audio device plugin
 
 */
-#define Fail(x) {printf("%s:"#x"\n",file);goto er;}
+#define Fail(x) {ADM_info("%s:"#x"\n",file);goto er;}
 static bool tryLoadingFilterPlugin(const char *file)
 {
-	ADM_AudioDevices *dll=new ADM_AudioDevices(file);
+    ADM_AudioDevices *dll=new ADM_AudioDevices(file);
     if(!dll->initialised) Fail(CannotLoad);
     if(dll->apiVersion!=ADM_AUDIO_DEVICE_API_VERSION) Fail(WrongApiVersion);
 
     ListOfAudioDevices.append(dll); // Needed for cleanup. FIXME TODO Delete it.
-    printf("Filters Registered filter %s as  %s\n",file,dll->descriptor);
+    ADM_info("Filters Registered filter %s as  %s\n",file,dll->descriptor);
     return true;
-	// Fail!
+    // Fail!
 er:
-	delete dll;
-	return false;
+    delete dll;
+    return false;
 
 }
 /**
- * 	\fn ADM_av_loadPlugins
+ *     \fn ADM_av_loadPlugins
  *  \brief load all audio device plugins
  */
 uint8_t ADM_av_loadPlugins(const char *path)
 {
 #define MAX_EXTERNAL_FILTER 100
 
-	char *filesMAX_EXTERNAL_FILTER;
-	uint32_t nbFile;
+    char *filesMAX_EXTERNAL_FILTER;
+    uint32_t nbFile;
 
 
     // PushBack our dummy one : TODO FIXME
@@ -108,22 +108,22 @@
                                 DummyDeleteAudioDevice);
     
     ListOfAudioDevices.append(dummyDevice); 
-	memset(files,0,sizeof(char *)*MAX_EXTERNAL_FILTER);
-	printf("ADM_av_plugin Scanning directory %s\n",path);
+    memset(files,0,sizeof(char *)*MAX_EXTERNAL_FILTER);
+    ADM_info("ADM_av_plugin Scanning directory %s\n",path);
 
-	if(!buildDirectoryContent(&nbFile, path, files, MAX_EXTERNAL_FILTER, SHARED_LIB_EXT))
-	{
-		printf("ADM_av_plugin Cannot parse plugin\n");
-		return 0;
-	}
+    if(!buildDirectoryContent(&nbFile, path, files, MAX_EXTERNAL_FILTER, SHARED_LIB_EXT))
+    {
+        ADM_info("ADM_av_plugin Cannot parse plugin\n");
+        return 0;
+    }
 
-	for(int i=0;i<nbFile;i++)
-		tryLoadingFilterPlugin(filesi);
+    for(int i=0;i<nbFile;i++)
+        tryLoadingFilterPlugin(filesi);
 
-	printf("ADM_av_plugin Scanning done\n");
+    ADM_info("ADM_av_plugin Scanning done\n");
         clearDirectoryContent(nbFile,files);
 
-	return 1;
+    return 1;
 }
 /**
     \fn AVDM_audioSave
@@ -134,8 +134,8 @@
 void AVDM_audioSave( void )
 {
 const char *string;
-		string=ADM_audioById(currentDevice);
-		prefs->set(AUDIO_DEVICE_AUDIODEVICE, string);
+        string=ADM_audioById(currentDevice);
+        prefs->set(AUDIO_DEVICE_AUDIODEVICE, string);
 }
 /**
     \fn ADM_audioByName
@@ -144,16 +144,16 @@
 */
 AUDIO_DEVICE ADM_audioByName(const char *name)
 {
-	if(!name) return (AUDIO_DEVICE)0;
-	for(uint32_t i=0;i<ListOfAudioDevices.size();i++)
-	{
-		if(!strcasecmp(name,ListOfAudioDevicesi->name))
-		{
-			return i;
-		}	
-	}
-	printf("Device not found :%s\n",name);
-	return (AUDIO_DEVICE)0;
+    if(!name) return (AUDIO_DEVICE)0;
+    for(uint32_t i=0;i<ListOfAudioDevices.size();i++)
+    {
+        if(!strcasecmp(name,ListOfAudioDevicesi->name))
+        {
+            return i;
+        }    
+    }
+    ADM_info("Device not found :%s\n",name);
+    return (AUDIO_DEVICE)0;
 
 }
 /**
@@ -162,7 +162,7 @@
 */
 const char *ADM_audioById(AUDIO_DEVICE id)
 {
-	ADM_assert(id<ListOfAudioDevices.size());
+    ADM_assert(id<ListOfAudioDevices.size());
     return ListOfAudioDevicesid->name;
 }
 /**
@@ -171,7 +171,7 @@
 */
 AUDIO_DEVICE AVDM_getCurrentDevice( void)
 {
-	return currentDevice;
+    return currentDevice;
 }
 /**
     \fn AVDM_audioInit
@@ -183,14 +183,14 @@
 char *name=NULL;
 AUDIO_DEVICE id=0;
 
-		if(prefs->get(AUDIO_DEVICE_AUDIODEVICE, &name))
-		{
-		id=ADM_audioByName(name);
-		ADM_dealloc(name);
-		name=NULL;	
+        if(prefs->get(AUDIO_DEVICE_AUDIODEVICE, &name))
+        {
+        id=ADM_audioByName(name);
+        ADM_dealloc(name);
+        name=NULL;    
         }
-		
-		
+        
+        
         AVDM_switch(id);
 }
 /**
@@ -199,15 +199,15 @@
 */
 void AVDM_cleanup(void)
 {
+    if(device)
+    {
+        delete device;
+        device=NULL;
+    }
     int nb=ListOfAudioDevices.size();
     for(int i=0;i<nb;i++)
             delete ListOfAudioDevicesi;
     ListOfAudioDevices.clear();
-	if(device)
-	{
-// FIXME		delete device;
-		device=NULL;
-	}
 }
 /**
     \fn AVDM_switch
@@ -215,11 +215,11 @@
 */
 void AVDM_switch(AUDIO_DEVICE action)
 {
-	if(device)
-	{
-		delete device;
-		device=NULL;
-	}
+    if(device)
+    {
+        delete device;
+        device=NULL;
+    }
     ADM_assert(action<ListOfAudioDevices.size());
     device=ListOfAudioDevicesaction->createAudioDevice();
     currentDevice=action;
@@ -232,7 +232,7 @@
 */
 void AVDM_AudioClose(void)
 {
-	device->stop();
+    device->stop();
 }
 
 /**
@@ -242,8 +242,8 @@
 */
 uint32_t AVDM_AudioSetup(uint32_t fq, uint8_t channel,CHANNEL_TYPE *channelMapping)
 {
-	
-	return device->init(channel,fq,channelMapping);
+    
+    return device->init(channel,fq,channelMapping);
 }
 /**
     \fn AVDM_setVolume
@@ -253,7 +253,7 @@
 
 uint8_t         AVDM_setVolume(int volume)
 {
-        printf("New volume :%d\n",volume);
+        ADM_info("New volume :%d\n",volume);
         device->setVolume(volume);
         return 1;
 
@@ -265,7 +265,7 @@
 */
 uint8_t AVDM_AudioPlay(float *ptr, uint32_t nb)
 {
-	return device->play(nb,ptr);
+    return device->play(nb,ptr);
 }
 /**
     \fn AVDM_GetLayencyMs
@@ -274,7 +274,7 @@
 */
 uint32_t AVDM_GetLayencyMs(void)
 {
-	return device->getLatencyMs();
+    return device->getLatencyMs();
 }
 
 /**

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudioFilter/include/audiofilter_bridge.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudioFilter/include/audiofilter_bridge.h Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudioFilter/src/audiofilterAPI.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudioFilter/src/audiofilterAPI.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudioParser/include/ADM_aacadts.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudioParser/include/ADM_aacadts.h Changed

@@ -17,10 +17,13 @@
 
 #include "ADM_audioParser6_export.h"
 #include "ADM_byteBuffer.h"
+#include <vector>
 /**
     \class ADM_adts2aac
 */
 #define ADTS_BUFFER_SIZE 16000
+
+
 class ADM_AUDIOPARSER6_EXPORT ADM_adts2aac
 {
 private:
@@ -28,14 +31,22 @@
         uint8_t extra2;
         ADM_byteBuffer buffer;
         int     head,tail;
-		
+        int     headOffset;
+       
 public:
     typedef enum
     {
         ADTS_OK,ADTS_ERROR,ADTS_MORE_DATA_NEEDED
     }ADTS_STATE;
-		bool getExtraData(uint32_t *len,uint8_t **data);
-		ADTS_STATE convert2(int incomingLen,uint8_t *intData,int *outLen,uint8_t *out);
+    
+        bool  reset();                                         // reset parser
+        bool  addData(int incomingLen,const uint8_t *inData); // inject data to buffer
+        ADTS_STATE getAACFrame(int *outLen,uint8_t *out,int *offset=NULL); // try to extract a frame from buffer
+    
+    
+        bool getExtraData(uint32_t *len,uint8_t **data);
+        // combined addData/getAACFRame, deprecated
+        ADTS_STATE convert2(int incomingLen,const uint8_t *intData,int *outLen,uint8_t *out);
         int  getFrequency(void);
         int  getChannels(void);
              ADM_adts2aac();

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_a52info.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_a52info.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_aacadts.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_aacadts.cpp Changed

@@ -43,6 +43,28 @@
 	16000, 12000, 11025,  8000,
 	0,     0,     0,     0 
 };
+
+/**
+    \fn ctor
+*/
+
+ADM_adts2aac::ADM_adts2aac(void)
+{
+    hasExtra=false;
+    extra0=extra1=0;
+    head=tail=0;
+    buffer.setSize(ADTS_BUFFER_SIZE*2);
+    headOffset=0;
+}
+/**
+    \fn dtor
+*/
+
+ADM_adts2aac::~ADM_adts2aac()
+{
+   
+}
+
 /**
     \fn getExtraData
     \brief extract extradata from adts/aac stream. You must have converted successfully at leat one frame.
@@ -88,26 +110,35 @@
     return aacChannelsdex;
 }
 
+
 /**
-    \fn convert
-    \brief strip adts header. Out can be null if you just want to get headers
+    \fn addData
+    \brief Add data to our pool
 */
-
-ADM_adts2aac::ADTS_STATE ADM_adts2aac::convert2(int incomingLen,uint8_t *inData,int *outLen,uint8_t *out)
+bool ADM_adts2aac::reset()
 {
-    bool r=false;
-    // Step 1 : append to our buffer...
-    *outLen=0;
+     head=tail=0;
+     hasExtra=false;
+     headOffset=0;
+     return true;
+}
+bool  ADM_adts2aac::addData(int incomingLen,const uint8_t *inData)
+{
+     // Step 1 : append to our buffer...
+    
     if(head==tail)
     {
+        headOffset+=tail; 
         head=tail=0;
     }
     if(tail>ADTS_BUFFER_SIZE)
     {
+        headOffset+=tail; 
         int size=head-tail;
         memmove(buffer.at(0),buffer.at(tail),size);
         head=size;
         tail=0;
+        
     }
     if(head+incomingLen>ADTS_BUFFER_SIZE*2)
     {
@@ -117,6 +148,21 @@
     }
     memcpy(buffer.at(head),inData,incomingLen);
     head+=incomingLen;
+    return true;
+}
+/**
+ * \fn getAACFrame
+ * \brief try to extract a valid frame from ADTS
+ * @param outLen
+ * @param out
+ * @param offset, offset from the beginning of the stream i.e. 1st add Data
+ * @return 
+ */
+ADM_adts2aac::ADTS_STATE ADM_adts2aac::getAACFrame(int *outLen,uint8_t *out,int *offset)
+{
+    bool r=false;
+    if(outLen)
+        *outLen=0;
     // ok , done
     aprintf("********** LOOP (incoming =%d)*******\n",incomingLen);
 again:
@@ -135,40 +181,41 @@
     int match;
     for( p=(buffer.at(tail));p<(buffer.at(head-2));p++)
     {
-        if(p0==0xff && ((p1&0xf0)==0xf0))
+        if(p0!=0xff || ((p1&0xf0)!=0xf0))
+            continue;
+        
+        match=p-buffer.at(0); // offset of syncword
+        packetLen=((p3&0x3)<<11)+(p4<<3)+(p5>>5);
+        nbFrames=1+(p6&3);
+        if(!(p1&1))
+        {
+            crc=true;
+        }
+        if(nbFrames!=1) continue;
+        aprintf("ADTS Packet len=%d, nbframes=%d\n",packetLen,nbFrames);
+        aprintf("ADTS Found sync at offset %d, buffer size=%d\n",(int)(p-buffer.at(0)),(int)(head-tail));
+        aprintf("ADTS Dropping %d bytes\n",(int)(p-buffer.at(0)-tail));
+        if(match==tail && match+packetLen==head)
         {
-            match=p-buffer.at(0); // offset of syncword
-            packetLen=((p3&0x3)<<11)+(p4<<3)+(p5>>5);
-            nbFrames=1+(p6&3);
-            if(!(p1&1))
-            {
-                crc=true;
-            }
-            if(nbFrames!=1) continue;
-            aprintf("ADTS Packet len=%d, nbframes=%d\n",packetLen,nbFrames);
-            aprintf("ADTS Found sync at offset %d, buffer size=%d\n",(int)(p-buffer.at(0)),(int)(head-tail));
-            aprintf("ADTS Dropping %d bytes\n",(int)(p-buffer.at(0)-tail));
-            if(match==tail && match+packetLen==head)
-            {
-                aprintf("ADTS Perfect match\n");
-                found=true;
-                break;
-            }
-            if(match+packetLen+2>head && match+packetLen!=head)
-            {
-                aprintf("ADTS** not enough data, r=%d **\n",(int)r);
-                return ADTS_MORE_DATA_NEEDED;
-            }
-            // do we have sync at the end ?
-            if(ppacketLen!=0xff)
-            {
-                aprintf("ADTS no ff marker at the end\n");
-                continue;
-            }
-            aprintf("ADTS End marker found\n");
+            aprintf("ADTS Perfect match\n");
             found=true;
             break;
         }
+        if(match+packetLen+2>head && match+packetLen!=head)
+        {
+            aprintf("ADTS** not enough data, r=%d **\n",(int)r);
+            return ADTS_MORE_DATA_NEEDED;
+        }
+        // do we have sync at the end ?
+        if(ppacketLen!=0xff)
+        {
+            aprintf("ADTS no ff marker at the end\n");
+            continue;
+        }
+        aprintf("ADTS End marker found\n");
+        found=true;
+        break;
+        
     }
     if(found==false)
     {
@@ -192,15 +239,15 @@
     // filter!
     //-------
 
-        if(crc) 
-            {
-                o=p+9;
-                produced=packetLen-9;
-            }else
-            {
-                o=p+7;
-                produced=packetLen-7;
-            }
+    if(crc) 
+    {
+        o=p+9;
+        produced=packetLen-9;
+    }else
+    {
+        o=p+7;
+        produced=packetLen-7;
+    }
     //
     //---------
     if(!produced)
@@ -209,36 +256,32 @@
         aprintf("ADTS No data produced\n");
         goto again;
     }
+    if(offset)
+    {
+        *offset=headOffset+(int)(p-buffer.at(0));
+    }
     aprintf("ADTS Found adts packet of size %d, extradataLen=%d\n",produced,2);
     if(out)
     {
         memcpy(out,o,produced);
         out+=produced;
         *outLen+=produced;
-    }
-    
-    tail=match+packetLen; // ~ skip 
+        tail=match+packetLen; // ~ skip 
+    }   
     ADM_assert(tail<=head);
     return ADTS_OK;
 }
 /**
-    \fn ctor
-*/
-
-ADM_adts2aac::ADM_adts2aac(void)
-{
-    hasExtra=false;
-    extra0=extra1=0;
-    head=tail=0;
-    buffer.setSize(ADTS_BUFFER_SIZE*2);
-}
-/**
-    \fn dtor
+    \fn convert
+    \brief strip adts header. Out can be null if you just want to get headers
 */
 
-ADM_adts2aac::~ADM_adts2aac()
+ADM_adts2aac::ADTS_STATE ADM_adts2aac::convert2(int incomingLen,const uint8_t *inData,int *outLen,uint8_t *out)
 {
-   
+    bool r=false;
+    *outLen=0;
+    if(incomingLen)
+        addData(incomingLen,inData);
+    return getAACFrame(outLen,out);
 }
-
 //EOF

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_eac3info.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_eac3info.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_mp3info.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_mp3info.cpp Changed

avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxerMpegTemplate.cpp.h Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/src/ADM_indexFile.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/src/ADM_indexFile.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/src/dmxPSPacket.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/src/dmxPSPacket.cpp Changed

@@ -92,7 +92,7 @@
 {
     if(!_file->setpos(pos))
     {
-        printf("psPacket Cannot seek to %"PRIx64"\n", pos);
+        printf("psPacket Cannot seek to %" PRIx64"\n", pos);
         return false;
     }
     return true;
@@ -113,7 +113,7 @@
         {
                 uint64_t pos;
                 _file->getpos(&pos);
-                printf("DmxPS cannot sync  at %"PRIu64"/%"PRIu64"\n",pos,_size);
+                printf("DmxPS cannot sync  at %" PRIu64"/%" PRIu64"\n",pos,_size);
                 return false;
         }
 // Position of this packet just before startcode
@@ -574,12 +574,12 @@
 {
     if(!_file->setpos(packetStart))
     {
-        printf("psPacket Cannot seek to %"PRIx64"\n",packetStart);
+        printf("psPacket Cannot seek to %" PRIx64"\n",packetStart);
         return 0;
     }
     if(!refill())
     {
-        printf("PsPacketLinear Seek to %"PRIx64":%"PRIx32" failed\n",packetStart,offset);
+        printf("PsPacketLinear Seek to %" PRIx64":%" PRIx32" failed\n",packetStart,offset);
         return false;
     }
     ADM_assert(offset<bufferLen);

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/src/dmx_io.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/src/dmx_io.cpp Changed

@@ -78,7 +78,7 @@
             splitFile=ADM_splitSequencedFile(filename, &left, &right,&decimals,&base);
             if(splitFile)
             {   
-                aprintf("left:<%s>, right=<%s>,base=%"PRIu32",digit=%"PRIu32"\n",left,right,base,decimals);
+                aprintf("left:<%s>, right=<%s>,base=%" PRIu32",digit=%" PRIu32"\n",left,right,base,decimals);
             }else       
             {
                 aprintf("No.\n");
@@ -104,7 +104,7 @@
                  newFd.fileSizeCumul=0;
                 _size=newFd.fileSize;
                 listOfFd.append(newFd);
-                aprintf( " file: %s, size: %"PRIu64"\n", filename, newFd.fileSize );
+                aprintf( " file: %s, size: %" PRIu64"\n", filename, newFd.fileSize );
                 aprintf( " found 1 files \n" );
                 aprintf( "Done \n" );
                 return 1;
@@ -162,7 +162,7 @@
                 myFd.fileSizeCumul = total;
                 total+=  myFd.fileSize;
 
-                aprintf( " file %d: %s, size: %"PRIu64"\n", (count + 1), outName.c_str(),
+                aprintf( " file %d: %s, size: %" PRIu64"\n", (count + 1), outName.c_str(),
                                             myFd.fileSize );
 
                 listOfFd.append(myFd);
@@ -247,7 +247,7 @@
                                                   return 1;
                                         }
                         }
-                        printf("\n cannot seek to %"PRIu64"\n",o);
+                        printf("\n cannot seek to %" PRIu64"\n",o);
                         return 0;
 }
 //
@@ -262,7 +262,7 @@
         // preload
         if((4+_off)>=_size)
         {
-                printf("Dmx IO: End of file met (%"PRIu64" / %"PRIu64" seg:%u)\n",_off,_size,(unsigned int)listOfFd.size());
+                printf("Dmx IO: End of file met (%" PRIu64" / %" PRIu64" seg:%u)\n",_off,_size,(unsigned int)listOfFd.size());
                 return 0;
         }
         hnt=(read8i()<<16) + (read8i()<<8) +read8i();
@@ -295,7 +295,7 @@
         // preload
         if((5+_off)>=_size)
         {
-                printf("Dmx IO: End of file met (%"PRIu64" / %"PRIu64" seg:%u)\n",_off,_size,(unsigned int)listOfFd.size());
+                printf("Dmx IO: End of file met (%" PRIu64" / %" PRIu64" seg:%u)\n",_off,_size,(unsigned int)listOfFd.size());
                 return 0;
         }
         hnt=(read8i()<<24)+(read8i()<<16) + (read8i()<<8) +read8i();

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreImage/include/ADM_colorspace.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreImage/include/ADM_colorspace.h Changed

@@ -45,13 +45,14 @@
                                             uint8_t **srcData,int *srcStride);
   public :
     
-                    ADMColorScalerFull(ADMColorScaler_algo algo, uint32_t sw, uint32_t sh, uint32_t dw,uint32_t dh,ADM_colorspace from,ADM_colorspace to);
-    bool            reset(ADMColorScaler_algo, uint32_t sw, uint32_t sh, uint32_t dw,uint32_t dh,ADM_colorspace from,ADM_colorspace to);
+                    ADMColorScalerFull(ADMColorScaler_algo algo, int sw, int sh, int dw,int dh,ADM_colorspace from,ADM_colorspace to);
+    bool            reset(ADMColorScaler_algo, int sw, int sh, int dw,int dh,ADM_colorspace from,ADM_colorspace to);
     
 
     bool            convert(uint8_t  *from, uint8_t *to);
     bool            convertImage(ADMImage *img, uint8_t *to);
-    bool            convertPlanes(uint32_t  sourceStride3,uint32_t destStride3,     
+    bool            convertImage(ADMImage *sourceImage, ADMImage *destImage);
+    bool            convertPlanes(int  sourceStride3,int destStride3,     
                                   uint8_t   *sourceData3, uint8_t *destData3);
                     ~ADMColorScalerFull();
 };
@@ -62,8 +63,8 @@
 class ADMColorScalerSimple :public ADMColorScalerFull
 {
 public:
-    bool            changeWidthHeight(uint32_t newWidth, uint32_t newHeight);
-                    ADMColorScalerSimple( uint32_t width, uint32_t height, ADM_colorspace from,ADM_colorspace to,ADMColorScaler_algo algo=ADM_CS_BICUBIC):
+    bool            changeWidthHeight(int newWidth, int newHeight);
+                    ADMColorScalerSimple( int width, int height, ADM_colorspace from,ADM_colorspace to,ADMColorScaler_algo algo=ADM_CS_BICUBIC):
                         ADMColorScalerFull(algo, width, height, width,height, from, to)
                      {
 
@@ -72,7 +73,7 @@
 };
 
 // Some misc functions
-ADM_COREIMAGE6_EXPORT bool ADM_ConvertRgb24ToYV12(bool inverted,uint32_t w, uint32_t h, uint8_t *source, uint8_t *destination);
+ADM_COREIMAGE6_EXPORT bool ADM_ConvertRgb24ToYV12(bool inverted,int w, int h, uint8_t *source, uint8_t *destination);
 #endif
 //EOF

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreImage/include/ADM_image.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreImage/include/ADM_image.h Changed

@@ -47,7 +47,8 @@
         PLANAR_Y=0,
         PLANAR_U=1,
         PLANAR_V=2,
-        PLANAR_LAST=3
+        PLANAR_ALPHA=3,
+        PLANAR_LAST=3 // Alpha is not a real channel
         
 } ADM_PLANE;
 
@@ -67,15 +68,15 @@
 
 
 typedef bool refFunction(void *instance,void *cookie);
-typedef bool refDownloadFunction(ADMImage *image, void *instance, void *cookie);
+typedef bool refDownloadFunction(ADMImage *image, void *refCodec, void *refHwImage);
 /**
     \struct hwRefDescriptor
     \brief  Used to deal with hw accelerated stuff
 */
 typedef struct
 {
-        void            *refInstance;  ///
-        void            *refCookie;  /// Ref to a hw image
+        void            *refCodec;  ///
+        void            *refHwImage;  /// Ref to a hw image
         refFunction     *refMarkUsed;   ///
         refFunction     *refMarkUnused; ///
         refDownloadFunction     *refDownload;
@@ -95,7 +96,9 @@
 {
 public: // half public/protected, only in  ADMImageRef case it is really public
         uint8_t         *_planes3;     /// In case of linked data store y/u/v pointers
-        uint32_t        _planeStride3; /// Same story
+        int             _planeStride3; /// Same story
+        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
@@ -113,17 +116,13 @@
         uint8_t         *quant;
         int             _qStride;
         int             _qSize;
-        int             GetHeight(ADM_PLANE plane) {if(plane==PLANAR_Y) return _height; return _height/2;}
-        int             GetWidth(ADM_PLANE plane) {if(plane==PLANAR_Y) return _width; return _width/2;}
-        bool            GetPitches(uint32_t *pitches) {pitches0=GetPitch(PLANAR_Y);
-                                                       pitches1=GetPitch(PLANAR_U);
-                                                       pitches2=GetPitch(PLANAR_V);return true;}
-        bool            GetWritePlanes(uint8_t **planes) {planes0=GetWritePtr(PLANAR_Y);
-                                                        planes1=GetWritePtr(PLANAR_U);
-                                                        planes2=GetWritePtr(PLANAR_V);return true;}
-        bool            GetReadPlanes(uint8_t **planes) {planes0=GetReadPtr(PLANAR_Y);
-                                                         planes1=GetReadPtr(PLANAR_U);
-                                                         planes2=GetReadPtr(PLANAR_V);return true;}
+        
+        
+        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();        
         
@@ -163,6 +162,7 @@
         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);
+        bool    copyWithAlphaChannel(ADMImage *target, uint32_t x, uint32_t y);
         bool    copyLeftSideTo(ADMImage *dest);
         /* Some utilitarian functions */
         bool    saveAsBmp(const char *filename);
@@ -184,13 +184,15 @@
 {
 protected:
                     ADM_byteBuffer  data;
+                    ADM_byteBuffer  alphaChannel;
 public:
                                     ADMImageDefault(uint32_t w, uint32_t h);
-        virtual      ~ADMImageDefault();
+        virtual                     ~ADMImageDefault();
         virtual      uint32_t        GetPitch(ADM_PLANE plane);
         virtual      uint8_t        *GetWritePtr(ADM_PLANE plane);
         virtual      uint8_t        *GetReadPtr(ADM_PLANE plane);
         virtual      bool           isWrittable(void);
+                     bool           addAlphaChannel();
 };
 /**
     \class ADMImageRef
@@ -201,8 +203,8 @@
 public:
 
 public:
-                        ADMImageRef(uint32_t w, uint32_t h);
-        virtual      ~ADMImageRef();
+                                    ADMImageRef(uint32_t w, uint32_t h);
+        virtual                     ~ADMImageRef();
         virtual      uint32_t        GetPitch(ADM_PLANE plane);
         virtual      uint8_t        *GetWritePtr(ADM_PLANE plane);
         virtual      uint8_t        *GetReadPtr(ADM_PLANE plane);

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreImage/include/ADM_rgb.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreImage/include/ADM_rgb.h Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp Changed

@@ -78,7 +78,7 @@
     \brief Convert ADM colorspace type swscale/lavcodec colorspace name
 
 */
-static PixelFormat ADMColor2LAVColor(ADM_colorspace fromColor_)
+static AVPixelFormat ADMColor2LAVColor(ADM_colorspace fromColor_)
 {
   ADM_colorspace fromColor=fromColor_;
   int intColor=(int)fromColor;
@@ -86,21 +86,22 @@
   fromColor=(ADM_colorspace)intColor;
   switch(fromColor)
   {
-    case ADM_COLOR_YUV444: return PIX_FMT_YUV444P;
-    case ADM_COLOR_YUV411: return PIX_FMT_YUV411P;
-    case ADM_COLOR_YUV422: return PIX_FMT_YUYV422;
-    case ADM_COLOR_YV12: return PIX_FMT_YUV420P;
-    case ADM_COLOR_YUV422P: return PIX_FMT_YUV422P;
-    case ADM_COLOR_RGB555: return PIX_FMT_RGB555LE;
-    case ADM_COLOR_RGB32A: return PIX_FMT_RGBA;
-    case ADM_COLOR_BGR32A: return PIX_FMT_RGBA; // Faster that way...PIX_FMT_BGR32;
-    case ADM_COLOR_RGB24: return PIX_FMT_RGB24;
-    case ADM_COLOR_BGR24: return PIX_FMT_BGR24;
+    case ADM_COLOR_YUV444: return AV_PIX_FMT_YUV444P;
+    case ADM_COLOR_YUV411: return AV_PIX_FMT_YUV411P;
+    case ADM_COLOR_YUV422: return AV_PIX_FMT_YUYV422;
+    case ADM_COLOR_YV12: return AV_PIX_FMT_YUV420P;
+    case ADM_COLOR_YUV422P: return AV_PIX_FMT_YUV422P;
+    case ADM_COLOR_RGB555: return AV_PIX_FMT_RGB555LE;
+    case ADM_COLOR_RGB32A: return AV_PIX_FMT_RGBA;
+    case ADM_COLOR_BGR32A: return AV_PIX_FMT_RGBA; // Faster that way...AV_PIX_FMT_BGR32;
+    case ADM_COLOR_RGB24: return AV_PIX_FMT_RGB24;
+    case ADM_COLOR_BGR24: return AV_PIX_FMT_BGR24;
     case ADM_COLOR_YV12_10BITS: return AV_PIX_FMT_YUV420P10LE;
-    case ADM_COLOR_Y8: return PIX_FMT_GRAY8;
+    case ADM_COLOR_YUV444_10BITS: return AV_PIX_FMT_YUV444P10LE;
+    case ADM_COLOR_Y8: return AV_PIX_FMT_GRAY8;
     default : ADM_assert(0); 
   }
-  return PIX_FMT_YUV420P;
+  return AV_PIX_FMT_YUV420P;
 }
 /**
       \fn getStrideAndPointers
@@ -212,11 +213,11 @@
     \fn convertPlanes
     \brief Same as convert but the 3 planes are given separately
 */
-bool            ADMColorScalerFull::convertPlanes(uint32_t  sourceStride3,uint32_t destStride3,     
+bool            ADMColorScalerFull::convertPlanes(int  sourceStride3,int destStride3,     
                                   uint8_t   *sourceData3, uint8_t *destData3)
 {
-    int xs4={sourceStride0,sourceStride1,sourceStride2,0};
-    int xd4={destStride0,destStride1,destStride2,0};
+    int xs4={(int)sourceStride0,(int)sourceStride1,(int)sourceStride2,0};
+    int xd4={(int)destStride0,(int)destStride1,(int)destStride2,0};
     uint8_t *src4={NULL,NULL,NULL,NULL};
     uint8_t *dst4={NULL,NULL,NULL,NULL};
      for(int i=0;i<3;i++)
@@ -228,6 +229,31 @@
      return true;
 }
 /**
+    \fn convertPlanes
+    \brief Same as convert but the 3 planes are given separately
+*/
+bool            ADMColorScalerFull::convertImage(ADMImage *sourceImage, ADMImage *destImage)
+{
+    int xs4;
+    int xd4;
+    uint8_t *src4;
+    uint8_t *dst4;
+    sourceImage->GetPitches(xs);
+    destImage->GetPitches(xd);
+    xs3=sourceImage->GetPitch(PLANAR_ALPHA);
+    xd3=destImage->GetPitch(PLANAR_ALPHA);
+    
+    destImage->GetWritePlanes(dst);
+    sourceImage->GetReadPlanes(src);
+    
+    src3=sourceImage->GetReadPtr(PLANAR_ALPHA);
+    dst3=destImage->GetWritePtr(PLANAR_ALPHA);
+    
+    sws_scale(CONTEXT,src,xs,0,srcHeight,dst,xd);
+    return true;
+}
+
+/**
     \fn  ADMColorScaler
     \brief Constructor
   @param w width
@@ -237,8 +263,8 @@
 */
 
 ADMColorScalerFull::ADMColorScalerFull(ADMColorScaler_algo algo,
-            uint32_t sw, uint32_t sh,
-            uint32_t dw, uint32_t dh,
+            int sw, int sh,
+            int dw, int dh,
             ADM_colorspace from,ADM_colorspace to)
 {
    context=NULL;
@@ -260,7 +286,7 @@
 /**
     \fn reset
 */
-bool  ADMColorScalerFull::reset(ADMColorScaler_algo algo, uint32_t sw, uint32_t sh, uint32_t dw,uint32_t dh,ADM_colorspace from,ADM_colorspace to)
+bool  ADMColorScalerFull::reset(ADMColorScaler_algo algo, int sw, int sh, int dw,int dh,ADM_colorspace from,ADM_colorspace to)
 {
     if(context) sws_freeContext(CONTEXT);
     context=NULL;
@@ -280,10 +306,11 @@
     SETAL(SPLINE);
     default: ADM_assert(0);
     }
-
+#if 0 // this is gone, we need to patch av_get_cpu_flags directly now
     {
         FLAGS();
     }
+#endif
   
     srcWidth=sw;
     srcHeight=sh;
@@ -293,8 +320,8 @@
 
     fromColor=from;
     toColor=to;
-    PixelFormat lavFrom=ADMColor2LAVColor(fromColor );
-    PixelFormat lavTo=ADMColor2LAVColor(toColor );
+    AVPixelFormat lavFrom=ADMColor2LAVColor(fromColor );
+    AVPixelFormat lavTo=ADMColor2LAVColor(toColor );
     
     context=(void *)sws_getContext(
                       srcWidth,srcHeight,
@@ -305,7 +332,7 @@
     return true;
 }
 //------------------------------
-bool            ADMColorScalerSimple::changeWidthHeight(uint32_t newWidth, uint32_t newHeight)
+bool            ADMColorScalerSimple::changeWidthHeight(int newWidth, int newHeight)
 {
     if(newWidth==srcWidth && newHeight==srcHeight) return true; // no change
     
@@ -344,8 +371,8 @@
 {
     uint8_t *srcPlanes3;
     uint8_t *dstPlanes3;
-    uint32_t srcPitch3;
-    uint32_t dstPitch3;
+    int srcPitch3;
+    int dstPitch3;
     int      idstPitch3;
     img->GetPitches(srcPitch);
     img->GetReadPlanes(srcPlanes);

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreImage/src/ADM_image.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreImage/src/ADM_image.cpp Changed

@@ -23,10 +23,10 @@
 {
 	printf("\nImages stat:\n");
 	printf("___________\n");
-	printf("Max memory consumed (MB)     : %"PRIu32"\n",imgMaxMem>>20);
-	printf("Current memory consumed (MB) : %"PRIu32"\n",imgCurMem>>20);
-	printf("Max image used               : %"PRIu32"\n",imgMaxNb);
-	printf("Cur image used               : %"PRIu32"\n",imgCurNb);
+	printf("Max memory consumed (MB)     : %" PRIu32"\n",imgMaxMem>>20);
+	printf("Current memory consumed (MB) : %" PRIu32"\n",imgCurMem>>20);
+	printf("Max image used               : %" PRIu32"\n",imgMaxNb);
+	printf("Cur image used               : %" PRIu32"\n",imgCurNb);
 
 }
 /**
@@ -51,6 +51,8 @@
         quant=NULL;
         _qStride=0;
         _qSize=0;
+        _alpha=NULL;
+        _alphaStride=0;
 };
 /**
     \fn ADMImage
@@ -59,7 +61,7 @@
 */
 ADMImage::~ADMImage()
 {
-	imgCurNb--;
+    imgCurNb--;
     hwDecRefCount();
 }
 /**
@@ -72,7 +74,7 @@
 {
         if(refType==ADM_HW_NONE) return true;
         ADM_assert(refDescriptor.refMarkUsed);
-        return refDescriptor.refMarkUsed(refDescriptor.refInstance,refDescriptor.refCookie); 
+        return refDescriptor.refMarkUsed(refDescriptor.refCodec,refDescriptor.refHwImage); 
 }
 /**
     \fn hwDecRefCount
@@ -84,7 +86,7 @@
 {
         if(refType==ADM_HW_NONE) return true;
         ADM_assert(refDescriptor.refMarkUnused);
-        bool r=refDescriptor.refMarkUnused(refDescriptor.refInstance,refDescriptor.refCookie); 
+        bool r=refDescriptor.refMarkUnused(refDescriptor.refCodec,refDescriptor.refHwImage); 
         refType=ADM_HW_NONE;
         return r;
         
@@ -99,7 +101,7 @@
 bool r=false;
         if(refType==ADM_HW_NONE) return true;
         ADM_assert(refDescriptor.refDownload);
-        r=refDescriptor.refDownload(this,refDescriptor.refInstance,refDescriptor.refCookie);
+        r=refDescriptor.refDownload(this,refDescriptor.refCodec,refDescriptor.refHwImage);
         hwDecRefCount();
         refType=ADM_HW_NONE;
         return r;
@@ -129,7 +131,16 @@
     }
     return 1;
 }
-
+/**
+ * 
+ * @param dst
+ * @param pitchDst
+ * @param src
+ * @param pitchSrc
+ * @param width
+ * @param height
+ * @return 
+ */
 bool BitBlit(uint8_t *dst, uint32_t pitchDst,uint8_t *src,uint32_t pitchSrc,uint32_t width, uint32_t height)
 {
 
@@ -167,14 +178,54 @@
 {
     data.clean();
 }
-bool           ADMImageDefault::isWrittable(void) {return true;}
+/**
+ * 
+ * @return 
+ */
+bool           ADMImageDefault::isWrittable(void)
+{
+        return true;
+}
+/**
+ */
+bool           ADMImageDefault::addAlphaChannel(void)
+{
+    int paddedWidth=(_width+15)& ~15;
+    alphaChannel.setSize(paddedWidth*_height);
+    _alpha=alphaChannel.at(0);
+    _alphaStride=paddedWidth;
+    return true;
+}
+ 
+/**
+ * 
+ * @param plane
+ * @return 
+ */
 uint32_t       ADMImageDefault::GetPitch(ADM_PLANE plane)
-                    {
-                            return _planeStrideplane;
-                        }
-uint8_t        *ADMImageDefault::GetWritePtr(ADM_PLANE plane) {return GetReadPtr(plane);}
+{
+    if(plane==PLANAR_ALPHA)
+        return _alphaStride;
+    return _planeStrideplane;
+}
+/**
+ * 
+ * @param plane
+ * @return 
+ */
+uint8_t        *ADMImageDefault::GetWritePtr(ADM_PLANE plane) 
+{
+    return GetReadPtr(plane);
+}
+/**
+ * 
+ * @param plane
+ * @return 
+ */
 uint8_t        *ADMImageDefault::GetReadPtr(ADM_PLANE plane)
 {
+    if(plane==PLANAR_ALPHA)
+        return _alpha;
     return _planesplane;
 }
 //****************************************
@@ -195,15 +246,93 @@
 ADMImageRef::~ADMImageRef()
 {
 }
-bool           ADMImageRef::isWrittable(void) {return false;}
+bool           ADMImageRef::isWrittable(void) 
+{
+        return false;
+}
 uint32_t       ADMImageRef::GetPitch(ADM_PLANE plane)
-                    {
-                          return _planeStrideplane;
-                        }
+{
+    if(plane==PLANAR_ALPHA)
+        return _alphaStride;
+    return _planeStrideplane;
+ }
+/**
+ * 
+ * @param plane
+ * @return 
+ */
 // Cannot write to a ref, the buffer does not belong to us...
-uint8_t        *ADMImageRef::GetWritePtr(ADM_PLANE plane) {return NULL;}
+uint8_t        *ADMImageRef::GetWritePtr(ADM_PLANE plane) 
+{
+        return NULL;
+}
+/**
+ * 
+ * @param plane
+ * @return 
+ */
 uint8_t        *ADMImageRef::GetReadPtr(ADM_PLANE plane)
 {
     return _planesplane;
 }
+/**
+ * 
+ * @param plane
+ * @return 
+ */
+int             ADMImage::GetHeight(ADM_PLANE plane)
+{
+    if(plane==PLANAR_Y  || plane==PLANAR_ALPHA) 
+        return _height; 
+    return _height/2;
+}
+/**
+ * 
+ * @param plane
+ * @return 
+ */
+int             ADMImage::GetWidth(ADM_PLANE plane) 
+{
+    if(plane==PLANAR_Y || plane==PLANAR_ALPHA) 
+        return _width; 
+    return _width/2;
+}
+/**
+ * 
+ * @param pitches
+ * @return 
+ */
+bool            ADMImage::GetPitches(int *pitches) 
+{
+    pitches0=GetPitch(PLANAR_Y);
+    pitches1=GetPitch(PLANAR_U);
+    pitches2=GetPitch(PLANAR_V);
+    return true;
+}
+/**
+ * 
+ * @param planes
+ * @return 
+ */
+bool            ADMImage::GetWritePlanes(uint8_t **planes) 
+{
+    planes0=GetWritePtr(PLANAR_Y);
+    planes1=GetWritePtr(PLANAR_U);
+    planes2=GetWritePtr(PLANAR_V);
+    return true;
+}
+/**
+ * 
+ * @param planes
+ * @return 
+ */
+bool            ADMImage::GetReadPlanes(uint8_t **planes) 
+{
+    planes0=GetReadPtr(PLANAR_Y);
+    planes1=GetReadPtr(PLANAR_U);
+    planes2=GetReadPtr(PLANAR_V);
+    return true;
+}
+
+
 //EOF

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageOperation.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageOperation.cpp Changed

@@ -52,8 +52,8 @@
          else // it is a hw surface
         {
             refType                    =src->refType;
-            refDescriptor.refCookie    =src->refDescriptor.refCookie;
-            refDescriptor.refInstance  =src->refDescriptor.refInstance;
+            refDescriptor.refHwImage   =src->refDescriptor.refHwImage;
+            refDescriptor.refCodec     =src->refDescriptor.refCodec;
             refDescriptor.refMarkUsed  =src->refDescriptor.refMarkUsed;
             refDescriptor.refMarkUnused=src->refDescriptor.refMarkUnused;
             refDescriptor.refDownload  =src->refDescriptor.refDownload;
@@ -154,7 +154,7 @@
     dest->GetWritePlanes(dstPlanes);
     GetReadPlanes(srcPlanes);
 
-    uint32_t srcPitches3,dstPitches3;
+    int srcPitches3,dstPitches3;
     dest->GetPitches(dstPitches);
     GetPitches(srcPitches);
     // do y
@@ -202,7 +202,7 @@
     dest->GetWritePlanes(dstPlanes);
     GetReadPlanes(srcPlanes);
 
-    uint32_t srcPitches3,dstPitches3;
+    int srcPitches3,dstPitches3;
     dest->GetPitches(dstPitches);
     GetPitches(srcPitches);
     // do y
@@ -219,5 +219,82 @@
     }
     return 1;
 }
+/**
+ * \fn blitWithAlpha
+ * \brief Blie one plane using transparency from alpha Channel
+ * @param dest
+ * @param x
+ * @param y
+ * @param alpha
+ * @return 
+ */
+
+static bool blitWithAlpha(uint8_t *dst, uint8_t *src, uint8_t *alpha,int dstStride, int srcStride,int alphaStride,int w,int h, int mul)
+{
+    for(int k=0;k<h;k++)
+    {
+        for(int j=0;j<w;j++)
+        {
+            int a=alphamul*j;
+            uint32_t x=(255-a)*dstj+a*srcj;
+            dstj=x>>8;
+        }
+        dst+=dstStride;
+        src+=srcStride;
+        alpha+=alphaStride*mul;
+    }
+    return true;
+}
+bool ADMImage::copyWithAlphaChannel(ADMImage *dest, uint32_t x,uint32_t y)
+{
+
+    uint32_t box_w=_width, box_h=_height;
+    // Clip if needed
+    if(y>dest->_height)
+    {
+        ADM_info("Image out of target image height : %d %d\n",y,dest->_height);
+        return true;
+    }
+    if(x>dest->_width)
+    {
+        ADM_info("Image out of target image width %d %d\n",x,dest->_width);
+        return true;
+    }
+
+    if(x+box_w>dest->_width) box_w=dest->_width-x;
+    if(y+box_h>dest->_height) box_h=dest->_height-y;
+    // Get Source plane
+    uint8_t *srcPlanes3;
+    uint8_t *dstPlanes3;
+    dest->GetWritePlanes(dstPlanes);
+    GetReadPlanes(srcPlanes);
 
+    int srcPitches3,dstPitches3;
+    dest->GetPitches(dstPitches);
+    GetPitches(srcPitches);
+
+    uint8_t *alpha=GetReadPtr(PLANAR_ALPHA);
+    int      alphaStride=GetPitch(PLANAR_ALPHA);
+    
+    // do U & V
+    for(int i=0;i<3;i++)
+    {
+        int mul=0;
+        if(i) mul++;
+        int xx=x>>mul;
+        int yy=y>>mul;
+        int ww=box_w>>mul;
+        int hh=box_h>>mul;
+        mul++;
+        blitWithAlpha(  dstPlanesi+xx+dstPitchesi*yy, 
+                        srcPlanesi,
+                        alpha,
+                
+                        dstPitchesi, 
+                        srcPitchesi, 
+                        alphaStride,
+                        ww,hh,mul);
+    }
+    return 1;
+}
 //EOF

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageResizer.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageResizer.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp Changed

@@ -173,7 +173,7 @@
         goto  jpgCleanup;
     }
 
-    codec=avcodec_find_encoder(CODEC_ID_MJPEG);
+    codec=avcodec_find_encoder(AV_CODEC_ID_MJPEG);
     if(!codec)
     {
         printf("saveAsJpg Cannot allocate codec\n");
@@ -187,7 +187,7 @@
         goto  jpgCleanup;
     }
 
-    context->pix_fmt =PIX_FMT_YUV420P;
+    context->pix_fmt =AV_PIX_FMT_YUV420P;
     context->strict_std_compliance = -1;
     context->time_base.den=1;
     context->time_base.num=1;
@@ -220,17 +220,23 @@
       byteBuffer.setSize(_width*_height*4);
 	  
 
-        if ((sz = avcodec_encode_video (context, byteBuffer.at(0), _width*_height*4, frame)) < 0)
-        {
-            printf("jpeg Error %d encoding video\n",sz);
+      AVPacket pkt;
+      int gotSomething;
+      pkt.size=_width*_height*4;
+      pkt.data=byteBuffer.at(0);
+      r=avcodec_encode_video2(context,&pkt,frame,&gotSomething);
+      if(r || !gotSomething)
+      {
+            ADM_error("jpeg Error %d encoding video\n",r);
             goto  jpgCleanup;
-        }
+      }
+      
         // Ok now write our file...
         {
             FILE *f=ADM_fopen(filename,"wb");
             if(f)
             {
-                fwrite(byteBuffer.at(0),sz,1,f);
+                fwrite(byteBuffer.at(0),pkt.size,1,f);
                 fclose(f);
                 result=true;
             }else
@@ -274,4 +280,4 @@
     clone.hwDownloadFromRef();
     return clone.saveAsJpgInternal(filename);
     
-}
\ No newline at end of file
+}

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp Changed

@@ -272,48 +272,88 @@
 
 */
 /* 3000 * 3000 max size, using uint32_t is safe... */
-static uint32_t computeDiff(uint8_t  *s1,uint8_t *s2,uint32_t noise,uint32_t l)
+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;
-uint32_t ww,hh;
-
 
-        for(int x=0;x<l;x++)
+    for(int y=0;y<h;y++)
+    {
+        for(int x=0;x<w;x++)
         {
-                delta=abs(*s1-*s2);
+                delta=abs((int)(s1x)-(int)(s2x));
                 if(delta>noise)
                         df+=delta;
-                s1++;
-                s2++;
-
         }
-        return df;
+        s1+=stride1;
+        s2+=stride2;
+    }
+    return df;
 }
-#ifdef ADM_CPU_X86
-static uint64_t __attribute__((used)) FUNNY_MANGLE(noise64);
-static uint32_t computeDiffMMX(uint8_t  *s1,uint8_t *s2,uint32_t noise,uint32_t l)
+/**
+ * 
+ * @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;
-uint32_t ll,rr;
+    for(int x=0;x<count;x++)
+    {
+            delta=abs((int)(s1x)-(int)(s2x));
+            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;
+uint32_t result=0,tmpResult;
         noise64=noise2+(noise2<<16)+(noise2<<32)+(noise2<<48);
-        ll=l>>2;
-        rr=l&3;
+        
+        leftOver=w&7;
 
          __asm__ volatile(
-                         "pxor %%mm7,%%mm7\n"
-                         "pxor %%mm3,%%mm3\n"
-                         "movq "Mangle(noise64)", %%mm6\n"
+                         "pxor %%mm7,%%mm7\n"                       
+                         "movq " Mangle(noise64)", %%mm6\n"
                 :::  "memory"
                  );
 
-          for(int y=0;y<ll;y++)
+          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"
@@ -326,8 +366,26 @@
                                            
                         "movq           %%mm2, %%mm0 \n"
                         "pcmpgtw        %%mm6, %%mm2 \n" // Threshold against noise
-                        "pand           %%mm2, %%mm0 \n" // MM0 is the 4 diff, time to pack
-
+                        "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
 
@@ -339,30 +397,32 @@
 
                         "paddw          %%mm1, %%mm0 \n"
                         "paddw          %%mm2, %%mm4 \n"
-                        "paddw          %%mm4, %%mm0 \n"
+                        "paddw          %%mm4, %%mm0 \n" // MM0 is the sum
 
                         "psllq          $48,  %%mm0 \n"
-                        "psrlq          $48,  %%mm0 \n"
+                        "psrlq          $48,  %%mm0 \n" // Only keep 16 bits
 
-                        "paddw          %%mm0, %%mm3 \n" /* PADDQ is SSE2 */
+                        "paddw          %%mm0, %%mm3 \n" /* PADDQ is SSE2 */                        
+                        "add            $8,%0      \n"
+                        "add            $8,%1      \n"
+                        "sub            $1,%2      \n"
+                        "jnz            1b         \n"
 
-                : : "r" (s1),"r" (s2)
-                :"memory"
+                : "=r" (tmpS1),"=r" (tmpS2),"=r"(mod4)
+                : "0"(tmpS1),"1"(tmpS2),"2"(mod4)
+                : "memory","0","1","2"
                 );
-                        s1+=4;
-                        s2+=4;
-                        
-         }
-        // Pack result
-#if 1        
                 __asm__ volatile(
                        
                         "movd           %%mm3,(%0)\n"
                         "emms\n"
-                :: "r"(&result)
+                :: "r"(&tmpResult)
                 );
-#endif                
-        if(rr) result+=computeDiff(s1, s2, noise,rr);
+                result+=tmpResult;
+                s1+=pitch1;
+                s2+=pitch2;
+         }
+        // Pack result
         return result;
 }
 
@@ -376,10 +436,22 @@
 uint32_t r1,r2;
         if(CpuCaps::hasMMX())
         {
-                return computeDiffMMX(YPLANE(src1),YPLANE(src2),noise,src1->_width*src1->_height);                
+                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->_width*src1->_height);
+        return computeDiff(YPLANE(src1),YPLANE(src2),noise,
+                src1->GetWidth(PLANAR_Y),src1->GetHeight(PLANAR_Y),
+                src1->GetPitch(PLANAR_Y),src2->GetPitch(PLANAR_Y));
 }
 
 //******************************************************************************
@@ -475,50 +547,50 @@
   */
  bool ADMImage::copyLeftSideTo(ADMImage *dest)
  {
-		uint8_t *src,*dst;
-		uint32_t srcStride,dstStride;
-        uint32_t len=this->_width;
- 
-			ADM_assert(_width==dest->_width);
-			ADM_assert(_height==dest->_height);
-		
-	 		dst=dest->GetWritePtr(PLANAR_Y);
-		    src=this->GetWritePtr(PLANAR_Y);
-		    srcStride=this->GetPitch(PLANAR_Y);
-            dstStride=dest->GetPitch(PLANAR_Y);
-		    for(uint32_t y=0;y<_height;y++)   // We do both u & v!
-		    {
-		        memcpy(dst,src,len>>1);
-		        dst+=dstStride;
-		        src+=srcStride;
-		    }
-            len>>=1;
-		        // U
-	 		dst=dest->GetWritePtr(PLANAR_U);
-		    src=this->GetWritePtr(PLANAR_U);
-		    srcStride=this->GetPitch(PLANAR_U);
-            dstStride=dest->GetPitch(PLANAR_U);
-		    
-		    uint32_t h2=_height>>1;
-		    for(uint32_t y=0;y<h2;y++)   // We do both u & v!
-		    {
-		        memcpy(dst,src,len>>1);
-		        dst+=dstStride;
-		        src+=srcStride;
-		    }
-		        // V
-            dst=dest->GetWritePtr(PLANAR_V);
-		    src=this->GetWritePtr(PLANAR_V);
-		    srcStride=this->GetPitch(PLANAR_V);
-            dstStride=dest->GetPitch(PLANAR_V);
-		    for(uint32_t y=0;y<h2;y++)   // We do both u & v!
-		    {
-		        memcpy(dst,src,len>>1);
-		        dst+=dstStride;
-		        src+=srcStride;
-		    }
-		    return 1;
- }
+    uint8_t *src,*dst;
+    uint32_t srcStride,dstStride;
+    uint32_t len=this->_width;
+
+        ADM_assert(_width==dest->_width);
+        ADM_assert(_height==dest->_height);
+
+        dst=dest->GetWritePtr(PLANAR_Y);
+        src=this->GetWritePtr(PLANAR_Y);
+        srcStride=this->GetPitch(PLANAR_Y);
+        dstStride=dest->GetPitch(PLANAR_Y);
+        for(uint32_t y=0;y<_height;y++)   // We do both u & v!
+        {
+            memcpy(dst,src,len>>1);
+            dst+=dstStride;
+            src+=srcStride;
+        }
+        len>>=1;
+                    // U
+        dst=dest->GetWritePtr(PLANAR_U);
+        src=this->GetWritePtr(PLANAR_U);
+        srcStride=this->GetPitch(PLANAR_U);
+        dstStride=dest->GetPitch(PLANAR_U);
+
+        uint32_t h2=_height>>1;
+        for(uint32_t y=0;y<h2;y++)   // We do both u & v!
+        {
+            memcpy(dst,src,len>>1);
+            dst+=dstStride;
+            src+=srcStride;
+        }
+                    // V
+        dst=dest->GetWritePtr(PLANAR_V);
+        src=this->GetWritePtr(PLANAR_V);
+        srcStride=this->GetPitch(PLANAR_V);
+        dstStride=dest->GetPitch(PLANAR_V);
+        for(uint32_t y=0;y<h2;y++)   // We do both u & v!
+        {
+            memcpy(dst,src,len>>1);
+            dst+=dstStride;
+            src+=srcStride;
+        }
+        return 1;
+}
 
 
 /**
@@ -559,7 +631,7 @@
 {
 static uint64_t __attribute__((used)) FUNNY_MANGLE(mask) = 0x00ff000000ff0000LL;
 
-    __asm__ volatile(" movq "Mangle(mask)", %%mm7\n" ::);
+    __asm__ volatile(" movq " Mangle(mask)", %%mm7\n" ::);
     __asm__ volatile(" pxor %%mm6,%%mm6\n" ::);
     
     int step=w/8;

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreImage/src/ADM_pp.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreImage/src/ADM_pp.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreImageLoader/include/ADM_imageLoader.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreImageLoader/include/ADM_imageLoader.h Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreImageLoader/src/ADM_imageLoader.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreImageLoader/src/ADM_imageLoader.cpp Changed

@@ -20,9 +20,24 @@
 #include "ADM_colorspace.h"
 #include "ADM_codec.h"
 #include "fourcc.h"
+
+/**
+ */
+typedef enum 
+{
+        ADM_PICTURE_UNKNOWN=0,
+        ADM_PICTURE_JPG=1,
+        ADM_PICTURE_PNG=2,
+        ADM_PICTURE_BMP=3,
+        ADM_PICTURE_BMP2=4
+        
+} ADM_PICTURE_TYPE;
+
+static ADM_PICTURE_TYPE ADM_identifyImageFile(const char *filename,uint32_t *w,uint32_t *h);
+
+
 //**********************************
 static ADMImage *createImageFromFile_jpeg(const char *filename);
-static ADMImage *createImageFromFile_Bmp(const char *filename);
 static ADMImage *createImageFromFile_Bmp2(const char *filename);
 static ADMImage *createImageFromFile_png(const char *filename);
 //***********************************
@@ -50,6 +65,13 @@
 	return (a<<24)+(b<<16)+(c<<8)+d;
 
 }
+static int getFileSize(FILE *fd)
+{
+        fseek(fd, 0, SEEK_END);
+        int imageSize = ftell(fd);
+        fseek(fd, 0, SEEK_SET);
+        return imageSize;
+}
 
 /**
 		\fn 	createImageFromFile
@@ -58,198 +80,246 @@
 */
 ADMImage *createImageFromFile(const char *filename)
 {
-	uint32_t w,h;
-	switch(ADM_identifyImageFile(filename,&w,&h))
-	{
-		case  ADM_PICTURE_UNKNOWN:
-					ADM_warning("imageLoader Trouble identifying /loading %s\n",filename);
-					return NULL;
-		case ADM_PICTURE_JPG:
-					return createImageFromFile_jpeg(filename);
-					break;
-		case ADM_PICTURE_PNG:
-					return createImageFromFile_png(filename);
-					break;
-		case ADM_PICTURE_BMP2:
-					return createImageFromFile_Bmp2(filename);
-					break;
-		default:
-				ADM_assert(0);
-
-	}
-	ADM_assert(0);
-        return NULL;
+    uint32_t w,h;
+    switch(ADM_identifyImageFile(filename,&w,&h))
+    {
+        case  ADM_PICTURE_UNKNOWN:
+                ADM_warning("imageLoader Trouble identifying /loading %s\n",filename);
+                return NULL;
+        case ADM_PICTURE_JPG:
+                return createImageFromFile_jpeg(filename);
+                break;
+        case ADM_PICTURE_PNG:
+                return createImageFromFile_png(filename);
+                break;
+        case ADM_PICTURE_BMP2:
+                return createImageFromFile_Bmp2(filename);
+                break;
+        default:
+                ADM_assert(0);
+                break;
+
+    }
+    ADM_assert(0);
+    return NULL;
 }
 /**
- * 	\fn createImageFromFile_jpeg
- *  \brief Create image from jpeg file
+ * 
+ * @param source
+ * @param w
+ * @param h
+ * @return 
  */
-ADMImage *createImageFromFile_jpeg(const char *filename)
+static ADMImage *convertImageColorSpace( ADMImage *source, int w, int h)
 {
+   
+    	ADMImageDefault *image=new ADMImageDefault(w,h);        
+        ADM_colorspace sourceFormat=source->_colorspace;   
+        bool swap=false;
+        
+        if(ADM_COLOR_RGB32A==sourceFormat)
+        {
+            image->addAlphaChannel();
+            // Extract alpha channel
+#define ALPHA_OFFSET 3            
+            uint8_t *alpha=source->GetReadPtr(PLANAR_Y)+ALPHA_OFFSET;
+            uint8_t *alphaDest=image->GetWritePtr(PLANAR_ALPHA);
+            int   sourceStride=source->GetPitch(PLANAR_Y);
+            int   destStride=image->GetPitch(PLANAR_ALPHA);
+
+            for(int y=0;y<h;y++)
+            {
+                uint8_t *inAlpha=alpha;
+                alpha+=sourceStride;
+                uint8_t *outAlpha=alphaDest;
+                alphaDest+=destStride;
+                for(int x=0;x<w;x++)
+                {
+                    *outAlpha=*inAlpha;
+                    outAlpha++;
+                    inAlpha+=4;
+                }
+            }
+            swap=true;
+        }
+        ADMColorScalerSimple converter(w,h,sourceFormat,ADM_COLOR_YV12);     
+        converter.convertImage(source,image); 
+        
+        if(swap)
+        {
+            uint8_t **s=image->_planes,*v;
+            v=s1;
+            s1=s2;
+            s2=v;
+        }
+        return image;
+}
 
-	FILE *fd;
-	uint32_t _imgSize;
-	uint32_t w = 0, h = 0;
-
-
-		fd = ADM_fopen(filename, "rb");
-		fseek(fd, 0, SEEK_END);
-		_imgSize = ftell(fd);
-		fseek(fd, 0, SEEK_SET);
-
-		//Retrieve width & height
-		//_______________________
-		    uint16_t tag = 0, count = 0, off;
-
-
-		    fseek(fd, 0, SEEK_SET);
-		    read16(fd);	// skip jpeg ffd8
-		    while (count < 15 && tag != 0xFFC0)
-		    {
-
-		    	tag = read16(fd);
-		    	if ((tag >> 8) != 0xff)
-		    	{
-		    		ADM_warning("imageLoaderinvalid jpeg tag found (%x)\n", tag);
-		    	}
-		    	if (tag == 0xFFC0)
-		    	{
-		    		read16(fd);	// size
-		    		read8(fd);	// precision
-		    		h = read16(fd);
-		    		w = read16(fd);
-	                if(w&1) w++;
-	                if(h&1) h++;
-		    	}
-		    	else
-		    	{
-		    		off = read16(fd);
-		    		if (off < 2)
-		    		{
-		    			ADM_warning("imageLoaderOffset too short!\n");
-		    		    fclose(fd);
-		    		    return NULL;
-		    		}
-		    		fseek(fd, off - 2, SEEK_CUR);
-		    	}
-			count++;
-		    }
-		    if (tag != 0xffc0)
-		    {
-		    	ADM_warning("imageLoaderCannot fint start of frame\n");
-				fclose(fd);
-				return NULL;
-		    }
-		    ADM_info("imageLoader %"PRIu32" x %"PRIu32".., total Size : %u, offset %u\n", w, h,_imgSize,off);
-
-		// Load the binary coded image
-                    ADM_byteBuffer buffer(_imgSize);
-		    fseek(fd, 0, SEEK_SET);
-		    fread(buffer.at(0),_imgSize,1,fd);
-		    fclose(fd);
-		  //
-
-		    ADMImageRef tmpImage(w,h); // It is a reference image
-		    // Now unpack it ...
-            decoders *dec=ADM_coreCodecGetDecoder (fourCC::get((uint8_t *)"MJPG"),   w,   h, 0 , NULL,0);
-            if(!dec)
+/**
+ * 
+ * @param fd
+ * @param width
+ * @param height
+ * @return 
+ */
+static bool readJpegInfo(FILE *fd, int &width, int &height)
+{
+        uint16_t tag = 0, count = 0, off;
+        int w,h;
+        fseek(fd, 0, SEEK_SET);
+        read16(fd);	// skip jpeg ffd8
+        while (count < 15 && tag != 0xFFC0)
+        {
+            tag = read16(fd);
+            if ((tag >> 8) != 0xff)
             {
-                ADM_warning("Cannot find decoder for mpjeg");
-                return NULL;
+                ADM_warning("imageLoaderinvalid jpeg tag found (%x)\n", tag);
+            }
+            if (tag == 0xFFC0)
+            {
+                read16(fd);	// size
+                read8(fd);	// precision
+                h = read16(fd);
+                w = read16(fd);
+                if(w&1) w++;
+                if(h&1) h++;
             }
-		    ADMCompressedImage bin;
-		    bin.data=buffer.at(0);
-		    bin.dataLength=_imgSize; // This is more than actually, but who cares...
-
-		    dec->uncompress (&bin, &tmpImage);
-		    //
-		    ADMImage *image=NULL;
-		    switch(tmpImage._colorspace)
-		    {
-		    case ADM_COLOR_YV12:
-		    {
-		    	ADM_info("imageLoader YV12\n");
-	    		image=new ADMImageDefault(w,h);
-	    		image->duplicate(&tmpImage);
-	    		break;
-		    }
-		    case ADM_COLOR_YUV422:
-		    {
-		    	ADM_info("imageLoader YUY2\n");
-		    	image=new ADMImageDefault(w,h);
-                ADMColorScalerSimple convert(w,h,ADM_COLOR_YUV422,ADM_COLOR_YV12);
-                uint32_t dstStride3={w,w/2,w/2};
-                uint8_t  *dstData3={YPLANE(image),UPLANE(image),VPLANE(image)};
-		    	convert.convertPlanes( tmpImage._planeStride,dstStride, tmpImage._planes,dstData);
-		    	break;
-		    }
-		    default:
-		    	GUI_Error_HIG(QT_TR_NOOP("Wrong Colorspace"),QT_TR_NOOP("Only YV12/I420 or YUY2/I422 JPegs are supported"));
-		    }
-		    // Cannot destroy decoder earlier as tmpImage has pointers to its internals
-		    delete dec;
-		    dec=NULL;
-		    return image;
+            else
+            {
+                off = read16(fd);
+                if (off < 2)
+                {
+                    ADM_warning("imageLoaderOffset too short!\n");
+                    return false;
+                }
+                fseek(fd, off - 2, SEEK_CUR);
+            }
+            count++;
+        }
+        if (tag != 0xffc0)
+        {
+            ADM_warning("imageLoaderCannot fint start of frame\n");
+            return false;
+        }
+        width=w;
+        height=h;
+        return true;
 }
+
 /**
  * 	\fn createImageFromFile_jpeg
- *  \brief Create image from Bmp
+ *  \brief Create image from jpeg file
  */
-ADMImage *createImageFromFile_Bmp(const char *filename)
+ADMImage *createImageFromFile_jpeg(const char *filename)
 {
 
-    FILE *fd;
-    uint32_t _imgSize;
-    uint32_t w = 0, h = 0;
-    uint16_t  s16;
-    uint32_t s32;
+FILE *fd;
+uint32_t _imgSize;
+int  w = 0, h = 0;
 
         fd = ADM_fopen(filename, "rb");
-        fseek(fd, 0, SEEK_END);
-        _imgSize = ftell(fd);
-        fseek(fd, 0, SEEK_SET);
-
-        //Retrieve width & height
-        //_______________________
-            ADM_BITMAPINFOHEADER bmph;
-
-        fread(&s16, 2, 1, fd);
-        if (s16 != 0x4D42)
+        if(!fd)
         {
-            ADM_warning("imageLoader incorrect bmp sig.\n");
-            fclose(fd);
+            ADM_warning("Cannot open jpeg file\n");
             return NULL;
         }
-        fread(&s32, 4, 1, fd);
-        fread(&s32, 4, 1, fd);
-        fread(&s32, 4, 1, fd);
-        fread(&bmph, sizeof(bmph), 1, fd);
-        if (bmph.biCompression != 0)
+        _imgSize = getFileSize(fd);
+
+        if(!readJpegInfo(fd,w,h))
         {
-            ADM_warning("imageLoadercannot handle compressed bmp\n");
+            ADM_warning("Cannot get info from jpeg\n");
             fclose(fd);
+            fd=NULL;
             return NULL;
         }
+        
+        ADM_info("imageLoader %d x %d.., total Size : %u \n", w, h,_imgSize);
 
-        w = bmph.biWidth;
-        h = bmph.biHeight;
-
-
-        ADM_info("ImageLoader BMP %u * %u\n",w,h);
-
-    // Load the binary coded image
-        ADM_byteBuffer buffer(w*h*3);
-
-        fread(buffer.at(0),w*h*3,1,fd);
+        // Load the binary coded image
+        ADM_byteBuffer buffer(_imgSize);
+        fseek(fd, 0, SEEK_SET);
+        fread(buffer.at(0),_imgSize,1,fd);
         fclose(fd);
+        //
 
-      // Colorconversion
+        ADMImageRef tmpImage(w,h); // It is a reference image
+        // Now unpack it ...
+        decoders *dec=ADM_coreCodecGetDecoder (fourCC::get((uint8_t *)"MJPG"),   w,   h, 0 , NULL,0);
+        if(!dec)
+        {
+            ADM_warning("Cannot find decoder for mpjeg");
+            return NULL;
+        }
+        ADMCompressedImage bin;
+        bin.data=buffer.at(0);
+        bin.dataLength=_imgSize; // This is more than actually, but who cares...
+
+        dec->uncompress (&bin, &tmpImage);
+        ADMImage *image=convertImageColorSpace(&tmpImage,w,h);        
+        delete dec;
+        dec=NULL;
+        return image;
+}
 
-        ADMImage *image=new ADMImageDefault(w,h);
-        ADM_ConvertRgb24ToYV12(false,w,h,buffer.at(0),YPLANE(image));
+/**
+ * 	\fn createImageFromFile_png
+ *  \brief Create image from PNG
+ */
+ADMImage *createImageFromFile_png(const char *filename)
+{
+    
+    uint32_t offset,size;
+    FILE *fd=NULL;
+    uint32_t w,h;
 
+       fd = ADM_fopen(filename, "rb");
+       if(!fd)
+       {
+           ADM_warning("Cannot open png file\n");
+           return NULL;
+       }
+       size=getFileSize(fd);
+       read32(fd);
+       read32(fd);
+       read32(fd);
+       read32(fd);
+       w=read32(fd);
+       h=read32(fd);
+       fseek(fd,0,SEEK_SET);
+       ADM_byteBuffer buffer(size);
+
+       fread(buffer.at(0),size,1,fd);
+       fclose(fd);
+       ADMImageRef tmpImage(w,h);
+    	// Decode PNG
+        decoders *dec=ADM_coreCodecGetDecoder (fourCC::get((uint8_t *)"PNG "),   w,   h, 0 , NULL,0);
+    	if(!dec)
+        {
+            ADM_warning("Cannot get PNG decoder");
+            return NULL;
+        }
+    	ADMCompressedImage bin;
+    	bin.data=buffer.at(0);
+    	bin.dataLength=size; // This is more than actually, but who cares...
 
-        return image;
+    	bool success=dec->uncompress (&bin, &tmpImage);
+   
+        
+        if(!success)
+        {
+            ADM_warning("PNG Decompressing failed\n");
+            delete dec;
+            dec=NULL;
+            return NULL;
+        }
+        ADMImage *image=convertImageColorSpace(&tmpImage,w,h);
+        if(tmpImage._alpha)
+        {
+            ADM_info("We do have alpha channel\n");
+        }
+        delete dec;
+        dec=NULL;
+    	return image;
 }
 /**
  * 	\fn createImageFromFile_bmp2
@@ -265,6 +335,11 @@
     uint32_t w,h;
 
 	fd = ADM_fopen(filename, "rb");
+        if(!fd)
+        {
+            ADM_warning("Cannot open BMP picture\n");
+            return NULL;
+        }
  	fseek(fd, 10, SEEK_SET);
 
  #define MK32() (fcc_tab0+(fcc_tab1<<8)+(fcc_tab2<<16)+ \
@@ -285,171 +360,104 @@
         }
         w = bmph.biWidth;
         h = bmph.biHeight;
-        ADM_info("imageLoader BMP2 W: %"PRIu32" H: %"PRIu32" offset : %"PRIu32"\n", w, h, offset);
+        ADM_info("imageLoader BMP2 W: %" PRIu32" H: %" PRIu32" offset : %" PRIu32"\n", w, h, offset);
 // Load the binary coded image
  	fseek(fd,offset,SEEK_SET);
         
-        ADM_byteBuffer buffer(w*h*3);
+        ADM_byteBuffer buffer(w*h*4);
         
-        fread(buffer.at(0),w*h*3,1,fd);
+        fread(buffer.at(0),w*h*4,1,fd);
         fclose(fd);
 
   // Colorconversion
 
-    	ADMImage *image=new ADMImageDefault(w,h);
-        ADM_ConvertRgb24ToYV12(true,w,h,buffer.at(0),YPLANE(image));
-
-    	return image;
-}
-/**
- * 	\fn createImageFromFile_png
- *  \brief Create image from PNG
- */
-ADMImage *createImageFromFile_png(const char *filename)
-{
-
-	ADM_BITMAPINFOHEADER bmph;
-    uint32_t offset,size;
-    FILE *fd=NULL;
-    uint32_t w,h;
-
-		fd = ADM_fopen(filename, "rb");
- 	    fseek(fd, 0, SEEK_END);
- 	    size=ftell(fd);
- 	   fseek(fd, 0, SEEK_SET);
- 	   read32(fd);
- 	   read32(fd);
- 	   read32(fd);
- 	   read32(fd);
- 	   w=read32(fd);
- 	   h=read32(fd);
- 	   fseek(fd,0,SEEK_SET);
-           ADM_byteBuffer buffer(size);
- 	   
- 	   fread(buffer.at(0),size,1,fd);
- 	   fclose(fd);
- 	   ADMImageRef tmpImage(w,h);
-    	// Decode PNG
-        decoders *dec=ADM_coreCodecGetDecoder (fourCC::get((uint8_t *)"PNG "),   w,   h, 0 , NULL,0);
-    	if(!dec)
-        {
-            ADM_warning("Cannot get PNG decoder");
-            return NULL;
-        }
-    	ADMCompressedImage bin;
-    	bin.data=buffer.at(0);
-    	bin.dataLength=size; // This is more than actually, but who cares...
-
-    	dec->uncompress (&bin, &tmpImage);
-
-    	ADMImage *image=new ADMImageDefault(w,h);
-        ADM_ConvertRgb24ToYV12(true,w,h,tmpImage._planes0,YPLANE(image));
+    	
+        ADMImageRefWrittable ref(w,h);
+        
+        ref._planes0=buffer.at(0)+(h-1)*w*3;
+        ref._planeStride0=-w*3;
+        ref._colorspace=ADM_COLOR_RGB24;
 
-        delete dec;
-        dec=NULL;
-    	return image;
+    	return convertImageColorSpace(&ref,w,h);
 }
 /**
  * 		\fn ADM_identidyImageFile
  * 		\brief Identidy image type, returns type and width/height
  */
+#define MAX_JPEG_TAG 20
 ADM_PICTURE_TYPE ADM_identifyImageFile(const char *filename,uint32_t *w,uint32_t *h)
 {
-			uint32_t *fcc;
-		    uint8_t fcc_tab4;
-		    FILE *fd;
-		    uint32_t off,tag=0,count,size;
-
-		    // 1- identity the file type
-		    //
-		    fcc = (uint32_t *) fcc_tab;
-		    fd = ADM_fopen(filename, "rb");
-		    if (!fd)
-		    {
-		    	printf("imageIdentify Cannot open that file!\n");
-		    	return ADM_PICTURE_UNKNOWN;
-		    }
-		    fread(fcc_tab, 4, 1, fd);
-		    fcc = (uint32_t *) fcc_tab;
-		    // 2- JPEG ?
-		    if (fcc_tab0 == 0xff && fcc_tab1 == 0xd8)
-		    {
-		    			// JPEG
-		    	  			fseek(fd, 0, SEEK_SET);
-		    			    read16(fd);	// skip jpeg ffd8
-		    			    count=0;
-		    			    while (count < 10 && tag != 0xFFC0)
-		    			    {
-
-		    			    	tag = read16(fd);
-		    			    	if ((tag >> 8) != 0xff)
-		    			    	{
-		    			    		ADM_warning("imageIdentifyinvalid jpeg tag found (%x)\n", tag);
-		    			    	}
-		    			    	if (tag == 0xFFC0)
-		    			    	{
-		    			    		read16(fd);	// size
-		    			    		read8(fd);	// precision
-		    			    		*h = read16(fd);
-		    			    		*w = read16(fd);
-		    		                if(*w&1) w++;
-		    		                if(*h&1) h++;
-		    			    	}
-		    			    	else
-		    			    	{
-		    			    		off = read16(fd);
-		    			    		if (off < 2)
-		    			    		{
-		    			    			ADM_warning("imageIdentifyOffset too short!\n");
-		    			    		    fclose(fd);
-		    			    		    return ADM_PICTURE_UNKNOWN;
-		    			    		}
-		    			    		fseek(fd, off - 2, SEEK_CUR);
-		    			    	}
-		    				count++;
-		    			    }
-		    			    fclose(fd);
-		    			    if(count>=10) return ADM_PICTURE_UNKNOWN;
-		    			    return ADM_PICTURE_JPG;
-		    }
-		    // PNG ?
-		    if (fcc_tab1 == 'P' && fcc_tab2 == 'N' && fcc_tab3 == 'G')
-			    {
-		     	    fseek(fd, 0, SEEK_SET);
-		     	    read32(fd);
-		     	    read32(fd);
-		     	    read32(fd);
-		     	    read32(fd);
-		     	    *w=read32(fd);
-		     	    *h=read32(fd);
-		     	    fclose(fd);
-		     	    return ADM_PICTURE_PNG;
-			    }
-		    // BMP2?
-		    if (fcc_tab0 == 'B' && fcc_tab1 == 'M')
-		    {
-		    	    ADM_BITMAPINFOHEADER bmph;
-
-		     	    fseek(fd, 10, SEEK_SET);
-		     	    fread(fcc_tab, 4, 1, fd);
-		     	    // size, width height follow as int32
-		     	    fread(&bmph, sizeof(bmph), 1, fd);
-		     #ifdef ADM_BIG_ENDIAN
-		     	    Endian_BitMapInfo(&bmph);
-		     #endif
-		     	    if (bmph.biCompression != 0)
-		     	    {
-		     	    	ADM_warning("imageIdentify BMP2:Cannot handle compressed bmp\n");
-		     	    	fclose(fd);
-		     	    	return ADM_PICTURE_UNKNOWN;
-		     	    }
-		     	    *w = bmph.biWidth;
-		     	    *h = bmph.biHeight;
-	     	    	fclose(fd);
-	     	    	return ADM_PICTURE_BMP2;
-		    }
-		    // Unknown filetype...
-		    fclose(fd);
-		    return ADM_PICTURE_UNKNOWN;
+    uint8_t fcc_tab4;
+    FILE *fd;
+    uint32_t off,tag=0,count,size;
+
+    // 1- identity the file type
+    //
+    
+    fd = ADM_fopen(filename, "rb");
+    if (!fd)
+    {
+        ADM_info("imageIdentify Cannot open that file!\n");
+        return ADM_PICTURE_UNKNOWN;
+    }
+    fread(fcc_tab, 4, 1, fd);
+
+    // 2- JPEG ?
+    if (fcc_tab0 == 0xff && fcc_tab1 == 0xd8)
+    {
+        int width,height;
+         if(readJpegInfo(fd,width,height))
+         {
+             ADM_info("Identified as jpeg (%d x %d)\n",width,height);
+             *w=width;
+             *h=height;
+             fclose(fd);
+             return ADM_PICTURE_JPG;
+         }else
+         {
+             fclose(fd);
+             return ADM_PICTURE_UNKNOWN;
+         }     
+    }
+    // PNG ?
+    if (fcc_tab1 == 'P' && fcc_tab2 == 'N' && fcc_tab3 == 'G')
+    {
+        fseek(fd, 0, SEEK_SET);
+        read32(fd);
+        read32(fd);
+        read32(fd);
+        read32(fd);
+        *w=read32(fd);
+        *h=read32(fd);
+        fclose(fd);
+        return ADM_PICTURE_PNG;
+    }
+    // BMP2?
+    if (fcc_tab0 == 'B' && fcc_tab1 == 'M')
+    {
+        ADM_BITMAPINFOHEADER bmph;
+
+            fseek(fd, 10, SEEK_SET);
+            fread(fcc_tab, 4, 1, fd);
+            // size, width height follow as int32
+            fread(&bmph, sizeof(bmph), 1, fd);
+     #ifdef ADM_BIG_ENDIAN
+            Endian_BitMapInfo(&bmph);
+     #endif
+            if (bmph.biCompression != 0)
+            {
+                ADM_warning("imageIdentify BMP2:Cannot handle compressed bmp\n");
+                fclose(fd);
+                return ADM_PICTURE_UNKNOWN;
+            }
+            *w = bmph.biWidth;
+            *h = bmph.biHeight;
+            fclose(fd);
+            return ADM_PICTURE_BMP2;
+    }
+    // Unknown filetype...
+    fclose(fd);
+    return ADM_PICTURE_UNKNOWN;
 }
 //EOF
+

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreJobs/src/ADM_coreJobs.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreJobs/src/ADM_coreJobs.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp Changed

@@ -187,7 +187,7 @@
 
         if(isMpeg4Compatible(fcc))
         {
-                c->codec_id = CODEC_ID_MPEG4;
+                c->codec_id = AV_CODEC_ID_MPEG4;
                 if(stream->providePts()==true)
                 {
                     c->has_b_frames=1; // in doubt...
@@ -217,26 +217,26 @@
                             c->codec_id = AV_CODEC_ID_HEVC;
                              setAvCodec(c,AV_CODEC_ID_HEVC);
                         } else {
-                            c->codec_id = CODEC_ID_H264;
-                             setAvCodec(c,CODEC_ID_H264);
+                            c->codec_id = AV_CODEC_ID_H264;
+                             setAvCodec(c,AV_CODEC_ID_H264);
                         }
                 }
                 else
                 {
                         if(isDVCompatible(fcc))
                         {
-                          c->codec_id = CODEC_ID_DVVIDEO;
+                          c->codec_id = AV_CODEC_ID_DVVIDEO;
                         }else
                         {
                           if(fourCC::check(fcc,(uint8_t *)"H263"))
                           {
-                                    c->codec_id=CODEC_ID_H263;
+                                    c->codec_id= AV_CODEC_ID_H263;
                             }else
 
                            if(isVP6Compatible(stream->getFCC()))
                                 {
-                                         c->codec_id=CODEC_ID_VP6F;
-                                         setAvCodec(c,CODEC_ID_VP6F);
+                                         c->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;
                                 }else
@@ -244,8 +244,8 @@
                                         {
                                                 c->has_b_frames=0; // No PTS=cannot handle CTS...
                                                 c->max_b_frames=0;
-                                                c->codec_id=CODEC_ID_FLV1;
-                                                setAvCodec(c,CODEC_ID_FLV1);
+                                                c->codec_id= AV_CODEC_ID_FLV1;
+                                                setAvCodec(c,AV_CODEC_ID_FLV1);
 
                                         }else
                                         {
@@ -253,19 +253,19 @@
                                             {
                                                 c->has_b_frames=1; // No PTS=cannot handle CTS...
                                                 c->max_b_frames=2;
-                                                c->codec_id=CODEC_ID_MPEG1VIDEO;
+                                                c->codec_id= AV_CODEC_ID_MPEG1VIDEO;
                                             }
                                             else if(fourCC::check(stream->getFCC(),(uint8_t *)"MPEG2"))
                                             {
                                                 c->has_b_frames=1; // No PTS=cannot handle CTS...
                                                 c->max_b_frames=2;
-                                                c->codec_id=CODEC_ID_MPEG2VIDEO;
+                                                c->codec_id= AV_CODEC_ID_MPEG2VIDEO;
                                             }else
                                             {
                                                 uint32_t id=stream->getFCC();
 
                                                 AVCodecID cid=ADM_codecIdFindByFourcc(fourCC::tostring(id));
-                                                if(cid==CODEC_ID_NONE)
+                                                if(cid== AV_CODEC_ID_NONE)
                                                 {
                                                     printf("FF Unknown video codec\n");
                                                     return false;
@@ -326,29 +326,29 @@
           switch(audioheader->encoding)
           {
                   case WAV_OGG_VORBIS:
-                                c->codec_id = CODEC_ID_VORBIS;c->frame_size=6*256;
+                                c->codec_id = AV_CODEC_ID_VORBIS;c->frame_size=6*256;
                                 ffmpuxerSetExtradata(c,audioextraSize,audioextraData);
                                 break;
-                  case WAV_DTS: c->codec_id = CODEC_ID_DTS;c->frame_size=1024;break;
-                  case WAV_OPUS:    c->codec_id = CODEC_ID_OPUS;
+                  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);
                                     break;
-                  case WAV_EAC3: c->codec_id = CODEC_ID_EAC3;c->frame_size=6*256;break;
-                  case WAV_AC3: c->codec_id = CODEC_ID_AC3;c->frame_size=6*256;break;
-                  case WAV_MP2: c->codec_id = CODEC_ID_MP2;c->frame_size=1152;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_MP3:
 //  #warning FIXME : Probe deeper
                               c->frame_size=1152;
-                              c->codec_id = CODEC_ID_MP3;
+                              c->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 = CODEC_ID_PCM_S16LE;break;
+                                  c->codec_id = AV_CODEC_ID_PCM_S16LE;break;
                   case WAV_AAC:
                                   ffmpuxerSetExtradata(c,audioextraSize,audioextraData);
-                                  c->codec_id = CODEC_ID_AAC;
+                                  c->codec_id = AV_CODEC_ID_AAC;
                                   c->frame_size=1024;
                                   break;
                   default:
@@ -446,9 +446,9 @@
             int64_t xdts=(int64_t)out.dts;
             if(out.pts==ADM_NO_PTS) xpts=-1;
             if(out.dts==ADM_NO_PTS) xdts=-1;
-            aprintf("FF:V Pts: %"PRId64" DTS:%"PRId64" ms\n",xpts/1000,xdts/1000);
+            aprintf("FF:V Pts: %" PRId64" DTS:%" PRId64" ms\n",xpts/1000,xdts/1000);
 
-            aprintf("FF:V LastDts:%08"PRIu64" Dts:%08"PRIu64" (%04"PRIu64") Delta : %"PRIu64"\n",
+            aprintf("FF:V LastDts:%08" PRIu64" Dts:%08" PRIu64" (%04" PRIu64") Delta : %" PRIu64"\n",
                         lastVideoDts,out.dts,out.dts/1000000,out.dts-lastVideoDts);
             rawDts=out.dts;
             if(rawDts==ADM_NO_PTS)
@@ -460,7 +460,7 @@
             }
             if(out.pts==ADM_NO_PTS)
             {
-                ADM_warning("No PTS information for frame %"PRIu32"\n",written);
+                ADM_warning("No PTS information for frame %" PRIu32"\n",written);
                 missingPts++;
                 out.pts=lastVideoDts;
             }
@@ -470,7 +470,7 @@
             muxerRescaleVideoTimeDts(&(out.dts),lastVideoDts);
             muxerRescaleVideoTime(&(out.pts));
             aprintf("FF:V RawDts:%lu Scaled Dts:%lu\n",rawDts,out.dts);
-            aprintf("FF:V Rescaled: Len : %d flags:%x Pts:%"PRIu64" Dts:%"PRIu64"\n",out.len,out.flags,out.pts,out.dts);
+            aprintf("FF:V Rescaled: Len : %d flags:%x Pts:%" PRIu64" Dts:%" PRIu64"\n",out.len,out.flags,out.pts,out.dts);
 
             av_init_packet(&pkt);
             pkt.dts=out.dts;

avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreSubtitles/include Added

avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreSubtitles/include/ADM_coreSubtitles.h Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreSubtitles/src/ADM_subConvert.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreSubtitles/src/ADM_subConvert.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreSubtitles/src/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreSubtitles/src/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreUI/include/DIA_factory.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreUI/include/DIA_factory.h Changed

@@ -16,9 +16,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef DIA_FACTORY_H
-#define DIA_FACTORY_H
-
+#pragma once
+#include <string>
 #include "ADM_coreUI6_export.h"
 #include "ADM_assert.h"
 
@@ -454,7 +453,7 @@
 };
 #endif
 /*************************************************/
-typedef diaElem *CREATE_FILE_T(uint32_t writeMode,char **filename,const char *toggleTitle,  const char *defaultSuffix ,const char *tip);
+typedef diaElem *CREATE_FILE_T(uint32_t writeMode,std::string  &filename,const char *toggleTitle,  const char *defaultSuffix ,const char *tip);
 class diaElemFileBase : public diaElem
 {
 
@@ -475,7 +474,7 @@
     
 public:
   
-  diaElemFile(uint32_t writeMode,char **filename,const char *toggleTitle,
+  diaElemFile(uint32_t writeMode,std::string &filename,const char *toggleTitle,
               const char *defaultSuffix = 0,const char *tip=NULL);
   virtual ~diaElemFile() ;
   void setMe(void *dialog, void *opaque,uint32_t line);
@@ -486,7 +485,7 @@
   int getRequiredLayout(void);
 };
 /*************************************************/
-typedef diaElem *CREATE_DIR_T(char **filename,const char *toggleTitle,const char *tip);
+typedef diaElem *CREATE_DIR_T(std::string &filename,const char *toggleTitle,const char *tip);
 class diaElemDirSelectBase : public diaElem
 {
 
@@ -501,7 +500,7 @@
 
 public:
   
-  diaElemDirSelect(char **filename,const char *toggleTitle,const char *tip=NULL);
+  diaElemDirSelect(std::string &filename,const char *toggleTitle,const char *tip=NULL);
   virtual ~diaElemDirSelect() ;
   void setMe(void *dialog, void *opaque,uint32_t line);
   void getMe(void);
@@ -651,4 +650,3 @@
 ADM_COREUI6_EXPORT uint8_t diaFactoryRun(const char *title,uint32_t nb,diaElem **elems);
 ADM_COREUI6_EXPORT uint8_t diaFactoryRunTabs(const char *title,uint32_t nb,diaElemTabs **tabs);
 /*********************************************/
-#endif

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreUI/src/DIA_factory.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreUI/src/DIA_factory.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_confCouple.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_confCouple.h Changed

@@ -13,11 +13,11 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
- #ifndef __CONFCOUPLE__
- #define __CONFCOUPLE__
-
+#pragma once
+#include <string>
 #include "ADM_coreUtils6_export.h"
-
+/**
+ */
 class ADM_COREUTILS6_EXPORT CONFcouple
 {
         private:
@@ -37,6 +37,7 @@
                         bool writeAsUint32(const char *name,uint32_t value);
                         bool writeAsInt32(const char *name,int32_t value);
                         bool writeAsString(const char *name,const char *value);
+                        bool writeAsStdString(const char *name,const std::string &value);
                         bool writeAsFloat(const char *name,float value);
                         bool writeAsDouble(const char *name,double value);
                         bool writeAsBool(const char *name,bool value);
@@ -49,6 +50,7 @@
                         bool readAsFloat(const char *name,float *value);
                         bool readAsDouble(const char *name,double *value);
                         bool readAsBool(const char *name,bool *value);
+                        bool readAsStdString(const char *name, std::string *value);
 
                         bool exist(const char *name);
 
@@ -61,4 +63,3 @@
 
 };
 ADM_COREUTILS6_EXPORT bool stringsToConfCouple(int nb,CONFcouple **conf,  const char **argv);
-#endif

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_coreJson.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_coreJson.h Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_paramList.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_paramList.h Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_videoInfoExtractor.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_videoInfoExtractor.h Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_confCouple.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_confCouple.cpp Changed

@@ -74,7 +74,7 @@
 	ADM_assert(cur<nb);
 
 	namecur=strupDupeAsNew(myname);
-	sprintf(tmpstring,"%"PRIu32,val);
+	sprintf(tmpstring,"%" PRIu32,val);
 	valuecur=strupDupeAsNew(tmpstring);
 	cur++;
 	return 1;
@@ -118,7 +118,7 @@
 	ADM_assert(cur<nb);
 
 	namecur=strupDupeAsNew(myname);
-	sprintf(tmpstring,"%"PRIi32,val);
+	sprintf(tmpstring,"%" PRIi32,val);
 	valuecur=strupDupeAsNew(tmpstring);
 	cur++;
 	return 1;
@@ -133,6 +133,23 @@
 	cur++;
 	return 1;
 }
+/**
+ * 
+ * @param name
+ * @param value
+ * @return 
+ */
+bool CONFcouple::writeAsStdString(const char *myname,const std::string &val)
+{
+  ADM_assert(cur<nb);
+
+	namecur=strupDupeAsNew(myname);
+	valuecur=strupDupeAsNew(val.c_str());
+	cur++;
+	return 1;
+}
+
+
 bool CONFcouple::writeAsBool(const char *myname,bool v)
 {
 	ADM_assert(cur<nb);
@@ -245,7 +262,21 @@
 	*val=strupDupeAsNew(valueindex);
 	return 1;
 }
-
+/**
+ * 
+ * @param name
+ * @param value
+ * @return 
+ */
+ bool CONFcouple::readAsStdString(const char *myname, std::string *val)
+ {
+   int32_t index=lookupName(myname);
+//#warning TODO : unescape
+	ADM_assert(index!=-1);
+	ADM_assert(index<(int)nb);
+	*val=std::string(valueindex);
+	return 1;
+ }
 bool CONFcouple::readAsFloat(const char *myname,float *val)
 {
 	int32_t index=lookupName(myname);

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_coreCodecMapping.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_coreCodecMapping.cpp Changed

@@ -23,47 +23,47 @@
 const ffVideoCodec ffCodec=
 {
                                 // Refcopy // extrdata // Can have  B frame
-  {"SNOW",  CODEC_ID_SNOW,      false, false,    false},
-  {"cvid",  CODEC_ID_CINEPAK,   false, false,    false},
-  {"CRAM",  CODEC_ID_MSVIDEO1,  false, false,    false},
-  {"VP6F",  CODEC_ID_VP6F,      false, false,    false},
-  {"VP6A",  CODEC_ID_VP6A,      false, false,    false},
-  {"VP8 ",  CODEC_ID_VP8,       false, false,    false},
-  {"SVQ1",  CODEC_ID_SVQ1,      false, false,    false},
-  {"FLV1",  CODEC_ID_FLV1,      false, false,    false},
-  {"AMV",   CODEC_ID_AMV,       false, false,    false},
-  {"MJPG",  CODEC_ID_MJPEG,     false, false,    false},
-  {"mjpa",  CODEC_ID_MJPEG,     false, false,    false},
-  {"MJPB",  CODEC_ID_MJPEGB,    false, false,    false},
-  {"FPS1",  CODEC_ID_FRAPS,     false, false,    false},
-  {"cvid",  CODEC_ID_CINEPAK,   false, false,    false},
+  {"SNOW",  AV_CODEC_ID_SNOW,      false, false,    false},
+  {"cvid",  AV_CODEC_ID_CINEPAK,   false, false,    false},
+  {"CRAM",  AV_CODEC_ID_MSVIDEO1,  false, false,    false},
+  {"VP6F",  AV_CODEC_ID_VP6F,      false, false,    false},
+  {"VP6A",  AV_CODEC_ID_VP6A,      false, false,    false},
+  {"VP8 ",  AV_CODEC_ID_VP8,       false, false,    false},
+  {"SVQ1",  AV_CODEC_ID_SVQ1,      false, false,    false},
+  {"FLV1",  AV_CODEC_ID_FLV1,      false, false,    false},
+  {"AMV",   AV_CODEC_ID_AMV,       false, false,    false},
+  {"MJPG",  AV_CODEC_ID_MJPEG,     false, false,    false},
+  {"mjpa",  AV_CODEC_ID_MJPEG,     false, false,    false},
+  {"MJPB",  AV_CODEC_ID_MJPEGB,    false, false,    false},
+  {"FPS1",  AV_CODEC_ID_FRAPS,     false, false,    false},
+  {"cvid",  AV_CODEC_ID_CINEPAK,   false, false,    false},
 // Need extradata
-  {"WMV2", CODEC_ID_WMV2,       true, false,    false},
-  {"WMV1", CODEC_ID_WMV1,       true, false,    false},
-  {"WMV3", CODEC_ID_WMV3,       true, false,    true},
-  {"WVC1", CODEC_ID_VC1,        true, false,    true},
-  {"WMVA", CODEC_ID_VC1,        true, false,    true},
-  {"VP8 ", CODEC_ID_VP8,        true, false,    false},
+  {"WMV2", AV_CODEC_ID_WMV2,       true, false,    false},
+  {"WMV1", AV_CODEC_ID_WMV1,       true, false,    false},
+  {"WMV3", AV_CODEC_ID_WMV3,       true, false,    true},
+  {"WVC1", AV_CODEC_ID_VC1,        true, false,    true},
+  {"WMVA", AV_CODEC_ID_VC1,        true, false,    true},
+  {"VP8 ", AV_CODEC_ID_VP8,        true, false,    false},
   {"VP9 ", AV_CODEC_ID_VP9,     true, false,    false},
-  {"tscc", CODEC_ID_TSCC,       false,false,    false},
-  {"CSCD", CODEC_ID_CSCD,       false,false,    false},
+  {"tscc", AV_CODEC_ID_TSCC,       false,false,    false},
+  {"CSCD", AV_CODEC_ID_CSCD,       false,false,    false},
 
   
 // RefCopy
-  {"FFV1", CODEC_ID_FFV1,       true, true,    false},
-  {"H263", CODEC_ID_H263,       false, true,   false},
-  {"MP42", CODEC_ID_MSMPEG4V2,  true, true,    false},
-  {"SVQ3", CODEC_ID_SVQ3,       true, true,    false},
-  {"FFVH", CODEC_ID_FFVHUFF,    true, true,    false},
-  {"HFYU", CODEC_ID_HUFFYUV,    true, true,    false},
-  {"VC1 ", CODEC_ID_VC1,        true, true,    true},
+  {"FFV1", AV_CODEC_ID_FFV1,       true, true,    false},
+  {"H263", AV_CODEC_ID_H263,       false, true,   false},
+  {"MP42", AV_CODEC_ID_MSMPEG4V2,  true, true,    false},
+  {"SVQ3", AV_CODEC_ID_SVQ3,       true, true,    false},
+  {"FFVH", AV_CODEC_ID_FFVHUFF,    true, true,    false},
+  {"HFYU", AV_CODEC_ID_HUFFYUV,    true, true,    false},
+  {"VC1 ", AV_CODEC_ID_VC1,        true, true,    true},
 
 
- //{CODEC_ID_FFVHUFF,"FFVH"},
-//    {CODEC_ID_HUFFYUV,"HFYU"},
-  //{"MJPB", CODEC_ID_CYUV,       true},
- // {"MJPB", CODEC_ID_THEORA),    true}
-  {"xxxx", CODEC_ID_NONE, false,false,    false}
+ //{AV_CODEC_ID_FFVHUFF,"FFVH"},
+//    {AV_CODEC_ID_HUFFYUV,"HFYU"},
+  //{"MJPB", AV_CODEC_ID_CYUV,       true},
+ // {"MJPB", AV_CODEC_ID_THEORA),    true}
+  {"xxxx", AV_CODEC_ID_NONE, false,false,    false}
 };
 
 /**
@@ -92,15 +92,15 @@
     // Special cases
  if (isMSMpeg4Compatible (fid) == 1)
     {
-      return CODEC_ID_MSMPEG4V3;
+      return AV_CODEC_ID_MSMPEG4V3;
     }
   if (isDVCompatible(fid))//"CDVC"))
     {
-      return CODEC_ID_DVVIDEO;
+      return AV_CODEC_ID_DVVIDEO;
     }
   if (isH264Compatible (fid))
     {
-        return CODEC_ID_H264;
+        return AV_CODEC_ID_H264;
     }
   if (isH265Compatible (fid))
     {
@@ -108,7 +108,7 @@
     }
   if (isMpeg4Compatible (fid) == 1)
     {
-      return CODEC_ID_MPEG4;
+      return AV_CODEC_ID_MPEG4;
     }
 
     uint32_t nb=sizeof(ffCodec)/sizeof(ffVideoCodec);
@@ -116,5 +116,5 @@
     {
         if(!strcmp(fcc,ffCodeci.string)) return ffCodeci.codecId;
     }
-    return CODEC_ID_NONE;
+    return AV_CODEC_ID_NONE;
 }

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_frameType.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_frameType.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_getbits.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_getbits.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH264.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH264.cpp Changed

avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorVC1.cpp Added

@@ -0,0 +1,87 @@
+/***************************************************************************
+                          ADM_infoextractor
+                             -------------------
+           - extract additionnal info from header (mp4/h263)                  
+**************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifdef _MSC_VER
+#	include <malloc.h>
+#endif
+
+#include "ADM_default.h"
+
+extern "C"
+{
+#include "libavcodec/parser.h"
+#include "libavcodec/avcodec.h"
+}
+
+#include "ADM_Video.h"
+
+#include "fourcc.h"
+//#include "ADM_mp4.h"
+
+#define aprintf(...) {}
+#include "ADM_getbits.h"
+#include "ADM_videoInfoExtractor.h"
+#include "ADM_h264_tag.h"
+
+
+//#define ANNEX_B_DEBUG
+
+#if defined(ANNEX_B_DEBUG)
+#define aprintf ADM_info
+#define check isNalValid
+#else
+#define aprintf(...) {}
+#define check(...) {}
+#endif
+
+
+
+bool ADM_findMpegStartCode (uint8_t * start, uint8_t * end,
+			    uint8_t * outstartcode, uint32_t * offset);
+
+/**
+ * 
+ * @param start
+ * @param size
+ * @param frameType
+ * @return 
+ */
+
+static int toType16= // unary ?
+{
+    0,0,0,0,0,0,0,0, // 0xxx
+    AVI_B_FRAME,AVI_B_FRAME,AVI_B_FRAME,AVI_B_FRAME, // 10xx
+    AVI_KEY_FRAME,AVI_KEY_FRAME, // 110x
+    AVI_B_FRAME,0
+};
+
+bool ADM_VC1getFrameType(uint8_t *start, int size, int *frameType)
+{
+    uint8_t *end=start+size; // We should not need escaping, (??)
+    uint8_t code;
+    uint32_t offset;
+    
+    while(ADM_findMpegStartCode(start,end,&code,&offset))
+    {
+        start+=offset;
+        if(code!=0x0D) // frame, field = 0xc , SLICE=0x0b
+            continue;
+        *frameType=toType*start >> 4;
+        printf("VC1 : => %02x : 0x%02x %02x %02x %02x\n",*frameType,code,start0,start1,start2);
+        return true;
+        // 
+    }
+    return false;
+}
+//EOF

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_json.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_json.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_paramList.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_paramList.cpp Changed

@@ -17,7 +17,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
-
+#include <string>
 #include "ADM_default.h"
 #include "ADM_paramList.h"
 #include <stddef.h>
@@ -193,12 +193,12 @@
     char tmp256;
     switch(params->mode)
     {
-        case COMPRESS_CQ:    sprintf(tmp,"CQ=%"PRIu32,params->qz);break;
-        case COMPRESS_CBR:   sprintf(tmp,"CBR=%"PRIu32,params->bitrate);break;
-        case COMPRESS_2PASS: sprintf(tmp,"2PASS=%"PRIu32,params->finalsize);break;
+        case COMPRESS_CQ:    sprintf(tmp,"CQ=%" PRIu32,params->qz);break;
+        case COMPRESS_CBR:   sprintf(tmp,"CBR=%" PRIu32,params->bitrate);break;
+        case COMPRESS_2PASS: sprintf(tmp,"2PASS=%" PRIu32,params->finalsize);break;
         case COMPRESS_SAME:  sprintf(tmp,"SAME");break;
-        case COMPRESS_2PASS_BITRATE: sprintf(tmp,"2PASSBITRATE=%"PRIu32,params->avg_bitrate);break;
-        case COMPRESS_AQ:    sprintf(tmp,"AQ=%"PRIu32,params->qz);break;
+        case COMPRESS_2PASS_BITRATE: sprintf(tmp,"2PASSBITRATE=%" PRIu32,params->avg_bitrate);break;
+        case COMPRESS_AQ:    sprintf(tmp,"AQ=%" PRIu32,params->qz);break;
         default:
             ADM_error("Unknown compressin mode \n");
             return false;
@@ -353,6 +353,15 @@
                         delete  var;
                     }
                     break;
+            case ADM_param_stdstring:
+                    {
+                        char   *var;                        
+                        std::string *str=(std::string *)(address+paramsi.offset);
+                        couples->readAsString(name,&var);
+                        *str=std::string(var);
+                        delete  var;
+                    }
+                break;                    
             default:
                     ADM_error("Type no handled %d\n",paramsi.type);
                     break;
@@ -464,6 +473,18 @@
                         }
                 }
                 break;
+            case ADM_param_stdstring:
+                {
+                        std::string *str;
+                        str=(std::string  *)(address+paramsi.offset);
+                        bool r=c->writeAsString(name,str->c_str());
+                        if(false==r)
+                        {
+                                ADM_error("Error writing string\n");
+                                return false;
+                        }
+                }
+                break;
             default:
                     ADM_assert(0);
         }

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreUtils/src/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreUtils/src/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreUtils/src/avidemutils.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreUtils/src/avidemutils.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreUtils/src/prefs.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreUtils/src/prefs.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_pref.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_pref.h Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/ADM_coreLibVA.h Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA_encoder.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA_encoder.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpau.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpau.h Changed

@@ -42,6 +42,7 @@
 #ifdef USE_VDPAU
     static  void        *getVdpDevice(void);
     static  void        *getProcAddress(void);
+    static  VdpGetProcAddress   *getProcAddress2(void)    ;
     static  const char  *getErrorString(VdpStatus er);
     static  bool        mixerIsFeatureEnabled( VdpVideoMixer mixer,VdpVideoMixerFeature feature);
     static  VdpStatus   surfaceCreate(uint32_t width,uint32_t height,VdpVideoSurface *surface);
@@ -49,7 +50,7 @@
     static  VdpStatus   getDataSurface(VdpVideoSurface surface,uint8_t *planes3,uint32_t stride3);
     static  VdpStatus   surfacePutBits(VdpVideoSurface surface,uint8_t *planes3,uint32_t stride3);
     /* Decoder */
-    static  VdpStatus   decoderCreate( VdpDecoderProfile profile,    uint32_t          width,    uint32_t          height,    uint32_t          max_references,       VdpDecoder *      decoder);
+    static  VdpStatus   decoderCreate( VdpDevice dev,VdpDecoderProfile profile,    uint32_t          width,    uint32_t          height,    uint32_t          max_references,       VdpDecoder *      decoder);
     static  VdpStatus   decoderDestroy(VdpDecoder decoder);
 
     static  VdpStatus   decoderRender(
@@ -83,14 +84,18 @@
     static VdpStatus presentationQueueDestroy(VdpPresentationQueue queue);
     static VdpStatus presentationQueueDisplay(VdpPresentationQueue queue,VdpOutputSurface outputSurface);
     /* Mixer */
-    static VdpStatus mixerCreate(uint32_t width,uint32_t height, VdpVideoMixer *mixer,bool deinterlace=false);
+    static VdpStatus mixerCreate(uint32_t width,uint32_t height, VdpVideoMixer *mixer,bool deinterlace=false,bool ivtc=false);
     static VdpStatus mixerDestroy(VdpVideoMixer mixer);
     static VdpStatus mixerRender(VdpVideoMixer mixer,VdpVideoSurface sourceSurface,VdpOutputSurface targetOutputSurface, uint32_t targetWidth, uint32_t targetHeight );
     static VdpStatus mixerRenderWithCropping(VdpVideoMixer mixer,VdpVideoSurface sourceSurface,VdpOutputSurface targetOutputSurface, uint32_t targetWidth, uint32_t targetHeight ,
                                             uint32_t sourceWidth, uint32_t sourceHeight);
-    static VdpStatus mixerRenderWithPastAndFuture(bool topField,VdpVideoMixer mixer,
+    static VdpStatus mixerRenderFieldWithPastAndFuture(bool topField,VdpVideoMixer mixer,
                                 VdpVideoSurface sourceSurface3, // Past present future
                                 VdpOutputSurface targetOutputSurface, uint32_t targetWidth,     uint32_t targetHeight,uint32_t sourceWidth,     uint32_t sourceHeight );
+    static VdpStatus mixerRenderFrameWithPastAndFuture(VdpVideoMixer mixer,
+                                VdpVideoSurface sourceSurface3, // Past present future
+                                VdpOutputSurface targetOutputSurface, uint32_t targetWidth,     uint32_t targetHeight,uint32_t sourceWidth,     uint32_t sourceHeight );
+    
     static VdpStatus mixerGetAttributesValue(VdpVideoMixer mixer,
                                 uint32_t attrCount,
                                 const  VdpVideoMixerAttribute *xkeys,

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpau.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpau.cpp Changed

@@ -18,6 +18,11 @@
 #include "../include/ADM_coreVdpauInternal.h"
 #include "ADM_dynamicLoading.h"
 
+#if 0
+#define VDP_TRACK printf
+#else
+#define VDP_TRACK(...) {}
+#endif
 
 GUI_WindowInfo      admVdpau::myWindowInfo;
 
@@ -56,8 +61,14 @@
 */
 void        *admVdpau::getProcAddress(void)
 {
+    printf("==> GetProcAddress called\n");
     return (void *)vdpProcAddress;
 }
+VdpGetProcAddress        *admVdpau::getProcAddress2(void)
+{
+    printf("==> GetProcAddress called\n");
+    return vdpProcAddress;
+}
 
 /**
     \fn     init
@@ -81,7 +92,12 @@
         return false;
     }
     // Now that we have the vdpProcAddress, time to get the functions....
-#define GetMe(fun,id)         ADM_coreVdpau::funcs.fun= (typeof(ADM_coreVdpau::funcs.fun))getFunc(id);ADM_assert(ADM_coreVdpau::funcs.fun); 
+#if 0 //def HAS_MOVE_SEMANTICS
+#define myTypeOf   decltype
+#else
+#define myTypeOf   typeof
+#endif
+#define GetMe(fun,id)         ADM_coreVdpau::funcs.fun= (myTypeOf(ADM_coreVdpau::funcs.fun))getFunc(id);ADM_assert(ADM_coreVdpau::funcs.fun); 
         
     GetMe(deviceDestroy,VDP_FUNC_ID_DEVICE_DESTROY);
     GetMe(getErrorString,VDP_FUNC_ID_GET_ERROR_STRING);
@@ -200,10 +216,11 @@
     \fn
     \brief
 */
-VdpStatus admVdpau::decoderCreate( VdpDecoderProfile profile,    uint32_t  width,uint32_t  height,
+VdpStatus admVdpau::decoderCreate(  VdpDevice dev,VdpDecoderProfile profile,    uint32_t  width,uint32_t  height,
             uint32_t  max_references,VdpDecoder *      decoder)
 {
-    CHECK(ADM_coreVdpau::funcs.decoderCreate(ADM_coreVdpau::vdpDevice,profile,width,height,max_references,decoder));
+    VDP_TRACK("Creating decoder\n");
+    CHECK(ADM_coreVdpau::funcs.decoderCreate(dev,profile,width,height,max_references,decoder));
 }
 /**
     \fn
@@ -211,6 +228,7 @@
 */
 VdpStatus  admVdpau::decoderDestroy(VdpDecoder decoder)
 {
+    VDP_TRACK("Destroying decoder\n");
     CHECK(ADM_coreVdpau::funcs.decoderDestroy(decoder));
 }
 /**
@@ -273,6 +291,7 @@
     uint32_t                   bitstream_buffer_count,
     VdpBitstreamBuffer const * bitstream_buffers)
 {
+    VDP_TRACK("Calling VDPAU decoder , target surface=%d\n",target);
     CHECK(ADM_coreVdpau::funcs.decoderRender(decoder, target, (void * const *)info,bitstream_buffer_count, bitstream_buffers));
 }
 /**

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpauMixer.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpauMixer.cpp Changed

@@ -61,7 +61,7 @@
 /**
     \fn mixerCreate
 */
-VdpStatus admVdpau::mixerCreate(uint32_t width,uint32_t height, VdpVideoMixer *mixer,bool deinterlace)
+VdpStatus admVdpau::mixerCreate(uint32_t width,uint32_t height, VdpVideoMixer *mixer,bool deinterlace,bool ivtc)
 {
 #define MIXER_NB_PARAM 3
 #define MIXER_NB_FEATURE_MAX 7
@@ -71,19 +71,25 @@
                                                VDP_VIDEO_MIXER_PARAMETER_VIDEO_SURFACE_HEIGHT,
                                                VDP_VIDEO_MIXER_PARAMETER_CHROMA_TYPE
                                                };
- VdpVideoMixerFeature featuresMIXER_NB_FEATURE_MAX;
- VdpBool              enabledFeaturesMIXER_NB_FEATURE_MAX={VDP_TRUE,VDP_TRUE,VDP_TRUE,VDP_TRUE,VDP_TRUE,VDP_TRUE,VDP_TRUE};
-
-uint32_t color=VDP_CHROMA_TYPE_420;
-void    *valuesMIXER_NB_PARAM={&width,&height,&color};
+    VdpVideoMixerFeature featuresMIXER_NB_FEATURE_MAX;
+    VdpBool              enabledFeaturesMIXER_NB_FEATURE_MAX={VDP_TRUE,VDP_TRUE,VDP_TRUE,VDP_TRUE,VDP_TRUE,VDP_TRUE,VDP_TRUE};
+    uint32_t color=VDP_CHROMA_TYPE_420;
+    void    *valuesMIXER_NB_PARAM={&width,&height,&color};
     int nbFeature=0;
     ADM_info("Creating vdpauMixer with width=%d, height=%d color=%d\n",width,height,color);
     //featuresnbFeature++=VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L5;
+   
+    if(ivtc)
+    {
+        ADM_info("Vdpau: Enabling ivtc\n");
+        featuresnbFeature++=VDP_VIDEO_MIXER_FEATURE_INVERSE_TELECINE;
+        deinterlace=true; // we need a sort of deinterlacing
+    }
     if(deinterlace)
     {
+        ADM_info("Vdpau: Enabling temporal spatial deint\n");
         featuresnbFeature++=VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL_SPATIAL;
     }
-    
     int nbParam=MIXER_NB_PARAM;
     
     VdpStatus e=ADM_coreVdpau::funcs.mixerCreate(ADM_coreVdpau::vdpDevice,
@@ -96,6 +102,7 @@
         
     }else   
     {
+        ADM_info("Vdpau Mixer : Enabling %d features\n",nbFeature);
         mixerEnableFeature(*mixer, nbFeature, features, enabledFeatures);
     }
     return e;
@@ -256,7 +263,7 @@
     \fn mixerRenderWithPastAndFuture
 */
 
-VdpStatus admVdpau::mixerRenderWithPastAndFuture(
+VdpStatus admVdpau::mixerRenderFieldWithPastAndFuture(
                                 bool topField,
                                 VdpVideoMixer mixer,
                                 VdpVideoSurface sourceSurface3, // Past present future
@@ -321,5 +328,64 @@
     }
     return e;
 }
+
+/**
+    \fn mixerRenderWithPastAndFuture
+*/
+
+VdpStatus admVdpau::mixerRenderFrameWithPastAndFuture(                                
+                                VdpVideoMixer mixer,
+                                VdpVideoSurface sourceSurface3, // Past present future
+                                VdpOutputSurface targetOutputSurface, 
+                                uint32_t targetWidth, 
+                                uint32_t targetHeight,
+                                uint32_t sourceWidth, 
+                                uint32_t sourceHeight        )
+{
+    VdpVideoSurface past=VDP_INVALID_HANDLE;
+    VdpVideoSurface future=VDP_INVALID_HANDLE;
+    VdpVideoSurface present;
+
+    VdpRect rect;
+    rect.x0=rect.y0=0;
+    rect.x1=sourceWidth;
+    rect.y1=sourceHeight;
+    
+    present=sourceSurface1;
+    
+    int nbPrev=0,nbNext=0;
+    
+    if(VDP_INVALID_HANDLE!=sourceSurface0 ) 
+    {
+        nbPrev=1;
+        past=sourceSurface0;
+    }
+    if(VDP_INVALID_HANDLE!=sourceSurface2 ) 
+    {
+        nbNext=1;
+        future=sourceSurface2;
+    }
+    // 0 & 1 p
+    //ADM_info("Deint : %d\n",(int)mixerIsFeatureEnabled(mixer,VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL_SPATIAL));
+
+    VdpStatus e=ADM_coreVdpau::funcs.mixerRender(mixer,
+                VDP_INVALID_HANDLE,NULL,    // Background
+                VDP_VIDEO_MIXER_PICTURE_STRUCTURE_FRAME,
+                nbPrev,       &past, // Past...
+                              present, // current
+                nbNext,       &future, // Future
+                &rect,                               // source RECT
+                targetOutputSurface,
+                NULL,                               // dest Rec
+                NULL,                               // dest video Rec
+                0,NULL);                            // Layers
+                
+            
+  if(VDP_STATUS_OK!=e)
+    {        
+        ADM_warning("mixerRenderIvtcWithPastAndFuture  failed :%s\n",getErrorString(e));        
+    }
+    return e;
+}
 #endif
 // EOF

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h Changed

@@ -1,11 +1,8 @@
 /***************************************************************************
-                          ADM_ffmp43.h  -  description
-                             -------------------
-
-	Mpeg4 ****decoder******** using ffmpeg
-
-    begin                : Wed Sep 25 2002
-    copyright            : (C) 2002 by mean
+  \name    ADM_ffmp43.h 
+  \brief   Interface to libavcodec
+ 
+    copyright            : (C) 2002/2016 by mean
     email                : fixounet@free.fr
  ***************************************************************************/
 
@@ -20,15 +17,25 @@
 #pragma once
 
 #include "ADM_coreVideoCodec6_export.h"
-typedef void (AV_FATAL_HANDLER)(const char *why,int fileno,const char *filewhereitcrashed);
-
-extern "C" {
+#include "ADM_codec.h"
+#include "ADM_paramList.h"
+extern "C" 
+{
 #include "libavcodec/avcodec.h"
-extern void av_setFatalHandler(AV_FATAL_HANDLER *func);
 }
+#include "ADM_hwAccel.h"
 
-#include "ADM_codec.h"
-#include "ADM_paramList.h"
+extern "C"
+{
+typedef void (AV_FATAL_HANDLER)(const char *why,int fileno,const char *filewhereitcrashed);
+extern void av_setFatalHandler(AV_FATAL_HANDLER *func);
+extern enum AVPixelFormat ADM_FFgetFormat(struct AVCodecContext *avctx,  const enum AVPixelFormat *fmt);
+}
+/**
+ * 
+ */
+ADM_COREVIDEOCODEC6_EXPORT void ADM_lavInit(void);
+ADM_COREVIDEOCODEC6_EXPORT void ADM_lavDestroy(void);
 
 /**
     \class decoderFF
@@ -36,145 +43,109 @@
 */
 class ADM_COREVIDEOCODEC6_EXPORT decoderFF:public decoders
 {
-protected:
-  bool  hurryUp;
-  bool _setBpp;
-  bool _setFcc;
-  int codecId;
-  uint8_t _refCopy;
-  uint32_t _bpp;
-  AVCodecContext *_context;
-  uint8_t  *_extraDataCopy;
-  int _extraDataLen;
-  uint32_t _fcc;
-  AVFrame *_frame;
-  uint8_t _allowNull;
-  uint32_t frameType (void);
-  uint8_t clonePic (AVFrame * src, ADMImage * out);
-  void decoderMultiThread ();
-  uint32_t _gmc;
-  uint32_t _usingMT;
-  uint32_t _threads;
-
-	typedef struct {
-		bool swapUv;
-		bool showMv;
-	} decoderFF_param_t;
-
-	decoderFF_param_t decoderFF_params;
-	static const decoderFF_param_t defaultConfig;
-	static const ADM_paramList decoderFF_param_template;
-
+friend class ADM_acceleratedDecoderFF;
 public:
+            typedef struct 
+             {
+                     bool swapUv;
+                     bool showMv;
+             } decoderFF_param_t;    
 
-    decoderFF (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp);
-    virtual ~ decoderFF ();
-  virtual bool dontcopy (void)
-  {
-    return true;
-  }
-  virtual bool uncompress (ADMCompressedImage * in, ADMImage * out);
-  virtual bool getConfiguration(CONFcouple **conf);
-  virtual bool resetConfiguration();
-  virtual bool setConfiguration(CONFcouple * conf);
-  virtual bool setParam (void);
-  virtual bool bFramePossible (void)
-  {
-    return false;
-  }
-  virtual bool decodeHeaderOnly (void);
-  virtual bool decodeFull (void);
-//  virtual uint32_t getSpecificMpeg4Info (void);
-  virtual uint8_t getPARWidth (void);
-  virtual uint8_t getPARHeight (void);
-  virtual bool    flush(void);
-  virtual const char *getDecoderName(void) {return "Lavcodec";}
-};
-
-class decoderFFDiv3:public decoderFF
-{
 protected:
-public:
-  decoderFFDiv3 (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp);
-};
+    static const decoderFF_param_t defaultConfig;
+    static const ADM_paramList decoderFF_param_template;
+
+           uint8_t      _allowNull;
+           bool         hurryUp;
+           bool         _setBpp;
+           bool         _setFcc;
+           int          codecId;
+           uint8_t      _refCopy;
+           uint32_t     _bpp;
+           AVCodecContext *_context;
+           uint8_t      *_extraDataCopy;
+           int          _extraDataLen;
+           uint32_t     _fcc;
+           AVFrame      *_frame;
+           uint32_t     _gmc;
+           uint32_t     _usingMT;
+           uint32_t     _threads;
+           ADM_acceleratedDecoderFF *hwDecoder;
+           decoderFF_param_t decoderFF_params;
+   
 
-class decoderFFMpeg4:public decoderFF
-{
 protected:
-public:
-        decoderFFMpeg4 (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp);
-  bool uncompress (ADMCompressedImage * in, ADMImage * out);
-  // mpeg4 can have B-frame
-  virtual bool bFramePossible (void)
-  {
-    return 1;
-  }
-};
-class decoderFFMpeg12:public decoderFF
-{
-protected:
-public:
-  decoderFFMpeg12 (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp);
-  // mpeg1/2 can have B-frame
-  virtual bool bFramePossible (void)
-  {
-    return 1;
-  }
+           uint32_t     frameType (void);
+           uint8_t      clonePic (AVFrame * src, ADMImage * out);
+           void         decoderMultiThread ();
+           uint32_t     admFrameTypeFromLav (AVFrame *pic);
+	
 
-};
 
-class decoderFFDV:public decoderFF
-{
-protected:
-public:
-  decoderFFDV (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp);
-};
-
-class decoderFFH264:public decoderFF
-{
-protected:
-  uint32_t _lowDelay;
-public:
-  decoderFFH264 (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp);
-  virtual bool bFramePossible (void)
-  {
-      return true;
-  }
-  bool   uncompress (ADMCompressedImage * in, ADMImage * out);
-};
-
-class decoderFFH265:public decoderFF
-{
-public:
-  decoderFFH265 (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp);
-  virtual bool bFramePossible (void)
-  {
-      return true;
-  }
-};
-
-class decoderFFhuff:public decoderFF
-{
-protected:
 public:
-  decoderFFhuff (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp);
+                        decoderFF (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp);
+        virtual         ~ decoderFF ();
+            bool        setHwDecoder(ADM_acceleratedDecoderFF *h) {hwDecoder=h;return true;}
+            ADM_acceleratedDecoderFF    *getHwDecoder() {return hwDecoder;}
+        virtual bool    dontcopy (void)
+        {
+          return true;
+        }
+        virtual bool uncompress (ADMCompressedImage * in, ADMImage * out);
+        virtual bool getConfiguration(CONFcouple **conf);
+        virtual bool resetConfiguration();
+        virtual bool setConfiguration(CONFcouple * conf);
+        virtual bool setParam (void);
+        virtual bool bFramePossible (void)
+        {
+          return false;
+        }
+        virtual bool decodeHeaderOnly (void);
+        virtual bool decodeFull (void);
+      //  virtual uint32_t getSpecificMpeg4Info (void);
+        virtual uint8_t getPARWidth (void);
+        virtual uint8_t getPARHeight (void);
+        virtual bool    flush(void);
+        virtual const char *getDecoderName(void) 
+                          {
+                              if(hwDecoder)
+                                  return hwDecoder->getName();
+
+                              return "Lavcodec";
+                          }
+        // for hw accel
+        AVFrame *getFramePointer() {return _frame;}
 };
 
-class decoderFF_ffhuff:public decoderFF
-{
-protected:
-public:
-  decoderFF_ffhuff (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp);
-};
-
-class decoderFFPng : public decoderFF
-{
-public:
-	decoderFFPng(uint32_t w, uint32_t h, uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData, uint32_t bpp);
-};
-
-ADM_COREVIDEOCODEC6_EXPORT void ADM_lavInit(void);
-ADM_COREVIDEOCODEC6_EXPORT void ADM_lavDestroy(void);
+#define FF_SIMPLE_DECLARE(x,y) \
+        class x:public decoderFF \
+        {\
+            protected: \
+            public: \
+                    x (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp); \
+                    y \
+        };
+
+FF_SIMPLE_DECLARE(decoderFFDiv3,)
+FF_SIMPLE_DECLARE(decoderFFDV,)
+FF_SIMPLE_DECLARE(decoderFFhuff,)
+FF_SIMPLE_DECLARE(decoderFF_ffhuff,)
+FF_SIMPLE_DECLARE(decoderFFPng,)
+FF_SIMPLE_DECLARE(decoderFFMpeg4, bool uncompress (ADMCompressedImage * in, ADMImage * out);
+                                // mpeg4 can have B-frame
+                                virtual bool bFramePossible (void)   {  return 1;   })
+FF_SIMPLE_DECLARE(decoderFFMpeg12,
+                                // mpeg1/2 can have B-frame
+                                virtual bool bFramePossible (void)   {  return 1;
+                                  })
+FF_SIMPLE_DECLARE(decoderFFH264,
+                                 virtual bool bFramePossible (void)   {    return true;    }
+                                bool   uncompress (ADMCompressedImage * in, ADMImage * out);
+                                )
+
+FF_SIMPLE_DECLARE(decoderFFH265,
+                                 virtual bool bFramePossible (void)   {   return true;    }
+                                )
 
 
 #define FF_SHOW		(FF_DEBUG_VIS_MV_P_FOR+	FF_DEBUG_VIS_MV_B_FOR+FF_DEBUG_VIS_MV_B_BACK)
@@ -182,24 +153,25 @@
 #define WRAP_Open_Template(funcz,argz,display,codecid,extra) \
 {\
 AVCodec *codec=funcz(argz);\
-if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec"display));ADM_assert(0);} \
+if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec" display));ADM_assert(0);} \
   codecId=codecid; \
   _context = avcodec_alloc_context3 (codec);\
   ADM_assert (_context);\
   _context->max_b_frames = 0;\
   _context->width = _w;\
   _context->height = _h;\
-  _context->pix_fmt = PIX_FMT_YUV420P;\
+  _context->pix_fmt = AV_PIX_FMT_YUV420P;\
   _context->debug_mv |= FF_SHOW;\
   _context->debug |= FF_DEBUG_VIS_MB_TYPE + FF_DEBUG_VIS_QP;\
   _context->workaround_bugs=1*FF_BUG_AUTODETECT +0*FF_BUG_NO_PADDING; \
   _context->error_concealment=3; \
+  _context->opaque=this; \
+  _context->get_format=ADM_FFgetFormat; \
   if (_setBpp) {\
     _context->bits_per_coded_sample = _bpp;\
   }\
   if (_setFcc) {\
-    _context->codec_tag=_fcc;\
-    _context->stream_codec_tag=_fcc;\
+    _context->codec_tag=_fcc; \
   }\
   if (_extraDataCopy) {\
     _context->extradata = _extraDataCopy;\
@@ -212,13 +184,13 @@
   \
   if (avcodec_open2(_context, codec, NULL) < 0)  \
                       { \
-                                        printf("lavc Decoder init: "display" video decoder failed!\n"); \
-                                        GUI_Error_HIG("Codec","Internal error opening "display); \
+                                        ADM_info("lavc Decoder init: " display" video decoder failed!\n"); \
+                                        GUI_Error_HIG("Codec","Internal error opening " display); \
                                         ADM_assert(0); \
                                 } \
                                 else \
                                 { \
-                                        printf("lavc Decoder init: "display" video decoder initialized! (%s)\n",codec->long_name); \
+                                        ADM_info("lavc Decoder init: " display" video decoder initialized! (%s)\n",codec->long_name); \
                                 } \
 }
 
@@ -226,8 +198,5 @@
 #define WRAP_OpenByName(x,y)    {WRAP_Open_Template(avcodec_find_decoder_by_name,#x,#x,y,;);}
 
 
-
-
-
 // EOF

avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_hwAccel.h Added

@@ -0,0 +1,68 @@
+/***************************************************************************
+         \fn ADM_hwAccel.h
+         \brief Top class for ffmpeg hwAccel
+         \author mean, fixounet@free.fr (C) 2016
+    
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   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_coreVideoCodec6_export.h"
+#include "ADM_compressedImage.h"
+/**
+ * 
+ */
+class decoderFF;
+class ADM_COREVIDEOCODEC6_EXPORT ADM_acceleratedDecoderFF
+{
+public:
+                     ADM_acceleratedDecoderFF(struct AVCodecContext *avctx,decoderFF *p) 
+                     {_context=avctx;_parent=p;};
+                     uint32_t admFrameTypeFromLav (AVFrame *pic);
+        virtual      ~ADM_acceleratedDecoderFF()
+                    {
+                        _context=NULL;
+                        _parent=NULL;
+                    }
+        virtual const char      *getName()=0;
+        virtual bool uncompress (ADMCompressedImage * in, ADMImage * out)=0;
+        
+protected:
+        struct AVCodecContext  *_context;
+                decoderFF       *_parent;
+public:                
+  static const AVHWAccel *parseHwAccel(enum AVPixelFormat pix_fmt,AVCodecID id,AVPixelFormat searchedItem);
+};
+
+/**
+ *  \class ADM_hwAccel
+ */
+extern "C"
+{
+class ADM_hwAccelEntry
+{
+public:    
+     const char             *name;
+     virtual bool           canSupportThis(struct AVCodecContext *avctx,  const enum AVPixelFormat *fmt,enum AVPixelFormat &outputFormat)=0;
+     virtual                ADM_acceleratedDecoderFF *spawn( struct AVCodecContext *avctx,  const enum AVPixelFormat *fmt )=0;     
+     virtual                ~ADM_hwAccelEntry() {};
+};
+}
+/**
+ * \fn ADM_hwAccelManager
+ */
+class ADM_COREVIDEOCODEC6_EXPORT ADM_hwAccelManager
+{
+public:       
+       static bool                registerDecoder(ADM_hwAccelEntry *);
+       static ADM_hwAccelEntry    *lookup(struct AVCodecContext *avctx,  const enum AVPixelFormat *fmt,enum AVPixelFormat &outputFormat);
+};
+
+
+// EOF

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp Changed

@@ -33,7 +33,7 @@
     AVCodec *codec=avcodec_find_decoder(id);
     if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec 0x%x"),fcc);ADM_assert(0);} 
     codecId=id; 
-    ADM_assert(id!=CODEC_ID_NONE);
+    ADM_assert(id!=AV_CODEC_ID_NONE);
     
     _context = avcodec_alloc_context3(codec);
     ADM_assert(_context);
@@ -50,12 +50,12 @@
  
     _context->width = _w;
     _context->height = _h;
-    _context->pix_fmt = PIX_FMT_YUV420P;
+    _context->pix_fmt = AV_PIX_FMT_YUV420P;
     
     _context->workaround_bugs=1*FF_BUG_AUTODETECT +0*FF_BUG_NO_PADDING; 
     _context->error_concealment=3; 
     // Hack
-    if(codecId==CODEC_ID_TSCC || codecId==CODEC_ID_CSCD)
+    if(codecId==AV_CODEC_ID_TSCC || codecId==AV_CODEC_ID_CSCD)
     {
         ADM_warning("Forcing bit per coded sample to %d\n",bpp);
          _context->bits_per_coded_sample = bpp;
@@ -81,7 +81,7 @@
     const ffVideoCodec *c=getCodecIdFromFourcc(fcc);
     if(!c) return NULL;
     AVCodecID id=c->codecId;
-    if(id==CODEC_ID_NONE) return NULL;
+    if(id==AV_CODEC_ID_NONE) return NULL;
     return new decoderFFSimple(w,h,fcc,extraDataLen,extraData,bpp);
 }
 /**

avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffHwAccel.cpp Added

@@ -0,0 +1,147 @@
+/***************************************************************************
+    \file ADM_ffHwAccel
+    \brief Decoders using lavcodec
+    \author mean & all (c) 2002-2010
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 <vector>
+
+static std::vector<ADM_hwAccelEntry *>listOfHwAccel;
+
+/**
+ * \fn registerDecoder
+ */
+bool                ADM_hwAccelManager::registerDecoder(ADM_hwAccelEntry *entry)
+{
+    listOfHwAccel.push_back(entry);
+    return false;
+}
+/**
+ * \fn lookup
+ */
+ADM_hwAccelEntry    *ADM_hwAccelManager::lookup(struct AVCodecContext *avctx,  const enum AVPixelFormat *fmt,enum AVPixelFormat &outputFormat)
+{
+    int n=listOfHwAccel.size();
+    for( int i=0;i<n;i++)
+    {
+        ADM_hwAccelEntry *e=listOfHwAcceli;
+        if(true==e->canSupportThis(avctx,fmt,outputFormat))
+        {
+            ADM_info("Matching hw accel : %s\n",e->name);
+            return e;
+        }
+    }
+    ADM_info("No Matching Hw accel\n");
+    return NULL;;
+}
+
+/**
+ * 
+ * @param avctx
+ * @param fmt
+ * @return 
+ */
+extern enum AVPixelFormat ADM_FFgetFormat(struct AVCodecContext *avctx,  const enum AVPixelFormat *fmt)
+{
+    enum AVPixelFormat outFmt;
+    ADM_hwAccelEntry    *accel=ADM_hwAccelManager::lookup(avctx,fmt,outFmt);
+    if(accel)
+    {
+        decoderFF *ff=(decoderFF *)avctx->opaque;
+        if(ff->getHwDecoder())
+        {
+            ADM_info("Reusing existing setup\n");        
+            return outFmt;
+        }else
+            if(ff->setHwDecoder(accel->spawn(avctx,fmt)))
+            {
+                ADM_info("Using %s as hw accel\n",accel->name);
+                return outFmt;
+            }
+    }
+    ADM_info("No Hw Accel for that\n");
+    return avcodec_default_get_format(avctx,fmt);
+}
+
+
+/**
+ * 
+ * @param pic
+ * @return 
+ */
+uint32_t ADM_acceleratedDecoderFF::admFrameTypeFromLav (AVFrame *pic)
+{
+    
+#define SET(x)      {outFlags=x;}
+#define SET_ADD(x)  {outFlags|=x;}
+  uint32_t outFlags=0;
+  switch (pic->pict_type)
+    {
+        case AV_PICTURE_TYPE_B:
+                SET (AVI_B_FRAME);
+                break;
+        case AV_PICTURE_TYPE_I:
+                SET (AVI_KEY_FRAME);
+                if (!pic->key_frame)
+                  {
+                    if (_context->codec_id == AV_CODEC_ID_H264)
+                        SET (AVI_P_FRAME)
+                    else
+                      ADM_info ("\n But keyframe is not set\n");
+                  }
+                break;
+        case AV_PICTURE_TYPE_S:
+        case AV_PICTURE_TYPE_P:
+                SET (AVI_P_FRAME);
+                break;
+        default:
+                break;
+    }
+    outFlags&=~AVI_STRUCTURE_TYPE_MASK;
+    if(pic->interlaced_frame)
+    {
+        SET_ADD(AVI_FIELD_STRUCTURE)
+        if(pic->top_field_first)
+            SET_ADD(AVI_TOP_FIELD)
+        else
+            SET_ADD(AVI_BOTTOM_FIELD)
+    }
+  return outFlags;
+}
+/**
+ * 
+ * @param pix_fmt
+ * @param id
+ * @return 
+ */
+const AVHWAccel *ADM_acceleratedDecoderFF::parseHwAccel(enum AVPixelFormat pix_fmt,AVCodecID id,AVPixelFormat searchedItem)
+{
+    AVHWAccel *hw=av_hwaccel_next(NULL);
+    
+    while(hw)
+    {
+        ADM_info("Trying %s, hwPixFmt=%d, wantedPixFmt %d, hwCodecId =%d : wantedCodecID=%d\n",hw->name,hw->pix_fmt,pix_fmt,hw->id,id);
+        if (hw->pix_fmt == searchedItem && id==hw->id)
+            return hw;
+        hw=av_hwaccel_next(hw);
+    }
+    return NULL;
+}
+
+
+// EOF
\ No newline at end of file

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp Changed

@@ -18,6 +18,7 @@
 #include "ADM_default.h"
 #include "ADM_ffmp43.h"
 #include "DIA_coreToolkit.h"
+#include "ADM_hwAccel.h"
 
 extern "C"
 {
@@ -61,13 +62,13 @@
 
   ref->_planes2 = (uint8_t *) src->datav;
   ref->_planeStride2 = src->linesizev;
-
+  
   _lastQ = 0;			//_context->quality;
   out->_Qp = (src->quality * 32) / FF_LAMBDA_MAX;
   out->flags = frameType ();
 
   // Quant ?
-  if (src->qstride && src->qscale_table && codecId != CODEC_ID_H264)
+  if (src->qstride && src->qscale_table && codecId != AV_CODEC_ID_H264)
     {
       out->quant = (uint8_t *) src->qscale_table;
       out->_qStride = src->qstride;
@@ -192,7 +193,7 @@
             memset(_extraDataCopy,0,extraDataLen+FF_INPUT_BUFFER_PADDING_SIZE);
             memcpy(_extraDataCopy,extraData,extraDataLen);
     }
-  
+   hwDecoder=NULL;
 
 }
 
@@ -224,60 +225,64 @@
       delete  _extraDataCopy;
       _extraDataCopy=NULL;
   }
+  delete hwDecoder;
+  hwDecoder=NULL;
+}
+/**
+ * 
+ * @param pic
+ * @return 
+ */
+uint32_t decoderFF::admFrameTypeFromLav (AVFrame *pic)
+{
+    uint32_t outFlags=0;
+#define SET(x)      {outFlags=x;}
+#define SET_ADD(x)  {outFlags|=x;}
+    
+  switch (pic->pict_type)
+    {
+        case AV_PICTURE_TYPE_B:
+                SET (AVI_B_FRAME);
+                break;
+        case AV_PICTURE_TYPE_I:
+                SET (AVI_KEY_FRAME);
+                if (!pic->key_frame)
+                  {
+                    if (codecId == AV_CODEC_ID_H264)
+                        SET (AVI_P_FRAME)
+                    else
+                      ADM_info ("\n But keyframe is not set\n");
+                  }
+                break;
+        case AV_PICTURE_TYPE_S:
+                _gmc = 1;			// No break, just inform that gmc is there
+        case AV_PICTURE_TYPE_P:
+                SET (AVI_P_FRAME);
+                if (pic->key_frame)
+                        aprintf ("\n But keyframe is set\n");
+                break;
+        default:
+                break;
+    }
+    outFlags&=~AVI_STRUCTURE_TYPE_MASK;
+    if(pic->interlaced_frame)
+    {
+        SET_ADD(AVI_FIELD_STRUCTURE)
+        if(pic->top_field_first)
+            SET_ADD(AVI_TOP_FIELD)
+        else
+            SET_ADD(AVI_BOTTOM_FIELD)
+    }
+  return outFlags;
 }
-
 /**
     \fn frameType
     \return frametype of the last decoded frame
 */
 uint32_t decoderFF::frameType (void)
 {
-  uint32_t
-    flag = 0;
-
-#define SET(x) {flag=x;aprintf("Frame is %s\n",#x);}
+    return admFrameTypeFromLav(_frame);
 
-  switch (_frame->pict_type)
-    {
-    case AV_PICTURE_TYPE_B:
-      SET (AVI_B_FRAME);
-      if (_frame->key_frame)
-	aprintf ("\n But keyframe is set\n");
-      break;
-
-    case AV_PICTURE_TYPE_I:
-      SET (AVI_KEY_FRAME);
-      if (!_frame->key_frame)
-	{
-	  if (codecId == CODEC_ID_H264)
-	    {
-	      SET (AVI_P_FRAME);
-	    }
-	  else
-	    printf ("\n But keyframe is not set\n");
-	}
-      break;
-    case AV_PICTURE_TYPE_S:
-      _gmc = 1;			// No break, just inform that gmc is there
-    case AV_PICTURE_TYPE_P:
-      SET (AVI_P_FRAME);
-      if (_frame->key_frame)
-	aprintf ("\n But keyframe is set\n");
-      break;
-    default:
-//                              printf("\n OOops XXX frame ?\n");
-      break;
-    }
-    flag&=~AVI_STRUCTURE_TYPE_MASK;
-    if(_frame->interlaced_frame)
-    {
-        flag|=AVI_FIELD_STRUCTURE;
-        if(_frame->top_field_first)
-            flag|=AVI_TOP_FIELD;
-        else
-            flag|=AVI_BOTTOM_FIELD;
-    }
-  return flag;
 }
 bool decoderFF::decodeHeaderOnly (void)
 {
@@ -316,6 +321,10 @@
   uint8_t *oBuff3;
   int ret = 0;
   out->_noPicture = 0;
+  if(hwDecoder)
+        return hwDecoder->uncompress(in,out);
+ 
+  
   if (decoderFF_params.showMv)
     {
       _context->debug_mv |= FF_SHOW;
@@ -384,7 +393,7 @@
       // vop flag set to 0
       // it is meant to mean frame skipped but very dubious
       if (in->dataLength <= 8)
-        if(codecId == CODEC_ID_MPEG4||codecId==CODEC_ID_FRAPS)
+        if(codecId == AV_CODEC_ID_MPEG4||codecId==AV_CODEC_ID_FRAPS)
 	{
 	  printf ("lavc Probably pseudo black frame...\n");
 	  out->_Qp = 2;
@@ -430,52 +439,54 @@
   // We have an image....
   switch (_context->pix_fmt)
     {
-    case PIX_FMT_YUV411P:
+    case AV_PIX_FMT_YUV411P:
       out->_colorspace = ADM_COLOR_YUV411;
       break;
-    case PIX_FMT_YUYV422:
+    case AV_PIX_FMT_YUYV422:
       out->_colorspace = ADM_COLOR_YUV422;
       break;
-    case PIX_FMT_YUV422P:
-    case PIX_FMT_YUVJ422P:
+    case AV_PIX_FMT_YUV422P:
+    case AV_PIX_FMT_YUVJ422P:
       out->_colorspace = ADM_COLOR_YUV422P;
       break;
-    case PIX_FMT_GRAY8:
+    case AV_PIX_FMT_GRAY8:
        out->_colorspace = ADM_COLOR_Y8;
        break;
-    case PIX_FMT_YUV444P:
-    case PIX_FMT_YUVJ444P:
+    case AV_PIX_FMT_YUV444P:
+    case AV_PIX_FMT_YUVJ444P:
       out->_colorspace = ADM_COLOR_YUV444;
       break;
-    case PIX_FMT_YUV420P:
-    case PIX_FMT_YUVJ420P:
-    case PIX_FMT_YUVA420P:
+    case AV_PIX_FMT_YUV420P:
+    case AV_PIX_FMT_YUVJ420P:
+    case AV_PIX_FMT_YUVA420P:
       // Default is YV12 or I420
       // In that case depending on swap u/v
       // we do it or not
       out->_colorspace = ADM_COLOR_YV12;
       break;
-   case PIX_FMT_BGR24:
-   case PIX_FMT_RGB24:
+   case AV_PIX_FMT_BGR24:
+   case AV_PIX_FMT_RGB24:
 	  out->_colorspace = ADM_COLOR_BGR24;
 	  break;
-    case PIX_FMT_BGRA:
+    case AV_PIX_FMT_BGRA:
       out->_colorspace = ADM_COLOR_BGR32A;
       break;
-    case PIX_FMT_RGBA: // ???PIX_FMT_RGBA32:
+    case AV_PIX_FMT_RGBA: // ???PIX_FMT_RGBA32:
       out->_colorspace = ADM_COLOR_RGB32A;
       break;
-    case PIX_FMT_RGB555:
+    case AV_PIX_FMT_RGB555:
       out->_colorspace = ADM_COLOR_RGB555;
       break;
-    case PIX_FMT_VDPAU_MPEG1:
-    case PIX_FMT_VDPAU_MPEG2:
-    case PIX_FMT_VDPAU_WMV3:
-    case PIX_FMT_VDPAU_VC1:
-    case PIX_FMT_VDPAU_H264:
+#if 0
+    case AV_PIX_FMT_VDPAU_MPEG1:
+    case AV_PIX_FMT_VDPAU_MPEG2:
+    case AV_PIX_FMT_VDPAU_WMV3:
+    case AV_PIX_FMT_VDPAU_VC1:
+    case AV_PIX_FMT_VDPAU_H264:
+    case AV_PIX_FMT_VDPAU:
         out->_colorspace=ADM_COLOR_VDPAU;
-        break;
-    case PIX_FMT_VAAPI_VLD:
+        break;        
+    case AV_PIX_FMT_VAAPI:
         out->_colorspace=ADM_COLOR_LIBVA;
         break;
         
@@ -484,11 +495,15 @@
         out->_colorspace=ADM_COLOR_XVBA;
         break;
 #endif        
+#endif
+  case AV_PIX_FMT_YUV444P10LE:
+        out->_colorspace=ADM_COLOR_YUV444_10BITS;
+        break;        
   case  AV_PIX_FMT_YUV420P10LE      :  
         out->_colorspace=ADM_COLOR_YV12_10BITS;
         break;
     default:
-      printf ("lavc Unhandled colorspace: %d\n", _context->pix_fmt);
+      printf ("lavc Unhandled colorspace: %d (AV_PIX_FMT_YUV444P10BE=%d)\n", _context->pix_fmt,AV_PIX_FMT_YUV444P10BE);
       return 0;
     }
     clonePic (_frame, out);
@@ -504,7 +519,7 @@
 decoderFF (w, h,fcc,extraDataLen,extraData,bpp)
 {
   _refCopy = 1;			// YUV420 only
-  WRAP_Open (CODEC_ID_MSMPEG4V3);
+  WRAP_Open (AV_CODEC_ID_MSMPEG4V3);
 }
 
 decoderFFMpeg4::decoderFFMpeg4 (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp):
@@ -516,7 +531,7 @@
   _refCopy = 1;			// YUV420 only
   _setFcc=true;
   decoderMultiThread ();
-  WRAP_Open (CODEC_ID_MPEG4);
+  WRAP_Open (AV_CODEC_ID_MPEG4);
   
 }
 bool decoderFFMpeg4::uncompress (ADMCompressedImage * in, ADMImage * out)
@@ -535,7 +550,7 @@
 decoderFF (w, h,fcc,extraDataLen,extraData,bpp)
 {
     
-    WRAP_Open (CODEC_ID_DVVIDEO);
+    WRAP_Open (AV_CODEC_ID_DVVIDEO);
   
 
 }
@@ -544,12 +559,12 @@
 {
   _refCopy = 1;			// YUV420 only
   decoderMultiThread ();
-  WRAP_Open (CODEC_ID_MPEG2VIDEO);
+  WRAP_Open (AV_CODEC_ID_MPEG2VIDEO);
 }
 
 decoderFFPng::decoderFFPng(uint32_t w, uint32_t h, uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData, uint32_t bpp) : decoderFF(w, h, fcc, extraDataLen, extraData, bpp)
 {
-	WRAP_Open (CODEC_ID_PNG);
+	WRAP_Open (AV_CODEC_ID_PNG);
 }
 
 decoderFF_ffhuff::decoderFF_ffhuff (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp)
@@ -558,7 +573,7 @@
     
   _setBpp=true;
   ADM_info ("lavc FFhuff: We have %d bytes of extra data\n", (int)extraDataLen);
-  WRAP_Open (CODEC_ID_FFVHUFF);  
+  WRAP_Open (AV_CODEC_ID_FFVHUFF);  
 
 }
 decoderFFH264::decoderFFH264 (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp)
@@ -567,7 +582,7 @@
   _refCopy = 1;			// YUV420 only
   decoderMultiThread ();
   ADM_info ("lavc Initializing H264 decoder with %d extradata\n", (int)extraDataLen);
-  WRAP_Open(CODEC_ID_H264);
+  WRAP_Open(AV_CODEC_ID_H264);
   
 }
 //*********************
@@ -606,7 +621,7 @@
 decoderFF (w, h,fcc,extraDataLen,extraData,bpp)
 {
   _setBpp=true;
-  WRAP_Open (CODEC_ID_HUFFYUV);
+  WRAP_Open (AV_CODEC_ID_HUFFYUV);
 }
 
 //***************

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoCodec/src/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoCodec/src/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderFFmpeg.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderFFmpeg.h Changed

avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoEncoder/include/FFcodecSettings_desc.cpp.h Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoder.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoder.cpp Changed

@@ -93,7 +93,7 @@
     }
     int nn,dd;
     av_reduce(&nn,&dd, useconds, 1000000, 0xFFF0); // mpeg4 allows a maximum of 1<<16-1 as time base, should be enough for most case
-    ADM_info("%"PRIu64" us -> %d / %d (old)\n",useconds,nn,dd);
+    ADM_info("%" PRIu64" us -> %d / %d (old)\n",useconds,nn,dd);
     *n=nn;
     *d=dd;
 
@@ -127,7 +127,7 @@
                     uint64_t newDts=lastDts+getFrameIncrement();
                     if(newDts<=*pts)
                     {
-                            ADM_warning("Using newDts=%"PRIu64"\n",newDts);
+                            ADM_warning("Using newDts=%" PRIu64"\n",newDts);
                             *dts=newDts;
                             return true;
                     }
@@ -138,8 +138,8 @@
             return true;
         }
     }
-    ADM_warning("Cannot find PTS : %"PRIu64"\n",val);
-    for(int i=0;i<n;i++) ADM_warning("%d : %"PRIu64"\n",i,mapperi.internalTS);
+    ADM_warning("Cannot find PTS : %" PRIu64"\n",val);
+    for(int i=0;i<n;i++) ADM_warning("%d : %" PRIu64"\n",i,mapperi.internalTS);
     ADM_assert(0);
     return false;

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp Changed

@@ -133,15 +133,15 @@
         case ADM_COLOR_YV12:    _frame->linesize0 = img->GetPitch(PLANAR_Y);
                                 _frame->linesize1 = img->GetPitch(PLANAR_U);
                                 _frame->linesize2 = img->GetPitch(PLANAR_V);
-                                _context->pix_fmt =PIX_FMT_YUV420P;break;
+                                _context->pix_fmt =AV_PIX_FMT_YUV420P;break;
         case ADM_COLOR_YUV422P: _frame->linesize0 = w;
                                 _frame->linesize1 = w>>1;
                                 _frame->linesize2 = w>>1;
-                                _context->pix_fmt =PIX_FMT_YUV422P;break;
+                                _context->pix_fmt =AV_PIX_FMT_YUV422P;break;
         case ADM_COLOR_RGB32A : _frame->linesize0 = w*4;
                                 _frame->linesize1 = 0;//w >> 1;
                                 _frame->linesize2 = 0;//w >> 1;
-                                _context->pix_fmt =PIX_FMT_RGB32;break;
+                                _context->pix_fmt =AV_PIX_FMT_RGB32;break;
         default: ADM_assert(0);
 
     }
@@ -206,7 +206,7 @@
 
     uint64_t p=image->Pts;
     queueOfDts.push_back(p);
-    aprintf("Incoming frame PTS=%"PRIu64", delay=%"PRIu64"\n",p,getEncoderDelay());
+    aprintf("Incoming frame PTS=%" PRIu64", delay=%" PRIu64"\n",p,getEncoderDelay());
     p+=getEncoderDelay();
     _frame->pts= timingToLav(p);    //
     if(!_frame->pts) _frame->pts=AV_NOPTS_VALUE;
@@ -216,7 +216,7 @@
     map.internalTS=_frame->pts;
     mapper.push_back(map);
 
-    aprintf("Codec> incoming pts=%"PRIu64"\n",image->Pts);
+    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);
     //
     switch(targetColorSpace)
@@ -266,6 +266,31 @@
 {
     return true;
 }
+
+/**
+ * \fn encodeWrapper
+ */
+int              ADM_coreVideoEncoderFFmpeg::encodeWrapper(AVFrame *in,ADMBitstream *out)
+{
+    int r,gotData;
+        AVPacket pkt;
+        pkt.data=out->data;
+        pkt.size=out->bufferSize;
+
+
+        r= avcodec_encode_video2 (_context,&pkt,NULL, &gotData);
+        if(r<0)
+        {
+            ADM_warning("Error %d encoding video\n",r);
+            return r;
+        }
+        if(!gotData)
+        {
+            ADM_warning("Encoder produced no data\n");
+            pkt.size=0;
+        }
+        return pkt.size;            
+}
 /**
  * 
  * @param codecId
@@ -431,7 +456,7 @@
     // update lastDts
     lastDts=out->dts;
 
-    aprintf("Codec>Out pts=%"PRIu64" us, out Dts=%"PRIu64"\n",out->pts,out->dts);
+    aprintf("Codec>Out pts=%" PRIu64" us, out Dts=%" PRIu64"\n",out->pts,out->dts);
 
     // Update quant
     if(!_context->coded_frame->quality)
@@ -580,7 +605,7 @@
                 averageBitrate=(uint32_t)avg*1000; // convert from kb/s to b/s
             }
 
-        printf("ffmpeg4 Average bitrate =%"PRIu32" kb/s\n",averageBitrate/1000);
+        printf("ffmpeg4 Average bitrate =%" PRIu32" kb/s\n",averageBitrate/1000);
         _context->bit_rate=averageBitrate;
         switch(pass)
         {

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter.h Changed

@@ -56,6 +56,7 @@
             FilterInfo            info;
             uint32_t             nextFrame; // next frame to fetch, it is reset to 0 after a seek!
             const char           *myName;
+            
 public:
                             ADM_coreVideoFilter(ADM_coreVideoFilter *previous,CONFcouple *conf=NULL);
        virtual             ~ADM_coreVideoFilter();
@@ -70,7 +71,7 @@
        virtual bool         configure(void) {return true;}             /// Start graphical user interface
        virtual uint64_t     getAbsoluteStartTime(void)                 /// Return the absolute offset of the current frame. Used to display time of for filter
                 {return previousFilter->getAbsoluteStartTime();}       /// Like subtitlers who need that
-
+               ADM_coreVideoFilter *getSource() {return previousFilter;} /// FOR INTERNAL USE ONLY
 protected:
             ADM_coreVideoFilter *previousFilter;
 };
@@ -95,5 +96,7 @@
 
 extern ADM_COREVIDEOFILTER6_EXPORT BVector <ADM_VideoFilterElement> ADM_VideoFilters;
 extern ADM_COREVIDEOFILTER6_EXPORT BVector <ADM_vf_plugin *> ADM_videoFilterPluginsListVF_MAX;
+
+
 #endif
 // EOF

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilterInternal.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilterInternal.h Changed

@@ -2,8 +2,7 @@
         \fn ADM_vf_plugin.h
         \brief Interface for dynamically loaded video filter
 */
-#ifndef ADM_vf_plugin_h
-#define ADM_vf_plugin_h
+#pragma once
 #include <stddef.h>
 
 #include "DIA_uiTypes.h"
@@ -14,7 +13,7 @@
 
 class ADM_coreVideoFilter;
 
-#define VF_API_VERSION 5
+#define VF_API_VERSION 8
 
 /**
     \struct admVideoFilterInfo
@@ -37,6 +36,7 @@
 typedef const char       *(ADM_vf_GetString)(void);
 typedef VF_CATEGORY       (ADM_vf_getCategory)(void);
 typedef void              (ADM_vf_getDefaultConfiguration)(CONFcouple **c);
+typedef bool              (ADM_vf_partializable)(void);
 
 /**
  *  \class ADM_vf_plugin
@@ -44,72 +44,80 @@
  */
 class ADM_vf_plugin : public ADM_LibWrapper
 {
-	public:
-		ADM_vf_CreateFunction		*create;
-		ADM_vf_DeleteFunction		*destroy;
-		ADM_vf_SupportedUI              *supportedUI;
-                ADM_vf_NeededFeatures           *neededFeatures;
-		ADM_vf_GetApiVersion	    *getApiVersion;
-		ADM_vf_GetPluginVersion	    *getFilterVersion;
-		ADM_vf_GetString    	    *getDesc;
-                ADM_vf_GetString    	    *getInternalName;
-                ADM_vf_GetString    	    *getDisplayName;
-                ADM_vf_getCategory          *getCategory;
+    public:
+        ADM_vf_CreateFunction       *create;
+        ADM_vf_DeleteFunction       *destroy;
+        ADM_vf_SupportedUI          *supportedUI;
+        ADM_vf_NeededFeatures       *neededFeatures;
+        ADM_vf_GetApiVersion        *getApiVersion;
+        ADM_vf_GetPluginVersion     *getFilterVersion;
+        ADM_vf_GetString            *getDesc;
+        ADM_vf_GetString            *getInternalName;
+        ADM_vf_GetString            *getDisplayName;
+        ADM_vf_getCategory          *getCategory;
+        ADM_vf_partializable        *partializable;
 
-                const char                  *nameOfLibrary;
-                VF_FILTERS                  tag;
-                admVideoFilterInfo          info;
+        const char                  *nameOfLibrary;
+        VF_FILTERS                  tag;
+        admVideoFilterInfo          info;
 
-		ADM_vf_plugin(const char *file);
+        ADM_vf_plugin(const char *file);
+        
+    protected:
+               ADM_vf_plugin() {} ; // fake plugin for partial                         
 };
 
-#define DECLARE_VIDEO_FILTER(Class,Major,Minor,Patch,UI,category,internalName,displayName,Desc) \
-	extern "C" { \
-	ADM_coreVideoFilter *create(ADM_coreVideoFilter *previous,CONFcouple *conf)\
-	{ \
-		return new Class(previous,conf);\
-	} \
-	void *destroy(ADM_coreVideoFilter *codec) \
-	{ \
-		Class *a=(Class *)codec;\
-		delete a;\
+#define DECLARE_VIDEO_FILTER_INTERNAL(Class,Major,Minor,Patch,UI,category,internalName,displayName,Desc,Partializable) \
+    extern "C" { \
+    ADM_coreVideoFilter *create(ADM_coreVideoFilter *previous,CONFcouple *conf)\
+    { \
+        return new Class(previous,conf);\
+    } \
+    void *destroy(ADM_coreVideoFilter *codec) \
+    { \
+        Class *a=(Class *)codec;\
+        delete a;\
         return NULL;\
-	}\
-	int supportedUI(void) \
-	{ \
-		return UI & ADM_UI_MASK; \
-	} \
+    }\
+    int supportedUI(void) \
+    { \
+        return UI & ADM_UI_MASK; \
+    } \
         int neededFeatures(void) \
-	{ \
-		return UI & ADM_FEATURE_MASK; \
-	} \
-	uint32_t getApiVersion(void)\
-	{\
-			return VF_API_VERSION;\
-	}\
-	bool getFilterVersion(uint32_t *major,uint32_t *minor, uint32_t *patch)\
-	{\
-		*major=Major;\
-		*minor=Minor;\
-		*patch=Patch;\
-		return true;\
-	}\
-	const char *getDesc(void)\
-	{\
-		return Desc; \
-	}\
-	const char *getInternalName(void)\
-	{\
-		return internalName; \
-	}\
-	const char *getDisplayName(void)\
-	{\
-		return displayName; \
-	}\
+    { \
+        return UI & ADM_FEATURE_MASK; \
+    } \
+    uint32_t getApiVersion(void)\
+    {\
+            return VF_API_VERSION;\
+    }\
+    bool getFilterVersion(uint32_t *major,uint32_t *minor, uint32_t *patch)\
+    {\
+        *major=Major;\
+        *minor=Minor;\
+        *patch=Patch;\
+        return true;\
+    }\
+    const char *getDesc(void)\
+    {\
+        return Desc; \
+    }\
+    const char *getInternalName(void)\
+    {\
+        return internalName; \
+    }\
+    const char *getDisplayName(void)\
+    {\
+        return displayName; \
+    }\
+    bool partializable() { return Partializable;} \
     VF_CATEGORY getCategory(void) \
     { \
         return category;\
     }\
-	}
+    }
 
-#endif
+    
+#define DECLARE_VIDEO_FILTER(Class,Major,Minor,Patch,UI,category,internalName,displayName,Desc) DECLARE_VIDEO_FILTER_INTERNAL(Class,Major,Minor,Patch,UI,category,internalName,displayName,Desc,false) 
+#define DECLARE_VIDEO_FILTER_PARTIALIZABLE(Class,Major,Minor,Patch,UI,category,internalName,displayName,Desc) DECLARE_VIDEO_FILTER_INTERNAL(Class,Major,Minor,Patch,UI,category,internalName,displayName,Desc,true) 
+

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_filterCategory.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_filterCategory.h Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_videoFilterCache.h -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_videoFilterCache.h Changed

@@ -21,10 +21,10 @@
 */
 typedef struct vidCacheEntry
 {
-		uint32_t 	frameNum;
-		ADMImage 	*image;
-		uint8_t		frameLock;		
-		uint32_t	lastUse;
+                uint32_t 	frameNum;
+                ADMImage 	*image;
+                uint8_t		frameLock;		
+                uint32_t	lastUse;
         bool        freeEntry;
 
 }vidCacheEntry;
@@ -33,26 +33,26 @@
 */
 class ADM_COREVIDEOFILTER6_EXPORT VideoCache
 {
-	private:
-		vidCacheEntry	    *entry;
-		uint32_t	        counter;
-		uint32_t 	        nbEntry;
-		ADM_coreVideoFilter *incoming;
-		
-		
-		int32_t 	        searchFrame( uint32_t frame);
-		int32_t 	        searchPtr( ADMImage *ptr);
-        int                 searchFreeEntry(void);
-		ADMImage            *getImageBase(uint32_t frame);
-	public:
-		VideoCache(uint32_t nb,ADM_coreVideoFilter *in);
-		~VideoCache(void);
-		
-		ADMImage *getImage(uint32_t frame);
-        ADMImage *getImageAs(ADM_HW_IMAGE type,uint32_t frame);
-		uint8_t unlockAll(void);
-		uint8_t unlock(ADMImage  *frame);
-		uint8_t flush(void);
-        void    dump(void);
+        private:
+                vidCacheEntry       *entry;
+                uint32_t            counter;
+                uint32_t            nbEntry;
+                ADM_coreVideoFilter *incoming;
+
+
+                int32_t             searchFrame( uint32_t frame);
+                int32_t             searchPtr( ADMImage *ptr);
+                int                 searchFreeEntry(void);
+                ADMImage            *getImageBase(uint32_t frame);
+        public:
+                                    VideoCache(uint32_t nb,ADM_coreVideoFilter *in);
+                                    ~VideoCache(void);
+
+                ADMImage            *getImage(uint32_t frame);
+                ADMImage            *getImageAs(ADM_HW_IMAGE type,uint32_t frame);
+                uint8_t             unlockAll(void);
+                uint8_t             unlock(ADMImage  *frame);
+                uint8_t             flush(void);
+                void                dump(void);
 };
 #endif

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoFilter/src/ADM_coreVideoFilterFunc.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoFilter/src/ADM_coreVideoFilterFunc.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterBridge.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterBridge.cpp Changed

@@ -26,7 +26,7 @@
 */
 ADM_videoFilterBridge::ADM_videoFilterBridge(IEditor *editor, uint64_t startTime, uint64_t endTime) : ADM_coreVideoFilter(NULL, NULL)
 {
-    printf("VideoFilterBridge Creating bridge from %"PRIu32" s to %"PRIu32" s\n", (uint32_t)(startTime / 1000000LL), (uint32_t)(endTime / 1000000LL));
+    printf("VideoFilterBridge Creating bridge from %" PRIu32" s to %" PRIu32" s\n", (uint32_t)(startTime / 1000000LL), (uint32_t)(endTime / 1000000LL));
     this->startTime = startTime;
     this->editor = editor;
 
@@ -82,13 +82,13 @@
 
     if (pts > endTime)
     {
-        ADM_warning("VideoBridge This frame is too late (%"PRId64" vs %"PRIu64")\n", pts, endTime);
+        ADM_warning("VideoBridge This frame is too late (%" PRId64" vs %" PRIu64")\n", pts, endTime);
         return false;
     }
 
     if (pts < startTime)
     {
-        ADM_warning("VideoBridge This frame is too early (%"PRId64" vs %"PRIu64")\n", pts, startTime);
+        ADM_warning("VideoBridge This frame is too early (%" PRId64" vs %" PRIu64")\n", pts, startTime);
         goto again;
     }

avidemux_2.6.12.tar.gz/avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterCache.cpp -> avidemux_2.6.13.tar.gz/avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterCache.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_core/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_core/CMakeLists.txt Changed

@@ -10,7 +10,7 @@
 SET(AVIDEMUX_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 SET(AVIDEMUX_TOP_SOURCE_DIR ${CMAKE_SOURCE_DIR}/..)
 SET(AVIDEMUX_CORE_BUILD_DIR ${CMAKE_BINARY_DIR})
-
+SET(AVIDEMUX_THIS_IS_CORE True)
 SET(CMAKE_MODULE_PATH "${AVIDEMUX_TOP_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
 SET(ADM_PROJECT admCore)
 
@@ -79,27 +79,32 @@
 ########################################
 # Directories to build
 ########################################
-ADD_SUBDIRECTORY(ADM_core)
-ADD_SUBDIRECTORY(ADM_coreAudioParser)
-ADD_SUBDIRECTORY(ADM_coreAudio)
-ADD_SUBDIRECTORY(ADM_coreAudioFilter)
-ADD_SUBDIRECTORY(ADM_coreAudioDevice)
-ADD_SUBDIRECTORY(ADM_coreAudioEncoder)
-ADD_SUBDIRECTORY(ADM_coreDemuxer)
-ADD_SUBDIRECTORY(ADM_coreDemuxerMpeg)
-ADD_SUBDIRECTORY(ADM_coreVideoCodec)
-ADD_SUBDIRECTORY(ADM_coreImage)
-ADD_SUBDIRECTORY(ADM_coreMuxer)
-ADD_SUBDIRECTORY(ADM_coreUI)
-ADD_SUBDIRECTORY(ADM_coreUtils)
-ADD_SUBDIRECTORY(ADM_coreVideoEncoder)
-ADD_SUBDIRECTORY(ADM_coreVideoFilter)
-ADD_SUBDIRECTORY(ADM_coreSqlLight3)
-ADD_SUBDIRECTORY(ADM_coreJobs)
-ADD_SUBDIRECTORY(ADM_coreSocket)
-add_subdirectory(ADM_coreImageLoader)
-add_subdirectory(ADM_coreScript)
-add_subdirectory(ADM_coreSubtitles)
+SET(SUBFOLDERS
+    ADM_core
+    ADM_coreAudioParser
+    ADM_coreAudio
+    ADM_coreAudioFilter
+    ADM_coreAudioDevice
+    ADM_coreAudioEncoder
+    ADM_coreDemuxer
+    ADM_coreDemuxerMpeg
+    ADM_coreVideoCodec
+    ADM_coreImage
+    ADM_coreMuxer
+    ADM_coreUI
+    ADM_coreUtils
+    ADM_coreVideoEncoder
+    ADM_coreVideoFilter
+    ADM_coreSqlLight3
+    ADM_coreJobs
+    ADM_coreSocket
+    ADM_coreImageLoader
+    ADM_coreScript
+    ADM_coreSubtitles
+)
+FOREACH( subfolder ${SUBFOLDERS})
+   ADD_SUBDIRECTORY(${subfolder})
+ENDFOREACH( subfolder ${SUBFOLDERS})
 
 # Update nsi version now
 IF(WIN32)
@@ -117,6 +122,25 @@
 
 include(admPackager)
 admPackager(corePackage)
+
+# install headers
+FOREACH( subfolder ${SUBFOLDERS} ADM_coreAudioCodec)
+   ADM_INSTALL_INCLUDE_FOLDER("${CMAKE_CURRENT_SOURCE_DIR}/${subfolder}/include/" ${subfolder})     
+ENDFOREACH( subfolder ${SUBFOLDERS} ADM_coreAudioCodec)
+
+IF(USE_VDPAU)
+   ADM_INSTALL_INCLUDE_FOLDER("${CMAKE_CURRENT_SOURCE_DIR}/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/" ADM_coreVdpau )     
+ENDIF(USE_VDPAU)
+IF(USE_LIBVA)
+   ADM_INSTALL_INCLUDE_FOLDER("${CMAKE_CURRENT_SOURCE_DIR}/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/include/" ADM_coreLibVA )     
+ENDIF(USE_LIBVA)
+
+SET(CMAKE_TOP_SOURCE_DIR "${CMAKE_SOURCE_DIR}/../cmake/")
+
+ADM_INSTALL_CMAKE_FOLDER("${CMAKE_TOP_SOURCE_DIR}/" cmake)     
+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" COMPONENT dev)
 MESSAGE("")

avidemux_2.6.12.tar.gz/avidemux_core/corePackageDebian.cmake -> avidemux_2.6.13.tar.gz/avidemux_core/corePackageDebian.cmake Changed

avidemux_2.6.13.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-3.0.2.tar.bz2 Added

avidemux_2.6.12.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_avcodec.h.patch -> avidemux_2.6.13.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_avcodec.h.patch Changed

@@ -1,31 +1,29 @@
-diff --git libavcodec/avcodec.h libavcodec/avcodec.h
-index 4aeb57a..076721a 100644
---- libavcodec/avcodec.h
-+++ libavcodec/avcodec.h
-@@ -768,6 +768,10 @@ typedef struct RcOverride{
- #define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000 ///< timecode is in drop frame format. DEPRECATED!!!!
- #define CODEC_FLAG2_IGNORE_CROP   0x00010000 ///< Discard cropping information from SPS.
+--- libavcodec/avcodec.h.org	2016-05-09 08:08:59.936664452 +0200
++++ libavcodec/avcodec.h	2016-05-09 08:10:37.922378818 +0200
+@@ -824,6 +824,10 @@
+  */
+ #define AV_CODEC_FLAG2_IGNORE_CROP    (1 << 16)
  
 +//MEANX: NEVER EVER USE CLOSED GOP ?
-+#define CODEC_FLAG2_32_PULLDOWN   0x80000000
++#define AV_CODEC_FLAG2_32_PULLDOWN    (1 << 17)
 +// /MEANX
 +
- #define CODEC_FLAG2_CHUNKS        0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
- #define CODEC_FLAG2_SHOW_ALL      0x00400000 ///< Show all frames before the first keyframe
- #define CODEC_FLAG2_EXPORT_MVS    0x10000000 ///< Export motion vectors through frame side data
-@@ -2302,6 +2306,7 @@ typedef struct AVCodecContext {
+ /**
+  * Show all frames before the first keyframe
+  */
+@@ -2498,6 +2502,7 @@
       * - decoding: unused
       */
      int rc_buffer_size;
-+    int rc_buffer_size_header;  /*< That one is set in the header MEANX*/
++    int rc_buffer_size_header; // MEANX : We fill the mpeg header with that value
  
      /**
       * ratecontrol override, see RcOverride
-@@ -2325,6 +2330,7 @@ typedef struct AVCodecContext {
-      * - decoding: Set by libavcodec.
+@@ -2521,6 +2526,7 @@
+      * - decoding: Set by user, may be overwritten by libavcodec.
       */
-     int rc_max_rate;
-+    int rc_max_rate_header; /*< That one is set in the header MEANX */
+     int64_t rc_max_rate;
++    int64_t rc_max_rate_header; // MEANX : We use that value to fill the mpeg header
  
      /**
       * minimum bitrate

avidemux_2.6.12.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_h263dec.c.patch -> avidemux_2.6.13.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_h263dec.c.patch Changed

avidemux_2.6.12.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_mpeg12enc.c.patch -> avidemux_2.6.13.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_mpeg12enc.c.patch Changed

@@ -24,14 +24,14 @@
 +             }
 +             else        //4:3
 +             {
-+               if(s->codec_id == CODEC_ID_MPEG2VIDEO)
++               if(s->codec_id == AV_CODEC_ID_MPEG2VIDEO)
 +                 put_bits(&s->pb, 4, 2);
 +               else
 +                 put_bits(&s->pb, 4, 12); // MPEG1
 +             }
 + // /MEANX
 +// MEANX : Pulldown
-+            if((s->avctx->flags2 & CODEC_FLAG2_32_PULLDOWN) && (s->codec_id == CODEC_ID_MPEG2VIDEO))
++            if((s->avctx->flags2 & AV_CODEC_FLAG2_32_PULLDOWN) && (s->codec_id == AV_CODEC_ID_MPEG2VIDEO))
 +             {           
 +                 put_bits(&s->pb, 4,4);
 +             }
@@ -63,7 +63,7 @@
 -            put_bits(&s->pb, 1, s->progressive_sequence);
 +   // MEANX pulldown put_bits(&s->pb, 1, s->progressive_sequence);
 +  // MEANX Pulldown
-+ if(s->avctx->flags2 & CODEC_FLAG2_32_PULLDOWN) //MEANX
++ if(s->avctx->flags2 & AV_CODEC_FLAG2_32_PULLDOWN) //MEANX
 +                        put_bits(&s->pb, 1, 0);
 +                else
 +                        put_bits(&s->pb, 1, s->progressive_sequence);
@@ -90,7 +90,7 @@
      s->frame_pred_frame_dct = 1;
      if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
 +// MEANX
-+        if(s->avctx->flags2 & CODEC_FLAG2_32_PULLDOWN)
++        if(s->avctx->flags2 & AV_CODEC_FLAG2_32_PULLDOWN)
 +        {
 +        
 +                switch((s->picture_number -

avidemux_2.6.12.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_mpegvideo_enc.c.patch -> avidemux_2.6.13.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_mpegvideo_enc.c.patch Changed

@@ -1,14 +1,12 @@
-diff --git libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_enc.c
-index 49fc083..a6ed8da 100644
---- libavcodec/mpegvideo_enc.c
-+++ libavcodec/mpegvideo_enc.c
-@@ -469,14 +469,14 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
+--- libavcodec/mpegvideo_enc.c.org	2016-05-09 07:46:33.134761271 +0200
++++ libavcodec/mpegvideo_enc.c	2016-05-09 07:47:50.428681680 +0200
+@@ -515,14 +515,14 @@
                 "Warning vbv_delay will be set to 0xFFFF (=VBR) as the "
                 "specified vbv buffer is too large for the given bitrate!\n");
      }
 -
 +#if 0 // MEANX
-     if ((s->avctx->flags & CODEC_FLAG_4MV) && s->codec_id != AV_CODEC_ID_MPEG4 &&
+     if ((s->avctx->flags & AV_CODEC_FLAG_4MV) && s->codec_id != AV_CODEC_ID_MPEG4 &&
          s->codec_id != AV_CODEC_ID_H263 && s->codec_id != AV_CODEC_ID_H263P &&
          s->codec_id != AV_CODEC_ID_FLV1) {
          av_log(avctx, AV_LOG_ERROR, "4MV not supported by codec\n");
@@ -19,21 +17,19 @@
      if (s->obmc && s->avctx->mb_decision != FF_MB_DECISION_SIMPLE) {
          av_log(avctx, AV_LOG_ERROR,
                 "OBMC is only supported with simple mb decision\n");
-@@ -568,7 +568,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
-         av_log(avctx, AV_LOG_ERROR, "interlacing not supported by codec\n");
-         return -1;
-     }
--
-+#if 0 // MEANX
+@@ -623,13 +623,14 @@
+ #endif
+ 
      // FIXME mpeg2 uses that too
++#if 0 // MEANX
      if (s->mpeg_quant && (   s->codec_id != AV_CODEC_ID_MPEG4
                            && s->codec_id != AV_CODEC_ID_MPEG2VIDEO)) {
-@@ -576,7 +576,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
+         av_log(avctx, AV_LOG_ERROR,
                 "mpeg2 style quantization not supported by codec\n");
          return -1;
      }
 -
-+#endif
++#endif // MEANX
      if ((s->mpv_flags & FF_MPV_FLAG_CBP_RD) && !avctx->trellis) {
          av_log(avctx, AV_LOG_ERROR, "CBP RD needs trellis quant\n");
          return -1;

avidemux_2.6.12.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_nvenc.patch -> avidemux_2.6.13.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_nvenc.patch Changed

@@ -1,15 +1,13 @@
-diff --git libavcodec/nvenc.c libavcodec/nvenc.c
-index 87ce6f3..83f2ea1 100644
---- libavcodec/nvenc.c
-+++ libavcodec/nvenc.c
-@@ -930,19 +930,19 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx)
+--- libavcodec/nvenc.c.org	2016-05-09 07:55:19.591504808 +0200
++++ libavcodec/nvenc.c	2016-05-09 08:03:10.873897123 +0200
+@@ -1015,19 +1015,19 @@
  
          switch (avctx->pix_fmt) {
          case AV_PIX_FMT_YUV420P:
 -            allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YV12_PL;
 -            break;
-+            //allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YV12_PL;
-+            //break;
++            // MEANX allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YV12_PL;
++            // MEANX break;
  
          case AV_PIX_FMT_NV12:
              allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_NV12_PL;
@@ -18,17 +16,17 @@
 -        case AV_PIX_FMT_YUV444P:
 -            allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YUV444_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");
++            av_log(avctx, AV_LOG_FATAL, "NVENC  : Invalid input pixel format\n");
              res = AVERROR(EINVAL);
              goto error;
          }
-@@ -1168,6 +1168,28 @@ error:
+@@ -1260,6 +1260,29 @@
  
      return res;
  }
@@ -54,14 +52,14 @@
 +
 +        }
 +} 
++ 
  
  static int nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
      const AVFrame *frame, int *got_packet)
-@@ -1205,62 +1227,34 @@ static int nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
-         if (nv_status != NV_ENC_SUCCESS) {
+@@ -1298,59 +1321,31 @@
              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;
@@ -77,10 +75,7 @@
 -                avctx->width >> 1, avctx->height >> 1);
 -
 -            buf += (inSurf->height * lockBufferParams.pitch) >> 2;
-+        }  
-+        { 
-+        uint8_t *buf = lockBufferParams.bufferDataPtr;
- 
+-
 -            av_image_copy_plane(buf, lockBufferParams.pitch >> 1,
 -                frame->data1, frame->linesize1,
 -                avctx->width >> 1, avctx->height >> 1);
@@ -88,27 +83,9 @@
 -            uint8_t *buf = lockBufferParams.bufferDataPtr;
 -
 -            av_image_copy_plane(buf, lockBufferParams.pitch,
-+        av_image_copy_plane(buf, lockBufferParams.pitch,
-                 frame->data0, frame->linesize0,
-                 avctx->width, avctx->height);
-+// MEANX : We accept YV12 and interleave while copying, it saves us one intermediate image buffer
-+        buf += inSurf->height * lockBufferParams.pitch;
-+        switch(avctx->pix_fmt)
-+        {
-+                case AV_PIX_FMT_YUV420P:
-+                        // Interleave U & V to NV12
-+                        interleave_nv12(buf, lockBufferParams.pitch,frame->data1,frame->linesize1,frame->data2,frame->linesize2,avctx->width>>1, avctx->height>>1); 
-+                        break;
-+
-+                case AV_PIX_FMT_NV12:
-+                        av_image_copy_plane(buf, lockBufferParams.pitch,
-+                                frame->data1, frame->linesize1,
-+                                avctx->width, avctx->height >> 1);
-+                        break;
-+                default:
-+                        av_log(avctx, AV_LOG_FATAL, "NVENC: Invalid pixel format!\n");
-+                        return AVERROR(EINVAL);
- 
+-                frame->data0, frame->linesize0,
+-                avctx->width, avctx->height);
+-
 -            buf += inSurf->height * lockBufferParams.pitch;
 -
 -            av_image_copy_plane(buf, lockBufferParams.pitch,
@@ -135,19 +112,32 @@
 -        } else {
 -            av_log(avctx, AV_LOG_FATAL, "Invalid pixel format!\n");
 -            return AVERROR(EINVAL);
-         }
--
--        nv_status = p_nvenc->nvEncUnlockInputBuffer(ctx->nvencoder, inSurf->input_surface);
-+       }
-+       nv_status = p_nvenc->nvEncUnlockInputBuffer(ctx->nvencoder, inSurf->input_surface);
-         if (nv_status != NV_ENC_SUCCESS) {
-             av_log(avctx, AV_LOG_FATAL, "Failed unlocking input buffer!\n");
-             return AVERROR_EXTERNAL;
-@@ -1377,6 +1371,7 @@ static int nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
- 
- static const enum AVPixelFormat pix_fmts_nvenc = {
-     AV_PIX_FMT_NV12,
-+    AV_PIX_FMT_YUV420P,
-     AV_PIX_FMT_NONE
- };
+-        }
++// MEANX
++        { 
++        uint8_t *buf = lockBufferParams.bufferDataPtr;
++          av_image_copy_plane(buf, lockBufferParams.pitch,
++                 frame->data0, frame->linesize0,
++                 avctx->width, avctx->height);
++// MEANX : We accept YV12 and interleave while copying, it saves us one intermediate image buffer
++        buf += inSurf->height * lockBufferParams.pitch;
++        switch(avctx->pix_fmt)
++        {
++                case AV_PIX_FMT_YUV420P:
++                        // Interleave U & V to NV12
++                        interleave_nv12(buf, lockBufferParams.pitch,frame->data1,frame->linesize1,frame->data2,frame->linesize2,avctx->width>>1, avctx->height>>1); 
++                        break;
++
++                case AV_PIX_FMT_NV12:
++                        av_image_copy_plane(buf, lockBufferParams.pitch,
++                                frame->data1, frame->linesize1,
++                                avctx->width, avctx->height >> 1);
++                        break;
++                default:
++                        av_log(avctx, AV_LOG_FATAL, "NVENC: Invalid pixel format!\n");
++                        return AVERROR(EINVAL);
++        } 
++// /MEANX
  
+         nv_status = p_nvenc->nvEncUnlockInputBuffer(ctx->nvencoder, inSurf->input_surface);
+         if (nv_status != NV_ENC_SUCCESS) {

avidemux_2.6.12.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_vdpau.h.patch -> avidemux_2.6.13.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_vdpau.h.patch Changed

avidemux_2.6.12.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_isom.c.patch -> avidemux_2.6.13.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_isom.c.patch Changed

@@ -1,18 +1,18 @@
-diff --git libavformat/isom.c libavformat/isom.c
-index c99f2dc..1663332 100644
---- libavformat/isom.c
-+++ libavformat/isom.c
-@@ -281,8 +281,11 @@ const AVCodecTag ff_codec_movaudio_tags = {
+--- libavformat/isom.c.org	2016-05-09 07:51:11.864152543 +0200
++++ libavformat/isom.c	2016-05-09 07:53:00.998025020 +0200
+@@ -292,8 +292,13 @@
      { AV_CODEC_ID_MACE3,           MKTAG('M', 'A', 'C', '3') },
      { AV_CODEC_ID_MACE6,           MKTAG('M', 'A', 'C', '6') },
      { AV_CODEC_ID_MP1,             MKTAG('.', 'm', 'p', '1') },
 -    { AV_CODEC_ID_MP2,             MKTAG('.', 'm', 'p', '2') },
 -    { AV_CODEC_ID_MP3,             MKTAG('.', 'm', 'p', '3') },
-+    // MEANX { AV_CODEC_ID_MP2,             MKTAG('.', 'm', 'p', '2') },
-+    // MEANX { AV_CODEC_ID_MP3,             MKTAG('.', 'm', 'p', '3') },
-+     { AV_CODEC_ID_MP2,             MKTAG( 'm', 'p', '4' ,'a') },
-+     { AV_CODEC_ID_MP3,             MKTAG( 'm', 'p', '4' ,'a') },
-+    // / MEANX
++
++// MEANX     { AV_CODEC_ID_MP2,             MKTAG('.', 'm', 'p', '2') },
++// MEANX     { AV_CODEC_ID_MP3,             MKTAG('.', 'm', 'p', '3') },
++ { AV_CODEC_ID_MP2,             MKTAG( 'm', 'p', '4','a') },
++ { AV_CODEC_ID_MP3,             MKTAG( 'm', 'p', '4','a') },
++
++// /MEANX
      { AV_CODEC_ID_MP3,             0x6D730055                },
      { AV_CODEC_ID_NELLYMOSER,      MKTAG('n', 'm', 'o', 's') }, /* Flash Media Server */
      { AV_CODEC_ID_PCM_ALAW,        MKTAG('a', 'l', 'a', 'w') },

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_faad/ADM_ad_faad.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_faad/ADM_ad_faad.cpp Changed

@@ -103,10 +103,10 @@
     {
         
         faacDecInit2(_instance, d,l, &srate,&chan);
-        ADM_info("FAADFound :%"PRIu32" rate %"PRIu32" channels\n",(uint32_t)srate,(uint32_t)chan);
+        ADM_info("FAADFound :%" PRIu32" rate %" PRIu32" channels\n",(uint32_t)srate,(uint32_t)chan);
         if(srate!=info->frequency)
         {
-            ADM_info("FAADFrequency mismatch!!! %d to %"PRIu32" (SBR ?)\n",info->frequency,(uint32_t)srate);
+            ADM_info("FAADFrequency mismatch!!! %d to %" PRIu32" (SBR ?)\n",info->frequency,(uint32_t)srate);
             if(srate==2*info->frequency)
             {
                 ADM_info("Sbr detected\n");
@@ -279,7 +279,7 @@
 			if(info.error)
 			{
 				ADM_warning("Faad: Error %d :%s\n",info.error,faacDecGetErrorMessage(info.error));
-				ADM_warning("Bytes consumed %"PRIu64", bytes dropped %"PRIu32" \n",info.bytesconsumed,tail-head);
+				ADM_warning("Bytes consumed %" PRIu64", bytes dropped %" PRIu32" \n",info.bytesconsumed,tail-head);
 
                 head=tail=0; // Purge buffer
 				return 1;
@@ -287,7 +287,7 @@
 			if(first)
 			{
 				printf("Channels : %d\n",info.channels);
-				printf("Frequency: %"PRIu64"\n",info.samplerate);
+				printf("Frequency: %" PRIu64"\n",info.samplerate);
 				printf("SBR      : %d\n",info.sbr);
 			}
 			consumed=info.bytesconsumed ;

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp Changed

@@ -18,7 +18,7 @@
 
 extern "C" {
 #include "libavcodec/avcodec.h"
-#include "libavutil/audioconvert.h"
+#include "libavcodec/audioconvert.h"
 }
 
 #include "ADM_ad_plugin.h"
@@ -33,19 +33,22 @@
 protected:
         typedef enum 
         {
-            asInt16,asFloat,asFloatPlanar
+            asFloat,asFloatPlanar,asS32Planar
         }ADM_outputFlavor;
 
                 ADM_outputFlavor        outputFlavor;
                 AVCodecContext          *_context;
+                AVFrame                 *_frame;
                 uint8_t    _buffer ADMWA_BUF;
                 uint32_t   _tail,_head;
                 uint32_t   _blockalign;
                 uint8_t scratchPadSCRATCH_PAD_SIZE;
     uint32_t    channels;
-    bool        decodeToS16(float *outptr,uint32_t *nbOut);
-    bool        decodeToFloat(float *outptr,uint32_t *nbOut);
-    bool        decodeToFloatPlanar(float *outptr,uint32_t *nbOut);
+    bool        decodeToS16(float **outptr,uint32_t *nbOut);
+    bool        decodeToFloat(float **outptr,uint32_t *nbOut);
+    bool        decodeToFloatPlanar(float **outptr,uint32_t *nbOut);
+    bool        decodeToS32Planar(float **outptr,uint32_t *nbOut);
+    bool        decodeToFloatPlanarStereo(float **outptr,uint32_t *nbOut);
     uint32_t    outputFrequency;
 public:
                     ADM_AudiocoderLavcodec(uint32_t fourcc, WAVHeader *info, uint32_t l, uint8_t *d);
@@ -80,9 +83,9 @@
 };
 
 DECLARE_AUDIO_DECODER(ADM_AudiocoderLavcodec,						// Class
-			0,0,1, 							       // Major, minor,patch
-			Formats, 							// Supported formats
-			"Lavcodec decoder plugin for avidemux (c) Mean/Gruntster\n"); 	// Desc
+                        0,0,1, 							       // Major, minor,patch
+                        Formats, 							// Supported formats
+                        "Lavcodec decoder plugin for avidemux (c) Mean/Gruntster\n"); 	// Desc
 //********************************************************
 
 
@@ -106,62 +109,57 @@
     _tail=_head=0;
     channels=info->channels;
     _blockalign=0;
+    _frame=av_frame_alloc();
     AVCodecID codecID = AV_CODEC_ID_NONE;
-    outputFrequency=info->frequency;
-    bool wantFloat=true;
+    outputFrequency=info->frequency;    
     switch(fourcc)
     {
       case WAV_WMAPRO:
-        codecID = CODEC_ID_WMAPRO;
+        codecID = AV_CODEC_ID_WMAPRO;
         break;
       case WAV_WMA:
-        codecID = CODEC_ID_WMAV2;
+        codecID = AV_CODEC_ID_WMAV2;
         break;
       case WAV_QDM2:
-        codecID = CODEC_ID_QDM2;
+        codecID = AV_CODEC_ID_QDM2;
         break;
       case WAV_AMV_ADPCM:
-        codecID = CODEC_ID_ADPCM_IMA_AMV;
+        codecID = AV_CODEC_ID_ADPCM_IMA_AMV;
         _blockalign=1;
         break;
       case WAV_NELLYMOSER:
-        codecID = CODEC_ID_NELLYMOSER;
+        codecID = AV_CODEC_ID_NELLYMOSER;
         _blockalign=1;
         break;
       case WAV_DTS:
-        codecID = CODEC_ID_DTS;
+        codecID = AV_CODEC_ID_DTS;
         _blockalign = 1;
         break;
       case WAV_MP3:
-        codecID = CODEC_ID_MP3;
+        codecID = AV_CODEC_ID_MP3;
         _blockalign = 1;
         break;
       case WAV_MP2:
-        codecID = CODEC_ID_MP2;
+        codecID = AV_CODEC_ID_MP2;
         _blockalign = 1;
         break;
       case WAV_AC3:
-        codecID = CODEC_ID_AC3;
+        codecID = AV_CODEC_ID_AC3;
         _blockalign = 1;
         break;
       case WAV_EAC3:
-        codecID = CODEC_ID_EAC3;
+        codecID = AV_CODEC_ID_EAC3;
         _blockalign = 1;
         break;
       case WAV_AAC:
       case 0x706D:
-        codecID = CODEC_ID_AAC;
+        codecID = AV_CODEC_ID_AAC;
         _blockalign = 1;
         break;
       default:
              ADM_assert(0);
-    }
-    AVSampleFormat fmt=AV_SAMPLE_FMT_S16;
-    if(wantFloat)
-    {
-        fmt=AV_SAMPLE_FMT_FLT;
-    }
-    
+    }   
+
     AVCodec *codec=avcodec_find_decoder(codecID);
     if(!codec) {ADM_assert(0);}
 
@@ -174,8 +172,8 @@
     _context->channels = info->channels;
     _context->block_align = info->blockalign;
     _context->bit_rate = info->byterate*8;
-    _context->sample_fmt=fmt;
-    _context->request_sample_fmt=fmt;
+    _context->sample_fmt=AV_SAMPLE_FMT_FLT;
+    _context->request_sample_fmt=AV_SAMPLE_FMT_FLT;
     _context->extradata=(uint8_t *)d;
     _context->extradata_size=(int)l;    
 
@@ -184,39 +182,43 @@
       _blockalign = _context->block_align;
     }
 
-    printf("ADM_AD_LAV Using %d bytes of extra header data\n", _context->extradata_size);
+    ADM_info("ADM_AD_LAV Using %d bytes of extra header data\n", _context->extradata_size);
     mixDump((uint8_t *)_context->extradata,_context->extradata_size);
     printf("\n");
 
     if (avcodec_open2(_context, codec, NULL) < 0)
     {
-         ADM_warning("audioCodec Cannot use float, retrying with int16 \n");
-         _context->sample_fmt=AV_SAMPLE_FMT_S16;
+         ADM_warning("audioCodec Cannot use float, retrying with floatp \n");
+         _context->sample_fmt=AV_SAMPLE_FMT_FLTP;
+         _context->request_sample_fmt=AV_SAMPLE_FMT_FLTP;
          if (avcodec_open2(_context, codec, NULL) < 0)
           {
-              ADM_warning("audioCodec int16 failed also. Crashing.. \n");
+              ADM_warning("audioCodec floatp failed also. Crashing.. \n");
               ADM_assert(0);
           }
-          ADM_info("Decoder created using int16..\n");
-         
+          ADM_info("Decoder created using floatp..\n");
     }
 
-        switch(_context->sample_fmt)
-        {
+    switch(_context->sample_fmt)
+    {
         case AV_SAMPLE_FMT_FLT:
             outputFlavor=asFloat;
             ADM_info("Decoder created using float..\n");
             break;
         case AV_SAMPLE_FMT_FLTP:
-            outputFlavor=asFloatPlanar;
+            outputFlavor=asFloatPlanar;            
             ADM_info("Decoder created using float planar...\n");
             break;
+        case AV_SAMPLE_FMT_S32P:
+            outputFlavor=asS32Planar;            
+            ADM_info("Decoder created using s32 planar...\n");
+            break;            
         default:
             ADM_info("Decoder created using ??? %d...\n",_context->sample_fmt);
             ADM_assert(0);
             break;
-        }
-     
+    }
+
 
 
     if(!_blockalign)
@@ -246,56 +248,27 @@
  {
         avcodec_close(_context);
         av_free(_context);
+        _context=NULL;
+        av_frame_free(&_frame);
 }
 /**
     \fn decodeToS16
+ * \brief THIS IS NOT USED ANY LONGER
 */
-bool ADM_AudiocoderLavcodec::decodeToS16(float *outptr,uint32_t *nbOut)
+bool ADM_AudiocoderLavcodec::decodeToS16(float **outptr,uint32_t *nbOut)
 {
-int out=0;
-int pout=0;
-int16_t *run16;
-int nbChunk;
-
-        while(_tail-_head>=_blockalign)
-        {
-          nbChunk=(_tail-_head)/_blockalign;
-          pout=SCRATCH_PAD_SIZE;
-          AVPacket pkt;
-          av_init_packet(&pkt);
-          pkt.size=nbChunk*_blockalign;
-          pkt.data=_buffer+_head;
-          out=avcodec_decode_audio3(_context,(int16_t *)scratchPad,
-                                   &pout,&pkt);
-
-          if(out<0)
-          {
-            printf( "ADM_ad_lav *** WMA decoding error (%u)***\n",_blockalign);
-            _head+=1; // Try skipping some bytes
-            continue;
-          }
-          if(pout>=SCRATCH_PAD_SIZE)
-          {
-            printf("ADM_ad_lavProduced : %u, buffer %u,in%u\n",pout,SCRATCH_PAD_SIZE,_tail-_head);
-            ADM_assert(0);
-          }
-
-//            printf("Channel layout :%llx\n",_context->channel_layout);
-
-          if(_context->codec_id == CODEC_ID_NELLYMOSER)
-          { // Hack, it returns inconsistent size
-            out=nbChunk*_blockalign;
-          }
-          _head+=out; // consumed bytes
-          // convert s16 to float...
-          pout>>=1;
-          *nbOut+=pout;
-          run16=(int16_t *)scratchPad;
-          for(int i=0;i<pout;i++)
-          {
-            *outptr++=((float)run16i)/32767.;
-          }
-        }
+    // convert s16 to float...
+    int nbSample=  _frame->nb_samples; 
+    for(int i=0;i<nbSample;i++)
+    {
+       for(int c=0;c<channels;c++)
+       {
+          int16_t *p=(int16_t *)(_frame->datac);
+          (*outptr)c=((float)*(p+i))/32767.;
+       }
+       *outptr+=channels;
+    }
+    (*nbOut)+=nbSample*channels;
     return true;
 }
 
@@ -303,101 +276,97 @@
     \fn decodeToFloat
 */
 
-bool ADM_AudiocoderLavcodec::decodeToFloat(float *outptr,uint32_t *nbOut)
+bool ADM_AudiocoderLavcodec::decodeToFloat(float **outptr,uint32_t *nbOut)
+{
+    int nbSample=  _frame->nb_samples; 
+    // copy
+    memcpy(*outptr,_frame0.data,sizeof(float)*nbSample*channels); // not sure...     
+    (*outptr)+=nbSample*channels;
+    (*nbOut)+=nbSample*channels;
+    return true;
+}
+/**
+ * \fn decodeToFloatPlanarStereo
+ * @param outptr
+ * @param nbOut
+ * @return 
+ */
+bool ADM_AudiocoderLavcodec::decodeToFloatPlanarStereo(float **outptr,uint32_t *nbOut)
 {
-int out=0;
-int pout=0;
-int nbChunk;
 
-    while(_tail-_head>=_blockalign)
+    // Interleave
+    int nbSample=  _frame->nb_samples; 
+    float *left =(float *)_frame->data0;
+    float *right=(float *)_frame->data1;
+    float *out=*outptr;
+    for(int i=0;i<nbSample;i++)
     {
-      nbChunk=(_tail-_head)/_blockalign;
-      pout=SCRATCH_PAD_SIZE;
-
-      AVPacket pkt;
-      av_init_packet(&pkt);
-      pkt.size=nbChunk*_blockalign;
-      pkt.data=_buffer+_head;
-
-      out=avcodec_decode_audio3(_context,(int16_t *)outptr,
-                               &pout,&pkt);
-        //ADM_info("in %d out %d\n",out,pout);
-
-      if(out<0)
-      {
-        ADM_warning( "ADM_ad_lav *** decoding error (%u)***\n",_blockalign);
-        _head+=1; // Try skipping some bytes
-        continue;
-      }
-      if(pout>=SCRATCH_PAD_SIZE)
-      {
-        ADM_error("ADM_ad_lavProduced : %u, buffer %u,in%u\n",pout,SCRATCH_PAD_SIZE,_tail-_head);
-        ADM_assert(0);
-      }
-
-      _head+=out; // consumed bytes
-      pout/=sizeof(float); // size in bytes -> nb float
-      outptr+=pout;
-      *nbOut+=pout;
+        out0=*(left++);
+        out1=*(right++);
+        out+=2;
     }
-    return true;
+   *outptr=out;
+   (*nbOut)+=nbSample*2;
+   return true;
+}
+/**
+ * 
+ * @param outptr
+ * @param nbOut
+ * @return 
+ */
+bool ADM_AudiocoderLavcodec::decodeToS32Planar(float **outptr,uint32_t *nbOut)
+{
+     // Interleave
+    int nbSample=  _frame->nb_samples; 
+    float scale=1./(float)(1LL<<31LL);
+    float *p=*outptr;
+    for(int c=0;c<channels;c++)
+    {
+        float *o=p+c;
+        int32_t *d=(int32_t *)_frame->datac;
+        
+        for(int i=0;i<nbSample;i++)
+        {
+            *o=((float)di)*scale;
+            o+=channels;
+        }
+    }
+   (*nbOut) +=nbSample*channels;
+   (*outptr)+=nbSample*channels;
+   return true;
 }
 
 /**
     \fn decodeToFloat
 */
 
-bool ADM_AudiocoderLavcodec::decodeToFloatPlanar(float *outptr,uint32_t *nbOut)
+bool ADM_AudiocoderLavcodec::decodeToFloatPlanar(float **outptr,uint32_t *nbOut)
 {
-int out=0;
-int pout=0;
-int nbChunk;
-
-    while(_tail-_head>=_blockalign)
+    switch(channels)
     {
-      nbChunk=(_tail-_head)/_blockalign;
-      pout=SCRATCH_PAD_SIZE;
-
-      AVPacket pkt;
-      av_init_packet(&pkt);
-      pkt.size=nbChunk*_blockalign;
-      pkt.data=_buffer+_head;
-
-      out=avcodec_decode_audio3(_context,(int16_t *)scratchPad,
-                               &pout,&pkt);
-        //ADM_info("in %d out %d\n",out,pout);
-
-      if(out<0)
-      {
-        ADM_warning( "ADM_ad_lav *** decoding error (%u)***\n",_blockalign);
-        _head+=1; // Try skipping some bytes
-        continue;
-      }
-      if(pout>=SCRATCH_PAD_SIZE)
-      {
-        ADM_error("ADM_ad_lavProduced : %u, buffer %u,in%u\n",pout,SCRATCH_PAD_SIZE,_tail-_head);
-        ADM_assert(0);
-      }
-
-      _head+=out; // consumed bytes
-      pout/=sizeof(float); // size in bytes -> nb float
-      int block=pout/channels;
-      //printf("%d blocks\n",block);
-      float *fin=(float *)scratchPad;
-      float *fout=outptr;
-      for(int c=0;c<channels;c++)
-      {
-            for(int i=0;i<block;i++)              
-          {
-              foutchannels*i=*fin;
-              fin++;
-          }
-          fout++;
-      }
-      outptr+=pout;
-      *nbOut+=pout;
+        case 1:
+            return decodeToFloat(outptr,nbOut);
+            break;
+        case 2:
+            return decodeToFloatPlanarStereo(outptr,nbOut);
+            break;
+        default:
+            break;
     }
-    return true;
+    // Interleave
+    int nbSample=  _frame->nb_samples; 
+    for(int i=0;i<nbSample;i++)
+    {
+        for(int c=0;c<channels;c++)
+        {
+           float *p=(float *)_frame->datac;
+           (*outptr)c=pi; // we can do better here
+        }
+        (*outptr)+=channels;
+    }
+   (*nbOut)+=nbSample*channels;
+   return true;
 }
 /**
     \fn run
@@ -418,14 +387,37 @@
         ADM_assert(nbIn+_tail<ADMWA_BUF);
         memcpy(_buffer+_tail,inptr,nbIn);
         _tail+=nbIn;
-        switch(outputFlavor)
+
+        AVPacket pkt;
+        av_init_packet(&pkt);
+        int nbChunk,out,gotData;
+        while(_tail-_head>=_blockalign)
         {
-                case asInt16:        decodeToS16(outptr,nbOut);break;
-                case asFloat:        decodeToFloat(outptr,nbOut);break;
-                case asFloatPlanar:  decodeToFloatPlanar(outptr,nbOut);break;
-                default: ADM_error("unknown output flavor\n");break;
+            nbChunk=(_tail-_head)/_blockalign;
+            pkt.size=nbChunk*_blockalign;
+            pkt.data=_buffer+_head;
+      
+            out=avcodec_decode_audio4(_context, _frame, &gotData, &pkt);
+            if(out<0)
+            {
+                ADM_warning( "ADM_ad_lav *** decoding error (%u)***\n",_blockalign);
+                _head+=1; // Try skipping some bytes
+                continue;
+            }
+            _head+=out; // consumed bytes
+            if(!gotData)
+                continue;
+            switch(_context->sample_fmt)
+            {
+              case AV_SAMPLE_FMT_FLT:     decodeToFloat(&outptr,nbOut);break;
+              case AV_SAMPLE_FMT_FLTP:    decodeToFloatPlanar(&outptr,nbOut);break;             
+              case AV_SAMPLE_FMT_S32P:    decodeToS32Planar(&outptr,nbOut);break;              
+              default:
+                  ADM_info("Decoder created using ??? %d...\n",_context->sample_fmt);
+                  ADM_assert(0);
+                  break;
+            }
         }
-
         //------------------
           if(channels>=5 )
             {

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_audioDevices/Oss/ADM_deviceoss.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_audioDevices/Oss/ADM_deviceoss.cpp Changed

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_audioEncoders/aften/aften_check.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.cpp Changed

@@ -127,11 +127,11 @@
                                 &max_bytes_output);
     if(!_handle)
     {
-          printf("FAACCannot open faac with fq=%"PRIu32" chan=%"PRIu32" br=%"PRIu32"\n",
+          printf("FAACCannot open faac with fq=%" PRIu32" chan=%" PRIu32" br=%" PRIu32"\n",
           wavheader.frequency,channels,_config.bitrate);
           return 0;
     }
-    printf(" FAAC : Sample input:%"PRIu32", max byte output%"PRIu32" \n",(uint32_t)samples_input,(uint32_t)max_bytes_output);
+    printf(" FAAC : Sample input:%" PRIu32", max byte output%" PRIu32" \n",(uint32_t)samples_input,(uint32_t)max_bytes_output);
     cfg= faacEncGetCurrentConfiguration(_handle);
     
     // Set default conf, same as ffmpeg
@@ -146,7 +146,7 @@
     cfg->useLfe=0;	
     if (!(ret=faacEncSetConfiguration(_handle, cfg))) 
     {
-        printf("FAAC Cannot set conf for faac with fq=%"PRIu32" chan=%"PRIu32" br=%"PRIu32" (err:%d)\n",
+        printf("FAAC Cannot set conf for faac with fq=%" PRIu32" chan=%" PRIu32" br=%" PRIu32" (err:%d)\n",
 				wavheader.frequency,channels,_config.bitrate,ret);
 	return 0;
     }
@@ -174,10 +174,10 @@
     printf("Faac Initialized :\n");
     
     printf("FaacVersion        : %s\n",cfg->name);
-    printf("FaacBitrate        : %"PRIu32"\n",(uint32_t)cfg->bitRate);
+    printf("FaacBitrate        : %" PRIu32"\n",(uint32_t)cfg->bitRate);
     printf("FaacMpeg2 (1)/4(0) : %u\n",cfg->mpegVersion);
     printf("FaacUse lfe      ) : %u\n",cfg->useLfe);
-    printf("FaacSample output  : %"PRIu32"\n",_chunk / channels);
+    printf("FaacSample output  : %" PRIu32"\n",_chunk / channels);
     printf("FaacBitrate        : %lu\n",cfg->bitRate*channels);

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_aac.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_aac.h Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_ac3.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_ac3.h Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_dts.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_dts.h Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_mp2.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_mp2.h Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_audioEncoders/pcm/audioencoder_pcm.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_audioEncoders/pcm/audioencoder_pcm.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Asf/ADM_asfAudio.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/Asf/ADM_asfAudio.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Asf/ADM_asfChunk.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/Asf/ADM_asfChunk.cpp Changed

@@ -114,7 +114,7 @@
   chunkLen<<=32;
   chunkLen+=low;
   
-  printf("Next chunk from %"PRIx32" +%"PRIx64" to %"PRIx64"\n",_chunkStart,chunkLen,chunkLen+_chunkStart);
+  printf("Next chunk from %" PRIx32" +%" PRIx64" to %" PRIx64"\n",_chunkStart,chunkLen,chunkLen+_chunkStart);
   
   return 1;
   
@@ -123,9 +123,9 @@
 {
   uint32_t go;
   go=_chunkStart+ chunkLen;
-  printf("Pos 0x%"PRIx64"\n",ftello(_fd));
+  printf("Pos 0x%" PRIx64"\n",ftello(_fd));
   fseeko(_fd,go,SEEK_SET);
-  printf("Skipping to 0x%"PRIx32"\n",go);
+  printf("Skipping to 0x%" PRIx32"\n",go);
   
   return 1; 
 }
@@ -182,8 +182,8 @@
   const chunky *id;
   id=chunkId();
   printf("Chunk type  : <<<<%s>>>>\n",id->name);
-  printf("Chunk Start : %"PRIx32"\n",_chunkStart);
-  printf("Chunk Len   : %"PRIu32"\n",(uint32_t)chunkLen);
+  printf("Chunk Start : %" PRIx32"\n",_chunkStart);
+  printf("Chunk Len   : %" PRIu32"\n",(uint32_t)chunkLen);
   printf("%02x%02x%02x%02x-%02x%02x-xxxx",guId3,guId2,guId1,guId0,guId5,guId4);
   for(int i=0;i<16;i++) printf("%02x ",guIdi);
   printf("\n");

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp Changed

@@ -108,12 +108,12 @@
         printf("\nConceal       :");
         for(int z=0;z<16;z++) printf(":%02x",s->read8());
         printf("\n");
-        printf("Reserved    : %08"PRIx64"\n",s->read64());
-        printf("Total Size  : %04"PRIx32"\n",s->read32());
-        printf("Size        : %04"PRIx32"\n",s->read32());
+        printf("Reserved    : %08" PRIx64"\n",s->read64());
+        printf("Total Size  : %04" PRIx32"\n",s->read32());
+        printf("Size        : %04" PRIx32"\n",s->read32());
         sid=s->read16();
         printf("Stream nb   : %04d\n",sid);
-        printf("Reserved    : %04"PRIx32"\n",s->read32());
+        printf("Reserved    : %04" PRIx32"\n",s->read32());
         switch(audiovideo)
         {
           case 1: // Video
@@ -164,7 +164,7 @@
             printf("\tstream langIndex  :%d\n",streamLangIndex);
             uint64_t avg=s->read64();
             avg/=10.;
-            printf("\t avg time/frame  : %"PRIu64" us\n",avg);
+            printf("\t avg time/frame  : %" PRIu64" us\n",avg);
             avgTimePerFrameUs=avg;
             int streamNameCount=s->read16(); // stream name count
             int payloadExtCount=s->read16(); // payload ext system count
@@ -267,16 +267,16 @@
             printf("Client        :");
             for(int z=0;z<16;z++) printf(":%02x",s->read8());
             printf("\n");
-            printf("File size     : %08"PRIu64"\n",s->read64());
-            printf("Creation time : %08"PRIu64"\n",s->read64());
-            printf("Number of pack: %08"PRIu64"\n",s->read64());
+            printf("File size     : %08" PRIu64"\n",s->read64());
+            printf("Creation time : %08" PRIu64"\n",s->read64());
+            printf("Number of pack: %08" PRIu64"\n",s->read64());
             playDuration=s->read64()/10LL;
             sendDuration=s->read64()/10LL;
             _duration=playDuration;
             printf("Play duration : %s\n",ADM_us2plain(playDuration));
             printf("Send duration : %s\n",ADM_us2plain(sendDuration));
             printf("Preroll   3   : %s\n",ADM_us2plain(s->read64()/10LL));
-            printf("Flags         : %04"PRIx32"\n",s->read32());
+            printf("Flags         : %04" PRIx32"\n",s->read32());
             mx=s->read32();
             mn=s->read32();
             if(mx!=mn)
@@ -286,9 +286,9 @@
               return 0; 
             }
             _packetSize=mx;
-            printf("Min size      : %04"PRIx32"\n",mx);
-            printf("Max size      : %04"PRIx32"\n",mn);
-            printf("Uncompres.size: %04"PRIx32"\n",s->read32());
+            printf("Min size      : %04" PRIx32"\n",mx);
+            printf("Max size      : %04" PRIx32"\n",mn);
+            printf("Uncompres.size: %04" PRIx32"\n",s->read32());
           }
           break;
       case ADM_CHUNK_STREAM_HEADER_CHUNK:

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Asf/ADM_asfPacket.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/Asf/ADM_asfPacket.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp Changed

@@ -212,7 +212,7 @@
                 case AMF_DATA_TYPE_ARRAY:
                                     {
                                             uint32_t len=read32();
-                                            Nest();printf("\n**FLV Array : %"PRIu32" entries**\n",len);
+                                            Nest();printf("\n**FLV Array : %" PRIu32" entries**\n",len);
                                             bool theend;
                                             for(int i=0;i<len && ftello(_fd)<endPos-4;i++) 
                                                 if(false==parseOneMeta("",endPos,theend)) return false;
@@ -345,7 +345,7 @@
         }
         else    
         {
-            ADM_info("FLV found some extradata %"PRIu32"\n",r);
+            ADM_info("FLV found some extradata %" PRIu32"\n",r);
             trk->extraData=new uint8_tr;
             trk->extraDataLen=r;
             read(r,trk->extraData);
@@ -568,7 +568,7 @@
     }
     _videostream.dwScale=1000;
     _mainaviheader.dwMicroSecPerFrame=ADM_UsecFromFps1000(_videostream.dwRate);
-   printf("FLV Duration %"PRIu64" ms\n",videoTrack->_indexvideoTrack->_nbIndex-1.dtsUs/1000);
+   printf("FLV Duration %" PRIu64" ms\n",videoTrack->_indexvideoTrack->_nbIndex-1.dtsUs/1000);
 
    //
     _videostream.fccType=fourCC::get((uint8_t *)"vids");
@@ -969,7 +969,7 @@
 
     if(frame>=videoTrack->_nbIndex)
     {
-      printf("MKV Frame %"PRIu32" exceeds # of frames %"PRIu32"\n",frame,videoTrack->_nbIndex);
+      printf("MKV Frame %" PRIu32" exceeds # of frames %" PRIu32"\n",frame,videoTrack->_nbIndex);
       return 0;
     }
 
@@ -986,7 +986,7 @@
 {
     if(frame>=videoTrack->_nbIndex)
     {
-      printf("MKV Frame %"PRIu32" exceeds # of frames %"PRIu32"\n",frame,videoTrack->_nbIndex);
+      printf("MKV Frame %" PRIu32" exceeds # of frames %" PRIu32"\n",frame,videoTrack->_nbIndex);
       return 0;
     }

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp Changed

@@ -59,7 +59,7 @@
         uint64_t timeBase=walkAndFind(&father,MKV_TIMECODE_SCALE);
         if(timeBase)
         {
-            ADM_info("TimeBase found : %"PRIu64" ns\n",timeBase);
+            ADM_info("TimeBase found : %" PRIu64" ns\n",timeBase);
             _timeBase=timeBase/1000; // We work in us
         }
   }
@@ -119,9 +119,18 @@
 
   // Now dump some infos about the track
     for(int i=0;i<1+_nbAudioTrack;i++)
-        ADM_info("Track %"PRIu32" has an index size of %d entries\n",i,_tracksi.index.size());
-
+        ADM_info("Track %" PRIu32" has an index size of %d entries\n",i,_tracksi.index.size());
 
+  
+  if(isVC1Compatible(_videostream.fccHandler))
+  {
+      int       nb=_tracks0.index.size();
+      mkvTrak   *vid=_tracks;
+      
+      ADM_warning("Deleting  timestamps. For VC1, they are often wrong\n");
+      for(int i=1;i<nb-1;i++)
+          vid->indexi.Pts=ADM_NO_PTS;
+  }
   // Delay frames + recompute frame duration
 // now that we have a good frameduration and max pts dts difference, we can set a proper DTS for all video frame
     uint32_t ptsdtsdelta, mindelta;
@@ -165,7 +174,7 @@
         }
         if(enforePtsGreaterThanDts)
         {
-                ADM_info("Have to delay by %"PRIu32" ms so that PTS>DTS\n",enforePtsGreaterThanDts);
+                ADM_info("Have to delay by %" PRIu32" ms so that PTS>DTS\n",enforePtsGreaterThanDts);
                 for(int i=0;i<_nbAudioTrack+1;i++)
                 delayTrack(i,&(_tracksi),enforePtsGreaterThanDts);
         }
@@ -272,21 +281,23 @@
         for(int i=0;i<nb-1;i++) 
         {
             if(track->indexi.flags==AVI_B_FRAME) nbBFrame++;
+            if(track->indexi+1.Pts==ADM_NO_PTS || track->indexi.Pts==ADM_NO_PTS)
+                continue;
             delta=(int64_t)track->indexi+1.Pts-(int64_t)track->indexi.Pts;
             if(delta<0) delta=-delta;
             if(delta<minDelta) minDelta=delta;
             if(delta>maxDelta) maxDelta=delta;
-            //printf("\/=%"PRId64" Min %"PRId64" MAX %"PRId64"\n",delta,minDelta,maxDelta);
+            //printf("\/=%" PRId64" Min %" PRId64" MAX %" PRId64"\n",delta,minDelta,maxDelta);
         }
     }
     if(nbBFrame) *bFramePresent=true;
-    ADM_info("Minimum delta found %"PRId64" us\n",minDelta);
-    ADM_info("Maximum delta found %"PRId64" us\n",maxDelta);
+    ADM_info("Minimum delta found %" PRId64" us\n",minDelta);
+    ADM_info("Maximum delta found %" PRId64" us\n",maxDelta);
     if(minDelta)
     {
         if(minDelta<track->_defaultFrameDuration && labs((long int)minDelta-(long int)track->_defaultFrameDuration)>1000)
         {
-            ADM_info("Changing default frame duration from %"PRIu64" to %"PRIu64" us\n",
+            ADM_info("Changing default frame duration from %" PRIu64" to %" PRIu64" us\n",
                     track->_defaultFrameDuration,minDelta);
             track->_defaultFrameDuration=minDelta;
             // updated fps also
@@ -296,11 +307,11 @@
             _videostream.dwRate=(uint32_t)(f*1000.);
         }else
         {
-            ADM_info("Keeping default frame duration  %"PRIu64" us\n", track->_defaultFrameDuration);
+            ADM_info("Keeping default frame duration  %" PRIu64" us\n", track->_defaultFrameDuration);
         }
 
     }
-    ADM_info("First frame pts     %"PRId64" us\n",track->index0.Pts);
+    ADM_info("First frame pts     %" PRId64" us\n",track->index0.Pts);
     uint64_t adj=0;
     int limit=32;
     if(limit>nb) limit=nb;
@@ -315,8 +326,8 @@
     }
     if(adj) // need to correct
     {
-        ADM_info("Delaying video by %"PRIu64" us\n",adj);
-        ADM_info("mkv Delaying audio by %"PRIu64" us\n",adj);
+        ADM_info("Delaying video by %" PRIu64" us\n",adj);
+        ADM_info("mkv Delaying audio by %" PRIu64" us\n",adj);
         for(int i=0;i<_nbAudioTrack+1;i++)
             delayTrack(i,&(_tracksi),adj);
     }
@@ -376,7 +387,7 @@
     }
     if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
     {
-      printf("MKV/SeekHead Tag 0x%"PRIx64" not found (len %"PRIu64")\n",id,len);
+      printf("MKV/SeekHead Tag 0x%" PRIx64" not found (len %" PRIu64")\n",id,len);
       return false;
     }
     if(id!=searchedId)
@@ -411,7 +422,7 @@
       father.readElemId(&id,&len);
       if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
       {
-        printf("MKV Tag 0x%"PRIx64" not found (len %"PRIu64")\n",id,len);
+        printf("MKV Tag 0x%" PRIx64" not found (len %" PRIu64")\n",id,len);
         father.skip(len);
         continue;
       }
@@ -442,7 +453,7 @@
       father->readElemId(&id,&len);
       if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
       {
-        printf("MKV Tag 0x%"PRIx64" not found (len %"PRIu64")\n",id,len);
+        printf("MKV Tag 0x%" PRIx64" not found (len %" PRIu64")\n",id,len);
         father->skip(len);
         continue;
       }
@@ -454,10 +465,10 @@
                   printf("%s skipped\n",ss);
                   break;
         case ADM_MKV_TYPE_UINTEGER:
-                  printf("%s:%"PRIu64"\n",ss,father->readUnsignedInt(len));
+                  printf("%s:%" PRIu64"\n",ss,father->readUnsignedInt(len));
                   break;
         case ADM_MKV_TYPE_INTEGER:
-                  printf("%s:%"PRId64"\n",ss,father->readSignedInt(len));
+                  printf("%s:%" PRId64"\n",ss,father->readSignedInt(len));
                   break;
         case ADM_MKV_TYPE_STRING:
         {
@@ -492,7 +503,7 @@
       father->readElemId(&id,&len);
       if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
       {
-        printf("MKV Tag 0x%"PRIx64" not found (len %"PRIu64")\n",id,len);
+        printf("MKV Tag 0x%" PRIx64" not found (len %" PRIu64")\n",id,len);
         father->skip(len);
         continue;
       }
@@ -508,11 +519,11 @@
                   uint64_t v=father->readUnsignedInt(len);
                   if(id==searched)
                         value=v;
-                  printf("%s:%"PRIu64"\n",ss,v);
+                  printf("%s:%" PRIu64"\n",ss,v);
                   }
                   break;
         case ADM_MKV_TYPE_INTEGER:
-                  printf("%s:%"PRId64"\n",ss,father->readSignedInt(len));
+                  printf("%s:%" PRId64"\n",ss,father->readSignedInt(len));
                   break;
         case ADM_MKV_TYPE_STRING:
         {
@@ -794,7 +805,7 @@
      ADM_assert(_parser);
      if(frame>=_tracks0.index.size()) 
      {
-            printf("MKV Frame %"PRIu32" exceeds # of frames %"PRIu32"\n",frame,(uint32_t)_tracks0.index.size());
+            printf("MKV Frame %" PRIu32" exceeds # of frames %" PRIu32"\n",frame,(uint32_t)_tracks0.index.size());
             return false;
      }
     mkvIndex *dx=&(_tracks0.indexframe);
@@ -811,7 +822,7 @@
       ADM_assert(_parser);
      if(frame>=_tracks0.index.size()) 
      {
-            printf("MKV Frame %"PRIu32" exceeds # of frames %"PRIu32"\n",frame,(uint32_t)_tracks0.index.size());
+            printf("MKV Frame %" PRIu32" exceeds # of frames %" PRIu32"\n",frame,(uint32_t)_tracks0.index.size());
             return false;
      }
     mkvIndex *dx=&(_tracks0.indexframe);
@@ -841,7 +852,7 @@
         item.readElemId(&id,&len);
         if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
         {
-          printf("MKV/SeekHead Tag 0x%"PRIx64" not found (len %"PRIu64")\n",id,len);
+          printf("MKV/SeekHead Tag 0x%" PRIx64" not found (len %" PRIu64")\n",id,len);
           return false;
         }
         if(id!=MKV_ID)
@@ -854,14 +865,14 @@
         uint64_t t=item.readEBMCode_Full();
         if(!ADM_searchMkvTag( (MKV_ELEM_ID)t,&ss,&type))
         {
-          printf("MKV/SeekHead Tag 0x%"PRIx64" not found (len %"PRIu64")\n",id,len);
+          printf("MKV/SeekHead Tag 0x%" PRIx64" not found (len %" PRIu64")\n",id,len);
           return false;
         }
         ADM_info("Found entry for %s\n",ss);
         item.readElemId(&id,&len);
         if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
         {
-          printf("MKV/SeekHead Tag 0x%"PRIx64" not found (len %"PRIu64")\n",id,len);
+          printf("MKV/SeekHead Tag 0x%" PRIx64" not found (len %" PRIu64")\n",id,len);
           return false;
         }
         if(id!=MKV_SEEK_POSITION)

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp Changed

@@ -55,7 +55,7 @@
     int nbCluster=_clusters.size();
    for(int clusters=0;clusters<nbCluster;clusters++)
     {
-        printf("Cluster %d/%d StartTimecode=%"PRIu64" ms\n",clusters,nbCluster,_clustersclusters.Dts);
+        printf("Cluster %d/%d StartTimecode=%" PRIu64" ms\n",clusters,nbCluster,_clustersclusters.Dts);
     }
 #endif
     int nbClusters=_clusters.size();
@@ -70,7 +70,7 @@
       cluster.readElemId(&id,&len);
       if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
       {
-        printf("MKV Tag 0x%"PRIx64" not found (len %"PRIu64")\n",id,len);
+        printf("MKV Tag 0x%" PRIx64" not found (len %" PRIu64")\n",id,len);
         cluster.skip(len);
         continue;
       }
@@ -96,7 +96,7 @@
                                 blockGroup.readElemId(&id,&len);
                                 if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
                                 {
-                                  printf("MKV Tag 0x%"PRIx64" not found (len %"PRIu64")\n",id,len);
+                                  printf("MKV Tag 0x%" PRIx64" not found (len %" PRIu64")\n",id,len);
                                   blockGroup.skip(len);
                                   continue;
                                 }
@@ -121,7 +121,7 @@
      }
    // printf("MKV ending cluster at 0x%llx\n",segment.tell());
   }
-     printf("Found %"PRIu32" images in this cluster\n",(uint32_t)VIDEO.index.size());
+     printf("Found %" PRIu32" images in this cluster\n",(uint32_t)VIDEO.index.size());
      delete work;
      delete  readBuffer;
      readBuffer=NULL;
@@ -181,7 +181,7 @@
 
 static bool canRederiveFrameType(uint32_t fcc)
 {
-    if(isMpeg4Compatible(fcc)) return true;
+    if(isMpeg4Compatible(fcc) || isVC1Compatible(fcc)) return true;
     if(isH264Compatible(fcc)) return true;
     if(isMpeg12Compatible(fcc)) return true;
     return false;
@@ -249,7 +249,7 @@
                 extractH264FrameType(2,readBuffer,rpt+size-3,&flags); // Nal size is not used in that case
                 if(flags & AVI_KEY_FRAME)
                 {
-                    printf("MKV/H264 Frame %"PRIu32" is a keyframe\n",(uint32_t)Track->index.size());
+                    printf("MKV/H264 Frame %" PRIu32" is a keyframe\n",(uint32_t)Track->index.size());
                 }
                 ix.flags=flags;
                 if(Track->index.size()) ix.Dts=ADM_NO_PTS;
@@ -265,7 +265,7 @@
                 extractH265FrameType(2,readBuffer,rpt+size-3,&flags); // Nal size is not used in that case
                 if(flags & AVI_KEY_FRAME)
                 {
-                    printf("MKV/H265 Frame %"PRIu32" is a keyframe\n",(uint32_t)Track->index.size());
+                    printf("MKV/H265 Frame %" PRIu32" is a keyframe\n",(uint32_t)Track->index.size());
                 }
                 ix.flags=flags;
                 if(Track->index.size()) ix.Dts=ADM_NO_PTS;
@@ -306,6 +306,18 @@
                     
                 }             
                 
+    }else if(isVC1Compatible(_videostream.fccHandler))
+    {
+        if(rpt)
+                    memcpy(readBuffer,_tracks0.headerRepeat,rpt);
+            parser->readBin(readBuffer+rpt,size-3);
+            uint8_t *begin=readBuffer;
+            uint8_t *end=readBuffer+size-3+rpt;
+            int frameType;
+            if(ADM_VC1getFrameType(begin, (int)(end-begin),&frameType))
+            {
+                ix.flags=frameType;
+            }
     }
   }
   Track->index.append(ix);
@@ -354,7 +366,7 @@
            cues.readElemId(&id,&len);
            if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
            {
-             printf("MKV Tag 0x%"PRIx64" not found (len %"PRIu64")\n",id,len);
+             printf("MKV Tag 0x%" PRIx64" not found (len %" PRIu64")\n",id,len);
              cues.skip(len);
              continue;
            }
@@ -370,7 +382,7 @@
             if(id!=MKV_CUE_TIME)
             {
                ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type);
-               printf("Found %s(0x%"PRIx64"), expected CUE_TIME  (0x%x)\n", ss,id,MKV_CUE_TIME);
+               printf("Found %s(0x%" PRIx64"), expected CUE_TIME  (0x%x)\n", ss,id,MKV_CUE_TIME);
                cue.skip(cue.remaining());
                continue;
             }
@@ -381,7 +393,7 @@
             if(id!=MKV_CUE_TRACK_POSITION)
             {
                ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type);
-               printf("Found %s (0x%"PRIx64"), expected MKV_CUE_TRACK_POSITION (0x%x)\n", ss,id,MKV_CUE_TRACK_POSITION);
+               printf("Found %s (0x%" PRIx64"), expected MKV_CUE_TRACK_POSITION (0x%x)\n", ss,id,MKV_CUE_TRACK_POSITION);
                cue.skip(cues.remaining());
                continue;
             }
@@ -399,12 +411,12 @@
                 case MKV_CUE_RELATIVE_POSITION: cue_position=trackPos.readUnsignedInt(len);break;
                 default:
                       ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type);
-                      printf("MKV in cluster position found tag %s (0x%"PRIx64")\n",ss,id);
+                      printf("MKV in cluster position found tag %s (0x%" PRIx64")\n",ss,id);
                       trackPos.skip(len);
                       continue;
               }
             }
-            aprintf("Track %"PRIx64" segmentPos=%"PRIx64" Cluster Position 0x%"PRIx64" Cue position 0x%"PRIx64" Absolute=%"PRIx64" time %"PRIu64"\n",
+            aprintf("Track %" PRIx64" segmentPos=%" PRIx64" Cluster Position 0x%" PRIx64" Cue position 0x%" PRIx64" Absolute=%" PRIx64" time %" PRIu64"\n",
                   tid,_segmentPosition,cluster_position,cue_position,cue_position+cluster_position+_segmentPosition,time);  
 
             if(!searchTrackFromTid(tid)) //only keep video i.e. track zero
@@ -450,7 +462,7 @@
    }
     // In case the segment is ridiculously small take file size....
    pos=parser->tell();
-   ADM_info("FileSize = %"PRIu64", pos=%"PRIu64" size=%"PRIu64",pos+size=%"PRIu64"\n",fileSize,pos,vlen,pos+vlen);
+   ADM_info("FileSize = %" PRIu64", pos=%" PRIu64" size=%" PRIu64",pos+size=%" PRIu64"\n",fileSize,pos,vlen,pos+vlen);
    if(pos+vlen<fileSize)
     {
         ADM_warning("Segment is way too small, trying to guess the right value\n");
@@ -486,7 +498,7 @@
        {
           ss=NULL;
           ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type);
-          ADM_warning("MKV Cluster : no time code Found %s(0x%"PRIx64"), expected MKV_TIMECODE  (0x%x)\n",
+          ADM_warning("MKV Cluster : no time code Found %s(0x%" PRIx64"), expected MKV_TIMECODE  (0x%x)\n",
                   ss,id,MKV_TIMECODE);
        }
        else // timecode

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv_audio.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv_audio.cpp Changed

@@ -160,7 +160,7 @@
             ADM_info("MKVAUDIO Asked for %s , go to block %d\n",ADM_us2plain(timeUs),clus);
             ADM_info("MKVAUDIO This block starts at %s\n",ADM_us2plain((*dex)clus.Dts));
             targetUs-=(*dex)clus.Dts; // now the time is relative
-            ADM_info("MKVAUDIO Offset=%"PRIu64" us\n",targetUs);
+            ADM_info("MKVAUDIO Offset=%" PRIu64" us\n",targetUs);
             goToBlock(clus);
 
             
@@ -206,7 +206,7 @@
                     uint64_t deltaTime=_track->index_currentBlock.Dts;
                     deltaTime-=time;
                     _laceIncrementUs=deltaTime/nbLaces;
-                    vprintf("***************DeltaTime : %"PRIu64" inc:%"PRIu64"\n",deltaTime,_laceIncrementUs);
+                    vprintf("***************DeltaTime : %" PRIu64" inc:%" PRIu64"\n",deltaTime,_laceIncrementUs);
                 } // else keep lastIncrement, which is as good as a random value
                 return true;
 }
@@ -230,7 +230,7 @@
       ADM_assert(*packlen<maxSize);
       vprintf("Continuing lacing : %u bytes, lacing %u/%u\n",*packlen,_currentLace,_maxLace);
       *timecode=_lastDtsBase+_laceIncrementUs*_currentLace;
-       vprintf(">>>>>>>>> %"PRIu64" \n",*timecode);
+       vprintf(">>>>>>>>> %" PRIu64" \n",*timecode);
       _currentLace++;
       return true;
     }

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ebml.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ebml.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_atom.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_atom.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp Changed

@@ -339,7 +339,7 @@
                                           if(of>fileSize) of=hi;
                                         }
                                         fseeko(_fd,of,SEEK_SET);
-                                        printf("Header starts at %"PRIx64"\n",of);
+                                        printf("Header starts at %" PRIx64"\n",of);
                                         delete atom;
                                         atom=new adm_atom(_fd);
         }
@@ -394,7 +394,7 @@
                 uint32_t w,h,ti;
                 if(extractMpeg4Info(VDEO.extraData,VDEO.extraDataSize,&w,&h,&ti))
                 {
-                    printf("MP4 Corrected size : %"PRIu32" x %"PRIu32"\n",w,h);
+                    printf("MP4 Corrected size : %" PRIu32" x %" PRIu32"\n",w,h);
                     _video_bih.biWidth=_mainaviheader.dwWidth=w ;
                     _video_bih.biHeight=_mainaviheader.dwHeight=h;
                 }
@@ -421,13 +421,13 @@
                         {
                         if(extractH263Info(bfer,sz,&w,&h))
                         {
-                            printf("H263 Corrected size : %"PRIu32" x %"PRIu32"\n",w,h);
+                            printf("H263 Corrected size : %" PRIu32" x %" PRIu32"\n",w,h);
                             _video_bih.biWidth=_mainaviheader.dwWidth=w ;
                             _video_bih.biHeight=_mainaviheader.dwHeight=h;
                         }
                         else
                         {
-                                  printf("H263 COULD NOT EXTRACT SIZE, using : %"PRIu32" x %"PRIu32"\n",
+                                  printf("H263 COULD NOT EXTRACT SIZE, using : %" PRIu32" x %" PRIu32"\n",
                                       _video_bih.biWidth,  _video_bih.biHeight);
                         }
                         }
@@ -653,7 +653,7 @@
 
     if(frame>=VDEO.nbIndex)
     {
-      printf("MP4 Frame %"PRIu32" exceeds # of frames %"PRIu32"\n",frame,VDEO.nbIndex);
+      printf("MP4 Frame %" PRIu32" exceeds # of frames %" PRIu32"\n",frame,VDEO.nbIndex);
       return false;
     }
 
@@ -670,7 +670,7 @@
 {
     if(frame>=VDEO.nbIndex)
     {
-      printf("MP4 Frame %"PRIu32" exceeds # of frames %"PRIu32"\n",frame,VDEO.nbIndex);
+      printf("MP4 Frame %" PRIu32" exceeds # of frames %" PRIu32"\n",frame,VDEO.nbIndex);
       return 0;
     }

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp Changed

@@ -180,7 +180,7 @@
 
 	_videoScale = scale;
 
-	printf("Warning: scale is not in ms %"PRIu32"!\n", _videoScale);
+	printf("Warning: scale is not in ms %" PRIu32"!\n", _videoScale);
 
 	if (_videoScale)
 	{
@@ -231,12 +231,12 @@
 				  else
 					  tom->skipBytes(8);
 
-				  aprintf("Track Id: %"PRIu32"\n", son.read32());
+				  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);
+				  aprintf( "Duration: %" PRIu32" (ms)\n", (duration * 1000) / _videoScale);
 				  son.skipBytes(8);
 				  son.skipBytes(8);
 				  son.skipBytes(36);
@@ -410,13 +410,13 @@
     adm_atom *tom=(adm_atom *)ztom;
     tom->skipBytes(4);
     uint32_t nb=tom->read32();
-    ADM_info("Found %"PRIu32" entries in list:\n",nb);
+    ADM_info("Found %" PRIu32" entries in list:\n",nb);
     for(int i=0;i<nb;i++)
       {
           editDuration=tom->read32();
           mediaTime=tom->read32();
           playbackSpeed=tom->read32();
-          ADM_info("Duration : %"PRIu32", mediaTime:%"PRIu32" speed=%"PRIu32"\n",editDuration,mediaTime,playbackSpeed);
+          ADM_info("Duration : %" PRIu32", mediaTime:%" PRIu32" speed=%" PRIu32"\n",editDuration,mediaTime,playbackSpeed);
       } 
      if(trackType==TRACK_VIDEO && nb==1 && mediaTime>0 && _videoScale )
      {
@@ -515,10 +515,10 @@
        }
        case ADM_MP4_STTS:
             {
-                printf("stts:%"PRIu32"\n",son.read32()); // version & flags
+                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);
+                printf("Time stts atom found (%" PRIu32")\n",info.nbStts);
+                printf("Using myscale %" PRIu32"\n",trackScale);
                 info.SttsN=new uint32_tinfo.nbStts;
                 info.SttsC=new uint32_tinfo.nbStts;
                 //double dur;
@@ -557,10 +557,10 @@
               n=son.read32();
               info.nbSz=son.read32();
               info.SzIndentical=0;
-              printf("%"PRIu32" frames /%"PRIu32" nbsz..\n",n,info.nbSz);
+              printf("%" PRIu32" frames /%" PRIu32" nbsz..\n",n,info.nbSz);
               if(n)
                       {
-                            aprintf("\t\t%"PRIu32" frames of the same size %"PRIu32" , n=%"PRIu32"\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;
@@ -579,7 +579,7 @@
             {
                 uint32_t n,i,j,k,v;
 
-                  printf("ctts:%"PRIu32"\n",son.read32()); // version & flags
+                  printf("ctts:%" PRIu32"\n",son.read32()); // version & flags
                   n=son.read32();
                   if(n==1) // all the same , ignore
                   {
@@ -635,7 +635,7 @@
 		   for(int j = 0; j < info.nbCo; j++)
 		   {
 			   info.Coj = son.read32();
-			   aprintf( "Chunk offset: %u / %u : %"PRIu64"\n", j, info.nbCo - 1, info.Coj);
+			   aprintf( "Chunk offset: %u / %u : %" PRIu64"\n", j, info.nbCo - 1, info.Coj);
 		   }
        }
        break;
@@ -651,7 +651,7 @@
 		   for(int j = 0; j< info.nbCo; j++)
 		   {
 			   info.Coj = son.read64();
-			   aprintf( "Chunk offset: %u / %u : %"PRIu64"\n", j, info.nbCo - 1, info.Coj);
+			   aprintf( "Chunk offset: %u / %u : %" PRIu64"\n", j, info.nbCo - 1, info.Coj);
 		   }
        }
        break;
@@ -794,7 +794,7 @@
                                             VDEO.extraData1='V';
                                             VDEO.extraData2='Q';
                                             VDEO.extraData3='3';
-                                            printf("SVQ3 Header size : %"PRIu32"",_videoExtraLen);
+                                            printf("SVQ3 Header size : %" PRIu32"",_videoExtraLen);
                                             commonPart(SVQ3);
                                             left=0;
                                   }
@@ -1233,14 +1233,14 @@
 #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);
+              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);
+              printf("Overriding size %" PRIu32" -> %" PRIu32"\n", info.SzIndentical,info.SzIndentical*ADIO.channels);
               info.SzIndentical=info.SzIndentical*ADIO.channels;
             }
 #endif

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4audio.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4audio.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudio.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudio.cpp Changed

@@ -99,7 +99,7 @@
     
     if(timeUs<seekPoints0.dts)
     {
-            aprintf("PsAudio Requested %"PRIu32" tick before 1st seek point at :%"PRIu32"\n",(uint32_t)timeUs/1000,(uint32_t)seekPoints0.dts/1000);
+            aprintf("PsAudio Requested %" PRIu32" tick before 1st seek point at :%" PRIu32"\n",(uint32_t)timeUs/1000,(uint32_t)seekPoints0.dts/1000);
             demuxer.setPos(seekPoints0.position);
             return true;
     }
@@ -108,7 +108,7 @@
     {
         if(seekPointsi.dts >=timeUs )
         {
-            aprintf("PsAudio Requested %"PRIu32" tick seeking to  at :%"PRIu32" us (next is %"PRIu32"ms \n",(uint32_t)timeUs/1000,
+            aprintf("PsAudio Requested %" PRIu32" tick seeking to  at :%" PRIu32" us (next is %" PRIu32"ms \n",(uint32_t)timeUs/1000,
                     (uint32_t)seekPointsi-1.dts/1000,
                     (uint32_t)seekPointsi.dts/1000);
             demuxer.setPos(seekPointsi-1.position);
@@ -174,7 +174,7 @@
     *dts=timeConvert(*dts);
     if(*dts!=ADM_NO_PTS) 
     {
-        aprintf("psAudio getPacket dts = %"PRIu32" ms\n",(uint32_t)*dts/1000);
+        aprintf("psAudio getPacket dts = %" PRIu32" ms\n",(uint32_t)*dts/1000);
     }
 
     return true;

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudioProbe.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psAudioProbe.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp Changed

@@ -221,9 +221,9 @@
                 printf("PsProbe Found audio Track %d, pid=%x\n",i,(*audioTracks)i->esID);
                 WAVHeader *hdr=&((*audioTracks)i->header);
                 printf("PsProbe codec    : 0x%x \n",hdr->encoding);
-                printf("PsProbe frequency: %"PRIu32" Hz\n",hdr->frequency);
-                printf("PsProbe channel  : %"PRIu32" \n",hdr->channels);
-                printf("PsProbe byterate : %"PRIu32" Byte/s\n",hdr->byterate);
+                printf("PsProbe frequency: %" PRIu32" Hz\n",hdr->frequency);
+                printf("PsProbe channel  : %" PRIu32" \n",hdr->channels);
+                printf("PsProbe byterate : %" PRIu32" Byte/s\n",hdr->byterate);
 
         }
 
@@ -370,13 +370,13 @@
                           type=7 & (val>>3);
                           if( type<1 ||  type>3)
                           {
-                                  printf("IndexerMet illegal pic at %"PRIx64" + %"PRIx32"\n",
+                                  printf("IndexerMet illegal pic at %" PRIx64" + %" PRIx32"\n",
                                                   info.startAt,info.offset);
                                   continue;
                           }
                           //
 #if 0
-                            printf("Found pic of type %d at 0x%"PRIx64" dts=%s pts=%s\n",type,info.startAt,ADM_us2plain(timeConvert(info.dts)),ADM_us2plain(timeConvert(info.pts)));
+                            printf("Found pic of type %d at 0x%" PRIx64" dts=%s pts=%s\n",type,info.startAt,ADM_us2plain(timeConvert(info.dts)),ADM_us2plain(timeConvert(info.pts)));
 #endif
                           //
                           if(lastValidVideoDts!=ADM_NO_PTS && info.dts!=ADM_NO_PTS)
@@ -409,9 +409,9 @@
         // Dump progressive/frame gop
         Mark(&data,&info,markStart);
         
-        qfprintf(index,"\n# Found %"PRIu32" images \n",data.nbPics); // Size
-        qfprintf(index,"# Found %"PRIu32" frame pictures\n",video.frameCount); // Size
-        qfprintf(index,"# Found %"PRIu32" field pictures\n",video.fieldCount); // Size
+        qfprintf(index,"\n# Found %" PRIu32" images \n",data.nbPics); // Size
+        qfprintf(index,"# Found %" PRIu32" frame pictures\n",video.frameCount); // Size
+        qfprintf(index,"# Found %" PRIu32" field pictures\n",video.fieldCount); // Size
 
        
         // Now write the header
@@ -451,7 +451,7 @@
         if(data->nbPics)
         {
             // Write previous image data (size) : TODO
-            qfprintf(index,":%06"PRIx32" ",data->pkt->getConsumed()+offset); // Size
+            qfprintf(index,":%06" PRIx32" ",data->pkt->getConsumed()+offset); // Size
         }
         else data->pkt->getConsumed();
     }
@@ -462,30 +462,30 @@
             // If audio, also dump audio
             if(audioTracks)
             {
-                qfprintf(index,"\nAudio bf:%08"PRIx64" ",data->startAt);
+                qfprintf(index,"\nAudio bf:%08" PRIx64" ",data->startAt);
                 for(int i=0;i<audioTracks->size();i++)
                 {
                     uint8_t e=(*audioTracks)i->esID;
                     packetStats *s=pkt->getStat(e);
                     
-                    qfprintf(index,"Pes:%x:%08"PRIx64":%"PRIi32":%"PRId64" ",e,s->startAt,s->startSize,s->startDts);
+                    qfprintf(index,"Pes:%x:%08" PRIx64":%" PRIi32":%" PRId64" ",e,s->startAt,s->startSize,s->startDts);
                 }
                 
             }
             // start a new line
-            qfprintf(index,"\nVideo at:%08"PRIx64":%04"PRIx32" Pts:%08"PRId64":%08"PRId64" ",data->startAt,data->offset,info->pts,info->dts);
+            qfprintf(index,"\nVideo at:%08" PRIx64":%04" PRIx32" Pts:%08" PRId64":%08" PRId64" ",data->startAt,data->offset,info->pts,info->dts);
             data->gopStartDts=info->dts;
             data->nextOffset=-2;
         }
         int64_t deltaDts,deltaPts;
 #if 0
-        printf("Dts%"PRId64",PTS:%"PRId64"\n",info->dts, info->pts);
+        printf("Dts%" PRId64",PTS:%" PRId64"\n",info->dts, info->pts);
 #endif
         if(info->dts==-1 || data->gopStartDts==-1) deltaDts=-1;
                 else deltaDts=(int64_t)info->dts-(int64_t)data->gopStartDts;
         if(info->pts==-1 || data->gopStartDts==-1) deltaPts=-1;
                 else deltaPts=(int64_t)info->pts-(int64_t)data->gopStartDts;
-        qfprintf(index,"%c%c:%"PRId64":%"PRId64,Typedata->frameType,Structuredata->picStructure&3,
+        qfprintf(index,"%c%c:%" PRId64":%" PRId64,Typedata->frameType,Structuredata->picStructure&3,
                     deltaPts,deltaDts);
     }
     if(update==markEnd || update==markNow)
@@ -539,8 +539,8 @@
         char head30;
         sprintf(head,"Reset%1d",i);
         qfprintf(index,"#%s\n",ADM_us2plain(timeConvert(listOfScrReseti.timeOffset)));
-        qfprintf(index,"%s.position=%"PRId64"\n",head,listOfScrReseti.position);
-        qfprintf(index,"%s.timeOffset=%"PRId64"\n",head,listOfScrReseti.timeOffset);
+        qfprintf(index,"%s.position=%" PRId64"\n",head,listOfScrReseti.position);
+        qfprintf(index,"%s.timeOffset=%" PRId64"\n",head,listOfScrReseti.timeOffset);
     }
     return true;
 }
@@ -594,7 +594,7 @@
         uint64_t newDts=dts+newOffset;
         if(newDts>lastValidVideoDts+timeOffset)
         {
-              ADM_info("SCR reset, using vobu to correct. New time offset %s, position 0x%"PRIx64"\n",
+              ADM_info("SCR reset, using vobu to correct. New time offset %s, position 0x%" PRIx64"\n",
                         PRETTY(newOffset),newPosition);
               ADM_warning("last Valid Dts %s\n",PRETTY(lastValidVideoDts));
               timeOffset=newOffset;

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psReadIndex.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psReadIndex.cpp Changed

@@ -64,15 +64,15 @@
     uint32_t pes;
     char *head,*tail;
     int trackNb=0;
-        sscanf(buffer,"bf:%"PRIx64,&startAt);
+        sscanf(buffer,"bf:%" PRIx64,&startAt);
         head=strstr(buffer," ");
         if(!head) return false;
         head++;
         while((tail=strstr(head," ")))
         {
-            if(4!=sscanf(head,"Pes:%"PRIx32":%"PRIx64":%"PRIi32":%"PRId64" ",&pes,&startAt,&size,&dts))
+            if(4!=sscanf(head,"Pes:%" PRIx32":%" PRIx64":%" PRIi32":%" PRId64" ",&pes,&startAt,&size,&dts))
             {
-// qfprintf(index,"Pes:%x:%08"PRIx64":%"PRIi32":%PRId64 ",e,s->startAt,s->startSize,s->startDts);
+// qfprintf(index,"Pes:%x:%08" PRIx64":%" PRIi32":%PRId64 ",e,s->startAt,s->startSize,s->startDts);
                 printf("PsHeader::processAudioIndex Reading index %s failed\n",buffer);
             }
             head=tail+1;
@@ -80,7 +80,7 @@
             track->push(startAt,dts,size);
 
             trackNb++;
-            //printf("%s => %"PRIx32" Dts:%"PRId64" Size:%"PRId64"\n",buffer,pes,dts,size);
+            //printf("%s => %" PRIx32" Dts:%" PRId64" Size:%" PRId64"\n",buffer,pes,dts,size);
             if(strlen(head)<4) break;
         }
         return true;
@@ -96,7 +96,7 @@
             char *head=buffer;
             uint64_t pts,dts,startAt;
             uint32_t offset;
-            if(4!=sscanf(head,"at:%"PRIx64":%"PRIx32" Pts:%"PRId64":%"PRId64,&startAt,&offset,&pts,&dts))
+            if(4!=sscanf(head,"at:%" PRIx64":%" PRIx32" Pts:%" PRId64":%" PRId64,&startAt,&offset,&pts,&dts))
             {
                     printf("psDemuxer cannot read fields in  :%s\n",buffer);
                     return false;
@@ -133,9 +133,9 @@
                     vector <string> result;
                     ADM_splitString(":",me,result);
                     
-                    ADM_assert(1==sscanf(result2.c_str(),"%"PRIx32,&len));
-                    ADM_assert(1==sscanf(result0.c_str(),"%"PRId64,&framePts));
-                    ADM_assert(1==sscanf(result1.c_str(),"%"PRId64,&frameDts));
+                    ADM_assert(1==sscanf(result2.c_str(),"%" PRIx32,&len));
+                    ADM_assert(1==sscanf(result0.c_str(),"%" PRId64,&framePts));
+                    ADM_assert(1==sscanf(result1.c_str(),"%" PRId64,&frameDts));
                 }
                 
                 dmxFrame *frame=new dmxFrame;
@@ -234,8 +234,8 @@
         char body40;
         uint32_t fq,chan,br,codec,pid;
         sprintf(header,"Track%d.",i);
-#define readInt(x,y) {sprintf(body,"%s"#y,header);x=index->getAsUint32(body);printf("%02d:"#y"=%"PRIu32"\n",i,x);}
-#define readHex(x,y) {sprintf(body,"%s"#y,header);x=index->getAsHex(body);printf("%02x:"#y"=%"PRIu32"\n",i,x);}
+#define readInt(x,y) {sprintf(body,"%s"#y,header);x=index->getAsUint32(body);printf("%02d:"#y"=%" PRIu32"\n",i,x);}
+#define readHex(x,y) {sprintf(body,"%s"#y,header);x=index->getAsHex(body);printf("%02x:"#y"=%" PRIu32"\n",i,x);}
         readInt(fq,fq);
         readInt(br,br);
         readInt(chan,chan);
@@ -284,7 +284,7 @@
         char body40;
         sprintf(header,"Reset%d.",i);
         uint64_t position,timeOffset;
-#define readInt64(x,y) {sprintf(body,"%s"#y,header);x=index->getAsUint64(body);printf("->%02d:"#y"=%"PRIu64"\n",i,x);}
+#define readInt64(x,y) {sprintf(body,"%s"#y,header);x=index->getAsUint64(body);printf("->%02d:"#y"=%" PRIu64"\n",i,x);}
         
         readInt64(position,position);
         readInt64(timeOffset,timeOffset);

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp Changed

@@ -23,7 +23,7 @@
 #include "ADM_videoInfoExtractor.h"
 
 #define MY_CLASS tsHeader
-#include "ADM_coreDemuxerMpegTemplate.cpp"
+#include "ADM_coreDemuxerMpegTemplate.cpp.h"
 
 
 
@@ -71,7 +71,7 @@
         goto abt;
     }
     append=index.getAsUint32("Append");
-    printf("tsDemux Append=%"PRIu32"\n",append);
+    printf("tsDemux Append=%" PRIu32"\n",append);
     if(append) appendType=FP_APPEND;
     if(!parser.open(name,&appendType))
     {
@@ -94,6 +94,11 @@
         printf("tsDemux Cannot read index for file %s\n",idxName);
         goto abt;
     }
+    if(!ListOfFrames.size())
+    {
+        ADM_info("TSDemux No video frames\n");
+        goto abt;
+    }
     updateIdr();
     updatePtsDts();
     _videostream.dwLength= _mainaviheader.dwTotalFrames=ListOfFrames.size();
@@ -294,11 +299,11 @@
     // Need to rewind, then forward
     int startPoint=frame;
     while(startPoint && !ListOfFramesstartPoint->startAt) startPoint--;
-    printf("tsDemux Wanted frame %"PRIu32", going back to frame %"PRIu32", last frame was %"PRIu32",\n",frame,startPoint,lastFrame);
+    printf("tsDemux Wanted frame %" PRIu32", going back to frame %" PRIu32", last frame was %" PRIu32",\n",frame,startPoint,lastFrame);
     pk=ListOfFramesstartPoint;
     if(!tsPacket->seek(pk->startAt,pk->index)) 
     {
-            printf("tsDemux Failed to rewind to frame %"PRIu32"\n",startPoint);
+            printf("tsDemux Failed to rewind to frame %" PRIu32"\n",startPoint);
             return false;
     }
     // Now forward
@@ -307,7 +312,7 @@
         pk=ListOfFramesstartPoint;
         if(!tsPacket->read(pk->len,img->data))
         {
-            printf("tsDemux Read fail for frame %"PRIu32"\n",startPoint);
+            printf("tsDemux Read fail for frame %" PRIu32"\n",startPoint);
             lastFrame=0xffffffff;
             return false;
         }

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudio.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudio.cpp Changed

@@ -120,7 +120,7 @@
     latm.flush();
     if(timeUs<seekPoints0.dts)
     {
-            aprintf("PsAudio Requested %"PRIu32" tick before 1st seek point at :%"PRIu32"\n",(uint32_t)timeUs/1000,(uint32_t)seekPoints0.dts/1000);
+            aprintf("PsAudio Requested %" PRIu32" tick before 1st seek point at :%" PRIu32"\n",(uint32_t)timeUs/1000,(uint32_t)seekPoints0.dts/1000);
             demuxer.setPos(seekPoints0.position);
             return true;
     }
@@ -129,7 +129,7 @@
     {
         if(seekPointsi.dts >=timeUs )
         {
-            aprintf("PsAudio Requested %"PRIu32" tick seeking to  at :%"PRIu32" us (next is %"PRIu32"ms \n",(uint32_t)timeUs/1000,
+            aprintf("PsAudio Requested %" PRIu32" tick seeking to  at :%" PRIu32" us (next is %" PRIu32"ms \n",(uint32_t)timeUs/1000,
                     (uint32_t)seekPointsi-1.dts/1000,
                     (uint32_t)seekPointsi.dts/1000);
             demuxer.setPos(seekPointsi-1.position);
@@ -232,7 +232,7 @@
      }
     if(*dts!=ADM_NO_PTS) 
     {
-        aprintf("psAudio getPacket dts = %"PRIu32" ms\n",(uint32_t)*dts/1000);
+        aprintf("psAudio getPacket dts = %" PRIu32" ms\n",(uint32_t)*dts/1000);
     }
     return true;
 }

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudioProbe.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudioProbe.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsComputeTimeStamp.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsComputeTimeStamp.cpp Changed

@@ -129,7 +129,7 @@
         for(int i=0;i<ListOfFrames.size();i++)
         {
             dmxFrame *frame=ListOfFramesi;
-            aprintf("psUpdate frame:%d raw DTS: %"PRId64" PTS:%"PRId64"\n",i,frame->dts,frame->pts);
+            aprintf("psUpdate frame:%d raw DTS: %" PRId64" PTS:%" PRId64"\n",i,frame->dts,frame->pts);
 #if 0
             if(frame->pts==ADM_NO_PTS || frame->dts==ADM_NO_PTS)
             {
@@ -147,7 +147,7 @@
                     uint64_t oldDts=lastDts;
                     frame->dts=lastDts=timeConvert(frame->dts);
                     frame->pts=lastPts=timeConvert(frame->pts);
-                    if(oldDts>lastDts) printf("tsRead Warning DTS going backward frame %d, old:%"PRId64" new:%"PRId64" delta=%"PRId64"\n",
+                    if(oldDts>lastDts) printf("tsRead Warning DTS going backward frame %d, old:%" PRId64" new:%" PRId64" delta=%" PRId64"\n",
                                                        i,oldDts/1000,lastDts/1000,(oldDts-lastDts)/1000);
 
                 }else
@@ -187,7 +187,7 @@
             dts=frame->dts;
             if(pts!=ADM_NO_PTS) pts/=1000;
             if(dts!=ADM_NO_PTS) dts/=1000;
-            printf("psVideo Framex %d PTS:%"PRId64" ms DTS:%"PRId64" ms, delta %"PRId64" ms\n",i,pts,dts,pts-dts);
+            printf("psVideo Framex %d PTS:%" PRId64" ms DTS:%" PRId64" ms, delta %" PRId64" ms\n",i,pts,dts,pts-dts);
         }
 #endif
         return 1;

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.cpp Changed

@@ -253,7 +253,7 @@
         {
             if(audioTracks)
             {
-                qfprintf(index,"\nAudio bf:%08"PRIx64" ",nextPacket->startAt);
+                qfprintf(index,"\nAudio bf:%08" PRIx64" ",nextPacket->startAt);
                 packetTSStats *s;
                 uint32_t na;
                 pkt->getStats(&na,&s);      
@@ -261,14 +261,14 @@
                 for(int i=0;i<na;i++)
                 {   
                     packetTSStats *current=s+i;
-                    qfprintf(index,"Pes:%x:%08"PRIx64":%"PRIi32":%"PRId64" ",
+                    qfprintf(index,"Pes:%x:%08" PRIx64":%" PRIi32":%" PRId64" ",
                                 current->pid,current->startAt,current->startSize,current->startDts);
                 }                
             }
             data.beginPts=pic->pts;
             data.beginDts=pic->dts;
             // start a new line
-            qfprintf(index,"\nVideo at:%08"PRIx64":%04"PRIx32" Pts:%08"PRId64":%08"PRId64" ",
+            qfprintf(index,"\nVideo at:%08" PRIx64":%04" PRIx32" Pts:%08" PRId64":%08" PRId64" ",
                         p->startAt,p->offset-unit->overRead,pic->pts,pic->dts);
         }
        
@@ -284,8 +284,8 @@
 
         qfprintf(index," %c%c",TypepicUnit->imageType,StructurepictStruct&3);
         int32_t delta=(int32_t)(nextConsumed-beginConsuming);
-        qfprintf(index,":%06"PRIx32,delta);
-        qfprintf(index,":%"PRId64":%"PRId64,deltaPts,deltaDts);
+        qfprintf(index,":%06" PRIx32,delta);
+        qfprintf(index,":%" PRId64":%" PRId64,deltaPts,deltaDts);
     
         beginConsuming=nextConsumed;
         listOfUnits.clear();
@@ -300,7 +300,7 @@
         myUnit.unitType=unitType2;
         myUnit.overRead=overRead;
 #if 0
-        printf("Adding new unit of type %x unitType2 PTS=%"PRId64" DTS=%"PRId64"\n",unitType2,
+        printf("Adding new unit of type %x unitType2 PTS=%" PRId64" DTS=%" PRId64"\n",unitType2,
                     unit.packetInfo.pts,
                     unit.packetInfo.dts
                     );

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp Changed

@@ -15,7 +15,8 @@
 #include "DIA_coreToolkit.h"
 #include "ADM_tsIndex.h"
 
-
+static bool decoderSei1(const ADM_SPSInfo &spsInfo,int size, uint8_t *bfer,pictureStructure *pic);
+static bool decoderSei6(int size, uint8_t *bfer,uint32_t *recovery);
 /**
         \fn decodeSEI
         \brief decode SEI to get short ref I
@@ -41,43 +42,24 @@
                 while(payload0==0xff) {sei_size+=0xff;payload++;};
                 sei_size+=payload0;payload++;
                 aprintf("  SEI Type : 0x%x size:%d\n",sei_type,sei_size);
+                if(payload+sei_size>=tail)
+                {
+                        return false;
+                }
                 switch(sei_type) // Recovery point
                 {
 
                        case 1:
-                            {
-                                if(spsInfo.hasStructInfo)
-                                {
-                                    getBits bits(sei_size,payload);
-                                    payload+=sei_size;
-                                    if(spsInfo.CpbDpbToSkip)
-                                    {
-                                            bits.get(spsInfo.CpbDpbToSkip);
-                                    }
-                                    //printf("Consumed: %d,\n",bits.getConsumedBits());
-                                    int pic=bits.get(4);
-                                    aprintf("Pic struct: %d,\n",pic);
-                                    switch(pic) 
-                                    {
-                                        case 0: *picStruct=pictureFrame; break;
-                                        case 3:
-                                        case 4: *picStruct=pictureFrame;
-                                        case 1: *picStruct=pictureTopField;break;
-                                        case 2: *picStruct=pictureBottomField;break;
-                                        default:*picStruct=pictureFrame;
-                                    }
-                                    
-                                }else
-                                        payload+=sei_size;
-                            }
+                        {
+                            decoderSei1(spsInfo,sei_size,payload,picStruct);
+                            payload+=sei_size;
                             break;
-
+                        }
                        case 6:
                         {
-                            getBits bits(sei_size,payload);
+                            decoderSei6(sei_size,payload,recoveryLength);
                             payload+=sei_size;
-                            *recoveryLength=bits.getUEG();
-                            aprintf("SEI Recovery :%"PRIu32"\n",*recoveryLength);
+                            aprintf("SEI Recovery :%" PRIu32"\n",*recoveryLength);
                             r=true;
                             break;
                         }
@@ -179,8 +161,8 @@
             pkt->seek(tmpInfo.startAt,tmpInfo.offset-5);
             if (extractSPSInfo(SEI_nal.payload, SEI_nal.payloadSize-4,&spsInfo))
             {
-              ADM_info("TsIndexer Found video %"PRIu32"x%"PRIu32", fps=%"PRIu32"\n",video.w,video.h,video.fps);
-              ADM_info("TsIndexer SPS says %"PRIu32"x%"PRIu32"\n",spsInfo.width,spsInfo.height);
+              ADM_info("TsIndexer Found video %" PRIu32"x%" PRIu32", fps=%" PRIu32"\n",video.w,video.h,video.fps);
+              ADM_info("TsIndexer SPS says %" PRIu32"x%" PRIu32"\n",spsInfo.width,spsInfo.height);
               seq_found=1;
               video.w=spsInfo.width;
               video.h=spsInfo.height;
@@ -319,7 +301,7 @@
                             default : thisUnit.imageType=2;break; // SP/SI
                         }
                       if(startCode==NAL_IDR) thisUnit.imageType=4; // IDR
-                      aprintf(">>>>>>>> Pic Type %"PRIu32" Recovery %"PRIu32"\n",thisUnit.imageType,recoveryCount);
+                      aprintf(">>>>>>>> Pic Type %" PRIu32" Recovery %" PRIu32"\n",thisUnit.imageType,recoveryCount);
                       if(thisUnit.imageType==1 && !thisUnit.recoveryCount) 
                                 thisUnit.imageType=4; //I  + Recovery=0 = IDR!
 
@@ -362,6 +344,42 @@
 /********************************************************************************************/
 /********************************************************************************************/
 
+// Workaround win64 bug
+// Put that in a separate function
+bool decoderSei1(const ADM_SPSInfo &spsInfo,int size, uint8_t *bfer,pictureStructure *pic)
+{
+    if(spsInfo.hasStructInfo)
+    {
+      getBits bits(size,bfer);
+      if(spsInfo.CpbDpbToSkip)
+      {
+              bits.get(spsInfo.CpbDpbToSkip);
+      }
+      //printf("Consumed: %d,\n",bits.getConsumedBits());
+      int pic4=bits.get(4);
+      aprintf("Pic struct: %d,\n",pic4);
+      switch(pic4) 
+      {
+          case 0: *pic=pictureFrame; break;
+          case 3:
+          case 4: *pic=pictureFrame;
+          case 1: *pic=pictureTopField;break;
+          case 2: *pic=pictureBottomField;break;
+          default:*pic=pictureFrame;break;
+      }
+    }
+    return true; 
+}
+//
+// 2nd one
+bool decoderSei6(int size, uint8_t *bfer,uint32_t *recovery)
+{
+     getBits bits(size,bfer);
+     *recovery=bits.getUEG();
+     return true;
+}
+
+
 //
 
 //EOF

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp Changed

@@ -190,7 +190,7 @@
                           type=7 & (val>>3);
                           if( type<1 ||  type>3)
                           {
-                                  printf("IndexerMet illegal pic at %"PRIx64" + %"PRIx32"\n",
+                                  printf("IndexerMet illegal pic at %" PRIx64" + %" PRIx32"\n",
                                                   thisUnit.packetInfo.startAt,thisUnit.packetInfo.offset);
                                   continue;
                           }
@@ -211,9 +211,9 @@
     
         printf("\n");
         qfprintf(index,"\nEnd\n");
-        qfprintf(index,"\n# Found %"PRIu32" images \n",data.nbPics); // Size
-        qfprintf(index,"# Found %"PRIu32" frame pictures\n",video.frameCount); // Size
-        qfprintf(index,"# Found %"PRIu32" field pictures\n",video.fieldCount); // Size
+        qfprintf(index,"\n# Found %" PRIu32" images \n",data.nbPics); // Size
+        qfprintf(index,"# Found %" PRIu32" frame pictures\n",video.frameCount); // Size
+        qfprintf(index,"# Found %" PRIu32" field pictures\n",video.fieldCount); // Size
         qfclose(index);
         index=NULL;
         audioTracks=NULL;

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsReadIndex.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsReadIndex.cpp Changed

@@ -72,15 +72,15 @@
     uint32_t pes;
     char *head,*tail;
     int trackNb=0;
-        sscanf(buffer,"bf:%"PRIx64,&startAt);
+        sscanf(buffer,"bf:%" PRIx64,&startAt);
         head=strstr(buffer," ");
         if(!head) return false;
         head++;
         while((tail=strstr(head," ")))
         {
-            if(4!=sscanf(head,"Pes:%"PRIx32":%"PRIx64":%"PRIi32":%"PRId64" ",&pes,&startAt,&size,&dts))
+            if(4!=sscanf(head,"Pes:%" PRIx32":%" PRIx64":%" PRIi32":%" PRId64" ",&pes,&startAt,&size,&dts))
             {
-// qfprintf(index,"Pes:%x:%08"PRIx64":%"PRIi32":%PRId64 ",e,s->startAt,s->startSize,s->startDts);
+// qfprintf(index,"Pes:%x:%08" PRIx64":%" PRIi32":%PRId64 ",e,s->startAt,s->startSize,s->startDts);
                 printf("tsHeader::processAudioIndex Reading index %s failed\n",buffer);
             }
             head=tail+1;
@@ -91,7 +91,7 @@
                 ADM_warning("No audio DTS\n");
 
             trackNb++;
-            //printf("%s => %"PRIx32" Dts:%"PRId64" Size:%"PRId64"\n",buffer,pes,dts,size);
+            //printf("%s => %" PRIx32" Dts:%" PRId64" Size:%" PRId64"\n",buffer,pes,dts,size);
             if(strlen(head)<4) break;
         }
         return true;
@@ -107,7 +107,7 @@
             char *head=buffer;
             uint64_t pts,dts,startAt;
             uint32_t offset;
-            if(4!=sscanf(head,"at:%"PRIx64":%"PRIx32" Pts:%"PRId64":%"PRId64,&startAt,&offset,&pts,&dts))
+            if(4!=sscanf(head,"at:%" PRIx64":%" PRIx32" Pts:%" PRId64":%" PRId64,&startAt,&offset,&pts,&dts))
             {
                     printf("TsDemuxerer cannot read fields in  :%s\n",buffer);
                     return false;
@@ -137,7 +137,7 @@
                 cur++;
                 next=strstr(start," ");
                 int64_t ppts,ddts;
-                ADM_assert(3==sscanf(cur,"%"PRIx32":%"PRId64":%"PRId64,&len,&ppts,&ddts));
+                ADM_assert(3==sscanf(cur,"%" PRIx32":%" PRId64":%" PRId64,&len,&ppts,&ddts));
                 
                 
                 dmxFrame *frame=new dmxFrame;
@@ -296,8 +296,8 @@
         std::string language=ADM_UNKNOWN_LANGUAGE;
         uint32_t fq,chan,br,codec,pid,muxing=0;
         sprintf(header,"Track%d.",i);
-#define readInt(x,y) {sprintf(body,"%s"#y,header);x=index->getAsUint32(body);printf("%02d:"#y"=%"PRIu32"\n",i,x);}
-#define readHex(x,y) {sprintf(body,"%s"#y,header);x=index->getAsHex(body);printf("%02x:"#y"=%"PRIu32"\n",i,x);}
+#define readInt(x,y) {sprintf(body,"%s"#y,header);x=index->getAsUint32(body);printf("%02d:"#y"=%" PRIu32"\n",i,x);}
+#define readHex(x,y) {sprintf(body,"%s"#y,header);x=index->getAsHex(body);printf("%02x:"#y"=%" PRIu32"\n",i,x);}
 
         readInt(fq,fq);
         readInt(br,br);

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp Changed

@@ -144,7 +144,7 @@
 {
     if(!_file->setpos(pos))
     {
-        printf("tsPacket Cannot seek to %"PRIx64"\n", pos);
+        printf("tsPacket Cannot seek to %" PRIx64"\n", pos);
         return false;
     }
     return true;
@@ -387,7 +387,7 @@
     zprintf("TS Demuxer Code=0x%x pid=0x%x\n",code,pes->pid);
     if((code&0xffffff00)!=0x100)
     {
-        printf("Ts Demuxer No PES startcode at 0x%"PRIx64"\n",pkt.startAt);
+        printf("Ts Demuxer No PES startcode at 0x%" PRIx64"\n",pkt.startAt);
         printf("0x:%02x %02x %02x %02x\n",pkt.payload4,pkt.payload5,pkt.payload6,pkt.payload7);
         goto nextPack3;
     }
@@ -433,7 +433,7 @@
 /**
     \fn decodePesHeader
 */
-#define fail(x) {printf("Ts Demuxer*********"x"*******\n");return false;}
+#define fail(x) {printf("Ts Demuxer*********" x"*******\n");return false;}
 bool tsPacket::decodePesHeader(TS_PESpacket *pes)
 {
     uint8_t  *start=pes->payload+6;
@@ -780,12 +780,12 @@
 {
     if(!_file->setpos(packetStart))
     {
-        printf("tsPacket Cannot seek to %"PRIx64"\n",packetStart);
+        printf("tsPacket Cannot seek to %" PRIx64"\n",packetStart);
         return 0;
     }
     if(!refill())
     {
-        printf("tsPacketLinear Seek to %"PRIx64":%"PRIx32" failed\n",packetStart,offset);
+        printf("tsPacketLinear Seek to %" PRIx64":%" PRIx32" failed\n",packetStart,offset);
         return false;
     }
     ADM_assert(offset<pesPacket->payloadSize);

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.h Changed

@@ -52,6 +52,7 @@
     \brief Handle exactly one PES packet
             It is assumed PES packet starts & ends at TS packet boundaries
 */
+#define TS_PES_PACKET_MIN_SIZE 32
 class TS_PESpacket
 {
 public:
@@ -80,7 +81,7 @@
                 }
     bool        expandPayload()
 		{
-                        payloadLimit*=2;
+                        payloadLimit=payloadLimit*2+TS_PES_PACKET_MIN_SIZE;
 			uint8_t *newPayload=(uint8_t *)ADM_alloc(payloadLimit);
 			memcpy(newPayload,payload,payloadSize);
 			ADM_dealloc(payload);
@@ -90,7 +91,7 @@
 		}
     bool        addData(uint32_t len,uint8_t *data)
                 {
-                    if(len+payloadSize>payloadLimit)
+                    if((len+payloadSize+TS_PES_PACKET_MIN_SIZE)>payloadLimit)
                     {
 				expandPayload();
                     }
@@ -105,7 +106,7 @@
      }
      bool pushByte(uint8_t byte)
      {
-            if(payloadSize>=payloadLimit)
+            if((payloadSize+TS_PES_PACKET_MIN_SIZE)>=payloadLimit)
             {
 			expandPayload();
             }

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_audio.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_audio.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_odml.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_odml.cpp Changed

@@ -191,12 +191,12 @@
 			return 0;
 		}
 	printf("AVIMaster index of "),fourCC::print(masterIndex.chunkId);printf(" found\n");
-	printf("AVISubType : %"PRIu32"\n",masterIndex.indexSubType);
+	printf("AVISubType : %" PRIu32"\n",masterIndex.indexSubType);
 
 
 
 	OPENDML_ENTRY *superEntries=(OPENDML_ENTRY *)malloc(masterIndex.nbEntryInUse*sizeof(OPENDML_ENTRY));
-	printf("AVIWe have %"PRIu32" indeces\n",masterIndex.nbEntryInUse);
+	printf("AVIWe have %" PRIu32" indeces\n",masterIndex.nbEntryInUse);
         if(!readSuperEntries(superEntries,masterIndex.nbEntryInUse,_fd)) //if(1!=fread(superEntries,sizeof(OPENDML_ENTRY)*masterIndex.nbEntryInUse,1,_fd))
 	{
                 free(superEntries);
@@ -221,7 +221,7 @@
 		total+=second.nbEntryInUse;
 	}
 _cntue:
-	printf("Found a grand total of %"PRIu32" frames\n",total);
+	printf("Found a grand total of %" PRIu32" frames\n",total);
 	*nbElem=total;
 
 	// second pass, actually assign them
@@ -232,9 +232,9 @@
 		fseeko(_fd,superEntriesi.offset,SEEK_SET);
 		fcc=read32();
 		len=read32();
-                aprintf("subindex : %"PRIu32" size %"PRIu32" (%lx)",i,len,len);
+                aprintf("subindex : %" PRIu32" size %" PRIu32" (%lx)",i,len,len);
 
-                aprintf("Seeking to %"PRIx64"\n",superEntriesi.offset);
+                aprintf("Seeking to %" PRIx64"\n",superEntriesi.offset);
 		fourCC::print(fcc);aprintf("\n");
 		//if(1!=fread(&second,sizeof(second),1,_fd))
                 if(!readSecondary(&second,_fd))
@@ -244,7 +244,7 @@
 			return 1;
 		}
 
-                aprintf("Base : %"PRIx64"\n",second.base);
+                aprintf("Base : %" PRIx64"\n",second.base);
 		uint32_t sizeflag;
 		for( j=0;j<second.nbEntryInUse;j++)
 		{
@@ -264,7 +264,7 @@
 				else
 					(*index)count.intra=AVI_KEY_FRAME;
 
-                                aprintf("Frame.off : %"PRIx64", size %"PRIx64"\n",
+                                aprintf("Frame.off : %" PRIx64", size %" PRIx64"\n",
                                         _idxcount.offset,
                                         _idxcount.size);

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp Changed

@@ -294,7 +294,7 @@
 		// now read up each parts...
 		//____________________________
 		                
-#define DUMP_TRACK(i) aprintf(" at %"PRIu64" (%"PRIx64") size : %"PRIu64" (%"PRIx64")\n", \
+#define DUMP_TRACK(i) aprintf(" at %" PRIu64" (%" PRIx64") size : %" PRIu64" (%" PRIx64")\n", \
 				_Tracksi.strh.offset,\
 				_Tracksi.strh.offset,\
 				_Tracksi.strh.size,\
@@ -314,7 +314,7 @@
 			fseeko(_fd,_Tracksi.strh.offset,SEEK_SET);
 			if(_Tracksi.strh.size!=sizeof(_videostream))
 			{
-				printf("AVIMmm(1) we have a bogey here, size mismatch : %"PRIu64"\n",_Tracksi.strh.size);
+				printf("AVIMmm(1) we have a bogey here, size mismatch : %" PRIu64"\n",_Tracksi.strh.size);
 				printf("AVIexpected %d\n",(int)sizeof(_videostream));
 				if(_Tracksi.strh.size<sizeof(_videostream)-8) // RECT is not mandatory
 				{
@@ -348,7 +348,7 @@
 		extra=_TracksvidTrack.strf.size-sizeof(_video_bih);
 		if(extra<0)
 		{	
-			printf("AVIbih is not big enough (%"PRIu64"/%d)!\n",_TracksvidTrack.strf.size,(int)sizeof(_video_bih));
+			printf("AVIbih is not big enough (%" PRIu64"/%d)!\n",_TracksvidTrack.strf.size,(int)sizeof(_video_bih));
 			return 0;
 		}
 		fread(&_video_bih,sizeof(_video_bih),1,_fd);
@@ -390,7 +390,7 @@
                                         fseeko(_fd,_Tracksrun.strh.offset,SEEK_SET);
                                         if(_Tracksrun.strh.size != sizeof(_audiostream))
                                         {
-                                                printf("AVIMmm(2) we have a bogey here, size mismatch : %"PRIu64"\n",_Tracksrun.strh.size);
+                                                printf("AVIMmm(2) we have a bogey here, size mismatch : %" PRIu64"\n",_Tracksrun.strh.size);
                                                 printf("AVIexpected %d\n",(int)sizeof(_audiostream));
                                                 if(_Tracksrun.strh.size<sizeof(_audiostream)-8)
                                                 {
@@ -414,7 +414,7 @@
                                         extra=_Tracksrun.strf.size-sizeof(WAVHeader);
                                         if(extra<0)
                                         {	
-                                                printf("AVIWavHeader is not big enough (%"PRIu64"/%d)!\n",
+                                                printf("AVIWavHeader is not big enough (%" PRIu64"/%d)!\n",
                                                 _Tracksrun.strf.size,(int)sizeof(WAVHeader));
                                                 return 0;
                                         }
@@ -654,7 +654,7 @@
 			if(_Tracksi.strh.size!=sizeof(tmp))
 			{
 				
-				printf("AVIMmm(3) we have a bogey here, size mismatch : %"PRIu64"\n",_Tracksi.strh.size);
+				printf("AVIMmm(3) we have a bogey here, size mismatch : %" PRIu64"\n",_Tracksi.strh.size);
 				printf("AVIexpected %d\n",(int)sizeof(tmp));
 				if(_Tracksi.strh.size<sizeof(tmp)-8)
 				{
@@ -831,7 +831,7 @@
 				aprintf("main header found \n");
 				if(len!=sizeof(_mainaviheader))
 				{
-					printf("AVIoops : %"PRIu32" / %d\n",len,(int)sizeof(_mainaviheader));
+					printf("AVIoops : %" PRIu32" / %d\n",len,(int)sizeof(_mainaviheader));
 				}
 				p->read(len,(uint8_t *)&_mainaviheader);
 
@@ -842,7 +842,7 @@
 				break;
 		case MKFCC('i','d','x','1'):
                                 _regularIndex.offset=p->getPos();
-                                printf("Avi Idx1 found at offset %"PRIx64"\n",_regularIndex.offset);
+                                printf("Avi Idx1 found at offset %" PRIx64"\n",_regularIndex.offset);
                                 _regularIndex.size=len;
 				return;
 				break;				
@@ -946,7 +946,7 @@
 {
     if(frame>_videostream.dwLength)
     {
-        printf("Odml %"PRIu32" exceeds nb of video frames %"PRIu32"\n",frame,_videostream.dwLength);
+        printf("Odml %" PRIu32" exceeds nb of video frames %" PRIu32"\n",frame,_videostream.dwLength);
         return false;
     }
     *dts=_idxframe.dts; // FIXME
@@ -960,7 +960,7 @@
 {
     if(frame>_videostream.dwLength)
     {
-        printf("Odml %"PRIu32" exceeds nb of video frames %"PRIu32"\n",frame,_videostream.dwLength);
+        printf("Odml %" PRIu32" exceeds nb of video frames %" PRIu32"\n",frame,_videostream.dwLength);
         return false;
     }
     _idxframe.dts=dts;

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/Pictures/ADM_pics.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/Pictures/ADM_pics.cpp Changed

@@ -232,11 +232,11 @@
     nnum--;
     end++;
     _first = atoi(end);
-	printf("\n First: %"PRIu32", Digit count: %"PRIu32"\n", _first, nnum);
+	printf("\n First: %" PRIu32", Digit count: %" PRIu32"\n", _first, nnum);
     *(end) = 0;
 	printf(" Path: %s\n", name);
 
-	sprintf(realstring, "%s%%0%"PRIu32"d.%s", name, nnum, extension);
+	sprintf(realstring, "%s%%0%" PRIu32"d.%s", name, nnum, extension);
 	_fileMask = ADM_strdup(realstring);
 	printf(" File Mask: %s\n\n", _fileMask);
 
@@ -245,7 +245,7 @@
 	for (uint32_t i = 0; i < MAX_ACCEPTED_OPEN_FILE; i++)
 	{
 		sprintf(realname, realstring, i + _first);
-		printf(" %"PRIu32" : %s\n", i, realname);
+		printf(" %" PRIu32" : %s\n", i, realname);
 
 		fd = ADM_fopen(realname, "rb");
 
@@ -256,7 +256,7 @@
 		_nb_file++;
 	}
 	}
-    printf("\n found %"PRIu32" images\n", _nb_file);
+    printf("\n found %" PRIu32" images\n", _nb_file);
 
     _imgSize = new uint32_t_nb_file;
     //_________________________________
@@ -350,7 +350,7 @@
 		fclose(fd);
 		return 0;
 	    }
-	    printf("\n %"PRIu32" x %"PRIu32"..\n", w, h);
+	    printf("\n %" PRIu32" x %" PRIu32"..\n", w, h);
 	}
 	break;
 
@@ -450,7 +450,7 @@
         default:
             ADM_assert(0);
     }
-    printf("Offset : %"PRIu32"\n", _offset);
+    printf("Offset : %" PRIu32"\n", _offset);
     return 1;
 }
 //****************************************************************

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsProxy.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/ADM_vsProxy.h Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/qt4/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/qt4/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/aviIndexOdml.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/aviIndexOdml.cpp Changed

@@ -171,7 +171,7 @@
     {
         odmlOneSuperIndex *cur=superIndex.trackIndeces+i; 
         uint64_t pos=openDmlHeaderPositioni;
-        ADM_info("Writing  superIndex %d at %"PRIx64"\n",i,pos);
+        ADM_info("Writing  superIndex %d at %" PRIx64"\n",i,pos);
         LMovie->Seek(pos);       
         cur->serialize(LMovie);
     }
@@ -190,7 +190,7 @@
     if(nbEntries)
     {
         // Write index
-        ADM_info("Writing regular index for track %d, at position 0x%"PRIx64"\n",trackNumber,cur->indexPosition);
+        ADM_info("Writing regular index for track %d, at position 0x%" PRIx64"\n",trackNumber,cur->indexPosition);
         LMovie->Seek(cur->indexPosition);
         cur->serialize(LMovie,fourccstrackNumber,trackNumber);
         cur->listOfChunks.clear();
@@ -264,7 +264,7 @@
             odmIndexEntry ix=listOfChunksi;
             if(ix.offset+8<baseOffset)
             {
-                    ADM_warning("Fatal error : Chunk is at %"PRIu64" but base is at %"PRIu64"\n",ix.offset,baseOffset);
+                    ADM_warning("Fatal error : Chunk is at %" PRIu64" but base is at %" PRIu64"\n",ix.offset,baseOffset);
                     exit(-1);
             }
             
@@ -430,7 +430,7 @@
         }
         if(riffSize> limit)
         {
-            ADM_info("Riff is now %"PRIu64" bytes, break needed\n",riffSize);
+            ADM_info("Riff is now %" PRIu64" bytes, break needed\n",riffSize);
             breakNeeded=true;
         }
 
@@ -452,7 +452,7 @@
 {
     uint64_t pos;
     pos=LMovie->Tell();
-    ADM_info("Starting new riff at position %"PRIu64" (0x%"PRIx64")\n",pos,pos);
+    ADM_info("Starting new riff at position %" PRIu64" (0x%" PRIx64")\n",pos,pos);
 
     // 0- Write legacy index, else WMP is not happy...
 
@@ -544,7 +544,7 @@
     // 3-write legacy index
     uint64_t pos;
     pos=_masterList->Tell();
-    ADM_info("Writting legacy index at %"PRIx64"\n",pos);
+    ADM_info("Writting legacy index at %" PRIx64"\n",pos);
     //---
     AviListAvi lst("idx1",_masterList->getFile());
     lst.Begin();

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/avilist_avi.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/avilist_avi.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp Changed

@@ -21,6 +21,7 @@
 #include "fourcc.h"
 #include "muxerAvi.h"
 #include "ADM_vidMisc.h"
+#include "ADM_codecType.h"
 
 
 avi_muxer muxerConfig={AVI_MUXER_AUTO};
@@ -67,6 +68,12 @@
 
 bool muxerAvi::open(const char *file, ADM_videoStream *s,uint32_t nbAudioTrack,ADM_audioStream **a)
 {
+       uint32_t fcc=s->getFCC();
+       if(isH264Compatible(fcc) || isH265Compatible(fcc))
+       {
+           if(!GUI_YesNo(QT_TRANSLATE_NOOP("adm","Bad Idea"),QT_TRANSLATE_NOOP("adm","Using H264/H265 in AVI is a bad idea, MKV is better for that.\n Do you want to continue anyway ?")))
+               return false;
+       }
         audioDelay=s->getVideoDelay();
         if(!writter.saveBegin (
              file,
@@ -74,7 +81,7 @@
              nbAudioTrack,
              a))
         {
-            GUI_Error_HIG("Error","Cannot create avi file");
+            GUI_Error_HIG("Error","Cannot create AVI file");
             return false;
 
         }
@@ -121,7 +128,7 @@
                                 aPacket->dts+=audioDelay;
                                 aPacket->dts-=firstPacketOffset;
                             }
-                            aprintf("Audio Packet size %"PRIu32" sample:%"PRIu32" dts:%"PRIu64" target :%"PRIu64"\n",
+                            aprintf("Audio Packet size %" PRIu32" sample:%" PRIu32" dts:%" PRIu64" target :%" PRIu64"\n",
                                             aPacket->sizeInBytes,aPacket->nbSamples,aPacket->dts,targetDts);
                             if(aPacket->dts!=ADM_NO_PTS)
                                 if( labs((long int)aPacket->dts-(long int)clk->getTimeUs())>32000)

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/op_aviwrite.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/op_aviwrite.cpp Changed

@@ -451,7 +451,7 @@
 	delete LMain;
 	LMain=NULL;
     for(int i=0;i<3;i++)
-        ADM_info("SuperIndex position so far %d : %"PRId64"\n",i,openDmlHeaderPositioni);
+        ADM_info("SuperIndex position so far %d : %" PRId64"\n",i,openDmlHeaderPositioni);
   //___________________________________
   // Write the beginning of the movie part
   //___________________________________
@@ -522,7 +522,7 @@
   printf("\n End of movie, \n video frames : %u\n",vframe);
     for(int i=0;i<nb_audio;i++)
     {
-        printf("Track %d Size :%"PRIu32" bytes, %"PRIu32" blocks\n",i,audioTracksi.sizeInBytes,audioTracksi.nbBlocks);
+        printf("Track %d Size :%" PRIu32" bytes, %" PRIu32" blocks\n",i,audioTracksi.sizeInBytes,audioTracksi.nbBlocks);
     }
 
   // cleanup
@@ -560,7 +560,7 @@
   // Place holder for odml super index
   uint64_t pos;
   alist->writeDummyChunk(AVI_SUPER_INDEX_CHUNK_SIZE,&pos);
-  printf("ODML videoTrack : using ODML placeholder of size %u bytes at pos 0x%"PRIx64"\n",AVI_SUPER_INDEX_CHUNK_SIZE,pos);  
+  printf("ODML videoTrack : using ODML placeholder of size %u bytes at pos 0x%" PRIx64"\n",AVI_SUPER_INDEX_CHUNK_SIZE,pos);  
   openDmlHeaderPosition0=pos;
   alist->End ();
   delete alist;
@@ -594,7 +594,7 @@
   
   uint64_t pos;
   alist->writeDummyChunk(AVI_SUPER_INDEX_CHUNK_SIZE,&pos);
-  ADM_info("ODML Audio track %d, using ODML placeholder of size %u bytes, odmltrack=%d, pos=0x%"PRIx64"\n",
+  ADM_info("ODML Audio track %d, using ODML placeholder of size %u bytes, odmltrack=%d, pos=0x%" PRIx64"\n",
                             audioTrackNumber,AVI_SUPER_INDEX_CHUNK_SIZE,1+audioTrackNumber,pos);  
   openDmlHeaderPosition1+audioTrackNumber=pos;
   alist->End ();

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4util.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/mp4util.h Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/rtphint.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/rtphint.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp Changed

@@ -237,7 +237,7 @@
         ADM_assert(innextWrite.dts!=ADM_NO_PTS)
         if(inother.pts==ADM_NO_PTS || inother.pts==ADM_NO_PTS)
         {
-            GUI_Error_HIG("Video","Video does not have enough timing information. Are you copying from AVI ?");
+            GUI_Error_HIG("Video","Video does not have enough timing information. Are you copying from AVI?");
             goto theEnd;
         }
 
@@ -246,7 +246,7 @@
         uint64_t nextDts=innextWrite.dts;   // Delta between dts=duration of the frame (sort of)     
         uint64_t myDts=inother.dts;
         uint64_t myPts=inother.pts;        
-        cprintf(">>next DTS=%"PRIu64", last DTS=%"PRIu64"delta=%"PRIu64"\n",nextDts,lastSentDts,nextDts-lastSentDts);
+        cprintf(">>next DTS=%" PRIu64", last DTS=%" PRIu64"delta=%" PRIu64"\n",nextDts,lastSentDts,nextDts-lastSentDts);
 
         encoding->pushVideoFrame(inother.len,inother.out_quantizer,myDts);
         uint64_t delta=myPts-lastSentDts; // composition time...
@@ -256,7 +256,7 @@
         uint64_t scaled_duration=timeScale(duration);
         duration=inverseTimeScale(scaled_duration); // handle rounding error
         nbFrame++;
-        cprintf("Sending frame duration=%"PRIu64", pts/dts=%"PRIu64"\n",lastSentDts,delta);
+        cprintf("Sending frame duration=%" PRIu64", pts/dts=%" PRIu64"\n",lastSentDts,delta);
         if(false==MP4WriteSample(handle,videoTrackId,inother.data,inother.len,
                         scaled_duration, // duration
                         delta, // pts/dts offset
@@ -270,7 +270,7 @@
         // update lastSentDts
         lastSentDts+=duration; // beginning of next frame...
         //
-        cprintf("lastSendDts=%"PRIu64", next Dts=%"PRIu64", skew=%"PRId64"\n",lastSentDts,nextDts,
+        cprintf("lastSendDts=%" PRIu64", next Dts=%" PRIu64", skew=%" PRId64"\n",lastSentDts,nextDts,
                         (int64_t)nextDts-(int64_t)lastSentDts);
         //
         fillAudio(lastSentDts);

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp Changed

@@ -50,7 +50,7 @@
                 case 32000: fscod=2;break;
                 default: 
                     {
-                    GUI_Error_HIG("", "invalid frequency for AC3. Only 32, 44.1 & 48 kHz");
+                    GUI_Error_HIG("", "Invalid frequency for AC3. Only 32, 44.1 & 48 kHz");
                     return false;
                     }
         }
@@ -82,7 +82,7 @@
                 case 6: acmod=7;lfe=1;break;
                 default: 
                         {
-                                  GUI_Error_HIG("","Invalid number of channel for AC3");
+                                  GUI_Error_HIG("","Invalid number of channels for AC3");
                                   return false;
                         }
         }
@@ -262,8 +262,8 @@
                         // Take either block Dts or our own if no DTS is provided
                         if(currentBlock->dts!=ADM_NO_PTS)
                         {
-                            bprintf("Current audio Dts=%"PRId64"\n",currentDts);
-                            bprintf("Incoming block, dts=%"PRId64"\n",currentBlock->dts);
+                            bprintf("Current audio Dts=%" PRId64"\n",currentDts);
+                            bprintf("Incoming block, dts=%" PRId64"\n",currentBlock->dts);
                             bprintf("Delta =%d ms\n",(int)(currentDts-currentBlock->dts));
                             if( labs((long int)currentBlock->dts-(long int)currentDts)>MP4V2_MAX_JITTER)
                             {

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerMplex/ADM_mplexInput.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_muxers/muxerMplex/ADM_mplexInput.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerMplex/ADM_mplexMuxer.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_muxers/muxerMplex/ADM_mplexMuxer.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerMplex/ADM_mplexOutput.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_muxers/muxerMplex/ADM_mplexOutput.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_muxers/muxerWebm/muxerWebm.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_scriptEngines/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_scriptEngines/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_scriptEngines/spiderMonkey/src/ADM_jsEditor.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_scriptEngines/spiderMonkey/src/ADM_jsEditor.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonScriptWriter.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonScriptWriter.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/ffFlv1/ffFlv1Plugin.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/ffFlv1/ffFlv1Plugin.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp Changed

@@ -98,7 +98,7 @@
 bool ADM_ffMpeg2Encoder::setup(void)
 {
 
-    if(false== ADM_coreVideoEncoderFFmpeg::setup(CODEC_ID_MPEG2VIDEO))
+    if(false== ADM_coreVideoEncoderFFmpeg::setup(AV_CODEC_ID_MPEG2VIDEO))
         return false;
     printf("ffMpeg Setup ok\n");
     return true;
@@ -121,16 +121,24 @@
 bool         ADM_ffMpeg2Encoder::encode (ADMBitstream * out)
 {
 int sz,q;
+int gotData;
+int r;
 again:
     sz=0;
     if(false==preEncode()) // Pop - out the frames stored in the queue due to B-frames
     {
-        if ((sz = avcodec_encode_video (_context, out->data, out->bufferSize, NULL)) <= 0)
+        AVPacket pkt;
+        pkt.data=out->data;
+        pkt.size=out->bufferSize;
+
+        r=encodeWrapper(NULL,out);
+        if(r<0)
         {
-            printf("ffMpeg2 Error %d encoding video\n",sz);
+            ADM_warning("ffMpeg2 Error %d encoding video\n",r);
             return false;
         }
-        printf("ffMpeg2 Popping delayed bframes (%d)\n",sz);
+        sz=r;
+        ADM_info("ffMpeg2 Popping delayed bframes (%d)\n",sz);
         goto link;
         return false;
     }
@@ -170,11 +178,13 @@
                                      _context->bit_rate,  _frame->quality, _frame->quality/ FF_QP2LAMBDA,q);     
     
     _frame->reordered_opaque=image->Pts;
-    if ((sz = avcodec_encode_video (_context, out->data, out->bufferSize, _frame)) < 0)
+    r=encodeWrapper(_frame,out);
+    if(r<0)
     {
-        printf("ffMpeg2 Error %d encoding video\n",sz);
+        ADM_warning("ffMpeg2 Error %d encoding video\n",r);
         return false;
     }
+    sz=r;
     
     if(sz==0) // no pic, probably pre filling, try again
         goto again;

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp Changed

@@ -77,7 +77,7 @@
 bool ADM_ffMpeg4Encoder::setup(void)
 {
 
-    if(false== ADM_coreVideoEncoderFFmpeg::setup(CODEC_ID_MPEG4))
+    if(false== ADM_coreVideoEncoderFFmpeg::setup(AV_CODEC_ID_MPEG4))
         return false;
 
     printf("ffMpeg Setup ok\n");
@@ -100,16 +100,18 @@
 */
 bool         ADM_ffMpeg4Encoder::encode (ADMBitstream * out)
 {
-int sz,q;
+int sz,q,r,gotData;
 again:
     sz=0;
     if(false==preEncode()) // Pop - out the frames stored in the queue due to B-frames
     {
-        if ((sz = avcodec_encode_video (_context, out->data, out->bufferSize, NULL)) <= 0)
+        r=encodeWrapper(NULL,out);
+        if(r<0)
         {
-            printf("ffmpeg4 Error %d encoding video\n",sz);
+            ADM_warning("ffMpeg4 Error %d encoding video\n",r);
             return false;
         }
+        sz=r;
         printf("ffmpeg4 Popping delayed bframes (%d)\n",sz);
         goto link;
         return false;
@@ -150,12 +152,13 @@
                                      _context->bit_rate,  _frame->quality, _frame->quality/ FF_QP2LAMBDA,q);
 
     _frame->reordered_opaque=image->Pts;
-    if ((sz = avcodec_encode_video (_context, out->data, out->bufferSize, _frame)) < 0)
+    r=encodeWrapper(_frame,out);
+    if(r<0)
     {
-        printf("ffmpeg4 Error %d encoding video\n",sz);
+        ADM_warning("ffMpeg4 Error %d encoding video\n",r);
         return false;
     }
-
+    sz=r;
     if(sz==0) // no pic, probably pre filling, try again
         goto again;
 link:

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMpeg4/ffMpeg4Plugin.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMpeg4/ffMpeg4Plugin.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEnc.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEnc.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.cpp Changed

@@ -173,7 +173,7 @@
         //return false;
     }else
     {
-        //printf("PPPP x264 Incoming : %"PRIu64"us \n",image->Pts);    
+        //printf("PPPP x264 Incoming : %" PRIu64"us \n",image->Pts);    
         // 2-preamble   
         if(false==preAmble(image))
         {
@@ -289,11 +289,11 @@
         }
         //------
         aprintf("encoder delay=%d, pic out dts=%d picout pts=%d\n",getEncoderDelay(),picout->i_dts,picout->i_pts);
-        aprintf("pts = %"PRIu64", dts=%"PRIu64", pts+delay=%"PRIu64" delta=%"PRIu64"\n",picout->i_pts,out->dts,out->pts,
+        aprintf("pts = %" PRIu64", dts=%" PRIu64", pts+delay=%" PRIu64" delta=%" PRIu64"\n",picout->i_pts,out->dts,out->pts,
                     out->pts-out->dts);
         if(out->dts>out->pts)
         {
-            ADM_warning("DTS > PTS, that can happen when there are holes in the source (%"PRIu64"/%"PRIu64")\n",
+            ADM_warning("DTS > PTS, that can happen when there are holes in the source (%" PRIu64"/%" PRIu64")\n",
                         out->dts,out->pts);
             if(picout->i_type!=X264_TYPE_B && picout->i_type!=X264_TYPE_BREF)
             {
@@ -341,7 +341,7 @@
           ADM_error ("x264 Unknown image type: %d\n", picout->i_type);
           //ADM_assert(0);
         }
-        //printf("OOOO x264 Outgoing : %"PRIu64"us \n",out->dts);    
+        //printf("OOOO x264 Outgoing : %" PRIu64"us \n",out->dts);    
         out->out_quantizer = picout->i_qpplus1;
         return true;
 }

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Plugin.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Plugin.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp Changed

@@ -62,7 +62,7 @@
   if(!x264Settings.useAdvancedConfiguration)
   {
     char tune200 = {0};
-    strcat(tune, x264Settings.general.tuning);
+    strcat(tune, x264Settings.general.tuning.c_str());
     if(x264Settings.general.fast_decode) 
     {
       strcat(tune, ",");
@@ -73,7 +73,7 @@
       strcat(tune, ",");
       strcat(tune, "zero_latency");
     }
-    x264_param_default_preset(&param, x264Settings.general.preset, tune);
+    x264_param_default_preset(&param, x264Settings.general.preset.c_str(), tune);
   }else
   {
         param.b_bluray_compat=x264Settings.general.blueray_compatibility;
@@ -179,7 +179,7 @@
                         param.rc.f_rf_constant = 0;
                         break;
         default:
-                        GUI_Error_HIG("Not coded","this mode has notbeen implemented\n");
+                        GUI_Error_HIG("Not coded","this mode has not been implemented\n");
                         return false;
                         break;
 
@@ -319,7 +319,7 @@
 
   if(!x264Settings.useAdvancedConfiguration)
   {
-    x264_param_apply_profile(&param, x264Settings.general.profile);
+    x264_param_apply_profile(&param, x264Settings.general.profile.c_str());
   }
 
   dumpx264Setup(&param);

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt Changed

@@ -10,7 +10,7 @@
 )
 include(admCheckX264)
 checkX264()
-IF(X264_FOUND)
+IF(USE_X264)
   MESSAGE(STATUS "x264 plugin activated.")
   INCLUDE_DIRECTORIES(${X264_INCLUDE_DIR})
 
@@ -28,21 +28,21 @@
   endif(DO_QT4)
   #-----------------------/QT4 VERSION---------------------
   #-----------------------GTK or CLI VERSION---------------------
-  if((DO_GTK) OR (DO_CLI))
+  if(DO_COMMON)
     ADD_VIDEO_ENCODER(ADM_ve_x264_other   ADM_x264_noui.cpp ${x264_SRCS})
     ADD_TARGET_CFLAGS(ADM_ve_x264_other "-DADM_UI_TYPE_BUILD=1") # CLI!
     TARGET_LINK_LIBRARIES(ADM_ve_x264_other "${X264_LIBRARY_DIR}")
     TARGET_LINK_LIBRARIES(ADM_ve_x264_other ADM_core6)
     INIT_VIDEO_ENCODER(ADM_ve_x264_other)
     INSTALL_VIDEO_ENCODER(ADM_ve_x264_other)
-  endif((DO_GTK) OR (DO_CLI))
+  endif(DO_COMMON)
   # ------------- PRESET -----------
   if(DO_SETTINGS)
     FILE(GLOB json_files ${CMAKE_CURRENT_SOURCE_DIR}/preset/*.json)
     message(STATUS "Presets found : ${json_files}")
     INSTALL_VIDEO_ENCODER_SETTINGS(x264 VERSION 3 FILES ${json_files})
   endif(DO_SETTINGS)
-ELSE(X264_FOUND)
+ELSE(USE_X264)
   MESSAGE(STATUS "x264 disabled.")
-ENDIF(X264_FOUND)
+ENDIF(USE_X264)

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp Changed

@@ -7,8 +7,8 @@
  ***************************************************************************/
 #include <math.h>
 #include <vector>
-#include <QFileDialog>
 #include <QDialog>
+#include <QFileDialog>
 #include <QTextEdit>
 #include <QLineEdit>
 using std::vector;
@@ -38,7 +38,7 @@
 }idcToken;
 
 static const idcToken listOfIdc={
-        {-1,"Auto"},
+        {(unsigned int)-1,"Auto"},
         {10,"1"},
         {11,"1.1"},
         {12,"1.2"},
@@ -97,29 +97,19 @@
 */
 bool x264_ui(x264_encoder *settings)
 {
-        bool success = false;
+    bool success = false;
     x264Dialog dialog(qtLastRegisteredDialog(), settings);
 
-        qtRegisterDialog(&dialog);
+    qtRegisterDialog(&dialog);
 
     if (dialog.exec() == QDialog::Accepted)
     {
             dialog.download();
-            if(settings->general.preset) ADM_dealloc(settings->general.preset);
-            settings->general.preset = NULL;
-            if(settings->general.tuning) ADM_dealloc(settings->general.tuning);
-            settings->general.tuning = NULL;
-            if(settings->general.profile) ADM_dealloc(settings->general.profile);
-            settings->general.profile = NULL;
-            memcpy(settings,&myCopy,sizeof(myCopy));
-            if(myCopy.general.preset) settings->general.preset = ADM_strdup(myCopy.general.preset);
-            if(myCopy.general.tuning) settings->general.tuning = ADM_strdup(myCopy.general.tuning);
-            if(myCopy.general.profile) settings->general.profile = ADM_strdup(myCopy.general.profile);
+            *settings=myCopy;
             success = true;
     }
 
-        qtUnregisterDialog(&dialog);
-
+    qtUnregisterDialog(&dialog);
     return success;
 }
 /**
@@ -143,16 +133,7 @@
         connect(ui.maxCrfSpinBox, SIGNAL(valueChanged(int)), this, SLOT(maxCrfSpinBox_valueChanged(int)));
 #endif
        x264_encoder* settings = (x264_encoder*)param;
-       if(myCopy.general.preset) ADM_dealloc(myCopy.general.preset);
-       myCopy.general.preset = NULL;
-       if(myCopy.general.tuning) ADM_dealloc(myCopy.general.tuning);
-       myCopy.general.tuning = NULL;
-       if(myCopy.general.profile) ADM_dealloc(myCopy.general.profile);
-       myCopy.general.profile = NULL;
-       memcpy(&myCopy,settings,sizeof(myCopy));
-       if(settings->general.preset) myCopy.general.preset = ADM_strdup(settings->general.preset);
-       if(settings->general.tuning) myCopy.general.tuning = ADM_strdup(settings->general.tuning);
-       if(settings->general.profile) myCopy.general.profile = ADM_strdup(settings->general.profile);
+       myCopy=*settings;
 
 #define ENCODING(x)  myCopy.general.params.x       
         lastBitrate =   ENCODING(bitrate);
@@ -252,18 +233,21 @@
 #define DISABLE(x) ui.x->setEnabled(false);
 #define MK_MENU(x,y) ui.x->setCurrentIndex(myCopy.y)
 #define MK_RADIOBUTTON(x) ui.x->setChecked(true);
-#define MK_COMBOBOX_STR(x,y,list,count) \
-  { \
-    QComboBox *combobox=ui.x; \
-    for(int i=0;i<count;i++) \
-    { \
-      const char *p=listi; \
-      if(myCopy.y && !strcmp(myCopy.y, p)) \
-      { \
-        combobox->setCurrentIndex(i); \
-      } \
-    } \
-  }
+#define MK_COMBOBOX_STR(x,y,list,count) updateComboBox(ui.x,myCopy.y,count,list)
+/**
+
+*/
+static void updateComboBox(QComboBox *combo,const std::string &mine,int count,const char **list)
+{
+    for(int i=0;i<count;i++) 
+    { 
+      const char *p=listi; 
+      if(mine.size() && !strcmp(mine.c_str(), p)) 
+      { 
+        combo->setCurrentIndex(i); 
+      } 
+    } 
+}
 bool x264Dialog::upload(void)
 {
           toogleAdvancedConfiguration(myCopy.useAdvancedConfiguration);
@@ -369,9 +353,9 @@
           }
 
           // preset
-          MK_COMBOBOX_STR(presetComboBox, general.preset, listOfPresets, NB_PRESET);
-          MK_COMBOBOX_STR(profileComboBox, general.profile, listOfProfiles, NB_PROFILE);
-          MK_COMBOBOX_STR(tuningComboBox, general.tuning, listOfTunings, NB_TUNE);
+          MK_COMBOBOX_STR(presetComboBox, general.preset.c_str(), listOfPresets, NB_PRESET);
+          MK_COMBOBOX_STR(profileComboBox, general.profile.c_str(), listOfProfiles, NB_PROFILE);
+          MK_COMBOBOX_STR(tuningComboBox, general.tuning.c_str(), listOfTunings, NB_TUNE);
 
           // udate idc
           QComboBox *idc=ui.idcLevelComboBox;
@@ -472,14 +456,17 @@
 #define MK_UINT(x,y)        myCopy.y=ui.x->value()
 #define MK_MENU(x,y)        myCopy.y=ui.x->currentIndex()
 #define MK_RADIOBUTTON(x,y)   myCopy.y=ui.x->setChecked(true);
-#define MK_COMBOBOX_STR(x,y,list,count) \
-  { \
-    QComboBox* combo=ui.x; \
-    int idx=combo->currentIndex(); \
-    ADM_assert(idx<count); \
-    if(myCopy.y) ADM_dealloc(myCopy.y); \
-    myCopy.y = ADM_strdup(listidx); \
-  }
+#define MK_COMBOBOX_STR(x,y,list,count) x_readComboBox(ui.x,myCopy.y,count,list)
+
+static void x_readComboBox(QComboBox *combo, std::string &inout,int count,const char **list)
+{
+    int idx=combo->currentIndex(); 
+    ADM_assert(idx<count);    
+    inout = std::string(listidx); 
+}
+
+
+
 
 bool x264Dialog::download(void)
 {

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/x264_encoder.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/x264_encoder.h Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/x264_encoder_desc.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/x264_encoder_desc.cpp Changed

@@ -3,9 +3,9 @@
  {"useAdvancedConfiguration",offsetof(x264_encoder,useAdvancedConfiguration),"bool",ADM_param_bool},
  {"general.params",offsetof(x264_encoder,general.params),"COMPRES_PARAMS",ADM_param_video_encode},
  {"general.threads",offsetof(x264_encoder,general.threads),"uint32_t",ADM_param_uint32_t},
- {"general.preset",offsetof(x264_encoder,general.preset),"char *",ADM_param_string},
- {"general.tuning",offsetof(x264_encoder,general.tuning),"char *",ADM_param_string},
- {"general.profile",offsetof(x264_encoder,general.profile),"char *",ADM_param_string},
+ {"general.preset",offsetof(x264_encoder,general.preset),"std::string",ADM_param_stdstring},
+ {"general.tuning",offsetof(x264_encoder,general.tuning),"std::string",ADM_param_stdstring},
+ {"general.profile",offsetof(x264_encoder,general.profile),"std::string",ADM_param_stdstring},
  {"general.fast_decode",offsetof(x264_encoder,general.fast_decode),"bool",ADM_param_bool},
  {"general.zero_latency",offsetof(x264_encoder,general.zero_latency),"bool",ADM_param_bool},
  {"general.fast_first_pass",offsetof(x264_encoder,general.fast_first_pass),"bool",ADM_param_bool},

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp Changed

@@ -168,7 +168,7 @@
         //return false;
     }else
     {
-        //printf("PPPP x265 Incoming : %"PRIu64"us \n",image->Pts);    
+        //printf("PPPP x265 Incoming : %" PRIu64"us \n",image->Pts);    
         // 2-preamble   
         if(false==preAmble(image))
         {
@@ -284,11 +284,11 @@
         }
         //------
         aprintf("encoder delay=%d, pic out dts=%d picout pts=%d\n",getEncoderDelay(),picout->i_dts,picout->i_pts);
-        aprintf("pts = %"PRIu64", dts=%"PRIu64", pts+delay=%"PRIu64" delta=%"PRIu64"\n",picout->i_pts,out->dts,out->pts,
+        aprintf("pts = %" PRIu64", dts=%" PRIu64", pts+delay=%" PRIu64" delta=%" PRIu64"\n",picout->i_pts,out->dts,out->pts,
                     out->pts-out->dts);
         if(out->dts>out->pts)
         {
-            ADM_warning("DTS > PTS, that can happen when there are holes in the source (%"PRIu64"/%"PRIu64")\n",
+            ADM_warning("DTS > PTS, that can happen when there are holes in the source (%" PRIu64"/%" PRIu64")\n",
                         out->dts,out->pts);
             if(picout->sliceType!=X265_TYPE_B && picout->sliceType!=X265_TYPE_BREF)
             {
@@ -336,7 +336,7 @@
           ADM_error ("x265 Unknown image type: %d\n", picout->sliceType);
           //ADM_assert(0);
         }
-        //printf("OOOO x265 Outgoing : %"PRIu64"us \n",out->dts);    
+        //printf("OOOO x265 Outgoing : %" PRIu64"us \n",out->dts);    
         out->out_quantizer = picout->forceqp;
         return true;
 }

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp Changed

@@ -47,8 +47,8 @@
   if(!x265Settings.useAdvancedConfiguration)
   {
     char tune200 = {0};
-    strcat(tune, x265Settings.general.tuning);
-    x265_param_default_preset(&param, x265Settings.general.preset, tune);
+    strcat(tune, x265Settings.general.tuning.c_str());
+    x265_param_default_preset(&param, x265Settings.general.preset.c_str(), tune);
   }
   param.logLevel=x265Settings.level; 
 
@@ -155,7 +155,7 @@
                         param.rc.rfConstant = 0;
                         break;
         default:
-                        GUI_Error_HIG("Not coded","this mode has notbeen implemented\n");
+                        GUI_Error_HIG("Not coded","this mode has not been implemented\n");
                         return false;
                         break;
 
@@ -247,7 +247,7 @@
 
   if(!x265Settings.useAdvancedConfiguration)
   {
-    x265_param_apply_profile(&param, x265Settings.general.profile);
+    x265_param_apply_profile(&param, x265Settings.general.profile.c_str());
   }
 
   dumpx265Setup(&param);

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt Changed

@@ -10,7 +10,7 @@
 )
 include(admCheckX265)
 checkX265()
-IF(X265_FOUND)
+IF(USE_X265)
   MESSAGE(STATUS "x265 plugin activated.")
   INCLUDE_DIRECTORIES(${X265_INCLUDE_DIR})
 
@@ -28,21 +28,21 @@
   endif(DO_QT4)
   #-----------------------/QT4 VERSION---------------------
   #-----------------------GTK or CLI VERSION---------------------
-  if((DO_GTK) OR (DO_CLI))
+  if(DO_COMMON)
     ADD_VIDEO_ENCODER(ADM_ve_x265_other   ADM_x265_noui.cpp ${x265_SRCS})
     ADD_TARGET_CFLAGS(ADM_ve_x265_other "-DADM_UI_TYPE_BUILD=1") # CLI!
     TARGET_LINK_LIBRARIES(ADM_ve_x265_other "${X265_LIBRARY_DIR}")
     TARGET_LINK_LIBRARIES(ADM_ve_x265_other ADM_core6)
     INIT_VIDEO_ENCODER(ADM_ve_x265_other)
     INSTALL_VIDEO_ENCODER(ADM_ve_x265_other)
-  endif((DO_GTK) OR (DO_CLI))
+  endif(DO_COMMON)
   # ------------- 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})
   endif(DO_SETTINGS)
-ELSE(X265_FOUND)
+ELSE(USE_X265)
   MESSAGE(STATUS "x265 disabled.")
-ENDIF(X265_FOUND)
+ENDIF(USE_X265)

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp Changed

@@ -38,7 +38,7 @@
 }idcToken;
 
 static const idcToken listOfIdc={
-        {-1,"Auto"},
+        {(unsigned int)-1,"Auto"},
         {10,"1"},
         {20,"2"},
         {21,"2.1"},
@@ -102,16 +102,7 @@
     if (dialog.exec() == QDialog::Accepted)
     {
             dialog.download();
-            if(settings->general.preset) ADM_dealloc(settings->general.preset);
-            settings->general.preset = NULL;
-            if(settings->general.tuning) ADM_dealloc(settings->general.tuning);
-            settings->general.tuning = NULL;
-            if(settings->general.profile) ADM_dealloc(settings->general.profile);
-            settings->general.profile = NULL;
-            memcpy(settings,&myCopy,sizeof(myCopy));
-            if(myCopy.general.preset) settings->general.preset = ADM_strdup(myCopy.general.preset);
-            if(myCopy.general.tuning) settings->general.tuning = ADM_strdup(myCopy.general.tuning);
-            if(myCopy.general.profile) settings->general.profile = ADM_strdup(myCopy.general.profile);
+            *settings=myCopy;
             success = true;
     }
 
@@ -139,16 +130,7 @@
         connect(ui.maxCrfSpinBox, SIGNAL(valueChanged(int)), this, SLOT(maxCrfSpinBox_valueChanged(int)));
 #endif
        x265_settings* settings = (x265_settings*)param;
-       if(myCopy.general.preset) ADM_dealloc(myCopy.general.preset);
-       myCopy.general.preset = NULL;
-       if(myCopy.general.tuning) ADM_dealloc(myCopy.general.tuning);
-       myCopy.general.tuning = NULL;
-       if(myCopy.general.profile) ADM_dealloc(myCopy.general.profile);
-       myCopy.general.profile = NULL;
-       memcpy(&myCopy,settings,sizeof(myCopy));
-       if(settings->general.preset) myCopy.general.preset = ADM_strdup(settings->general.preset);
-       if(settings->general.tuning) myCopy.general.tuning = ADM_strdup(settings->general.tuning);
-       if(settings->general.profile) myCopy.general.profile = ADM_strdup(settings->general.profile);
+       myCopy=*settings;
 
 #define ENCODING(x)  myCopy.general.params.x       
         lastBitrate =   ENCODING(bitrate);
@@ -259,7 +241,7 @@
     for(int i=0;i<count;i++) \
     { \
       const char *p=listi; \
-      if(myCopy.y && !strcmp(myCopy.y, p)) \
+      if(myCopy.y.size() && !strcmp(myCopy.y.c_str(), p)) \
       { \
         combobox->setCurrentIndex(i); \
       } \
@@ -455,9 +437,8 @@
   { \
     QComboBox* combo=ui.x; \
     int idx=combo->currentIndex(); \
-    ADM_assert(idx<count); \
-    if(myCopy.y) ADM_dealloc(myCopy.y); \
-    myCopy.y = ADM_strdup(listidx); \
+    ADM_assert(idx<count); \    
+    myCopy.y = std::string(ADM_strdup(listidx)); \
   }
 
 bool x265Dialog::download(void)

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/x265_settings.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/x265_settings.h Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/x265_settings_desc.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/x265_settings_desc.cpp Changed

@@ -4,9 +4,9 @@
  {"general.params",offsetof(x265_settings,general.params),"COMPRES_PARAMS",ADM_param_video_encode},
  {"general.poolThreads",offsetof(x265_settings,general.poolThreads),"uint32_t",ADM_param_uint32_t},
  {"general.frameThreads",offsetof(x265_settings,general.frameThreads),"uint32_t",ADM_param_uint32_t},
- {"general.preset",offsetof(x265_settings,general.preset),"char *",ADM_param_string},
- {"general.tuning",offsetof(x265_settings,general.tuning),"char *",ADM_param_string},
- {"general.profile",offsetof(x265_settings,general.profile),"char *",ADM_param_string},
+ {"general.preset",offsetof(x265_settings,general.preset),"std::string",ADM_param_stdstring},
+ {"general.tuning",offsetof(x265_settings,general.tuning),"std::string",ADM_param_stdstring},
+ {"general.profile",offsetof(x265_settings,general.profile),"std::string",ADM_param_stdstring},
  {"level",offsetof(x265_settings,level),"int32_t",ADM_param_int32_t},
  {"vui.sar_height",offsetof(x265_settings,vui.sar_height),"uint32_t",ADM_param_uint32_t},
  {"vui.sar_width",offsetof(x265_settings,vui.sar_width),"uint32_t",ADM_param_uint32_t},

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/x265_settings_json.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/x265_settings_json.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters/PulldownRemoval/ADM_vidFieldUnblend.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters/PulldownRemoval/ADM_vidFieldUnblend.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp Changed

@@ -20,7 +20,7 @@
 
 #include "ass_ssa.h"
 #include "ass_ssa_desc.cpp"
-#include "ADM_coreSubtitles/inc/ADM_coreSubtitles.h"
+#include "ADM_coreSubtitles.h"
 #include "prefs.h"
 extern "C"
 {
@@ -40,6 +40,8 @@
         bool            setup(void);
         bool            cleanup(void);
         ADMImage        *src;
+        
+        bool            mergeOneImage(ASS_Image *img,ADMImage *target);
 public:
                             subAss(ADM_coreVideoFilter *previous,CONFcouple *conf);
                             ~subAss();
@@ -53,7 +55,7 @@
 };
 
 // Add the hook to make it valid plugin
-DECLARE_VIDEO_FILTER(   subAss,   // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   subAss,   // Class
                         1,0,1,              // Version
                         ADM_UI_ALL,         // UI
                         VF_SUBTITLE,            // Category
@@ -86,7 +88,7 @@
 
       sprintf((char *)buf," ASS/SSA Subtitles: ");
 
-      char *filename = (char*)param.subtitleFile;
+      const char *filename = param.subtitleFile.c_str();
       if(filename)
       {
           if(strrchr(filename, DIR_SEP) != NULL && *(strrchr(filename, DIR_SEP) + 1) != 0)
@@ -106,8 +108,8 @@
     if (!setup || !ADM_paramLoad(setup, ass_ssa_param, &param)) {
         param.font_scale = 1.;
         param.line_spacing = param.topMargin = param.bottomMargin = 0;
-        param.subtitleFile = NULL;
-        param.fontDirectory = ADM_strdup(DEFAULT_FONT_DIR);
+        param.subtitleFile = std::string("");
+        param.fontDirectory = std::string(DEFAULT_FONT_DIR);
         param.extractEmbeddedFonts = 1;
     }
     src = new ADMImageDefault(in->getInfo()->width, in->getInfo()->height);
@@ -117,7 +119,7 @@
     _ass_track = NULL;
     _ass_rend = NULL;
 
-    if (param.subtitleFile) 
+    if (param.subtitleFile.size()) 
     {
         if (!this->setup()) 
         {
@@ -133,11 +135,7 @@
 {
       if(src) delete src;
       src=NULL;
-
-
-        DELETE(param.subtitleFile);
-        DELETE(param.fontDirectory);
-        cleanup();
+      cleanup();
 }
 /**
     \fn getCoupledConf
@@ -166,8 +164,7 @@
     MKME(scale,font_scale);
     MKME(spacing,line_spacing);
     char newName2*1024; // should be a dynamic size..
-
-    diaElemFile       file(0,(char **)PX(subtitleFile),QT_TRANSLATE_NOOP("ass","_Subtitle file (ASS/SSA):"), NULL, QT_TRANSLATE_NOOP("ass","Select Subtitle file"));
+    diaElemFile       file(0,param.subtitleFile,QT_TRANSLATE_NOOP("ass","_Subtitle file (ASS/SSA):"), NULL, QT_TRANSLATE_NOOP("ass","Select Subtitle file"));
     diaElemFloat      dSpacing(&spacing,QT_TRANSLATE_NOOP("ass","_Line spacing:"),0.10,10.0);
     diaElemFloat      dScale(&scale,QT_TRANSLATE_NOOP("ass","_Font scale:"),0.10,10.0);
     diaElemUInteger   dTop(PX(topMargin),QT_TRANSLATE_NOOP("ass","_Top margin:"),0,200);
@@ -175,49 +172,47 @@
 
        diaElem *elems5={&file,&dSpacing,&dScale,&dTop,&dBottom};
 again:
-   if( diaFactoryRun(QT_TRANSLATE_NOOP("ass","ASS"),5,elems))
-   {
-       char *p=param.subtitleFile;
-       int l=strlen(p);
-       if(l>3 && !strcasecmp(p+l-4,".srt"))
-       {
-           if(!GUI_Question("This is a srt file. Convert to SSA ?"))
-           {
-               goto again;
-           }
-           ADM_subtitle sub;
-           if(!sub.load(p))
-           {
-               GUI_Error_HIG("Error","Cannot load this srt file.");
-               goto again;
-           }
-           if(false==sub.srt2ssa())
-           {
-               GUI_Error_HIG("Error","Cannot convert to ssa.");
-               goto again;               
-           }
-           
-           strcpy(newName,p);
-           strcpy(newName+l-4,".ssa");
-           if(false==sub.saveAsSSA(newName))
-           {
-               GUI_Error_HIG("Error","Cannot save converted file.");
-               goto again;                              
-           }
-           // all ok, we can now use the ssa file
-           strcpy(p,newName);
-       }
-       
-       
+   if(!diaFactoryRun(QT_TRANSLATE_NOOP("ass","ASS"),5,elems))
+       return false;
+   
+    const char *p=param.subtitleFile.c_str();
+    int l=strlen(p);
+    if(l>3 && !strcasecmp(p+l-4,".srt"))
+    {
+        if(!GUI_Question("This is a srt file. Convert to SSA ?"))
+        {
+            goto again;
+        }
+        ADM_subtitle sub;
+        if(!sub.load(p))
+        {
+            GUI_Error_HIG("Error","Cannot load this srt file.");
+            goto again;
+        }
+        if(false==sub.srt2ssa())
+        {
+            GUI_Error_HIG("Error","Cannot convert to ssa.");
+            goto again;               
+        }
+
+        strcpy(newName,p);
+        strcpy(newName+l-4,".ssa");
+        if(false==sub.saveAsSSA(newName))
+        {
+            GUI_Error_HIG("Error","Cannot save converted file.");
+            goto again;                              
+        }
+        param.subtitleFile=std::string(newName);
+    }
+
+
 #undef MKME
 #define MKME(x,y) param.y=(float)x
-    MKME(scale,font_scale);
-    MKME(spacing,line_spacing);
+     MKME(scale,font_scale);
+     MKME(spacing,line_spacing);
      cleanup();
      setup();
-     return true;
-   }
-   return false;
+     return true; 
 }
 
 /**
@@ -284,9 +279,9 @@
 #endif
         ass_set_fonts(_ass_rend, NULL, "Sans",fc,NULL,true);
         //~ ass_set_aspect_ratio(_ass_rend, ((double)_info.width) / ((double)_info.height));
-       _ass_track = ass_read_file(_ass_lib, (char*)param.subtitleFile, NULL);
+       _ass_track = ass_read_file(_ass_lib, (char *)param.subtitleFile.c_str(), NULL);
         if(!_ass_track)
-          GUI_Error_HIG("SSA Error","Cannot read_file for *%s*",(char*)param.subtitleFile);
+          GUI_Error_HIG("SSA Error","Cannot read_file for *%s*",param.subtitleFile.c_str());
         return 1;
 }
 
@@ -327,6 +322,124 @@
             return true;
 }
 /**
+ * \fn mergeOneImage
+ * \brief merge one partial sub into the final image
+ * @param img
+ * @param target
+ * @return 
+ */
+
+static int clipWindow(int original, int offset,int targetSize)
+{
+    int r=  original;
+    int tail=offset+original;
+    if(tail > targetSize)
+    {
+        r=targetSize-offset;
+    }
+    return r;
+}
+
+bool subAss::mergeOneImage(ASS_Image *img,ADMImage *target)
+{
+    uint8_t y, u, v, opacity;
+    uint32_t  j, k, l, val;
+    int32_t orig_u, orig_v,klong,newu,newv;
+    uint8_t orig_y;
+    uint8_t *bitmap, *ydata, *udata, *vdata;
+
+    
+    
+    //  printf("Image is %d x %d \n",img->w, img->h);
+    y = rgba2y(img->color);
+    u = rgba2u(img->color);
+    v = rgba2v(img->color);
+
+    opacity = 255 - _a(img->color);
+
+    uint8_t *planes3;
+    int      pitches3;
+
+    target->GetPitches(pitches);
+    target->GetWritePlanes(planes);
+
+    uint32_t x=img->dst_x;
+    ydata = planes0+pitches0*( param.topMargin+img->dst_y)+x;
+
+    x>>=1;
+    udata = planes1+pitches1*((param.topMargin+img->dst_y)/2)+x;
+    vdata = planes2+pitches2*((param.topMargin+img->dst_y)/2)+x;
+   
+    
+    
+    bitmap = img->bitmap;    
+    
+    int topH,topW;
+    
+    // -- clip height --
+    topH=clipWindow(img->h, param.topMargin+img->dst_y,target->_height);    
+    if(topH<0)
+    {
+        ADM_warning("Subtitle outside of video-h\n");
+        return false;
+    }
+    //-- clip width--
+    topW=clipWindow(img->w, img->dst_x,target->_width);    
+    if(topW<0)
+    {
+        ADM_warning("Subtitle outside of video-w\n");
+        return false;
+    }
+    
+    
+    // now go
+    for(int i = 0; i < topH; ++i)
+    {
+            for(j = 0; j < topW; ++j)
+            {
+                    k = *(bitmap+j) * opacity / 255; // Alpha Channel
+                    orig_y = *(ydata+j);
+                    *(ydata+j) = (k*y + (255-k)*orig_y) / 255;
+            }
+
+            bitmap += img->stride;
+            ydata += pitches0;
+    }
+    // Now do u & v
+    bitmap = img->bitmap;
+
+    newu=u-128;
+    newv=v-128;
+
+    for(int i = 0; i < (topH-1); i += 2)
+    {
+            for(j = 0, l = 0; j < (topW-1); j += 2, ++l)
+            {
+                    val = 0;
+                    val += *(bitmap + j);
+                    val += *(bitmap + j + 1);
+                    val += *(bitmap + img->stride + j);
+                    val += *(bitmap + img->stride + j + 1);
+                    val >>= 2;
+
+                    k = val * opacity / 255;
+                    orig_u = *(udata+l);
+                    orig_v = *(vdata+l);
+
+                    orig_u=( k*u+(255-k)*orig_u)/255;
+                    orig_v=( k*v+(255-k)*orig_v)/255;
+                    *(udata+l) = orig_u;
+                    *(vdata+l) = orig_v;
+            }
+
+            bitmap += img->stride << 1;
+            udata += pitches1;
+            vdata += pitches2;
+    }
+    return true;
+}
+
+/**
     \fn getNextFrame
 */
 bool subAss::getNextFrame(uint32_t *fn,ADMImage *image)
@@ -337,11 +450,8 @@
         return false;
     }
 
-        uint32_t  i, j, k, l, val;
-        uint8_t y, u, v, opacity;
-        int32_t orig_u, orig_v,klong,newu,newv;
-        uint8_t orig_y;
-        uint8_t *bitmap, *ydata, *udata, *vdata;
+        
+        
 
 
        /* copy source to image */
@@ -368,76 +478,10 @@
         ASS_Image *img = ass_render_frame(_ass_rend, _ass_track, now,&changed);
         //printf("Time is now %d ms\n",now);
 
-        while(img) {
-                  //  printf("Image is %d x %d \n",img->w, img->h);
-                  y = rgba2y(img->color);
-                  u = rgba2u(img->color);
-                  v = rgba2v(img->color);
-
-                  opacity = 255 - _a(img->color);
-
-
-
-                  uint8_t *planes3;
-                  uint32_t pitches3;
-
-                  image->GetPitches(pitches);
-                  image->GetWritePlanes(planes);
-
-                  uint32_t x=img->dst_x;
-                  ydata = planes0+pitches0*( param.topMargin+img->dst_y)+x;
-
-                  x>>=1;
-                  udata = planes1+pitches1*((param.topMargin+img->dst_y)/2)+x;
-                  vdata = planes2+pitches2*((param.topMargin+img->dst_y)/2)+x;
-
-                  // do y
-                  bitmap = img->bitmap;
-                  for(i = 0; i < img->h; ++i)
-                  {
-                          for(j = 0; j < img->w; ++j)
-                          {
-                                  k = *(bitmap+j) * opacity / 255;
-                                  orig_y = *(ydata+j);
-                                  *(ydata+j) = (k*y + (255-k)*orig_y) / 255;
-                          }
-
-                          bitmap += img->stride;
-                          ydata += pitches0;
-                  }
-                  // Now do u & v
-                  bitmap = img->bitmap;
-
-                  newu=u-128;
-                  newv=v-128;
-
-                  for(i = 0; i < img->h; i += 2)
-                  {
-                          for(j = 0, l = 0; j < img->w; j += 2, ++l)
-                          {
-                                  val = 0;
-                                  val += *(bitmap + j);
-                                  val += *(bitmap + j + 1);
-                                  val += *(bitmap + img->stride + j);
-                                  val += *(bitmap + img->stride + j + 1);
-                                  val >>= 2;
-
-                                  k = val * opacity / 255;
-                                  orig_u = *(udata+l);
-                                  orig_v = *(vdata+l);
-
-                                  orig_u=( k*u+(255-k)*orig_u)/255;
-                                  orig_v=( k*v+(255-k)*orig_v)/255;
-                                  *(udata+l) = orig_u;
-                                  *(vdata+l) = orig_v;
-                          }
-
-                          bitmap += img->stride << 1;
-                          udata += pitches1;
-                          vdata += pitches2;
-                  }
-
-                  img = img->next;
+        while(img) 
+        {
+            mergeOneImage(img,image);
+            img = img->next;
         }
         return true;
 }

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/ass_ssa.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/ass_ssa.h Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/ass_ssa_desc.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/ass_ssa_desc.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp Changed

@@ -14,7 +14,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-
+#include <string>
 #ifndef AVS_WINE_BINARY_PATH
 #error "AVS_WINE_BINARY_PATH not set!!!"
 #endif
@@ -58,7 +58,7 @@
  * several functions for realize link of objects
  */
 WINE_LOADER *find_object(int order,
-                         char *avs_loader, char *avs_script,
+                         const char *avs_loader, const char *avs_script,
                          time_t script_ctime, time_t script_mtime,
                          FilterInfo *input_info,
                          bool *full)
@@ -71,9 +71,9 @@
     if (res->order == order)
     {
       // after we check other params
-      if (!strcmp((char*)res->param.avs_loader, avs_loader) &&
+      if (!strcmp((char*)res->param.avs_loader.c_str(), avs_loader) &&
           (!avs_script ||
-           !strcmp((char*)res->param.avs_script, avs_script)) &&
+           !strcmp((char*)res->param.avs_script.c_str(), avs_script)) &&
           res->input_info.width == input_info->width &&
           res->input_info.height == input_info->height &&
           res->param.script_ctime == script_ctime &&
@@ -349,7 +349,7 @@
   return NULL;
 }
 
-bool wine_start(char *wine_app, char *avsloader, AVS_PIPES *avs_pipes, int pipe_timeout)
+bool wine_start(const char *wine_app, const char *avsloader, AVS_PIPES *avs_pipes, int pipe_timeout)
 {
   char snameMAX_PATH;
   struct stat st;
@@ -435,7 +435,7 @@
 }
 
 bool avs_start(FilterInfo *info, FilterInfo *avisynth_info,
-               char *fname, AVS_PIPES *avs_pipes, PITCH_DATA *pd_pipe_source, PITCH_DATA *pd_avsloader)
+               const char *fname, AVS_PIPES *avs_pipes, PITCH_DATA *pd_pipe_source, PITCH_DATA *pd_avsloader)
 {
  DEBUG_PRINTF("avsfilter : avs_start()\n");
  DEBUG_PRINTF("avsfilter : %X %X %s %X\n",
@@ -576,7 +576,7 @@
   static char bufMAXPATHLEN;
 
   snprintf((char *)buf, MAXPATHLEN, "wine_app : %s\n loader : %s\n script : %s\npipe timeout %d\n",
-           param.wine_app, param.avs_loader, param.avs_script, param.pipe_timeout);
+           param.wine_app.c_str(), param.avs_loader.c_str(), param.avs_script.c_str(), param.pipe_timeout);
   return buf;
 }
 
@@ -589,13 +589,18 @@
  print_objects();
 
 #define PX(x) &(param.x)
- diaElemFile wine_app(0,(char**)PX(wine_app),
+std::string pWineApp=std::string(param.wine_app);
+std::string pLoaderFile=std::string(param.avs_loader);
+std::string pAvsScript=std::string(param.avs_script);
+ 
+ 
+ diaElemFile wine_app(0,pWineApp,
                       QT_TR_NOOP("_wine app file:"), NULL,
                       QT_TR_NOOP("Select wine filenamewine/cedega/etc."));
- diaElemFile loaderfile(0,(char**)PX(avs_loader),
+ diaElemFile loaderfile(0,pLoaderFile,
                         QT_TR_NOOP("_loader file:"), NULL,
                         QT_TR_NOOP("Select loader filenameavsload.exe"));
- diaElemFile avsfile(0,(char**)PX(avs_script),
+ diaElemFile avsfile(0,pAvsScript,
                      QT_TR_NOOP("_avs file:"), NULL,
                      QT_TR_NOOP("Select avs filename*.avs"));
  diaElemUInteger pipe_timeout(PX(pipe_timeout),QT_TR_NOOP("_pipe timeout:"),1,30);
@@ -605,16 +610,20 @@
  if( diaFactoryRun(QT_TR_NOOP("AvsFilter config"), 4, elems))
  {
   bool res = false;
-
+    param.wine_app=ADM_strdup(pWineApp.c_str()); // 3x memleak
+    param.avs_loader=ADM_strdup(pLoaderFile.c_str());
+    param.avs_script=ADM_strdup(pAvsScript.c_str());
+  
+  
   DEBUG_PRINTF("avsfilter : configure before SetParameters\n");
 
   // if script/loader names are exist, then taste config
-  if (param.avs_loader && strlen((const char*)param.avs_loader) &&
-      param.avs_script && strlen((const char*)param.avs_script) &&
-      param.wine_app && strlen((const char*)param.wine_app))
+  if (param.avs_loader.size() &&
+      param.avs_script.size() &&
+      param.wine_app.size())
   {
    struct stat st;
-   if (stat((char*)param.avs_script, &st) != 0)
+   if (stat((char*)param.avs_script.c_str(), &st) != 0)
    {
     DEBUG_PRINTF_RED("avsfilter : cannot stat script file\n");
     return 0;
@@ -629,7 +638,7 @@
     avsfilter_config_jserialize(prefs_name, &param);
 
    DEBUG_PRINTF("avsfilter : configure before save prefs %s%s\n",
-                param.avs_script, param.avs_loader);
+                param.avs_script.c_str(), param.avs_loader.c_str());
    // if setparameters are ok and (therefore) avs_script and avs_loader exist
    // we store this parameters in filter preferences
    DEBUG_PRINTF("avsfilter : after save prefs info : frameIncrement %lu totalDuration %llu\n",
@@ -651,8 +660,8 @@
 
   // find corresponding loader/script
   WINE_LOADER *loader = find_object(order,
-                                    (char*)newparam->avs_loader,
-                                    (char*)newparam->avs_script,
+                                    newparam->avs_loader.c_str(),
+                                    newparam->avs_script.c_str(),
                                     newparam->script_ctime, newparam->script_mtime,
                                     &info,
                                     &full_exact);
@@ -665,10 +674,10 @@
     loader->avs_pipes1.flags = O_WRONLY;
     loader->avs_pipes2.flags = O_WRONLY;
     loader->RefCounter = 0;
-    loader->param.avs_script = NULL;
-    loader->param.avs_loader = NULL;
+    loader->param.avs_script = std::string("");
+    loader->param.avs_loader = std::string("");
 
-    if (!wine_start((char*)newparam->wine_app, (char*)newparam->avs_loader, loader->avs_pipes, newparam->pipe_timeout))
+    if (!wine_start(newparam->wine_app.c_str(), newparam->avs_loader.c_str(), loader->avs_pipes, newparam->pipe_timeout))
     {
       DEBUG_PRINTF_RED("avsfilter : wine_start unsuccessful start!\n");
       delete loader;
@@ -692,7 +701,7 @@
     DEBUG_PRINTF("avsfilter : SetParameters !full_exact\n");
 
     // matched only order (need reload with new script/geometry/etc)
-    if (!avs_start(&info, &loader->output_info, (char*)newparam->avs_script, loader->avs_pipes, &pd_pipe_source, &pd_avsloader))
+    if (!avs_start(&info, &loader->output_info, newparam->avs_script.c_str(), loader->avs_pipes, &pd_pipe_source, &pd_avsloader))
     {
       DEBUG_PRINTF_RED("avsfilter : SetParameters fail avs_start\n");
       delete_object(loader);
@@ -702,8 +711,8 @@
     DEBUG_PRINTF("avsfilter : SetParameters avs_start ok\n");
     loader->RefCounter = 0;
     memcpy(&loader->input_info, &info, sizeof(info));
-    loader->param.avs_loader = ADM_strdup ((char*)newparam->avs_loader);
-    loader->param.avs_script = ADM_strdup ((char*)newparam->avs_script);
+    loader->param.avs_loader = newparam->avs_loader;
+    loader->param.avs_script = newparam->avs_script;
     loader->param.script_ctime = newparam->script_ctime; // store timestamp
     loader->param.script_mtime = newparam->script_mtime;
   }
@@ -773,7 +782,7 @@
                info.frameIncrement, info.totalDuration);
 
   DEBUG_PRINTF("avsfilter : wine_app %s avsloader %s avsscript %s\n",
-               param.wine_app, param.avs_loader, param.avs_script);
+               param.wine_app.c_str(), param.avs_loader.c_str(), param.avs_script.c_str());
 
   if (!SetParameters(&param))
   {

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam.h Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam_desc.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam_desc.cpp Changed

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avsload_pipe_binary.tar.bz2 Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avspipecomm.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avspipecomm.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avspipecomm.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/avsfilter/avspipecomm.h Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/fastConvolution/Gauss.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/fastConvolution/Gauss.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/fastConvolution/Mean.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/fastConvolution/Mean.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/fastConvolution/Median.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/fastConvolution/Median.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/fastConvolution/Sharpen.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/fastConvolution/Sharpen.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFluxAsm.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFluxAsm.cpp Changed

@@ -195,7 +195,7 @@
 "psubusw %%mm1, %%mm2 \n\t" \
 "psubusw %%mm0, %%mm3 \n\t" \
 "por     %%mm3, %%mm2				\n\t" /* mm2 = abs diff */ \
-"pcmpgtw "Mangle(threshold)", %%mm2	\n\t "/* Compare with threshold */ \
+"pcmpgtw " Mangle(threshold)", %%mm2	\n\t "/* Compare with threshold */ \
 "paddw   %%mm2, %%mm6	\n\t	"/* -1 from counter if not within */ \
 "pandn   %%mm1, %%mm2 \n\t" \
 "paddw   %%mm2, %%mm5	\n\t" /* Add to sum */ 
@@ -238,31 +238,31 @@
 UNUSED_ARG(_l_prev_pels);
 UNUSED_ARG(_l_next_pels);
 asm(
-"                mov "Mangle(_l_currp)", "REG_si" \n\t"
-"                mov "Mangle(_l_destp)", "REG_di" \n\t"
+"                mov " Mangle(_l_currp)", " REG_si" \n\t"
+"                mov " Mangle(_l_destp)", " REG_di" \n\t"
 "                pxor %%mm7,%%mm7 \n\t"
 " \n\t"
 "yloop%=:  \n\t"
 "                # Copy first dword \n\t"
 " \n\t"
-"                mov ("REG_si"),"REG_ax" \n\t"
-"                mov "REG_ax",("REG_di") \n\t"
+"                mov (" REG_si")," REG_ax" \n\t"
+"                mov " REG_ax",(" REG_di") \n\t"
 " \n\t"
-"                mov $4,"REG_cx" \n\t"
+"                mov $4," REG_cx" \n\t"
 " \n\t"
 "xloop%=:  \n\t"
 "                # Get current pels, init sum and counter \n\t"
 " \n\t"
-"                movd ("REG_si","REG_cx"),%%mm0 \n\t"
+"                movd (" REG_si"," REG_cx"),%%mm0 \n\t"
 "                punpcklbw %%mm7,%%mm0 \n\t"
 "                movq %%mm0,%%mm5 \n\t"
-"                movq "Mangle(_l_counter_init)",%%mm6 \n\t"
+"                movq " Mangle(_l_counter_init)",%%mm6 \n\t"
 " \n\t"
 "                # Middle left \n\t"
 " \n\t"
 "                movq %%mm0,%%mm1 \n\t"
 "                psllq $16,%%mm1 \n\t"
-"                movd -4("REG_si","REG_cx"),%%mm2 \n\t"
+"                movd -4(" REG_si"," REG_cx"),%%mm2 \n\t"
 "                punpcklbw %%mm7,%%mm2 \n\t"
 "                psrlq $48,%%mm2 \n\t"
 "                por %%mm2,%%mm1 \n\t"
@@ -273,7 +273,7 @@
 " \n\t"
 "                movq %%mm0,%%mm1 \n\t"
 "                psrlq $16,%%mm1 \n\t"
-"                movd 4("REG_si","REG_cx"),%%mm2 \n\t"
+"                movd 4(" REG_si"," REG_cx"),%%mm2 \n\t"
 "                punpcklbw %%mm7,%%mm2 \n\t"
 "                psllq $48,%%mm2 \n\t"
 "                por %%mm2,%%mm1 \n\t"
@@ -282,12 +282,12 @@
 " \n\t"
 "                # Top left \n\t"
 " \n\t"
-"                mov "REG_si","REG_ax" \n\t"
-"                sub "Mangle(_l_src_pitch)", "REG_ax" \n\t"
-"                movd ("REG_ax","REG_cx"),%%mm1 \n\t"
+"                mov " REG_si"," REG_ax" \n\t"
+"                sub " Mangle(_l_src_pitch)", " REG_ax" \n\t"
+"                movd (" REG_ax"," REG_cx"),%%mm1 \n\t"
 "                punpcklbw %%mm7,%%mm1 \n\t"
 "                psllq $16,%%mm1 \n\t"
-"                movd -4("REG_ax","REG_cx"),%%mm2 \n\t"
+"                movd -4(" REG_ax"," REG_cx"),%%mm2 \n\t"
 "                punpcklbw %%mm7,%%mm2 \n\t"
 "                psrlq $48,%%mm2 \n\t"
 "                por %%mm2,%%mm1 \n\t"
@@ -296,7 +296,7 @@
 " \n\t"
 "                # Top centre \n\t"
 " \n\t"
-"                movd ("REG_ax","REG_cx"),%%mm1 \n\t"
+"                movd (" REG_ax"," REG_cx"),%%mm1 \n\t"
 "                punpcklbw %%mm7,%%mm1 \n\t"
 " \n\t"
 CHECK_AND_ADD(spat_thresh)
@@ -304,7 +304,7 @@
 "                # Top right \n\t"
 " \n\t"
 "                psrlq $16,%%mm1 \n\t"
-"                movd 4("REG_ax","REG_cx"),%%mm2 \n\t"
+"                movd 4(" REG_ax"," REG_cx"),%%mm2 \n\t"
 "                punpcklbw %%mm7,%%mm2 \n\t"
 "                psllq $48,%%mm2 \n\t"
 "                por %%mm2,%%mm1 \n\t"
@@ -313,12 +313,12 @@
 " \n\t"
 "                # Bottom left \n\t"
 " \n\t"
-"                mov "REG_si","REG_ax" \n\t"
-"                add "Mangle(_l_src_pitch)", "REG_ax" \n\t"
-"                movd ("REG_ax","REG_cx"),%%mm1 \n\t"
+"                mov " REG_si"," REG_ax" \n\t"
+"                add " Mangle(_l_src_pitch)", " REG_ax" \n\t"
+"                movd (" REG_ax"," REG_cx"),%%mm1 \n\t"
 "                punpcklbw %%mm7,%%mm1 \n\t"
 "                psllq $16,%%mm1 \n\t"
-"                movd -4("REG_ax","REG_cx"),%%mm2 \n\t"
+"                movd -4(" REG_ax"," REG_cx"),%%mm2 \n\t"
 "                punpcklbw %%mm7,%%mm2 \n\t"
 "                psrlq $48,%%mm2 \n\t"
 "                por %%mm2,%%mm1 \n\t"
@@ -327,7 +327,7 @@
 " \n\t"
 "                # Bottom centre \n\t"
 " \n\t"
-"                movd ("REG_ax","REG_cx"),%%mm1 \n\t"
+"                movd (" REG_ax"," REG_cx"),%%mm1 \n\t"
 "                punpcklbw %%mm7,%%mm1 \n\t"
 " \n\t"
 CHECK_AND_ADD(spat_thresh)
@@ -335,7 +335,7 @@
 "                # Bottom right \n\t"
 " \n\t"
 "                psrlq $16,%%mm1 \n\t"
-"                movd 4("REG_ax","REG_cx"),%%mm2 \n\t"
+"                movd 4(" REG_ax"," REG_cx"),%%mm2 \n\t"
 "                punpcklbw %%mm7,%%mm2 \n\t"
 "                psllq $48,%%mm2 \n\t"
 "                por %%mm2,%%mm1 \n\t"
@@ -344,19 +344,19 @@
 " \n\t"
 "                # Previous frame \n\t"
 " \n\t"
-"                mov "Mangle(_l_prevp)", "REG_ax" \n\t"
-"                movd ("REG_ax","REG_cx"),%%mm1 \n\t"
+"                mov " Mangle(_l_prevp)", " REG_ax" \n\t"
+"                movd (" REG_ax"," REG_cx"),%%mm1 \n\t"
 "                punpcklbw %%mm7,%%mm1 \n\t"
-"                movq %%mm1, "Mangle(_l_prev_pels)" \n\t"
+"                movq %%mm1, " Mangle(_l_prev_pels)" \n\t"
 " \n\t"
 CHECK_AND_ADD(temp_thresh)
 " \n\t"
 "                # Next frame \n\t"
 " \n\t"
-"                mov "Mangle(_l_nextp)", "REG_ax" \n\t"
-"                movd ("REG_ax","REG_cx"),%%mm1 \n\t"
+"                mov " Mangle(_l_nextp)", " REG_ax" \n\t"
+"                movd (" REG_ax"," REG_cx"),%%mm1 \n\t"
 "                punpcklbw %%mm7,%%mm1 \n\t"
-"                movq %%mm1, "Mangle(_l_next_pels)" \n\t"
+"                movq %%mm1, " Mangle(_l_next_pels)" \n\t"
 " \n\t"
 CHECK_AND_ADD(temp_thresh)
 " \n\t"
@@ -365,22 +365,22 @@
 "                psllw $1,%%mm5                                  # sum *= 2 \n\t"
 "                paddw %%mm6,%%mm5                               # sum += count \n\t"
 " \n\t"
-"                pmaddwd "Mangle(_l_indexer)",%%mm6                  # Make index into lookup \n\t"
+"                pmaddwd " Mangle(_l_indexer)",%%mm6                  # Make index into lookup \n\t"
 "                movq %%mm6,%%mm1 \n\t"
 "                punpckhdq %%mm6,%%mm6 \n\t"
-"                mov "Mangle(scaletab_MMX)", "REG_ax" \n\t"
+"                mov " Mangle(scaletab_MMX)", " REG_ax" \n\t"
 "                paddd %%mm6,%%mm1 \n\t"
-"                movd %%mm1,"REG_bx" \n\t"
+"                movd %%mm1," REG_bx" \n\t"
 " \n\t"
-"            movq ("REG_ax","REG_bx",8),%%mm2          # Do lookup \n\t"
+"            movq (" REG_ax"," REG_bx",8),%%mm2          # Do lookup \n\t"
 "            pmulhw %%mm2,%%mm5                                  # mm5 = average \n\t"
 " \n\t"
 "                # Apply smoothing only to fluctuating pels \n\t"
 " \n\t"
 "                movq %%mm0,%%mm1 \n\t"
-"                movq "Mangle(_l_prev_pels)",%%mm2 \n\t"
+"                movq " Mangle(_l_prev_pels)",%%mm2 \n\t"
 "                movq %%mm0,%%mm3 \n\t"
-"                movq "Mangle(_l_next_pels)",%%mm4 \n\t"
+"                movq " Mangle(_l_next_pels)",%%mm4 \n\t"
 " \n\t"
 "                pcmpgtw %%mm2,%%mm1                             # curr > prev \n\t"
 "                pcmpgtw %%mm4,%%mm3                             # curr > next \n\t"
@@ -399,31 +399,31 @@
 "                # Store \n\t"
 " \n\t"
 "                packuswb %%mm7,%%mm1 \n\t"
-"                movntq %%mm1,("REG_di","REG_cx") \n\t"
+"                movntq %%mm1,(" REG_di"," REG_cx") \n\t"
 " \n\t"
 "                # Advance \n\t"
 " \n\t"
-"                add $4,"REG_cx" \n\t"
-"                cmp "Mangle(_l_xmax)", "REG_cx" \n\t"
+"                add $4," REG_cx" \n\t"
+"                cmp " Mangle(_l_xmax)", " REG_cx" \n\t"
 "                jl xloop%= \n\t"
 " \n\t"
 "                # Copy last dword \n\t"
 " \n\t"
-"                mov ("REG_si","REG_cx"),"REG_ax" \n\t"
-"                mov "REG_ax",("REG_di","REG_cx") \n\t"
+"                mov (" REG_si"," REG_cx")," REG_ax" \n\t"
+"                mov " REG_ax",(" REG_di"," REG_cx") \n\t"
 " \n\t"
 "                # Next row \n\t"
 " \n\t"
-"                add "Mangle(_l_src_pitch)", "REG_si" \n\t"
-"                mov "Mangle(_l_prevp)", "REG_ax" \n\t"
-"                add "Mangle(_l_src_pitch)", "REG_ax" \n\t"
-"                mov "REG_ax", "Mangle(_l_prevp)" \n\t"
-"                mov "Mangle(_l_nextp)", "REG_bx" \n\t"
-"                add "Mangle(_l_src_pitch)", "REG_bx" \n\t"
-"                mov "REG_bx", "Mangle(_l_nextp)" \n\t"
-"                add "Mangle(_l_dst_pitch)", "REG_di" \n\t"
+"                add " Mangle(_l_src_pitch)", " REG_si" \n\t"
+"                mov " Mangle(_l_prevp)", " REG_ax" \n\t"
+"                add " Mangle(_l_src_pitch)", " REG_ax" \n\t"
+"                mov " REG_ax", " Mangle(_l_prevp)" \n\t"
+"                mov " Mangle(_l_nextp)", " REG_bx" \n\t"
+"                add " Mangle(_l_src_pitch)", " REG_bx" \n\t"
+"                mov " REG_bx", " Mangle(_l_nextp)" \n\t"
+"                add " Mangle(_l_dst_pitch)", " REG_di" \n\t"
 " \n\t"
-"                subl $1, "Mangle(ycnt)" \n\t"
+"                subl $1, " Mangle(ycnt)" \n\t"
 "                jnz yloop%= \n\t"
 " \n\t"
 //"MISMATCH: "                sfence" \n\t"

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/horizontalFlip/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/horizontalFlip/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/horizontalFlip/horizontalFlip.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/horizontalFlip/horizontalFlip.cpp Changed

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp Added

@@ -0,0 +1,399 @@
+/***************************************************************************
+
+		Put a logon on video
+
+    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 "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_vidMisc.h"
+#include "DIA_factory.h"
+#include "DIA_coreToolkit.h"
+#include "ivtcDupeRemover.h"
+#include "ivtcDupeRemover_desc.cpp"
+
+#define PERIOD 4
+#if 0
+#define aprintf printf
+#else
+#define aprintf(...) {}
+#endif
+/**
+    \class ivtcDupeRemover
+*/
+class ivtcDupeRemover : public  ADM_coreVideoFilterCached
+{
+public:
+                enum dupeState
+                {
+                    dupeSyncing,      
+                    dupeSynced,
+                    dupePassThrough
+                };
+                enum searchMode
+                {
+                    full=0,
+                    fast=1,
+                    veryFast=2
+                };
+                int             incomingNum; // Incoming frame number
+                int             currentNum;  // outgoing frame number
+                int             phaseStart;  // Frame Number of 1st frame of cycle
+                uint64_t        phaseStartPts; // its PTS
+                int             dupeOffset;  // offset of the duplicate to drop,  i.e. abs number = phaseStart+dupeOffset
+                dupeState       state;       // Current finite state machine
+                uint32_t        deltaPERIOD+1; // List of image difference
+                unsigned int    hintsPERIOD+1; // From D. Graft ivtc if used
+protected:
+                dupeRemover        configuration;
+                dupeState          searchSync();
+                bool               postProcess(ADMImage *in,ADMImage *out,uint64_t pts);
+                uint32_t           computeDelta(ADMImage *left,ADMImage *right, int threshold);
+public:
+                                   ivtcDupeRemover(ADM_coreVideoFilter *previous,CONFcouple *conf);
+                                   ~ivtcDupeRemover();
+                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 FilterInfo  *getInfo(void);                             /// Return picture parameters after this filter
+        virtual bool               getCoupledConf(CONFcouple **couples) ;     /// Return the current filter configuration
+        virtual void               setCoupledConf(CONFcouple *couples);
+        virtual bool               configure(void);                           /// Start graphical user interface
+        
+};
+
+// Add the hook to make it valid plugin
+DECLARE_VIDEO_FILTER(   ivtcDupeRemover,   // Class
+                        1,0,0,              // Version
+                        ADM_UI_ALL,         // UI
+                        VF_INTERLACING,            // Category
+                        "ivtcRemover",            // internal name (must be uniq!)
+                        "Remove IVTC dupe.",            // Display name
+                        "Remove the duplicate frames present after ivtc." // Description
+                    );
+
+// Now implements the interesting parts
+/**
+    \fn ivtcDupeRemover
+    \brief constructor
+*/
+ivtcDupeRemover::ivtcDupeRemover(  ADM_coreVideoFilter *in,CONFcouple *setup) : ADM_coreVideoFilterCached(11,in,setup)
+{
+    if(!setup || !ADM_paramLoad(setup,dupeRemover_param,&configuration))
+    {
+        // Default value
+        configuration.threshold=5;
+        configuration.show=false;
+        configuration.mode=1; // fast!
+        
+    }
+    myName="ivtcDupeRemover";
+    
+    incomingNum=0;
+    currentNum=0;
+    phaseStart=0;
+    dupeOffset=0;
+    state=dupeSyncing;
+}
+/**
+    \fn ivtcDupeRemover
+    \brief destructor
+*/
+ivtcDupeRemover::~ivtcDupeRemover()
+{
+}
+/**
+ * \fn computeDelta
+ * @param left
+ * @param right
+ * @param threshold
+ * @return 
+ */
+uint32_t ivtcDupeRemover::computeDelta(ADMImage *left,ADMImage *right, int threshold)
+{
+    if(!configuration.mode)
+        return ADMImage::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._planes0=left->_planes0;
+    refLeft._planeStride0=left->_planeStride0/scale;
+    
+    refRight._planes0=right->_planes0;
+    refRight._planeStride0=right->_planeStride0/scale;
+    
+     return ADMImage::lumaDiff(&refLeft,&refRight,threshold);
+
+    
+}
+/**
+ * \fn lookupSync
+ * \brief Try to search for a sequence
+ * @return 
+ */
+ivtcDupeRemover::dupeState ivtcDupeRemover::searchSync()
+{
+    ADMImage *imagesPERIOD+1;
+    
+    
+    aprintf("Searching sync\n");
+    
+    for(int i=0;i<(PERIOD+1);i++)
+    {
+        imagesi=vidCache->getImage(incomingNum+i);
+        if(!imagesi)
+        {
+            vidCache->unlockAll();
+            return dupeSyncing;
+        }
+        if(GetHintingData(imagesi->GetReadPtr(PLANAR_Y),hints+i))
+        {
+            hintsi=0;
+        }
+    }
+    
+    int film=0;
+    for(int i=0;i<PERIOD;i++)
+    {
+        deltai=0;
+        if((imagesi+1->Pts-imagesi->Pts)> 41000) // 24 fps
+            film++;
+    }
+    // All of it is 24 fps, pass through
+    if(film==PERIOD)
+    {
+        aprintf("It is all film\n");
+        vidCache->unlockAll();
+        return dupePassThrough;
+    }
+    // It is mixed, keep syncing
+    if(film)
+    {
+        aprintf("It is mixed fps\n");
+        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++)
+    {
+        if(imagesi && imagesi+1)
+            deltai=computeDelta(imagesi,imagesi+1,configuration.threshold);
+        else
+            deltai=0x70000000; // Big number 
+    }
+    uint32_t minDelta=0x7f000000;
+    for(int i=0;i<PERIOD;i++)
+    {
+        if(minDelta>deltai) 
+        {
+            minDelta=deltai;
+            dupeOffset=i;
+            
+        }
+    }
+    phaseStart=incomingNum;
+    phaseStartPts=images0->Pts;
+    vidCache->unlockAll();    
+    return dupeSynced;
+}
+/**
+ * \fn dupeState2string
+ * @return 
+ */
+static const char *dupeState2string(ivtcDupeRemover::dupeState state)
+{
+      const char *m="";
+      switch(state)
+            {
+                case    ivtcDupeRemover::dupeSyncing:     m="Syncing";break;
+                case    ivtcDupeRemover::dupeSynced:      m="dupeSynced";break;
+                case    ivtcDupeRemover::dupePassThrough: m="dupePassThrough";break;
+                default: ADM_assert(0);break;
+            }
+      return m;
+}
+/**
+ * 
+ * @param img
+ * @return 
+ */
+bool ivtcDupeRemover::postProcess(ADMImage *in,ADMImage *out,uint64_t newPts)
+{
+    if(in)
+    {
+        out->duplicateFull(in);
+        if(newPts!=ADM_NO_PTS)
+            out->Pts=newPts;
+        if(configuration.show)
+        {
+            char s256;
+            const char *m=dupeState2string(state);
+            out->printString(2,2,m);
+            for(int i=0;i<PERIOD;i++) 
+            {
+                sprintf(s,"Diff:%u",deltai);
+                out->printString(2,4+i,s);
+                sprintf(s,"Hint:%x",hintsi);
+                out->printString(2,11+i,s);
+            }
+            sprintf(s,"Hint:%x",hintsPERIOD);
+            out->printString(2,11+PERIOD,s);
+
+        }
+    }
+    return true;
+}
+/**
+    \fn getFrame
+    \brief Get a processed frame
+*/
+#define END_PROCESS(i,image,newPts,nextState) \
+                *fn=currentNum; \
+                currentNum++; \
+                postProcess(i,image,newPts); \
+                state=nextState; \
+                vidCache->unlockAll(); \
+                if(i) \
+                    return true; \
+                return false;
+
+
+bool ivtcDupeRemover::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    aprintf("Current state is %s\n",dupeState2string(state));
+    switch(state)
+    {
+        case dupeSynced:
+            {
+              ivtcDupeRemover::dupeState nextState=dupeSynced;
+              int count=incomingNum-phaseStart;
+              if(count>dupeOffset)
+                  count--;
+              if((incomingNum-phaseStart)==dupeOffset)
+              {
+                  aprintf("This is the dupe (%d), skipping\n",incomingNum);
+                  incomingNum++;
+              }
+              aprintf("Cound in sequence is %d\n",count);
+              ADMImage *i=vidCache->getImage(incomingNum);
+              incomingNum++;
+              if((incomingNum-phaseStart)>PERIOD)
+              {
+                  nextState=dupeSyncing;
+              }              
+              uint64_t newPts=phaseStartPts+count*41666;
+              END_PROCESS(i,image,newPts,nextState);
+              break;
+            }
+            break;
+        case dupePassThrough:   
+            {
+              ADMImage *i=vidCache->getImage(incomingNum);
+              incomingNum++;
+              if((incomingNum-phaseStart)>(PERIOD))
+                      state=dupeSyncing;
+             END_PROCESS(i,image,ADM_NO_PTS,dupePassThrough);            
+             break;
+            }
+        case dupeSyncing:
+            {
+                ivtcDupeRemover::dupeState nextState=searchSync();
+                // 1st one gets through
+                aprintf(">>State = %s, in =%d, out=%d\n",dupeState2string(nextState),incomingNum,currentNum);
+                ADMImage *i=vidCache->getImage(incomingNum);
+                if(i)
+                    aprintf(">>PTS=%s\n",ADM_us2plain(i->Pts));
+                incomingNum++;
+                END_PROCESS(i,image,ADM_NO_PTS,nextState);
+                break;
+            }          
+        default:
+              ADM_assert(0);
+
+              break;
+
+      }
+}
+/**
+    \fn getCoupledConf
+    \brief Return our current configuration as couple name=value
+*/
+bool         ivtcDupeRemover::getCoupledConf(CONFcouple **couples)
+{
+    
+    return ADM_paramSave(couples, dupeRemover_param,&configuration);
+}
+
+void ivtcDupeRemover::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, dupeRemover_param, &configuration);
+}
+
+/**
+    \fn getConfiguration
+    \brief Return current setting as a string
+*/
+const char *ivtcDupeRemover::getConfiguration(void)
+{
+    static char bfer1024;
+    
+    sprintf(bfer,"IVTC Dupe Removed : Threshold =%u",(unsigned int)configuration.threshold);
+    return bfer;
+}
+/**
+ * 
+ * @param usSeek
+ * @return 
+ */
+bool         ivtcDupeRemover::goToTime(uint64_t usSeek)
+{
+    vidCache->flush();
+    state=dupeSyncing;
+    incomingNum=0;
+    currentNum=0;
+    return previousFilter->goToTime(usSeek);
+}
+/**
+    \fn configure
+*/
+bool ivtcDupeRemover::configure( void)
+{
+
+#define PX(x) &(configuration.x)
+        diaElemUInteger   threshold(PX(threshold),QT_TR_NOOP("_Noise:"),0,255);
+        diaElemToggle     show(PX(show),QT_TR_NOOP("_Show:"));
+
+        
+        diaMenuEntry menuMode={
+                {0,      QT_TRANSLATE_NOOP("adm","Full")},
+                {1,      QT_TRANSLATE_NOOP("adm","Fast")},
+                {2,      QT_TRANSLATE_NOOP("adm","VeryFast")}
+                };
+
+        
+        
+        diaElemMenu      eMode(&configuration.mode,QT_TRANSLATE_NOOP("adm","_Frame rate change:"),3,menuMode);
+
+        diaElem *elems3={&threshold,&show,&eMode};
+        diaFactoryRun(QT_TR_NOOP("DupeRemover"),3,elems);
+        return true;
+}
+
+
+/************************************************/
+//EOF

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/CMakeLists.txt Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover.conf Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover.h Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover_desc.cpp Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ivtcDupeRemover_json.cpp Added

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp Changed

@@ -13,37 +13,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-
-#include "ADM_default.h"
-#include "ADM_coreVideoFilter.h"
-#include "logo.h"
-#include "logo_desc.cpp"
-#include "ADM_imageLoader.h"
-#include "DIA_factory.h"
-#include "DIA_coreToolkit.h"
-/**
-    \class addLogopFilter
-*/
-class addLogopFilter : public  ADM_coreVideoFilter
-{
-protected:
-                ADMImage    *myImage;
-                logo        configuration;
-                bool        reloadImage(void);
-public:
-                    addLogopFilter(ADM_coreVideoFilter *previous,CONFcouple *conf);
-                    ~addLogopFilter();
-
-        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 FilterInfo  *getInfo(void);                             /// Return picture parameters after this filter
-        virtual bool         getCoupledConf(CONFcouple **couples) ;     /// Return the current filter configuration
-		virtual void setCoupledConf(CONFcouple *couples);
-        virtual bool         configure(void);                           /// Start graphical user interface
-};
-
-// Add the hook to make it valid plugin
-DECLARE_VIDEO_FILTER(   addLogopFilter,   // Class
+#include "ADM_vidLogo.h"
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   addLogopFilter,   // Class
                         1,0,0,              // Version
                         ADM_UI_ALL,         // UI
                         VF_TRANSFORM,            // Category
@@ -52,6 +23,11 @@
                         QT_TRANSLATE_NOOP("logo","Put a logo on top of video, with alpha blending.") // Description
                     );
 
+extern bool DIA_getLogo(logo *param, ADM_coreVideoFilter *in);
+
+
+
+
 // Now implements the interesting parts
 /**
     \fn addLogopFilter
@@ -66,7 +42,7 @@
         configuration.x=0;
         configuration.y=0;
         configuration.alpha=255;
-        configuration.logo=NULL;
+        configuration.logoImageFile=std::string("");
     }
     myName="logo";
     reloadImage();
@@ -79,11 +55,11 @@
         if(myImage) delete myImage;
         myImage=NULL;
 
-        if(!configuration.logo)
+        if(!configuration.logoImageFile.size())
         {
             return false;
         }
-        myImage=createImageFromFile(configuration.logo);
+        myImage=createImageFromFile(configuration.logoImageFile.c_str());
         if(!myImage) return false;
         return true;
 }
@@ -93,8 +69,6 @@
 */
 addLogopFilter::~addLogopFilter()
 {
-    if(configuration.logo) ADM_dealloc(configuration.logo);
-    configuration.logo=NULL;
     if(myImage) delete myImage;
     myImage=NULL;
 }
@@ -111,11 +85,13 @@
         ADM_warning("logoFilter : Cannot get frame\n");
         return false;
     }
-    // do in place flip
-#if 1
     if(myImage)
-        myImage->copyToAlpha(image,configuration.x,configuration.y,configuration.alpha);
-#endif
+    {
+        if(myImage->GetReadPtr(PLANAR_ALPHA))
+            myImage->copyWithAlphaChannel(image,configuration.x,configuration.y);
+        else
+            myImage->copyToAlpha(image,configuration.x,configuration.y,configuration.alpha);
+    }
     return true;
 }
 /**
@@ -146,21 +122,7 @@
 */
 bool addLogopFilter::configure( void)
 {
-#define PX(x) &(configuration.x)
-	   diaElemFile       file(0,(char **)PX(logo),QT_TRANSLATE_NOOP("logo","_Logo (jpg file):"), NULL, QT_TRANSLATE_NOOP("logo","Select JPEG file"));
-	   diaElemUInteger   positionX(PX(x),QT_TRANSLATE_NOOP("logo","_X Position:"),0,info.width);
-	   diaElemUInteger   positionY(PX(y),QT_TRANSLATE_NOOP("logo","_Y Position:"),0,info.height);
-	   diaElemUInteger   alpha(PX(alpha),QT_TRANSLATE_NOOP("logo","_Alpha:"),0,255);
-
-	   diaElem *elems4={&file,&positionX,&positionY,&alpha};
-
-	   if( diaFactoryRun(QT_TRANSLATE_NOOP("logo","Logo"),4,elems))
-	   {
-		   if(false==reloadImage())
-            GUI_Error_HIG("Oops","Cannot load the logo");
-		   return true;
-	   }
-	   return false;
+    return DIA_getLogo(&configuration, this->previousFilter);
 }

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.h Added

@@ -0,0 +1,43 @@
+/***************************************************************************
+
+		Put a logon on video
+
+    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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "logo.h"
+#include "logo_desc.cpp"
+#include "ADM_imageLoader.h"
+#include "DIA_factory.h"
+#include "DIA_coreToolkit.h"
+/**
+    \class addLogopFilter
+*/
+class addLogopFilter : public  ADM_coreVideoFilter
+{
+protected:
+                ADMImage    *myImage;
+                logo        configuration;
+                bool        reloadImage(void);
+public:
+                    addLogopFilter(ADM_coreVideoFilter *previous,CONFcouple *conf);
+                    ~addLogopFilter();
+
+        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 FilterInfo  *getInfo(void);                             /// Return picture parameters after this filter
+        virtual bool         getCoupledConf(CONFcouple **couples) ;     /// Return the current filter configuration
+		virtual void setCoupledConf(CONFcouple *couples);
+        virtual bool         configure(void);                           /// Start graphical user interface
+};

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/CMakeLists.txt Changed

@@ -1,11 +1,20 @@
 INCLUDE(vf_plugin)
+SET(logoCommon_SRCS  ADM_vidLogo.cpp  )
+# ---------- QT4 Version ----------------
+INCLUDE(vf_plugin_qt4)
+SET(logoQT_SRCS         qt4/Q_logo.cpp )
+SET(logoQT_HEADERS      qt4/Q_logo.h)
+SET(logoQT_UI           qt4/logo)
+IF(DO_QT4)
+  INIT_VIDEO_FILTER_QT4(ADM_vf_logo${QT_LIBRARY_EXTENSION} ${logoQT_SRCS} ${logoQT_HEADERS} ${logoQT_UI} ${logoCommon_SRCS} )
+  TARGET_LINK_LIBRARIES(ADM_vf_logo${QT_LIBRARY_EXTENSION} ADM_coreImageLoader6)
+ENDIF(DO_QT4)
 
+#------------ Cli Version ----------------
+INCLUDE(vf_plugin_cli)
+SET(logoCli_SRCS cli/logo_cli.cpp)
+IF(DO_CLI)
+  INIT_VIDEO_FILTER_CLI(  ADM_vf_logoCli ${logoCli_SRCS} ${logoCommon_SRCS})
+  TARGET_LINK_LIBRARIES(ADM_vf_logoCli ADM_coreImageLoader6)
+ENDIF(DO_CLI)
 
-SET(ADM_vf_logo_SRCS ADM_vidLogo.cpp)
-
-ADD_VIDEO_FILTER(ADM_vf_logo ${ADM_vf_logo_SRCS})
-IF(DO_COMMON)
-  TARGET_LINK_LIBRARIES(ADM_vf_logo ADM_coreImageLoader6 )
-ENDIF(DO_COMMON)
-INIT_VIDEO_FILTER(ADM_vf_logo)
-INSTALL_VIDEO_FILTER(ADM_vf_logo)

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/cli Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/cli/logo_cli.cpp Added

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/logo.conf -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/logo.conf Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/logo.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/logo.h Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/logo_desc.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/logo_desc.cpp Changed

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/other.cmake Added

@@ -0,0 +1,38 @@
+INCLUDE(vf_plugin)
+
+MACRO(addDeps tgt)
+        TARGET_LINK_LIBRARIES(${tgt} ADM_libswscale)
+        TARGET_LINK_LIBRARIES(${tgt} ADM_libavcodec)
+        TARGET_LINK_LIBRARIES(${tgt} ADM_libavutil)
+ENDMACRO(addDeps tgt)
+
+SET(mpdelogoCommon_SRCS 
+ADM_vidMPdelogo.cpp
+DIA_flyMpDelogo.cpp
+)
+# ---------- QT4 Version ----------------
+INCLUDE(vf_plugin_qt4)
+SET(mpdelogoQT_SRCS  qt4/Q_mpdelogo.cpp)
+SET(mpdelogoQT_HEADERS  qt4/Q_mpdelogo.h)
+SET(mpdelogoQT_UI    qt4/mpdelogo)
+IF(DO_QT4)
+  INIT_VIDEO_FILTER_QT4(ADM_vf_mpdelogo${QT_LIBRARY_EXTENSION} ${mpdelogoQT_SRCS} ${mpdelogoQT_HEADERS} ${mpdelogoQT_UI} ${mpdelogoCommon_SRCS})
+  addDeps(ADM_vf_mpdelogo${QT_LIBRARY_EXTENSION})
+ENDIF(DO_QT4)
+# /QT4
+
+
+#------------- Gtk Version ---------------
+#INCLUDE(vf_plugin_gtk)
+#SET(mpdelogoGtk_SRCS gtk/DIA_mpdelogo.cpp)
+#INIT_VIDEO_FILTER_GTK(ADM_vf_mpdelogoGtk ${mpdelogoGtk_SRCS} ${mpdelogoCommon_SRCS})
+
+#------------ Cli Version ----------------
+INCLUDE(vf_plugin_cli)
+SET(mpdelogoCli_SRCS cli/DIA_mpdelogo.cpp)
+IF(DO_CLI)
+  INIT_VIDEO_FILTER_CLI(  ADM_vf_mpdelogoCli ${mpdelogoCli_SRCS} ${mpdelogoCommon_SRCS})
+  addDeps(ADM_vf_mpdelogoCli)
+ENDIF(DO_CLI)
+##%%%%%%%%%%%%%%%%%%
+

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4 Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/DIA_flyLogo.h Added

@@ -0,0 +1,45 @@
+/***************************************************************************
+    copyright            : (C) 2011 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 "logo.h"
+/**
+    \class flyLogo
+*/
+
+class flyLogo : public FLY_DIALOG_TYPE
+{
+  
+  public:
+   logo        param;
+   bool        preview;
+  public:
+   uint8_t     processYuv(ADMImage* in, ADMImage *out);
+   uint8_t     download(void);
+   uint8_t     upload(void);
+               flyLogo (uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    void *canvas, void *slider) : 
+                FLY_DIALOG_TYPE(width, height,in,canvas, slider,true,RESIZE_AUTO) 
+                {};
+   virtual     ~flyLogo() {};
+   bool         setXy(int x,int y);
+   bool         setPreview(bool onoff)
+                {
+                    preview=onoff;
+                    return true;
+                }
+   
+};
+// EOF
+

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp Added

@@ -0,0 +1,381 @@
+/***************************************************************************
+                        Q_mpdelogo.cpp  -  description
+                             -------------------
+
+			   flyDialog for MPlayer DeLogo filter
+
+    copyright            : (C) 2004/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 "Q_logo.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_imageLoader.h"
+#include "DIA_fileSel.h"
+
+#if 1
+#define aprintf printf
+#else
+#define aprintf(...) {}
+#endif
+/**
+ * 
+ * @param z
+ * @param w
+ * @param h
+ */
+ ADM_LogoCanvas::ADM_LogoCanvas(QWidget *z, uint32_t w, uint32_t h) : ADM_QCanvas(z,w,h)
+ {
+     
+ }
+ /**
+  * 
+  */
+ ADM_LogoCanvas::~ADM_LogoCanvas()
+ {
+     
+ }
+
+/**
+ * 
+ * @param event
+ */
+void ADM_LogoCanvas::mousePressEvent(QMouseEvent * event)
+{
+    aprintf("Pressed\n");
+}
+/**
+ * 
+ * @param event
+ */
+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     
+    
+    if(x<0) x=0;
+    if(y<0) y=0;    
+    
+    aprintf("Released %d %d\n",x,y);
+    emit movedSignal(x,y);
+
+}
+/**
+ * 
+ * @param event
+ */
+void ADM_LogoCanvas::moveEvent(QMoveEvent * event)
+{
+    aprintf("Move\n");
+}
+
+/**
+ * 
+ * @param enabled
+ * @return 
+ */
+bool                Ui_logoWindow::enableLowPart(bool enabled)
+{
+    ui.spinX->setEnabled(enabled);
+    ui.spinY->setEnabled(enabled);
+    if(false==enabled)
+        ui.spinAlpha->setEnabled(enabled);
+    ui.horizontalSlider->setEnabled(enabled);
+    return true;
+}
+/**
+ * 
+ * @return 
+ */
+void                   Ui_logoWindow::imageSelect()
+{
+     
+    char buffer2048;
+    if(FileSel_SelectRead(QT_TR_NOOP("Select Logo Image"),buffer,2048,""))
+    {
+        if(tryToLoadimage(buffer))
+        {
+            myLogo->sameImage();
+        }
+    }
+}
+/**
+ * \fn tryToLoadimage
+ * @param image
+ * @return 
+ */
+bool                Ui_logoWindow::tryToLoadimage(const char *imageName)
+{
+    bool status=false;
+    if(strlen(imageName))
+    {
+        ADMImage *im2=createImageFromFile(imageName);
+        if(im2)
+        {
+            if(image) delete image;
+            image=im2;
+            imageWidth=image->GetWidth(PLANAR_Y);
+            imageHeight=image->GetHeight(PLANAR_Y);            
+            this->imageName=std::string(imageName);
+            ui.labelImage->setText(this->imageName.c_str());
+            
+            if(image->GetReadPtr(PLANAR_ALPHA))
+                ui.spinAlpha->setEnabled(false);
+            else
+                ui.spinAlpha->setEnabled(true);
+            status=true;    
+           
+        }
+    }
+    enableLowPart(status);
+    return status;
+}
+
+/**
+    \fn ctor
+*/
+
+  Ui_logoWindow::Ui_logoWindow(QWidget *parent,  logo *param, ADM_coreVideoFilter *in) 
+            : QDialog(parent)
+  {
+        uint32_t width,height;
+        ui.setupUi(this);
+        _in=in;
+        
+        image=NULL;;
+        alpha=param->alpha;
+        if(param->logoImageFile.size())
+        {
+            if(tryToLoadimage(param->logoImageFile.c_str()))
+            {
+                imageName=param->logoImageFile;
+            }
+        }
+        
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_LogoCanvas(ui.graphicsView,width,height);
+        
+        myLogo=new flyLogo( width, height,in,canvas,ui.horizontalSlider);
+        myLogo->param.x=param->x;
+        myLogo->param.y=param->y;
+        myLogo->param.alpha=param->alpha;
+        myLogo->param.logoImageFile=std::string("");
+        myLogo->_cookie=this;
+        
+        myLogo->setPreview(false);
+#define SPINENTRY(x) ui.x
+        SPINENTRY(spinX)->setMaximum(width);        
+        SPINENTRY(spinY)->setMaximum(height);
+        SPINENTRY(spinAlpha)->setMaximum(255);
+        SPINENTRY(spinAlpha)->setMinimum(0);
+        SPINENTRY(spinX)->setSingleStep(1);
+        SPINENTRY(spinY)->setSingleStep(1);
+        
+        myLogo->upload();
+        myLogo->sliderChanged();
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+        connect( ui.pushButtonSelect,SIGNAL(pressed()),this,SLOT(imageSelect()));
+#define SPINNER(x) connect( ui.x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); 
+        SPINNER(spinX);
+        SPINNER(spinY);
+        SPINNER(spinAlpha);
+        connect(canvas, SIGNAL(movedSignal(int,int)),this, SLOT(moved(int,int)));
+        myLogo->sameImage();
+        show();
+          
+  }
+/**
+    \fn sliderUpdate
+*/
+void Ui_logoWindow::sliderUpdate(int foo)
+{
+    myLogo->sliderChanged();
+}
+/**
+    \fn gather
+*/
+void Ui_logoWindow::gather(logo *param)
+{
+    myLogo->download();
+#define DUPE(x)     param->x=myLogo->param.x;
+    DUPE(x)
+    DUPE(y)
+    DUPE(alpha)
+    param->logoImageFile=imageName;
+    
+}
+/**
+    \fn dtor
+*/
+Ui_logoWindow::~Ui_logoWindow()
+{
+    if(myLogo) delete myLogo;
+    myLogo=NULL; 
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+/**
+    \fn valueChanged
+*/
+
+void Ui_logoWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    myLogo->download();
+    myLogo->sameImage();
+    lock--;
+}
+
+/**
+ * 
+ * @param x
+ * @param y
+ */
+void Ui_logoWindow::moved(int x,int y)
+{
+      if(lock) return;
+      lock++;
+      myLogo->setXy(x,y);
+      myLogo->sameImage();      
+      lock--;
+}
+/**
+ * 
+ * @param x
+ */
+ void Ui_logoWindow::preview(int x)
+ {
+     if(x==Qt::Checked)
+     {
+         myLogo->setPreview(true);
+         myLogo->sameImage();
+     }
+     else
+     {
+         myLogo->setPreview(false);
+         myLogo->sameImage();
+     }
+ }
+
+/**
+ * 
+ * @param x
+ * @param y
+ * @return 
+ */
+bool flyLogo::setXy(int x,int y)
+{
+    if(x<0) x=0;
+    if(y<0) y=0;
+    param.x= x;
+    param.y= y;      
+    upload();
+    return true;
+}
+
+//************************
+/**
+    \fn upload
+*/
+uint8_t flyLogo::upload(void)
+{
+
+    Ui_logoWindow *parent=(Ui_logoWindow *)this->_cookie;
+#define MYSPIN(x) parent->ui.x
+    MYSPIN(spinX)->setValue(param.x);
+    MYSPIN(spinY)->setValue(param.y);
+    MYSPIN(spinAlpha)->setValue(param.alpha);   
+    parent->ui.labelImage->setText(parent->imageName.c_str());
+    return 1;
+}
+/**
+        \fn download
+*/
+uint8_t flyLogo::download(void)
+{
+    Ui_logoWindow *parent=(Ui_logoWindow *)this->_cookie;
+    param.x= MYSPIN(spinX)->value();
+    param.y= MYSPIN(spinY)->value();
+    param.alpha= MYSPIN(spinAlpha)->value();
+    return true;
+}
+
+/**
+    \fn process
+*/
+uint8_t    flyLogo::processYuv(ADMImage* in, ADMImage *out)
+{
+    out->duplicate(in);
+    Ui_logoWindow *parent=(Ui_logoWindow *)this->_cookie;
+    if(!parent->image)
+        return true;
+    
+    int targetHeight=out->GetHeight(PLANAR_Y);
+    int targetWidth =out->GetWidth(PLANAR_Y);
+    
+    
+    if(param.y>targetHeight) 
+        return true;
+    if(param.x>targetWidth) 
+        return true;
+
+    ADMImage *myImage=parent->image;
+    if(myImage->GetReadPtr(PLANAR_ALPHA))
+    {
+        ADM_info("We have alpha\n");
+        myImage->copyWithAlphaChannel(out,param.x,param.y);
+    }
+    else
+        myImage->copyToAlpha(out,param.x,param.y,param.alpha);
+    return true;
+}
+
+/**
+      \fn     DIA_getMpDelogo
+      \brief  Handle delogo dialog
+*/
+
+bool DIA_getLogo(logo *param, ADM_coreVideoFilter *in)
+{
+    bool ret=false;
+
+    Ui_logoWindow dialog(qtLastRegisteredDialog(), param,in);
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=true;
+    }
+
+    qtUnregisterDialog(&dialog);
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.h Added

@@ -0,0 +1,70 @@
+#ifndef Q_mpdelogo_h
+#define Q_mpdelogo_h
+
+#include "ui_logo.h"
+#include "DIA_flyDialog.h"
+#include "ADM_image.h"
+#include "DIA_flyDialogQt4.h"
+#include "DIA_flyLogo.h"
+#include "QMouseEvent"
+/**
+ * 
+ * @return 
+ */
+class  ADM_LogoCanvas : public ADM_QCanvas
+{
+    Q_OBJECT
+protected:
+public:
+	
+                ADM_LogoCanvas(QWidget *z, uint32_t w, uint32_t h);
+	virtual ~ADM_LogoCanvas();
+        void mousePressEvent(QMouseEvent * event);
+        void mouseReleaseEvent(QMouseEvent * event);
+        void moveEvent(QMoveEvent * event);        
+
+signals:
+        void movedSignal(int newx, int newy);                
+};
+
+/**
+ * 
+ * @return 
+ */
+class Ui_logoWindow : public QDialog
+{
+	Q_OBJECT
+
+protected: 
+	int lock;
+        
+        bool                enableLowPart(bool enabled);
+        bool                tryToLoadimage(const char *image);
+public:
+        ADMImage            *image;
+        int                 imageWidth,imageHeight;
+        int                 alpha;
+
+public:
+	
+                            Ui_logoWindow(QWidget *parent, logo *param, ADM_coreVideoFilter *in);
+                            ~Ui_logoWindow();
+	Ui_logoDialog        ui;
+        ADM_coreVideoFilter *_in;
+        flyLogo             *myLogo;
+	ADM_LogoCanvas      *canvas;
+        std::string         imageName;
+public slots:
+	void                gather(logo *param);
+
+private slots:
+	void                sliderUpdate(int foo);
+	void                valueChanged(int foo);
+        void                moved(int x,int y);
+        void                preview(int x);
+        void                imageSelect();
+        
+       
+    
+};
+#endif

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui Added

@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>logoDialog</class>
+ <widget class="QDialog" name="logoDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>549</width>
+    <height>516</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Logo</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Image</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLabel" name="labelImage">
+       <property name="minimumSize">
+        <size>
+         <width>360</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QPushButton" name="pushButtonSelect">
+       <property name="text">
+        <string>Select</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>X</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QSpinBox" name="spinX">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <spacer name="spacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>110</width>
+         <height>18</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Y</string>
+       </property>
+       <property name="textFormat">
+        <enum>Qt::PlainText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QSpinBox" name="spinY">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="2" rowspan="2">
+      <spacer name="spacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>38</width>
+         <height>29</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="3" column="0" rowspan="2">
+      <widget class="QLabel" name="label_4">
+       <property name="toolTip">
+        <string>Alpha will be ignored if the image has alpha channel (png in RGB)</string>
+       </property>
+       <property name="text">
+        <string>Alpha</string>
+       </property>
+       <property name="textFormat">
+        <enum>Qt::PlainText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1" rowspan="2">
+      <widget class="QSpinBox" name="spinAlpha">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="2">
+      <spacer name="spacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>38</width>
+         <height>29</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView"/>
+   </item>
+   <item>
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>You can click in the image to set the logo approximatively</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </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>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>logoDialog</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>logoDialog</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.12.tar.gz/avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/printInfo/printInfo.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/printInfo/printInfo.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp Changed

@@ -240,7 +240,7 @@
                         {
                                 // The chosen frame doesn't match the prediction.
                                 if (predicted_metric == 0) mismatch = 0.0;
-                                else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric;
+                                else mismatch = (100.0*abs((int)predicted_metric - (int)lowest))/predicted_metric;
                                 if (mismatch < gthresh)
                                 {
                                         // It's close enough, so use the predicted one.
@@ -283,7 +283,7 @@
                                         {
                                                 // The chosen frame doesn't match the prediction.
                                                 if (predicted_metric == 0) mismatch = 0.0;
-                                                else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric;
+                                                else mismatch = (100.0*abs((int)predicted_metric - (int)lowest))/predicted_metric;
                                                 if ((int) mismatch <= gthresh)
                                                 {
                                                         // It's close enough, so use the predicted one.

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp Changed

@@ -22,7 +22,7 @@
 
 
 
-#include "ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpau.h"
+#include "ADM_coreVdpau.h"
 //
 #define ADM_INVALID_FRAME_NUM 0x80000000
 #define ADM_NB_SURFACES 3
@@ -264,11 +264,14 @@
         return false;
     }
   // Blit our image to surface
+    int      ipitches3;
     uint32_t pitches3;
     uint8_t *planes3;
-    next->GetPitches(pitches);
+    next->GetPitches(ipitches);
     next->GetReadPlanes(planes);
 
+    for(int i=0;i<3;i++) pitchesi=(uint32_t)ipitchesi;
+    
     // Put out stuff in input...
     //printf("Uploading image to surface %d\n",surfaceIndex%ADM_NB_SURFACES);
 
@@ -302,7 +305,7 @@
     if(next->refType==ADM_HW_VDPAU)
     {
         
-        struct vdpau_render_state *rndr = (struct vdpau_render_state *)next->refDescriptor.refCookie;
+        struct vdpau_render_state *rndr = (struct vdpau_render_state *)next->refDescriptor.refHwImage;
         tmpSurface=rndr->surface;
         printf("image is already vdpau %d\n",(int)tmpSurface);
     }else

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilterDeint.cpp Changed

@@ -29,7 +29,7 @@
 #include "vdpauFilterDeint.h"
 #include "vdpauFilterDeint_desc.cpp"
 
-#include "ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpau.h"
+#include "ADM_coreVdpau.h"
 //
 #define ADM_INVALID_FRAME_NUM 0x80000000
 #define ADM_NB_SURFACES 5
@@ -226,7 +226,7 @@
                                             previousFilter->getInfo()->height);
     
     if(VDP_STATUS_OK!=admVdpau::mixerCreate(previousFilter->getInfo()->width,
-                                            paddedHeight,&mixer,true)) 
+                                            paddedHeight,&mixer,true,configuration.enableIvtc)) 
     {
         ADM_error("Cannot create mixer\n");
         goto badInit;
@@ -290,6 +290,7 @@
         configuration.deintMode=ADM_KEEP_TOP;
         configuration.targetWidth=info.width;
         configuration.targetHeight=info.height;
+        configuration.enableIvtc=false;
     }
     
     myName="vdpauDeint";
@@ -319,16 +320,19 @@
                              
           };
      bool doResize=configuration.resizeToggle;
-     diaElemToggle    tResize(&(doResize),   QT_TR_NOOP("_Resize:"));
+     bool doIvtc=configuration.enableIvtc;
+     diaElemToggle    tIvtc(&(doIvtc),   QT_TR_NOOP("_Ivtc:"));
+     diaElemToggle    tResize(&(doResize),   QT_TR_NOOP("_Resize:"));     
      diaElemMenu      mMode(&(configuration.deintMode),   QT_TR_NOOP("_Deint Mode:"), 3,tMode);
      diaElemUInteger  tWidth(&(configuration.targetWidth),QT_TR_NOOP("Width :"),16,2048);
      diaElemUInteger  tHeight(&(configuration.targetHeight),QT_TR_NOOP("Height :"),16,2048);
      
-     diaElem *elems={&mMode,&tResize,&tWidth,&tHeight};
+     diaElem *elems={&mMode,&tIvtc,&tResize,&tWidth,&tHeight};
      
      if(diaFactoryRun(QT_TR_NOOP("vdpau"),sizeof(elems)/sizeof(diaElem *),elems))
      {
                 configuration.resizeToggle=(bool)doResize;
+                configuration.enableIvtc=doIvtc;
                 if(doResize)
                 {
                     info.width=configuration.targetWidth;
@@ -390,10 +394,13 @@
         return false;
     }
   // Blit our image to surface
+    int      ipitches3;
     uint32_t pitches3;
     uint8_t *planes3;
-    next->GetPitches(pitches);
+    next->GetPitches(ipitches);
     next->GetReadPlanes(planes);
+    
+    for(int i=0;i<3;i++) pitchesi=(uint32_t)ipitchesi;
 
     aprintf("Putting image in surface %d\n",(int)surface);
     // Put out stuff in input...
@@ -436,7 +443,7 @@
         img->duplicateFull(image); // increment ref count
         // get surface
         img->hwDownloadFromRef();
-        vdpau_render_state *render=(vdpau_render_state *)img->refDescriptor.refCookie;
+        vdpau_render_state *render=(vdpau_render_state *)img->refDescriptor.refHwImage;
         ADM_assert(render->refCount);
         tgt=render->surface;
         external=true;
@@ -524,7 +531,7 @@
     
        
     // ---------- Top field ------------
-    if(VDP_STATUS_OK!=admVdpau::mixerRenderWithPastAndFuture(topField, 
+    if(VDP_STATUS_OK!=admVdpau::mixerRenderFieldWithPastAndFuture(topField, 
                 mixer,
                 in,
                 outputSurface,

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/CMakeLists.txt Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint.conf -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint.conf Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint.h -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint.h Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint_desc.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint_desc.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6/verticalFlip/verticalFlip.cpp -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6/verticalFlip/verticalFlip.cpp Changed

avidemux_2.6.12.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/CMakeLists.txt Changed

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/CMakeLists.txt Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/bouncingFishEye.shader Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp Added

@@ -0,0 +1,278 @@
+/** *************************************************************************
+                    \file     shaderLoader
+                    \brief    Rotate picture
+
+   
+                    copyright            : (C) 2011 by mean
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 <string>
+#include "ADM_openGl.h"
+#define ADM_LEGACY_PROGGY
+#include "ADM_default.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "T_openGLFilter.h"
+#include "ADM_clock.h"
+#include "DIA_factory.h"
+#include "shaderLoader.h"
+#include "shaderLoader_desc.cpp"
+/**
+    \class shaderLoader
+*/
+class shaderLoader : public  ADM_coreVideoFilterQtGl
+{
+protected:
+                shaderLoaderConf params;
+                GLuint       glList;
+                ADMImage    *original;
+                bool         ready;
+                std::string  erString;
+                bool         genQuad(void);
+
+protected:
+                bool        render(ADMImage *image,ADM_PLANE plane,QGLFramebufferObject *fbo);
+public:
+                             shaderLoader(ADM_coreVideoFilter *previous,CONFcouple *conf);
+                            ~shaderLoader();
+
+        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
+};
+
+// Add the hook to make it valid plugin
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   shaderLoader,   // Class
+                        1,0,0,              // Version
+                        ADM_UI_QT4+ADM_FEATURE_OPENGL,         // UI
+                        VF_OPENGL,            // Category
+                        "shaderLoader",            // internal name (must be uniq!)
+                        "Shader Loader",            // Display name
+                        "Run an external shader program." // Description
+                    );
+
+// Now implements the interesting parts
+/**
+    \fn shaderLoader
+    \brief constructor
+*/
+shaderLoader::shaderLoader(  ADM_coreVideoFilter *in,CONFcouple *setup) : ADM_coreVideoFilterQtGl(in,setup)
+{
+        if(!setup || !ADM_paramLoad(setup,shaderLoaderConf_param,&params))
+        {
+            params.shaderFile=strdup("");
+        }
+        original=new ADMImageDefault(in->getInfo()->width,in->getInfo()->height);
+        _parentQGL->makeCurrent();
+        fboY->bind();
+        ready=true;
+       
+        printf("Compiling shader \n");
+        glProgramY = new QGLShaderProgram(_context);
+        ADM_assert(glProgramY);
+        
+        // Load the file info memory
+        int sourceSize=-1;
+        if(ADM_fileExist(params.shaderFile.c_str()))
+        {
+            sourceSize=ADM_fileSize(params.shaderFile.c_str());
+        }else
+        {
+            ADM_warning("Shader file does not exist (%s)\n",params.shaderFile.c_str());
+            ready=false;
+        }
+        if(sourceSize<5)
+        {
+            ADM_warning("File too short, needs to be at least 5 chars\n");
+            ready=false;
+        }
+        if(ready)
+        {
+            uint8_t *buffer=(uint8_t *)alloca(sourceSize+1);
+            FILE *f=fopen(params.shaderFile.c_str(),"rt");
+            if(f)
+            {
+                fread(buffer,sourceSize,1,f);
+                buffersourceSize=0;
+                fclose(f);
+                if ( !glProgramY->addShaderFromSourceCode(QGLShader::Fragment,(char *) buffer))
+                {
+                    ready=false;
+                    erString="Compiling shader failed"+std::string(glProgramY->log().toUtf8().constData());
+                    ADM_warning("Compilation failed (size=%d)\n",sourceSize);
+                }
+            }else
+            {
+                ADM_warning("Cannot open file %s\n",params.shaderFile.c_str());
+                erString=std::string("Cannot open file");
+                ready=false;
+            }
+        }
+        if ( ready && !glProgramY->link())
+        {
+            ready=false;
+            erString=std::string( glProgramY->log().toUtf8().constData());
+            ADM_warning("Link failed\n");
+        }
+
+        if ( ready && ! glProgramY->bind())
+        {
+                ready=false;
+                erString=std::string("OpenGl bind failed");
+                ADM_warning("Bind failed\n");
+        }
+        glList=glGenLists(1);
+        genQuad();
+        fboY->release();
+        _parentQGL->doneCurrent();
+}
+/**
+    \fn shaderLoader
+    \brief destructor
+*/
+shaderLoader::~shaderLoader()
+{
+    if(original) delete original;
+    original=NULL;
+    glDeleteLists(glList,1);
+
+}
+
+/**
+    \fn getFrame
+    \brief Get a processed frame
+*/
+bool shaderLoader::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    // since we do nothing, just get the output of previous filter
+    if(false==previousFilter->getNextFrame(fn,original))
+    {
+        ADM_warning("glRotate : Cannot get frame\n");
+        return false;
+    }
+    if(!ready)
+    {
+        ADM_info("OpenGl shader not loaded (%s)\n",erString.c_str());
+        image->duplicateFull(original);
+        image->printString(2,2,"Shader not loaded");
+        image->printString(2,2,erString.c_str());
+        return true;
+    }
+    _parentQGL->makeCurrent();
+    glPushMatrix();
+    // size is the last one...
+    fboY->bind();
+
+    glProgramY->setUniformValue("myTextureU", 1); 
+    glProgramY->setUniformValue("myTextureV", 2); 
+    glProgramY->setUniformValue("myTextureY", 0); 
+    glProgramY->setUniformValue("myResolution", (GLfloat)info.width,(GLfloat)info.height); 
+    
+    glProgramY->setUniformValue("pts", (GLfloat)original->Pts); 
+
+    uploadAllPlanes(original);
+
+    render(image,PLANAR_Y,fboY);
+
+    downloadTextures(image,fboY);
+
+    fboY->release();
+    firstRun=false;
+    glPopMatrix();
+    _parentQGL->doneCurrent();
+    image->copyInfo(original);
+    return true;
+}
+/**
+    \fn getCoupledConf
+    \brief Return our current configuration as couple name=value
+*/
+bool         shaderLoader::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, shaderLoaderConf_param,&params);
+}
+
+void shaderLoader::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, shaderLoaderConf_param, &params);
+}
+/**
+    \fn getConfiguration
+    \brief Return current setting as a string
+*/
+const char *shaderLoader::getConfiguration(void)
+{
+    static char st200;
+    snprintf(st,199,"Shader Loader %s",params.shaderFile.c_str());
+    return st;
+}
+
+/**
+    \fn configure
+*/
+bool shaderLoader::configure( void) 
+{
+    diaElemFile shader(0,params.shaderFile,"ShaderFile to load");    
+    diaElem *elems={&shader};
+     
+     if(diaFactoryRun(QT_TR_NOOP("ShaderLoader"),sizeof(elems)/sizeof(diaElem *),elems))
+     {
+                return true;
+     }
+     return false;
+}
+/**
+ * 
+ * @return 
+ */
+bool shaderLoader::genQuad(void)
+{
+  int width=info.width;
+  int height=info.height;
+
+#define POINT(a,b)  glTexCoord2i(a, b);glVertex2i(a, b);  
+  
+  glDeleteLists(glList,1);
+  glNewList(glList,GL_COMPILE);
+  glBegin(GL_QUADS);
+    int x=0,y=0;
+
+    POINT(0,0);
+    POINT(width,0);
+    POINT(width,height);
+    POINT(0,height);
+
+  glEnd();
+  glEndList();
+  return true;
+}
+
+
+/**
+    \fn render
+*/
+bool shaderLoader::render(ADMImage *image,ADM_PLANE plane,QGLFramebufferObject *fbo)
+{
+    int width=image->GetWidth(plane);
+    int height=image->GetHeight(plane);
+
+    glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
+	glViewport(0, 0, width, height);
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glOrtho(0, width, 0, height, -1, 1);
+    glCallList(glList);
+
+    return true;
+}
+//EOF

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.h Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader1.shader Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader2.shader Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaderLoader.conf Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaderLoader.h Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaderLoader_desc.cpp Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaderLoader_json.cpp Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaders Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaders/bump.shader Added

@@ -0,0 +1,43 @@
+#extension GL_ARB_texture_rectangle: enable
+uniform sampler2DRect myTextureY; // tex unit 0
+uniform sampler2DRect myTextureU; // tex unit 1
+uniform sampler2DRect myTextureV; // tex unit 2
+uniform float pts; // time in us
+uniform vec2  myResolution; // 
+const vec2 half_vec=vec2(0.5,0.5);
+const float PI = 3.1415926535;
+ 
+void main()
+{
+  float aperture = 178.0;
+  float apertureHalf = 0.5 * aperture * (PI / 180.0);
+  float maxFactor = sin(apertureHalf)*3*cos((pts/3000000.)*PI);
+  if(maxFactor<0)
+  {
+               maxFactor=-maxFactor; // fabs ? 
+  }
+  
+  vec2 uv;
+  vec2 xy =  2*gl_TexCoord0.xy /myResolution -vec2(1.,1.);
+  float d = length(xy);
+  if (d < (2.0-maxFactor))
+  {
+    d = length(xy * maxFactor);
+    float z = sqrt(1.0 - d * d);
+    float r = atan(d, z) / PI;
+    float phi = atan(xy.y, xy.x);
+    
+    uv.x = r * cos(phi) + 0.5;
+    uv.y = r * sin(phi) + 0.5;
+    uv=uv*myResolution;
+  }
+  else
+  {
+    uv = gl_TexCoord0.xy ;
+  }
+  vec4 cY = texture2DRect(myTextureY, uv);
+  vec4 cU = texture2DRect(myTextureU, uv*half_vec);
+  vec4 cV = texture2DRect(myTextureV, uv*half_vec);
+  gl_FragColor = vec4(cY.r,cU.r,cV.r,1.0);
+}
+

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaders/lightning.shader Added

@@ -0,0 +1,81 @@
+//http://glslsandbox.com/e#33682.0
+#extension GL_ARB_texture_rectangle: enable
+uniform sampler2DRect myTextureY; // tex unit 0
+uniform sampler2DRect myTextureU; // tex unit 1
+uniform sampler2DRect myTextureV; // tex unit 2
+uniform vec2  myResolution;
+uniform float pts; // tex unit 2
+const vec2 half_vec=vec2(0.5,0.5);
+// Lightning
+// By: Brandon Fogerty
+// bfogerty at gmail dot com 
+// xdpixel.com
+
+float Hash( vec2 p)
+{
+     vec3 p2 = vec3(p.xy,1.0);
+    return fract(sin(dot(p2,vec3(37.1,61.7, 12.4)))*3758.5453123);
+}
+
+float noise(in vec2 p)
+{
+    vec2 i = floor(p);
+     vec2 f = fract(p);
+     f *= f*(3.0-2.0*f);
+    return mix(mix(Hash(i + vec2(0.,0.)), Hash(i + vec2(1.,0.)),f.x),
+               mix(Hash(i + vec2(0.,1.)), Hash(i + vec2(1.,1.)),f.x),
+               f.y);
+}
+
+float fbm(vec2 p)
+{
+     float v = 0.0;
+     v += noise(p*1.0) * .75;
+     v += noise(p*3.)  * .50;
+     v += noise(p*9.)  * .250;
+     v += noise(p*27.)  * .125;
+     return v;
+}
+
+
+vec4 lightning( void ) 
+{
+
+	vec2 uv = ( gl_TexCoord0.xy / myResolution.xy ) * 2.0 - 1.0;
+	uv.x *= myResolution.x/myResolution.y; 
+        uv.y -= 1.05;
+
+	//vec2 tmp_uv;
+	//tmp_uv.x = uv.y;
+	//tmp_uv.y = uv.x;
+	//uv = tmp_uv;
+	float timeVal = pts /100000.;
+
+	vec3 finalColor = vec3( 0.0 );
+	for( int i=0; i < 10; ++i )
+	{
+		float indexAsFloat = float(i);
+		float amp = 10.0 + (indexAsFloat*500.0);
+		float period = 2.0 + (indexAsFloat+2.0);
+		float thickness = mix( 0.9, 1.0, noise(uv*indexAsFloat) );
+		float t = abs( 1.0 / (sin(uv.y + fbm( uv + timeVal * period )) * amp) * thickness );
+		
+		
+		finalColor +=  t * vec3( 0.3, 0.3, .5 );
+	}
+	
+	return vec4( finalColor, 1.0 );
+
+}
+
+void main(void)
+{
+        vec2 pos = gl_TexCoord0.xy ;
+	vec4 color = lightning();
+        vec4 luma=color+texture2DRect(myTextureY,pos);
+        vec4 chromaU=texture2DRect(myTextureU,pos*half_vec);
+        vec4 chromaV=texture2DRect(myTextureV,pos*half_vec);
+        gl_FragColor = vec4(luma.r,chromaU.r,chromaV.r,1.0);
+}
+
+

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaders/ripple.shader Added

@@ -0,0 +1,36 @@
+//http://www.geeks3d.com/20091116/shader-library-2d-shockwave-post-processing-filter-glsl/
+#extension GL_ARB_texture_rectangle: enable
+uniform sampler2DRect myTextureY; // tex unit 0
+uniform sampler2DRect myTextureU; // tex unit 1
+uniform sampler2DRect myTextureV; // tex unit 2
+uniform vec2  myResolution;
+uniform float pts; // tex unit 2
+const vec2 half_vec=vec2(0.5,0.5);
+void main() 
+{ 
+  vec3 shockParams=vec3( 10.0, 0.8, myResolution.x/50); // 1- pow base, 2 - pow exponent 3- Size of the wave
+
+  vec2 pos=gl_TexCoord0.xy;
+  vec2 texCoord = pos;
+
+  float distance = distance(pos, myResolution*half_vec);
+
+  float time=pts/3000.;
+
+ if ( (distance <= (time + shockParams.z)) && 
+       (distance >= (time - shockParams.z)) ) 
+  {
+    float diff = (distance - time); 
+    float powDiff = 1.0 - pow(abs(diff*shockParams.x), 
+                                shockParams.y); 
+    float diffTime = diff  * powDiff; 
+    vec2 diffUV = normalize(pos - myResolution*half_vec); 
+    texCoord = pos + (diffUV * diffTime);
+  } 
+
+  vec3 cY = texture2DRect(myTextureY, texCoord);
+  vec3 cU = texture2DRect(myTextureU, texCoord*half_vec);
+  vec3 cV = texture2DRect(myTextureV, texCoord*half_vec);
+
+  gl_FragColor = vec4(cY.r,cU.r,cV.r,1.0);
+}

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaders/zigzag.shader Added

avidemux_2.6.13.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/zigzag.shader Added

avidemux_2.6.12.tar.gz/avidemux_plugins/CMakeLists.txt -> avidemux_2.6.13.tar.gz/avidemux_plugins/CMakeLists.txt Changed

@@ -1,27 +1,54 @@
 cmake_minimum_required(VERSION 2.6)
+SET(AVIDEMUX_API_VERSION 2.6)
 
 SET(ADM_PROJECT AdmPlugins)
+SET(PLUGINS TRUE)
 
 MESSAGE("")
 MESSAGE("#####################################")
 MESSAGE("Plugins Configure Started")
 MESSAGE("#####################################")
 MESSAGE("")
+MESSAGE(STATUS "Checking for avidemux development files ..")
+
+
+
+IF(NOT FAKEROOT)
+	SET(AVIDEMUX_FAKEROOT "")
+else(NOT FAKEROOT)
+	SET(AVIDEMUX_FAKEROOT "${FAKEROOT}/")
+endif(NOT FAKEROOT)
+
+
+
+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.")
+
 
-SET(PLUGINS TRUE)
 ########################################
 # Where is the top dir ?
 ########################################
-IF (NOT AVIDEMUX_SOURCE_DIR)
-	MESSAGE(FATAL_ERROR "Please add -DAVIDEMUX_SOURCE_DIR=path_to_avidemux_source")
-ELSE (NOT AVIDEMUX_TOP_SOURCE_DIR)
-	# We need TOP_SOURCE_DIR
-	SET(AVIDEMUX_TOP_SOURCE_DIR "${AVIDEMUX_SOURCE_DIR}" CACHE STRING "")
-ENDIF (NOT AVIDEMUX_SOURCE_DIR)
 
 # Common definitions...
-SET(CMAKE_MODULE_PATH "${AVIDEMUX_TOP_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
-include(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux/commonCmakeApplication.cmake)
+include(commonCmakeApplication)
 
 ########################################
 # Add include dirs
@@ -44,7 +71,7 @@
 ########################################
 # retrieve core config, needed to get USE_VDPAU and friends
 ########################################
-include(${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6/ADM_coreConfig.cmake)
+include(${ADM_HEADER_DIR}/ADM_coreConfig.cmake)
 
 ########################################
 # Global options
@@ -196,14 +223,14 @@
     ADD_SUBDIRECTORY(ADM_demuxers)
     ADD_SUBDIRECTORY(ADM_muxers)
     ADD_SUBDIRECTORY(ADM_autoScrips)
-    add_subdirectory(ADM_scriptEngines)
+    ADD_SUBDIRECTORY(ADM_scriptEngines)
 ENDIF(DO_COMMON)
 
 ADD_SUBDIRECTORY(ADM_videoEncoder)
 ADD_SUBDIRECTORY(ADM_videoFilters6)
 IF(DO_QT4)
         add_subdirectory(ADM_demuxers/VapourSynth)
-        add_subdirectory(ADM_scriptEngines)
+    #    add_subdirectory(ADM_scriptEngines)
         #IF(USE_OPENGL AND NOT WIN32)
         IF(USE_OPENGL )
          ADD_SUBDIRECTORY(ADM_videoFilters6_openGl)

avidemux_2.6.12.tar.gz/avidemux_plugins/pluginsPackageDebian.cmake -> avidemux_2.6.13.tar.gz/avidemux_plugins/pluginsPackageDebian.cmake Changed

@@ -1,7 +1,7 @@
 ##############################
 # DEBIAN
 ##############################
-
+include(admDebianUtils)
 SET(PLUGIN_EXT ${PLUGIN_UI})
 IF(${PLUGIN_UI} MATCHES "QT4")
         SET(PLUGIN_EXT ${QT_EXTENSION})
@@ -18,9 +18,32 @@
 ELSE(DO_SETTINGS)
 ENDIF(DO_SETTINGS)
 #
-
 # Build our deps list
-SET(DEPS "libc6 (>=2.4),libglib2.0-0 (>=2.14.0),libstdc++6 (>=4.2.1),libx11-6,  libxv1, zlib1g (>=1:1.1.4), avidemux3-core-runtime (>=${AVIDEMUX_VERSION})")
+#
+SET(DEPS "libc6 (>=2.4), libstdc++6 (>=4.2.1),libx11-6,  libxv1, zlib1g (>=1:1.1.4), avidemux3-core-runtime (>=${AVIDEMUX_VERSION})")
+IF(${PLUGIN_UI} MATCHES "COMMON")
+        # Audio decoder
+        SETDEBIANDEPS(USE_FAAD libfaad2 DEPS)
+        SETDEBIANDEPS(USE_VORBIS "libvorbis0a, libvorbisenc2, libogg0" DEPS)
+        SETDEBIANDEPS(USE_LIBOPUS libopus0 DEPS)
+        # Audio encoder
+        SETDEBIANDEPS(USE_LAME libmp3lame0 DEPS)
+        SETDEBIANDEPS(USE_FAAC libfaac0 DEPS)
+        # Audio device
+        SETDEBIANDEPS(USE_AFTEN libpulse0 DEPS)
+        # Demuxer
+        # Muxer
+        # Video Encode
+        SETDEBIANDEPS(USE_XVID libxvidcore4 DEPS)
+ENDIF(${PLUGIN_UI} MATCHES "COMMON")
+#
+#
+#
+IF((${PLUGIN_UI} MATCHES "QT4") OR (${PLUGIN_UI} MATCHES "CLI"))
+        #SETDEBIANDEPS(USE_X264 "libx264-dev" DEPS) # libx264 contains the lib revision, pull the -dev package to get the latest one
+        #SETDEBIANDEPS(USE_X265 "libx265-dev" DEPS) # libx265 contains the lib revision, pull the -dev package to get the latest one
+ENDIF((${PLUGIN_UI} MATCHES "QT4") OR (${PLUGIN_UI} MATCHES "CLI"))
+#
 # Add optional DEPS here
 SET(CPACK_DEBIAN_PACKAGE_DEPENDS "${DEPS}")
 #

avidemux_2.6.12.tar.gz/bootStrap.bash -> avidemux_2.6.13.tar.gz/bootStrap.bash Changed

@@ -1,17 +1,21 @@
 #!/bin/bash
 # Bootstrapper to semi-automatically build avidemux deb/rpm from source
-# (c) Mean 2009
+# (c) Mean 2009/2016
+#
+# By default we use qt5 now
 #
 packages_ext=""
+rebuild=0
 do_core=1
-do_cli=0
-do_gtk=0
+do_cli=1
+do_gtk=0  # Gtk is obsolete!
 do_qt4=1
 do_plugins=1
 do_asan=0
 debug=0
-qt_ext=Qt4
-export QT_SELECT=4 # default for ubuntu, harmless for others
+qt_ext=Qt5
+QT_FLAVOR="-DENABLE_QT5=True"
+export QT_SELECT=5 # default for ubuntu, harmless for others
 export O_PARAL="-j 2"
 fail()
 {
@@ -38,10 +42,14 @@
         fi
 	FAKEROOT=" -DFAKEROOT=$FAKEROOT_DIR "
         echo "Building $BUILDDIR from $SOURCEDIR with EXTRA=<$EXTRA>, DEBUG=<$DEBUG>"
-        rm -Rf ./$BUILDDIR
-        mkdir $BUILDDIR || fail mkdir
+        if  "x$rebuild" != "x1"  ; then
+                rm -Rf ./$BUILDDIR
+        fi
+        if  ! -e "$BUILDDIR"  ; then
+                mkdir $BUILDDIR || fail mkdir
+        fi
         cd $BUILDDIR 
-        cmake $PKG $FAKEROOT $QT_FLAVOR -DCMAKE_EDIT_COMMAND=vim -DAVIDEMUX_SOURCE_DIR=$TOP -DCMAKE_INSTALL_PREFIX=/usr $EXTRA $ASAN $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ
+        cmake $PKG $FAKEROOT $QT_FLAVOR -DCMAKE_EDIT_COMMAND=vim -DCMAKE_INSTALL_PREFIX=/usr $EXTRA $ASAN $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ
         make  $PARAL >& /tmp/log$BUILDDIR || fail "make, result in /tmp/log$BUILDDIR"
 	if   "x$PKG" != "x"  ; then
           $FAKEROOT_COMMAND make package DESTDIR=$FAKEROOT_DIR/tmp || fail package
@@ -82,6 +90,7 @@
         echo "  --deb             : Build deb packages"
         echo "  --tgz             : Build tgz packages"
         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"
@@ -92,7 +101,7 @@
         echo "  --without-qt4     : Dont build qt4"
         echo "  --with-plugins    : Build plugins"
         echo "  --without-plugins : Dont build plugins"
-        echo "  --enable-qt5      : Try to use qt5 instead of qt4"
+        echo "  --enable-qt4      : Try to use qt4 instead of qt5"
         echo "  --enable-asan     : Enable Clang/llvm address sanitizer"
 	echo "The end result will be in the install folder. You can then copy it to / or whatever"
         config 
@@ -119,6 +128,9 @@
          --debug)
                 debug=1
                 ;;
+         --rebuild)
+                rebuild=1
+                ;;
          --tgz)
                 packages_ext=tar.gz
                 PKG="$PKG -DAVIDEMUX_PACKAGER=tgz"
@@ -147,10 +159,10 @@
          --without-core)
                 do_core=0
              ;;
-         --enable-qt5)
-                QT_FLAVOR="-DENABLE_QT5=True"
-                export QT_SELECT=5
-                qt_ext=Qt5
+         --enable-qt4)
+                QT_FLAVOR=""
+                export QT_SELECT=4
+                qt_ext=Qt4
              ;;
          --enable-asan)
                 do_asan=1
@@ -184,6 +196,7 @@
 export TOP=$PWD
 export POSTFIX=""
 export FAKEROOT_DIR=$PWD/install
+export PARAL="$O_PARAL"
 echo "Top dir : $TOP"
 echo "Fake installation directory=$FAKEROOT_DIR"
 if  "x$debug" = "x1"  ; then echo   
@@ -201,12 +214,10 @@
 if  "x$do_core" = "x1"  ; then 
         echo "** CORE **"
         cd $TOP
-        export PARAL=""
         Process buildCore ../avidemux_core
         echo " Installing core"
         cd $TOP/buildCore${POSTFIX} 
 fi
-export PARAL="$O_PARAL"
 if  "x$do_qt4" = "x1"  ; then 
         echo "** $qt_ext **"
         cd $TOP

avidemux_2.6.12.tar.gz/bootStrapCrossMingw_w32Qt5.sh -> avidemux_2.6.13.tar.gz/bootStrapCrossMingw_w32Qt5.sh Changed

@@ -5,10 +5,13 @@
 export CROSS_PREFIX=i686-w64-mingw32
 export SDLDIR=/mingw
 export MINGW=/mingw
+export MINGWDEV=/mingw_dev
 export QT_HOME=/mingw/Qt/current
 #export CFLAGS="-fpermissive"
 export O_PARAL="-j 2"
 export TOOLCHAIN_LOCATION=/mingw
+export C_COMPILER=gcc
+export CXX_COMPILER=g++
 
 # ** Put your config here **
 
@@ -30,20 +33,23 @@
         sh $TOP/foreignBuilds/$SCRIPT $EXTRA || fail cmake
         make  $PARAL VERBOSE=1 || 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
 }
 
 echo "**BootStrapping avidemux **"
+rm -Rf ${MINGWDEV}/*
+rm -Rf ${MINGW}/Release
+mkdir -p ${MINGW}/Release
 export TOP=$PWD
+export PARAL="$O_PARAL"
 echo "Top dir : $TOP"
 echo "** CORE **"
 cd $TOP
-export PARAL=""
 Process buildMingwCore cross_mingw64_core
-export PARAL="$O_PARAL"
 echo "** QT4 **"
 cd $TOP
 Process buildMingwQt4 cross_mingw64_qt5
-export PARAL="$O_PARAL"
 Process buildMingwCli cross_mingw_cli 
 #echo "** GTK **"
 #cd $TOP

avidemux_2.6.12.tar.gz/bootStrapCrossMingw_w64Qt5.sh -> avidemux_2.6.13.tar.gz/bootStrapCrossMingw_w64Qt5.sh Changed

@@ -5,8 +5,9 @@
 export CROSS_PREFIX=x86_64-w64-mingw32
 export SDLDIR=/mingw
 export MINGW=/mingw
+export MINGWDEV=/mingw_dev
 export QT_HOME=/mingw/Qt/current
-#export CFLAGS="-fpermissive"
+export CFLAGS="-I/mingw/include -L/mingw/lib"
 export O_PARAL="-j 2"
 export TOOLCHAIN_LOCATION=/mingw
 
@@ -29,21 +30,33 @@
         cd $BUILDDIR 
         sh $TOP/foreignBuilds/$SCRIPT $EXTRA || fail cmake
         make  $PARAL VERBOSE=1 || fail make
+	make preinstall
         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
 }
+# Clang ?
 
+if  "${USE_CLANG}" = "" ; then
+        export C_COMPILER=gcc
+        export CXX_COMPILER=g++
+else
+        export C_COMPILER=clang
+        export CXX_COMPILER=clang++
+fi
+# --
 echo "**BootStrapping avidemux **"
+rm -Rf ${MINGWDEV}
+rm -Rf ${MINGW}/Release
 export TOP=$PWD
+export PARAL="$O_PARAL"
 echo "Top dir : $TOP"
 echo "** CORE **"
 cd $TOP
-export PARAL=""
 Process buildMingwCore cross_mingw64_core
-export PARAL="$O_PARAL"
 echo "** QT4 **"
 cd $TOP
 Process buildMingwQt4 cross_mingw64_qt5
-export PARAL="$O_PARAL"
 Process buildMingwCli cross_mingw_cli 
 #echo "** GTK **"
 #cd $TOP

avidemux_2.6.13.tar.gz/bootStrapOsx_EC.bash Added

@@ -0,0 +1,217 @@
+#!/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
+# 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"`
+export gt=`git log --format=oneline -1 | head -c 11`
+export REV="${DAT}_$gt"
+#
+# To move as parameter
+#
+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_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
+fail()
+{
+        echo "** Failed at $1**"
+        exit 1
+}
+rm -Rf $PREFIX/*
+Process()
+{
+        export BUILDDIR=$1
+        export SOURCEDIR=$2
+        export FAKEROOT="-DFAKEROOT=$FAKEROOT_DIR"
+        export EXTRA="$3"
+        export DEBUG=""
+        BUILDER="Unix Makefiles"
+	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
+        mkdir -p $BUILDDIR || fail mkdir
+        cd $BUILDDIR 
+        cmake $PKG $FAKEROOT -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_EDIT_COMMAND=vim -DAVIDEMUX_SOURCE_DIR=$TOP  $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
+}
+printModule()
+{
+        value=$1
+        name=$2
+        if  "x$value" = "x1" ; then echo "    $name will be built"
+        else echo "     $name will be skipped"
+        fi
+        
+
+}
+config()
+{
+        echo "Build configuration :"
+        echo "******************* :"
+        echo "Build type :"
+        if  "x$debug" = "x1"  ; then echo   "Debug build"
+        else echo   "Release build"
+        fi
+        printModule $do_core Core
+        printModule $do_gtk Gtk
+        printModule $do_qt4 Qt4
+        printModule $do_cli Cli
+        printModule $do_plugins Plugins
+}
+usage()
+{
+        echo "Bootstrap avidemux 2.6:"
+        echo "***********************"
+        echo "  --help            : Print usage"
+        echo "  --tgz             : Build tgz packages"
+        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 
+
+}
+# Could probably do it with getopts...
+while  $# != 0  ;do
+        case "$1" in
+         -h|--help)
+             usage
+             exit 1
+             ;;
+         --debug)
+                debug=1
+                ;;
+         --rebuild)
+                do_rebuild=1
+                ;;
+         --pause)
+                pause_script=true
+                ;;
+         --tgz)
+                packages_ext=tar.gz
+                PKG="$PKG -DAVIDEMUX_PACKAGER=tgz"
+                ;;
+         --without-qt4)
+                do_qt4=0
+             ;;
+         --without-cli)
+                do_cli=0
+             ;;
+         --without-plugins)
+                do_plugins=0
+             ;;
+         --without-core)
+                do_core=0
+             ;;
+         --with-qt4)
+                do_qt4=1
+             ;;
+         --with-cli)
+                do_cli=1
+             ;;
+         --with-plugins)
+                do_plugins=1
+             ;;
+         --with-core)
+                do_core=1
+             ;;
+        *)
+                echo "unknown parameter $1"
+                usage
+                exit 1
+                ;;
+     esac
+     shift
+done
+config
+echo "**BootStrapping avidemux **"
+export TOP=$PWD
+export POSTFIX=""
+echo "Top dir : $TOP"
+if  "x$debug" = "x1"  ; then echo   
+POSTFIX="_debug"
+fi
+
+if  "x$do_core" = "x1"  ; then 
+        echo "** CORE **"
+        cd $TOP
+        Process buildCore ../avidemux_core
+fi
+if  "x$do_qt4" = "x1"  ; then 
+        echo "** QT4 **"
+        cd $TOP
+        Process buildQt4 ../avidemux/qt4
+fi
+if  "x$do_cli" = "x1"  ; then 
+        echo "** CLI **"
+        cd $TOP
+        Process buildCli ../avidemux/cli
+fi
+if  "x$do_plugins" = "x1"  ; then 
+        echo "** Plugins **"
+        cd $TOP
+        Process buildPluginsCommon ../avidemux_plugins -DPLUGIN_UI=COMMON 
+fi
+if  "x$do_plugins" = "x1" -a "x$do_qt4" = "x1"  ; then 
+        echo "** Plugins Qt4 **"
+        cd $TOP
+        Process buildPluginsQt4 ../avidemux_plugins -DPLUGIN_UI=QT4 
+fi
+if  "x$do_plugins" = "x1" -a "x$do_cli" = "x1"  ; then 
+        echo "** Plugins CLI **"
+        cd $TOP
+        Process buildPluginsCLI ../avidemux_plugins -DPLUGIN_UI=CLI 
+fi
+echo "** Copying Qt nib files**"
+cp -Rap $MYQT/qt_menu.nib   $PREFIX/bin/
+echo "**  Changing link path**"
+python $TOP/cmake/osx_libs_ec.py
+echo "* Copying make files **"
+cp $TOP/cmake/osx/Info.plist $PREFIX/../
+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
+echo "** Preparing packaging **"
+echo "** ALL DONE **"

avidemux_2.6.12.tar.gz/bootStrapOsx_qt5.bash -> avidemux_2.6.13.tar.gz/bootStrapOsx_qt5.bash Changed

avidemux_2.6.12.tar.gz/cmake/FindGitSvn.cmake -> avidemux_2.6.13.tar.gz/cmake/FindGitSvn.cmake Changed

@@ -6,22 +6,22 @@
 #
 ###################################################################
 MACRO(admIsGitSvn _dir _isSvn)
-	#MESSAGE(STATUS "Git on folder ${_dir}")
-	EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} log -n 50 ${_dir}
-			COMMAND grep "git-svn-id"
-			COMMAND wc -l
-			WORKING_DIRECTORY ${_dir}
-        		RESULT_VARIABLE result 
-        		OUTPUT_VARIABLE output
-        	)
-	if(${output} EQUAL 0)
-		MESSAGE(STATUS "This is not git-svn")
-		SET(${_isSvn} 0)
-	else(${output} EQUAL 0)
-		MESSAGE(STATUS "This is git-svn")
-		SET(${_isSvn} 1)
-	endif(${output} EQUAL 0)
-	#MESSAGE(STATUS "Dir : ${_dir} Output : ${output} result:${result} svn:${${_isSvn}}")	
+    #MESSAGE(STATUS "Git on folder ${_dir}")
+    EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} log -n 50 ${_dir}
+            COMMAND grep "git-svn-id"
+            COMMAND wc -l
+            WORKING_DIRECTORY ${_dir}
+                RESULT_VARIABLE result 
+                OUTPUT_VARIABLE output
+            )
+    if(${output} EQUAL 0)
+        MESSAGE(STATUS "This is not git-svn")
+        SET(${_isSvn} 0)
+    else(${output} EQUAL 0)
+        MESSAGE(STATUS "This is git-svn")
+        SET(${_isSvn} 1)
+    endif(${output} EQUAL 0)
+    #MESSAGE(STATUS "Dir : ${_dir} Output : ${output} result:${result} svn:${${_isSvn}}")    
 ENDMACRO(admIsGitSvn _dir _svn)
 #
 #
@@ -35,19 +35,31 @@
         IF(GIT_EXECUTABLE)
         
         #SET(EXE  "cd ${_dir}&& ${GIT_EXECUTABLE} svn log | head -2  | grep '^r' | sed 's/ .*$//g'" )
-	set(svn 0)
-        	MESSAGE(STATUS "Getting git-svn version from ${_dir}")
-      		EXECUTE_PROCESS(
-                        COMMAND ${GIT_EXECUTABLE} log --format=oneline -1  ${_dir}
-                        COMMAND head -c 11
-                        WORKING_DIRECTORY ${_dir} 
-                        RESULT_VARIABLE result 
-                        OUTPUT_VARIABLE output
-                        )
-                ADM_TIMESTAMP(date)
-                STRING(STRIP "${output}" output)
-                SET( ${_rev} "${date}_${output}")
-                MESSAGE(STATUS "<${output}><${date}>==> ${${_rev}}")
+        set(svn 0)
+       MESSAGE(STATUS "Getting git-svn version from ${_dir}")
+       EXECUTE_PROCESS(
+               COMMAND ${GIT_EXECUTABLE} rev-parse  --show-toplevel ${_dir}
+               WORKING_DIRECTORY ${_dir} 
+               RESULT_VARIABLE result 
+               OUTPUT_VARIABLE topdir
+               )
+       STRING(STRIP "${topdir}" topdir)
+       MESSAGE(STATUS "Top dir is <${topdir}>")
+       #MESSAGE(STATUS "COMMAND  ${GIT_EXECUTABLE} log --format=oneline -1   ${topdir}")
+       EXECUTE_PROCESS(
+               COMMAND echo  log --format=oneline -1   ${topdir}
+               COMMAND xargs ${GIT_EXECUTABLE} 
+               COMMAND head -c 11
+               WORKING_DIRECTORY ${_dir} 
+               RESULT_VARIABLE result 
+               OUTPUT_VARIABLE output
+               )
+
+       #MESSAGE(STATUS "git last entry is ${output} -- ${result}")
+       ADM_TIMESTAMP(date)
+       STRING(STRIP "${output}" output)
+       SET( ${_rev} "${date}_${output}")
+       MESSAGE(STATUS "<${output}><${date}>==> ${${_rev}}")
                 
 ELSE(GIT_EXECUTABLE)
                 SET(ADM_GIT_SVN_REVISION 0)

avidemux_2.6.12.tar.gz/cmake/Ts.cmake -> avidemux_2.6.13.tar.gz/cmake/Ts.cmake Changed

avidemux_2.6.12.tar.gz/cmake/ad_plugin.cmake -> avidemux_2.6.13.tar.gz/cmake/ad_plugin.cmake Changed

avidemux_2.6.12.tar.gz/cmake/admCheckAudioDeviceLibs.cmake -> avidemux_2.6.13.tar.gz/cmake/admCheckAudioDeviceLibs.cmake Changed

avidemux_2.6.12.tar.gz/cmake/admCheckAudioEncoderLibs.cmake -> avidemux_2.6.13.tar.gz/cmake/admCheckAudioEncoderLibs.cmake Changed

@@ -11,18 +11,18 @@
 	PRINT_LIBRARY_INFO("Aften" AFTEN_FOUND "${AFTEN_INCLUDE_DIR}" "${AFTEN_LIBRARY_DIR}")
 
 	IF (AFTEN_FOUND)
-		SET(USE_AFTEN 1)
+		SET(USE_AFTEN True CACHE BOOL "")
 	        SET(TMP_LIBS "${AFTEN_LIBRARY_DIR}")	
                 IF(CROSS)
                                         MESSAGE(WARNING "  Cross compiling mode used. Let's assume aften is recent, it might fail at compile time!")
-                                        SET(USE_AFTEN 1)
+                                        SET(USE_AFTEN True CACHE BOOL "")
                 ELSE(CROSS)
 
         		IF (NOT DEFINED AFTEN_TEST_RUN_RESULT)
 			        TRY_RUN(AFTEN_TEST_RUN_RESULT
 				        AFTEN_TEST_COMPILE_RESULT
 				        ${CMAKE_BINARY_DIR}
-				        "${AVIDEMUX_TOP_SOURCE_DIR}/cmake_compile_check/aften_check.cpp"
+				        "${CMAKE_CURRENT_SOURCE_DIR}/aften/aften_check.cpp"
 				        CMAKE_FLAGS -DINCLUDE_DIRECTORIES:PATH=${AFTEN_INCLUDE_DIR}   -DLINK_LIBRARIES:STRING=${TMP_LIBS}
                                         OUTPUT_VARIABLE AFTEN_OUTPUT)
 		        ENDIF (NOT DEFINED AFTEN_TEST_RUN_RESULT)
@@ -31,10 +31,10 @@
                                 IF(AFTEN_TEST_RUN_RESULT EQUAL 99)
                                         MESSAGE(STATUS "  version: SVN")
                                         MESSAGE(WARNING "  This is a svn version of Aften. We will assume it is compatible with 0.0.8, build may fail")
-                                        SET(USE_AFTEN 1)
+                                        SET(USE_AFTEN True CACHE BOOL "")
 		                ELSEIF (AFTEN_TEST_RUN_RESULT EQUAL 8)
                                         MESSAGE(STATUS " This is version 0.8 of aften")
-			                SET(USE_AFTEN 1)
+			                SET(USE_AFTEN True CACHE BOOL "")
 			                SET(USE_AFTEN_08 1)
                                 ENDIF(AFTEN_TEST_RUN_RESULT EQUAL 99)
                         ELSE( AFTEN_TEST_COMPILE_RESULT )
@@ -66,7 +66,7 @@
 	PRINT_LIBRARY_INFO("TWOLAME" TWOLAME_FOUND "${TWOLAME_INCLUDE_DIR}" "${TWOLAME_LIBRARY_DIR}")
 
 	IF (TWOLAME_FOUND)
-		SET(USE_TWOLAME 1)
+		SET(USE_TWOLAME True CACHE BOOL "")
 	ENDIF (TWOLAME_FOUND)
 ELSE (TWOLAME)
 	MESSAGE("${MSG_DISABLE_OPTION}")
@@ -93,7 +93,7 @@
 	PRINT_LIBRARY_INFO("LAME" LAME_FOUND "${LAME_INCLUDE_DIR}" "${LAME_LIBRARY_DIR}")
 
 	IF (LAME_FOUND)
-		SET(USE_LAME 1)
+		SET(USE_LAME True CACHE BOOL "")
 	ENDIF (LAME_FOUND)
 ELSE (LAME)
 	MESSAGE("${MSG_DISABLE_OPTION}")
@@ -119,7 +119,7 @@
 	PRINT_LIBRARY_INFO("DCAENC" DCAENC_FOUND "${DCAENC_INCLUDE_DIR}" "${DCAENC_LIBRARY_DIR}")
 
 	IF (DCAENC_FOUND)
-		SET(USE_DCAENC 1)
+		SET(USE_DCAENC True CACHE BOOL "")
 	ENDIF (DCAENC_FOUND)
 ELSE (DCAENC)
 	MESSAGE("${MSG_DISABLE_OPTION}")
@@ -144,7 +144,7 @@
 	PRINT_LIBRARY_INFO("FAAC" FAAC_FOUND "${FAAC_INCLUDE_DIR}" "${FAAC_LIBRARY_DIR}")
 
 	IF (FAAC_FOUND)
-		SET(USE_FAAC 1)
+		SET(USE_FAAC True CACHE BOOL "")
 	ENDIF (FAAC_FOUND)
 ELSE (FAAC)
 	MESSAGE("${MSG_DISABLE_OPTION}")
@@ -166,7 +166,7 @@
 	FIND_HEADER_AND_LIB(VORBISENC "" vorbisenc vorbis_encode_init)
 
 	IF (VORBIS_FOUND AND VORBISENC_FOUND)
-		SET(USE_VORBIS 1)
+		SET(USE_VORBIS True CACHE BOOL "")
 	ELSE (VORBIS_FOUND AND VORBISENC_FOUND)
 		SET(VORBIS_FOUND 0 CACHE INTERNAL "")
 	ENDIF (VORBIS_FOUND AND VORBISENC_FOUND)

avidemux_2.6.12.tar.gz/cmake/admCheckFaad.cmake -> avidemux_2.6.13.tar.gz/cmake/admCheckFaad.cmake Changed

avidemux_2.6.12.tar.gz/cmake/admCheckNvEnc.cmake -> avidemux_2.6.13.tar.gz/cmake/admCheckNvEnc.cmake Changed

avidemux_2.6.12.tar.gz/cmake/admCheckOpus.cmake -> avidemux_2.6.13.tar.gz/cmake/admCheckOpus.cmake Changed

avidemux_2.6.12.tar.gz/cmake/admCheckQt4.cmake -> avidemux_2.6.13.tar.gz/cmake/admCheckQt4.cmake Changed

avidemux_2.6.12.tar.gz/cmake/admCheckQt5.cmake -> avidemux_2.6.13.tar.gz/cmake/admCheckQt5.cmake Changed

avidemux_2.6.12.tar.gz/cmake/admCheckVDPAU.cmake -> avidemux_2.6.13.tar.gz/cmake/admCheckVDPAU.cmake Changed

@@ -4,40 +4,40 @@
 # as it is including its own dynlinker
 ########################################
 MACRO(checkVDPAU)
-	if (UNIX)
-		IF (NOT VDPAU_CHECKED)
-			OPTION(VDPAU "" ON)
+    if (UNIX)
+        IF (NOT VDPAU_CHECKED)
+            OPTION(VDPAU "" ON)
 
-			MESSAGE(STATUS "Checking for VDPAU")
-			MESSAGE(STATUS "*******************")
+            MESSAGE(STATUS "Checking for VDPAU")
+            MESSAGE(STATUS "*******************")
 
-			IF (VDPAU)
-		
-				FIND_HEADER_AND_LIB(VDPAU vdpau/vdpau.h )
-		
-				IF (VDPAU_FOUND)
-									# CHECK That it has 
-									ADM_COMPILE(check_vdpau.cpp "" "${VDPAU_INCLUDE_DIR}" "${VDPAU_LIBRARY_DIR}" VDPAU_COMPILE VDPAU_OUTPUT)
-									IF(VDPAU_COMPILE)
-							SET(VDPAU_FOUND 1)
-							SET(USE_VDPAU 1)
-							SET(VDPAU_INCLUDE_DIR "${VDPAU_INCLUDE_DIR}")
-							SET(VDPAU_LIBRARY_DIR "${VDPAU_LIBRARY_DIR}")
-									ELSE(VDPAU_COMPILE)
-											MESSAGE(STATUS "The vdpau found does not compile, probably too old ${VDPAU_OUTPUT}.")
-									ENDIF(VDPAU_COMPILE)
+            IF (VDPAU)
+        
+                FIND_HEADER_AND_LIB(VDPAU vdpau/vdpau.h )
+        
+                IF (VDPAU_FOUND)
+                            # CHECK That it has 
+                            ADM_COMPILE(check_vdpau.cpp "" "${VDPAU_INCLUDE_DIR}" "${VDPAU_LIBRARY_DIR}" VDPAU_COMPILE VDPAU_OUTPUT)
+                            IF(VDPAU_COMPILE)
+                                SET(VDPAU_FOUND 1)
+                                SET(USE_VDPAU 1)
+                                SET(VDPAU_INCLUDE_DIR "${VDPAU_INCLUDE_DIR}")
+                                SET(VDPAU_LIBRARY_DIR "${VDPAU_LIBRARY_DIR}")
+                            ELSE(VDPAU_COMPILE)
+                                MESSAGE(STATUS "The vdpau found does not compile, probably too old ${VDPAU_OUTPUT}.")
+                            ENDIF(VDPAU_COMPILE)
                                 
-				ENDIF (VDPAU_FOUND)
+                ENDIF (VDPAU_FOUND)
 
-				PRINT_LIBRARY_INFO("VDPAU" VDPAU_FOUND "${VDPAU_INCLUDE_DIR}" "${VDPAU_LIBRARY_DIR}")
-			ELSE (VDPAU)
-				MESSAGE("${MSG_DISABLE_OPTION}")
-			ENDIF (VDPAU)
+                PRINT_LIBRARY_INFO("VDPAU" VDPAU_FOUND "${VDPAU_INCLUDE_DIR}" "${VDPAU_LIBRARY_DIR}")
+            ELSE (VDPAU)
+                MESSAGE("${MSG_DISABLE_OPTION}")
+            ENDIF (VDPAU)
 
-			SET(VDPAU_CHECKED 1)
-			MESSAGE("")
-		ENDIF (NOT VDPAU_CHECKED)
+            SET(VDPAU_CHECKED 1)
+            MESSAGE("")
+        ENDIF (NOT VDPAU_CHECKED)
 
-		APPEND_SUMMARY_LIST("Miscellaneous" "VDPAU" "${VDPAU_FOUND}")
-	endif (UNIX)
+        APPEND_SUMMARY_LIST("Miscellaneous" "VDPAU" "${VDPAU_FOUND}")
+    endif (UNIX)
 ENDMACRO(checkVDPAU)

avidemux_2.6.12.tar.gz/cmake/admCheckVorbisDec.cmake -> avidemux_2.6.13.tar.gz/cmake/admCheckVorbisDec.cmake Changed

avidemux_2.6.12.tar.gz/cmake/admCheckVpx.cmake -> avidemux_2.6.13.tar.gz/cmake/admCheckVpx.cmake Changed

avidemux_2.6.12.tar.gz/cmake/admCheckX264.cmake -> avidemux_2.6.13.tar.gz/cmake/admCheckX264.cmake Changed

@@ -17,11 +17,16 @@
 				IF (x264_version LESS 67)
 					MESSAGE("WARNING: x264 core version is too old.  At least version 67 is required.")
 					SET(X264_FOUND 0)
-				ELSEIF (x264_version GREATER 73)
-					FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open_${x264_version})
+				ELSE (x264_version LESS 67)
+                                        IF (x264_version GREATER 73)
+					        FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open_${x264_version})
+                                        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)
+                                        SET(USE_X264 True CACHE BOOL "")
+                                ENDIF(X264_FOUND)
 			ELSE (_X264_FOUND)
 				SET(X264_FOUND 0)
 			ENDIF (_X264_FOUND)
@@ -36,5 +41,5 @@
 		MESSAGE("")
 	ENDIF (NOT X264_CHECKED)
 
-	APPEND_SUMMARY_LIST("Video Encoder" "x264" "${X264_FOUND}")
+	APPEND_SUMMARY_LIST("Video Encoder" "x264" "${USE_X264}")
 ENDMACRO(checkX264)

avidemux_2.6.12.tar.gz/cmake/admCheckX265.cmake -> avidemux_2.6.13.tar.gz/cmake/admCheckX265.cmake Changed

avidemux_2.6.12.tar.gz/cmake/admCheckXvid.cmake -> avidemux_2.6.13.tar.gz/cmake/admCheckXvid.cmake Changed

avidemux_2.6.12.tar.gz/cmake/admConfigHelper.cmake -> avidemux_2.6.13.tar.gz/cmake/admConfigHelper.cmake Changed

@@ -77,15 +77,22 @@
 
 
 MACRO (ADM_COMPILE _file _def _include _lib _varToSet _output)
+        #MESSAGE(STATUS " ADM_compile <${_file}>")
+	IF(AVIDEMUX_THIS_IS_CORE)
+		  SET(src ${AVIDEMUX_TOP_SOURCE_DIR}/cmake/cmake_compile_check/${_file})
+        ELSE()
+		  SET(src ${ADM_CMAKE_DIR}/cmake_compile_check/${_file})
+        ENDIF()
+        #MESSAGE(STATUS " Compiling <${src}>")
 	IF (NOT DEFINED ${_varToSet}_COMPILED)
-		SET(${_varToSet}_COMPILED 1 CACHE INTERNAL "")
-
-		TRY_COMPILE(${_varToSet}
-			  ${CMAKE_BINARY_DIR}
-			  ${AVIDEMUX_TOP_SOURCE_DIR}/cmake_compile_check/${_file}
-			  CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${_include}" "-DLINK_LIBRARIES:STRING=${_lib}"
-			  COMPILE_DEFINITIONS ${_def}
-			  OUTPUT_VARIABLE ${_output})
+	        SET(${_varToSet}_COMPILED 1 CACHE INTERNAL "")
+                TRY_COMPILE(${_varToSet}
+		  ${CMAKE_BINARY_DIR}
+		  ${src}
+		  CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${_include}" "-DLINK_LIBRARIES:STRING=${_lib}"
+		  COMPILE_DEFINITIONS ${_def}
+		  OUTPUT_VARIABLE ${_output})
+                #MESSAGE(STATUS "output=${output}")
 	ENDIF (NOT DEFINED ${_varToSet}_COMPILED)
 ENDMACRO (ADM_COMPILE)

avidemux_2.6.12.tar.gz/cmake/admConfigSummary.cmake -> avidemux_2.6.13.tar.gz/cmake/admConfigSummary.cmake Changed

avidemux_2.6.12.tar.gz/cmake/admCoreIncludes.cmake -> avidemux_2.6.13.tar.gz/cmake/admCoreIncludes.cmake Changed

@@ -6,32 +6,45 @@
 IF(CMAKE_COMPILER_IS_GNUCXX)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmessage-length=0")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-#/
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core)
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_core/include)
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_coreAudioFilter/include)
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_coreAudioParser/include)
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_coreAudio/include)
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_coreAudioDevice/include)
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_coreAudioEncoder/include)
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_coreDemuxer/include)
+#
+IF(AVIDEMUX_THIS_IS_CORE)
+        SET(ADM_INCLUDE_PREFIX ${CMAKE_SOURCE_DIR}/)
+        SET(ADM_INCLUDE_POSTFIX include/)
+        INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/config)
+ELSE(AVIDEMUX_THIS_IS_CORE)
+        SET(ADM_INCLUDE_PREFIX ${ADM_HEADER_DIR})
+        SET(ADM_INCLUDE_POSTFIX /)
+        INCLUDE_DIRECTORIES(${ADM_INCLUDE_PREFIX}/)
+ENDIF(AVIDEMUX_THIS_IS_CORE)
 
-if (UNIX)
-	include_directories(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_coreDemuxer/include/unix)
-endif (UNIX)
+MACRO(ADD_CORE_INCLUDE iname)
+        INCLUDE_DIRECTORIES(${ADM_INCLUDE_PREFIX}/${iname}/${ADM_INCLUDE_POSTFIX})
+ENDMACRO(ADD_CORE_INCLUDE name)
 
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_coreDemuxerMpeg/include)
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_coreImage/include)
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_coreMuxer/include)
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_coreScript/include)
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_coreUI/include)
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_coreUtils/include)
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_coreVideoEncoder/include)
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_coreVideoFilter/include)
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_coreVideoCodec/include)
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_coreImageLoader/include)
-INCLUDE_DIRECTORIES(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ADM_coreJobs/include)
 
-if (NOT EXCLUDE_ADM_INCLUDE)
-	INCLUDE_DIRECTORIES(${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6)
-endif (NOT EXCLUDE_ADM_INCLUDE)
+ADD_CORE_INCLUDE(ADM_core)
+ADD_CORE_INCLUDE(ADM_coreAudioFilter)
+ADD_CORE_INCLUDE(ADM_coreAudioParser)
+ADD_CORE_INCLUDE(ADM_coreAudio)
+ADD_CORE_INCLUDE(ADM_coreAudioDevice)
+ADD_CORE_INCLUDE(ADM_coreAudioEncoder)
+ADD_CORE_INCLUDE(ADM_coreDemuxer)
+
+if (UNIX )
+	include_directories(${ADM_INCLUDE_PREFIX}/ADM_coreDemuxer/${ADM_INCLUDE_POSTFIX}/unix)
+endif (UNIX )
+
+ADD_CORE_INCLUDE(ADM_coreDemuxerMpeg)
+ADD_CORE_INCLUDE(ADM_coreImage)
+ADD_CORE_INCLUDE(ADM_coreMuxer)
+ADD_CORE_INCLUDE(ADM_coreScript)
+ADD_CORE_INCLUDE(ADM_coreUI)
+ADD_CORE_INCLUDE(ADM_coreUtils)
+ADD_CORE_INCLUDE(ADM_coreVideoEncoder)
+ADD_CORE_INCLUDE(ADM_coreVideoFilter)
+ADD_CORE_INCLUDE(ADM_coreVideoCodec)
+ADD_CORE_INCLUDE(ADM_coreImageLoader)
+ADD_CORE_INCLUDE(ADM_coreJobs)
+ADD_CORE_INCLUDE(ADM_coreSocket)
+ADD_CORE_INCLUDE(ADM_coreAudioCodec)
+

avidemux_2.6.13.tar.gz/cmake/admCoreIncludesExternalBuild.cmake Added

avidemux_2.6.13.tar.gz/cmake/admDebianUtils.cmake Added

avidemux_2.6.12.tar.gz/cmake/admFFmpegBuild.cmake -> avidemux_2.6.13.tar.gz/cmake/admFFmpegBuild.cmake Changed

@@ -9,7 +9,7 @@
 
 option(FF_INHERIT_BUILD_ENV "" ON)
 
-set(FFMPEG_VERSION "2.7.6")
+set(FFMPEG_VERSION "3.0.2")
 set(FFMPEG_ROOT_DIR "${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ffmpeg_package")
 set(FFMPEG_PATCH_DIR  "${FFMPEG_ROOT_DIR}/patches/")
 set(FFMPEG_SOURCE_ARCHIVE "ffmpeg-${FFMPEG_VERSION}.tar.bz2")
@@ -170,6 +170,9 @@
 		xadd(--host-cc gcc)
 		xadd(--nm ${CMAKE_CROSS_PREFIX}-nm) 
 		#xadd(--sysroot /mingw/include)
+		if (CMAKE_C_FLAGS)
+			xadd(--extra-cflags ${CMAKE_C_FLAGS})
+		endif (CMAKE_C_FLAGS)
 
 		set(CROSS_OS mingw32)	
 
@@ -300,17 +303,41 @@
 set(ffmpeg_gnumake_executable ${GNUMAKE_EXECUTABLE})
 convertPathToUnix(ffmpeg_gnumake_executable ${BASH_EXECUTABLE})
 configure_file("${AVIDEMUX_TOP_SOURCE_DIR}/cmake/ffmpeg_make.sh.cmake" "${FFMPEG_BINARY_DIR}/ffmpeg_make.sh")
+registerFFmpeg("${FFMPEG_SOURCE_DIR}" "${FFMPEG_BINARY_DIR}" 0)
+
+add_custom_target(                 libavutil_dummy
+				   COMMAND ${BASH_EXECUTABLE} ffmpeg_make.sh 
+                                   WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}")
+MACRO(FF_ADD_SUBLIB lib)
+        add_custom_command(
+				   OUTPUT       "${lib}"	
+                                   DEPENDS 	libavutil_dummy
+				   COMMAND ${BASH_EXECUTABLE} -c echo "placeHolder")
+
+ENDMACRO(FF_ADD_SUBLIB lib)
+
+FF_ADD_SUBLIB(     	"${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}"       )
+FF_ADD_SUBLIB(     	"${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}"       )
+FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}"   )
+FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}"   )
+FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}"     )
+
+
+MACRO(FF_ADD_SUBLIB lib)
+        add_custom_command(
+				   OUTPUT       "${lib}"	
+                                   DEPENDS 	"${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}"
+				   COMMAND ${BASH_EXECUTABLE} -c echo "placeHolder")
+
+ENDMACRO(FF_ADD_SUBLIB lib)
+
+FF_ADD_SUBLIB(     	"${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}"       )
+FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}"   )
+FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}"   )
+FF_ADD_SUBLIB(          "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}"     )
 
-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}"
-				   COMMAND ${BASH_EXECUTABLE} ffmpeg_make.sh WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}")
 
 # Add and INSTALL libraries
-registerFFmpeg("${FFMPEG_SOURCE_DIR}" "${FFMPEG_BINARY_DIR}" 0)
 include_directories("${FFMPEG_SOURCE_DIR}")
 include_directories("${FFMPEG_BINARY_DIR}")
 
@@ -331,7 +358,8 @@
 ENDIF(USE_XVBA)
 INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/avcodec.h" "${FFMPEG_SOURCE_DIR}/libavcodec/vdpau.h"
 	"${FFMPEG_SOURCE_DIR}/libavcodec/version.h" 
-	"${FFMPEG_SOURCE_DIR}/libavcodec/old_codec_ids.h" 
+	"${FFMPEG_SOURCE_DIR}/libavcodec/audioconvert.h"
+	#"${FFMPEG_SOURCE_DIR}/libavcodec/internal.h" 
 	DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/libavcodec" COMPONENT dev)
 INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavformat/avformat.h" "${FFMPEG_SOURCE_DIR}/libavformat/avio.h"
 	"${FFMPEG_SOURCE_DIR}/libavformat/version.h" 
@@ -342,7 +370,6 @@
 	"${FFMPEG_SOURCE_DIR}/libavutil/cpu.h" "${FFMPEG_SOURCE_DIR}/libavutil/frame.h"
 	"${FFMPEG_SOURCE_DIR}/libavutil/log.h" "${FFMPEG_SOURCE_DIR}/libavutil/mathematics.h"
 	"${FFMPEG_SOURCE_DIR}/libavutil/mem.h" "${FFMPEG_SOURCE_DIR}/libavutil/pixfmt.h"
-	"${FFMPEG_SOURCE_DIR}/libavutil/macros.h" "${FFMPEG_SOURCE_DIR}/libavutil/old_pix_fmts.h"
 	"${FFMPEG_SOURCE_DIR}/libavutil/channel_layout.h" 
 	"${FFMPEG_SOURCE_DIR}/libavutil/error.h" 
 	"${FFMPEG_SOURCE_DIR}/libavutil/dict.h" 
@@ -350,7 +377,8 @@
 	"${FFMPEG_SOURCE_DIR}/libavutil/time.h" 
 	"${FFMPEG_SOURCE_DIR}/libavutil/opt.h" 
 	"${FFMPEG_SOURCE_DIR}/libavutil/intfloat.h" 
-	"${FFMPEG_SOURCE_DIR}/libavutil/samplefmt.h" "${FFMPEG_SOURCE_DIR}/libavutil/audioconvert.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)
 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)

avidemux_2.6.12.tar.gz/cmake/admGetRevision.cmake -> avidemux_2.6.13.tar.gz/cmake/admGetRevision.cmake Changed

avidemux_2.6.12.tar.gz/cmake/admInstallDir.cmake -> avidemux_2.6.13.tar.gz/cmake/admInstallDir.cmake Changed

@@ -48,7 +48,7 @@
         INSTALL(TARGETS ${lib} RUNTIME 
                 DESTINATION ${AVIDEMUX_BIN_DIR}          COMPONENT runtime
                 LIBRARY DESTINATION ${AVIDEMUX_LIB_DIR}  COMPONENT runtime
-                ARCHIVE DESTINATION ${AVIDEMUX_LIB_DIR}  COMPONENT runtime
+                ARCHIVE DESTINATION ${AVIDEMUX_LIB_DIR}  COMPONENT dev
                 )
 ENDMACRO(ADM_INSTALL_LIB )
 
@@ -71,4 +71,55 @@
                 )
 ENDMACRO(ADM_INSTALL_BIN )
 #
-
+# Macro to install include folder
+#
+MACRO(ADM_INSTALL_INCLUDE_FOLDER folder targetName)
+        INSTALL(DIRECTORY ${folder} 
+                DESTINATION ${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/${targetName}
+                COMPONENT dev
+                FILES_MATCHING PATTERN "*.h*"
+                )
+ENDMACRO(ADM_INSTALL_INCLUDE_FOLDER )
+##
+#
+# Macro to install include folder
+#
+MACRO(ADM_INSTALL_QT_INCLUDE_FOLDER folder targetName)
+        INSTALL(DIRECTORY ${folder} 
+                DESTINATION ${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/${QT_EXTENSION}/${targetName}
+                COMPONENT dev
+                FILES_MATCHING PATTERN "*.h*"
+                )
+ENDMACRO(ADM_INSTALL_QT_INCLUDE_FOLDER )
+##
+#
+# Macro to install cmake folder
+#
+MACRO(ADM_INSTALL_CMAKE_FOLDER folder targetName)
+        INSTALL(DIRECTORY ${folder} 
+                DESTINATION ${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/${targetName}
+                COMPONENT dev
+                FILES_MATCHING PATTERN "*.cmake*"
+                )
+ENDMACRO(ADM_INSTALL_CMAKE_FOLDER )
+#
+#
+# Macro to install cmake folder
+#
+MACRO(ADM_INSTALL_CMAKE_HELPER_FOLDER folder targetName)
+        INSTALL(DIRECTORY ${folder} 
+                DESTINATION ${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/cmake/${targetName}
+                COMPONENT dev
+                FILES_MATCHING PATTERN "*.c*"
+                )
+ENDMACRO(ADM_INSTALL_CMAKE_HELPER_FOLDER )
+#
+# Macro to install include folder
+#
+MACRO(ADM_INSTALL_APP_HEADER folder )
+        INSTALL(FILE ${folder} ${ARGN} 
+                DESTINATION ${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/ADM_app
+                COMPONENT dev
+                )
+ENDMACRO(ADM_INSTALL_APP_HEADER folder)
+#

avidemux_2.6.12.tar.gz/cmake/admMainChecks.cmake -> avidemux_2.6.13.tar.gz/cmake/admMainChecks.cmake Changed

@@ -34,7 +34,7 @@
 endif (${CMAKE_VERSION} VERSION_GREATER 2.8.5)
 
 INCLUDE(admConfigHelper)
-include( admGetRevision)
+include(admGetRevision)
 
 IF (FRESH_BUILD)
 	MESSAGE("")
@@ -63,6 +63,7 @@
                 SET(CMAKE_LD_FLAGS  "${CMAKE_LD_FLAGS}  -fsanitize=address ")
         ELSE (ASAN)
                 MESSAGE(STATUS "Address Sanitizer not activated")
+	        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
         ENDIF (ASAN)
 ENDIF(${CMAKE_CXX_COMPILER} MATCHES ".*cClang.*")
 
@@ -127,11 +128,11 @@
 MESSAGE("")
 MESSAGE(STATUS "Checking for SCM")
 MESSAGE(STATUS "****************")
-IF(RELEASE)
-SET( ADM_SUBVERSION 0)
-ELSE(RELEASE)
-admGetRevision( ${AVIDEMUX_TOP_SOURCE_DIR} ADM_SUBVERSION)
-ENDIF(RELEASE)
+IF(RELEASE OR AVIDEMUX_EXTERNAL_BUILD)
+        SET( ADM_SUBVERSION 0)
+ELSE()
+        admGetRevision( ${CMAKE_SOURCE_DIR} ADM_SUBVERSION)
+ENDIF()
 MESSAGE("")
 include(avidemuxVersion)
 
@@ -151,7 +152,7 @@
 checkVDPAU()
 #checkXvba()
 checkLibVA()
-checkNvEnc()
+#checkNvEnc()
 ENDIF(NOT PLUGINS)
 
 ########################################

avidemux_2.6.12.tar.gz/cmake/admSerialization.py -> avidemux_2.6.13.tar.gz/cmake/admSerialization.py Changed

@@ -17,7 +17,7 @@
 allCTypes"uint32_t"="uint32_t"
 allCTypes"int32_t"="int32_t"
 allCTypes"bool"="bool"
-allCTypes"string"="char *"
+allCTypes"string"="std::string "
 allCTypes"float"="float"
 allCTypes"double"="double"
 allCTypes"video_encode"="COMPRES_PARAMS"
@@ -38,7 +38,7 @@
 allATypes"float"="ADM_param_float"
 allATypes"double"="ADM_param_double"
 allATypes"bool"="ADM_param_bool"
-allATypes"string"="ADM_param_string"
+allATypes"string"="ADM_param_stdstring"
 allATypes"video_encode"="ADM_param_video_encode"
 allATypes"lavcodec_context"="ADM_param_lavcodec_context"
 
@@ -86,6 +86,7 @@
 ###################################################################################################################################
 def writeDescHead():
     outputDesc("// automatically generated by admSerialization.py, do not edit!")
+    #outputDesc("#include \"string\"")
     #outputDesc("#include \"ADM_default.h\"")
     #outputDesc("#include \"ADM_paramList.h\"")
     #outputDesc("#include \""+str(headerFileName)+"\"")
@@ -123,13 +124,12 @@
 
 def writeHeaderHead():
     outputHeader( "// automatically generated by admSerialization.py do not edit")
-    outputHeader(  "#ifndef ADM_"+str(structName)+"_CONF_H")
-    outputHeader(  "#define ADM_"+str(structName)+"_CONF_H")
+    outputHeader("#include \"string\"")
+    outputHeader("#pragma once")
     outputHeader(  "typedef struct {")
 
 def writeHeadFooter():
     outputHeader("}"+structName+";")
-    outputHeader("#endif")
 ###################################################################################################################################
 # Main...
 ###################################################################################################################################

avidemux_2.6.12.tar.gz/cmake/ae_plugin.cmake -> avidemux_2.6.13.tar.gz/cmake/ae_plugin.cmake Changed

avidemux_2.6.12.tar.gz/cmake/av_plugin.cmake -> avidemux_2.6.13.tar.gz/cmake/av_plugin.cmake Changed

avidemux_2.6.12.tar.gz/cmake/avidemuxVersion.cmake -> avidemux_2.6.13.tar.gz/cmake/avidemuxVersion.cmake Changed

avidemux_2.6.13.tar.gz/cmake/cmake_compile_check Added

avidemux_2.6.13.tar.gz/cmake/cmake_compile_check/CheckFunctionExists.c Changed

avidemux_2.6.13.tar.gz/cmake/cmake_compile_check/check_vdpau.cpp Changed

avidemux_2.6.13.tar.gz/cmake/cmake_compile_check/cpu_armel_check.cpp Changed

avidemux_2.6.13.tar.gz/cmake/cmake_compile_check/cpu_x86-64_check.cpp Changed

avidemux_2.6.13.tar.gz/cmake/cmake_compile_check/cpu_x86_check.cpp Changed

avidemux_2.6.13.tar.gz/cmake/cmake_compile_check/execinfo.cpp Changed

avidemux_2.6.13.tar.gz/cmake/cmake_compile_check/faad_check.cpp Changed

avidemux_2.6.13.tar.gz/cmake/cmake_compile_check/ftello.cpp Changed

avidemux_2.6.13.tar.gz/cmake/cmake_compile_check/gettext.cpp Changed

avidemux_2.6.13.tar.gz/cmake/cmake_compile_check/gtk_x11_check.cpp Changed

avidemux_2.6.13.tar.gz/cmake/cmake_compile_check/iconv_check.cpp Changed

avidemux_2.6.13.tar.gz/cmake/cmake_compile_check/libva.cpp Changed

avidemux_2.6.13.tar.gz/cmake/cmake_compile_check/os_bsd_check.cpp Changed

avidemux_2.6.13.tar.gz/cmake/commonCmakeApplication.cmake Added

@@ -0,0 +1,136 @@
+########################################
+# Definitions and Includes
+########################################
+
+
+
+include(avidemuxVersion)
+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 "Cmake module path = ${CMAKE_MODULE_PATH}")
+IF (WIN32)
+	SET(ADM_PLUGIN_DIR "plugins")
+ELSE (WIN32)
+	SET(ADM_PLUGIN_DIR "ADM_plugins6")
+ENDIF (WIN32)
+
+include(admConfigSummary)
+INITIALISE_SUMMARY_LISTS()
+
+########################################
+# Shared cmake part
+########################################
+ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES)
+include(admMainChecks)
+
+########################################
+# Add include dirs
+########################################
+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)
+# 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")
+
+LINK_DIRECTORIES("${AVIDEMUX_SEARCH_LIB_DIR}")
+#
+INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/ADM_muxerGate/include/")
+
+IF (GETTEXT_FOUND)
+	INCLUDE_DIRECTORIES(${GETTEXT_INCLUDE_DIR})
+ENDIF (GETTEXT_FOUND)
+
+INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../common/")
+INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../common/ADM_audioFilter/include")
+INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../common/ADM_commonUI")
+INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../common/ADM_videoFilter2/include")
+INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../common/ADM_videoEncoder/include")
+INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../common/ADM_editor/include")
+#
+# Add main source
+#
+SET(ADM_EXE_SRCS
+../common/ADM_preview.cpp
+../common/ADM_previewNavigate.cpp
+../common/gui_main.cpp
+../common/gui_autodrive.cpp
+../common/GUI_jobs.cpp
+../common/gui_navigate.cpp
+../common/gui_play.cpp
+../common/gui_save.cpp
+../common/gui_savenew.cpp
+../common/main.cpp
+../common/gui_action.cpp
+../common/gui_blackframes.cpp
+../common/ADM_gettext.cpp
+../common/ADM_slave.cpp
+)
+
+########################################
+# FFmpeg
+########################################
+include_directories("${ADM_HEADER_DIR}/ffmpeg")
+
+#############################################
+# Add core libs
+#############################################
+SET(coreLibs
+ADM_core6
+ADM_audioParser6
+ADM_coreAudio6
+ADM_coreAudioFilterAPI6
+ADM_coreAudioDevice6
+ADM_coreAudioEncoder6
+ADM_coreDemuxer6
+ADM_coreImage6
+ADM_coreMuxer6
+ADM_coreUI6
+ADM_coreUtils6
+ADM_coreSocket6
+ADM_coreVideoEncoder6
+ADM_coreVideoFilter6
+)
+
+#############################################
+# Add common libs
+#############################################
+SET(commonLibs1
+
+ADM_muxerGate6
+ADM_audioFilter6
+ADM_editor6
+ADM_audiocodec6
+ADM_videocodec6
+ADM_coreVideoCodec6
+ADM_commonUI6
+)
+
+if (USE_VDPAU)
+	SET(commonLibs1 ${commonLibs1} ADM_coreVDPAU6)
+endif (USE_VDPAU)
+if (USE_XVBA)
+	SET(commonLibs1 ${commonLibs1} ADM_coreXvba6)
+endif (USE_XVBA)
+if (USE_LIBVA)
+	SET(commonLibs1 ${commonLibs1} ADM_coreLibVA6)
+endif (USE_LIBVA)
+
+SET(commonLibs1 ${commonLibs1} ADM_libavcodec ADM_libavutil)
+
+
+
+SET(commonLibs2
+ADM_coreJobs
+ADM_osSupport6
+ADM_script6
+ADM_videoEncoder6
+ADM_internalVideoFilter6
+ADM_toolkit6
+)
+
+# END

avidemux_2.6.13.tar.gz/cmake/debian_deps.py Added

@@ -0,0 +1,90 @@
+#
+#
+import shutil
+import re
+import subprocess
+import os
+import sys
+#
+already_done = 
+#
+systemLibs = "libstdc++","libm","libc","libdl","libpthread","libgcc_s","linux-vdso","libXext","libX11","/lib64/ld-linux-x86-64",
+                "libXdmcp","libXau","libdrm","libXfixes","lib32z1","libxcb1"
+# Returns the list of libs as dependencies in /opt (macport)
+def log(s):
+    #print "Log:<"+str(s)+">"
+    pass
+
+#
+def aptfilesearch(lib):
+    if lib in already_done:
+        return None
+    cmd = "/usr/bin/apt-file","search", lib
+    cmd = subprocess.Popen(" ".join(cmd), shell=True, stdout=subprocess.PIPE)
+    for line in cmd.stdout:
+        if(len(line)!=0):
+            package=re.sub(":.*$","",line).strip()
+            already_done.append(lib)
+            return package
+    return None
+def getlinkedlibs(target):
+    cmd = "/usr/bin/ldd","", target
+    #log(cmd)
+    q = 
+    cmd = subprocess.Popen(" ".join(cmd), shell=True, stdout=subprocess.PIPE)
+    for line in cmd.stdout:
+       line = re.sub('=>.*$', '', line)
+       line = re.sub(' ', '', line)
+       line=line.strip()
+       #log(line)
+       q.append(line)
+    #log("\n"+target + "Found deps to adjust:"+str(q))
+    return q;
+#
+def purgeSystemLibs(folder):
+   out= 
+   for incoming in folder:
+       short=re.sub("\.so.*$","",incoming)
+       if short in systemLibs:
+           pass
+       else:
+           out.append(incoming)
+   return out
+def walking(folder):
+    copied=0
+    dependencies = 
+    #log("Copy files"+folder)
+    for dirname, dirnames, filenames in os.walk(folder):
+       for filename in filenames:
+           absPath=os.path.join(dirname, filename)
+           #log(absPath)
+           libs=getlinkedlibs(absPath)
+           libs=purgeSystemLibs(libs)
+           log(absPath+"Found deps to adjust:"+str(libs))
+           for libname in libs:
+               if not libname in dependencies:
+                   dependencies.append(libname)
+    return dependencies
+#
+#print "Adjusting dependencies"
+if len(sys.argv) !=1:
+   print "debian_track folder"
+   exit
+
+#deps=walking('/tmp/x/usr/lib')
+deps=walking(sys.argv1)
+alldeps =  
+for lib in deps:
+   print("\t" + lib)
+   package=aptfilesearch(lib)
+   if package is not None:
+       #print("\t"+"\t" + package)
+       if not package in alldeps:
+           alldeps.append(package)
+print("Package dependency list:")
+print("========================")
+for lib in alldeps:
+    print("\t"+lib) 
+print("Done")
+        
+

avidemux_2.6.13.tar.gz/cmake/osx_libs_ec.py Added

@@ -0,0 +1,314 @@
+#
+#
+import shutil
+import re
+import subprocess
+import os
+home=os.getenv("HOME")
+print "Preparing independant bundle, home="+home+"..."
+rootFolder=home+"/Avidemux2.6.app/Contents/Resources"
+libFolder=rootFolder+"/lib"
+binFolder=rootFolder+"/bin"
+frameWorkFolder=rootFolder+"/../Frameworks"
+qtPluginFolder=rootFolder+"/../plugins"
+qts = 'QtCore', 'QtGui', 'QtOpenGL','QtScript','QtWidgets','QtPrintSupport'
+
+#
+#
+allSymbols=
+#
+#
+#
+def log(s):
+    #print "Log:<"+str(s)+">"
+    pass
+#
+#
+#
+def getShortName(fl):
+    shortName=re.sub('^.*\/','',fl)
+    return shortName
+#
+# Returns the list of libs as dependencies in /opt (macport)
+#
+def getGlobalDeps(target):
+    cmd = "/usr/bin/otool","-L", target
+    log(cmd)
+    q = 
+    cmd = subprocess.Popen(" ".join(cmd), shell=True, stdout=subprocess.PIPE)
+    for line in cmd.stdout:
+       line = re.sub(' \t\r\n*', '', line)
+       line = re.sub('\(.*$', '', line)
+       if(not line.startswith('/opt/local') and not line.startswith('/usr/local/opt') and not line.startswith('/usr/local/Cellar/qt5/') and not line.startswith('@rpath')):
+              continue
+       if(":" in line):
+              continue
+       log(line)
+       q.append(line)
+    log(str(q))
+    return q;
+#
+#
+#
+def getGlobalDepsNoQt(target):
+    q= 
+    p = getGlobalDeps(target)
+    for line in p:
+       if not getShortName(line).startswith('Qt'):
+          q.append(line)
+    return q
+#
+def getGlobalDepsQtOnly(target):
+    q= 
+    p = getGlobalDeps(target)
+    for line in p:
+       if getShortName(line).startswith('Qt'):
+          q.append(line)
+    return q
+#
+def getRpathDepsOnly(target):
+    q= 
+    p = getGlobalDeps(target)
+    for line in p:
+       if getShortName(line).startswith('@rpath'):
+          q.append(line)
+    return q
+#
+# Returns the list of libs as dependencies  to local installation folder (
+#
+def getLocalDeps(target):
+    cmd = "/usr/bin/otool","-L", target
+    log(cmd)
+    q = 
+    cmd = subprocess.Popen(" ".join(cmd), shell=True, stdout=subprocess.PIPE)
+    for line in cmd.stdout:
+       line = re.sub(' \t\r\n*', '', line)
+       line = re.sub('\(.*$', '', line)
+       if(not line.startswith(libFolder)):
+              continue
+       if(":" in line):
+              continue
+       log(line)
+       q.append(line)
+    log(str(q))
+    return q;
+#
+# 
+# Copy used library coming from /opt/local
+#
+def copyFiles(folder,libFolder):
+    copied=0
+    log("Copy files"+folder)
+    for dirname, dirnames, filenames in os.walk(folder):
+       for filename in filenames:
+           absPath=os.path.join(dirname, filename)
+           deps=getGlobalDepsNoQt(absPath)
+           for dep in deps:
+               shortName=re.sub('^.*\/','',dep)
+               if(os.path.exists(libFolder+'/'+shortName)):
+                               log(shortName+" already copied")
+               else:
+                   log("Copying"+shortName)
+                   shutil.copy(dep,libFolder)
+                   copied+=1
+    return copied
+#
+# 
+# Copy used library coming from /opt/local
+#
+def copyQtDeps(components,libFolder):
+    copied=0
+    for modul in components:
+        absPath='/usr/local/opt/qt5/lib/'+modul+'.framework/Versions/5/'+modul
+        print("Copy deps for "+modul+" ("+absPath+")")
+        deps=getGlobalDepsNoQt(absPath)
+        for dep in deps:
+                   shortName=re.sub('^.*\/','',dep)
+                   if(os.path.exists(libFolder+'/'+shortName)):
+                               print(shortName+" already copied")
+                   else:
+                       print("Copying:"+shortName)
+                       shutil.copy(dep,libFolder)
+                       copied+=1
+    # copy plugins deps too
+    copyFiles(qtPluginFolder+'/imageformats',libFolder)
+    return copied
+##
+def changeSymbol(target,oldName,newName):
+        cmd="/usr/bin/install_name_tool -change "+oldName+" "+newName+" "+target
+        log(cmd)
+        subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
+#
+def changeId(target,newId):
+           cmd="/usr/bin/install_name_tool -id "+newId+" "+target
+           log(cmd)
+           subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
+#
+#
+def renameSymbols(libs):
+   for qt in libs:
+      print "Processing "+qt
+      # Change binding
+      for otherQt in allSymbols:
+          newname=re.sub(r'^.*\/',r'@executable_path/../lib/',otherQt)
+          exc="install_name_tool -change "+otherQt+" "+newname+" libToProcess"
+          print(exc)
+#
+#
+#
+def changeGlobalLinkPathForOne(f):
+    deps=getGlobalDepsNoQt(f)
+    for d in deps:
+        shortName=getShortName(d)
+        shortName="@executable_path/../lib/"+shortName
+        changeSymbol(f,d,shortName)
+def changeLocalLinkPathForOne(f):
+    deps=getLocalDeps(f)
+    for d in deps:
+        shortName="@executable_path/../lib/"+re.sub("^.*\/","",d)
+        changeSymbol(f,d,shortName)
+def changeLibLinkPath(folder):
+    for dirname, dirnames, filenames in os.walk(folder):
+       for filename in filenames:
+           absPath=os.path.join(dirname, filename)
+           changeGlobalLinkPathForOne(absPath)
+           changeLocalLinkPathForOne(absPath)
+           changeQtLinkPathForOne(absPath)
+           shortName="@executable_path/../lib/"+re.sub("^.*\/","",absPath)
+           changeId(absPath,shortName)
+#
+def changeQtPlatformLinkPath(folder):
+    for dirname, dirnames, filenames in os.walk(folder):
+       for filename in filenames:
+           absPath=os.path.join(dirname, filename)
+           changeGlobalLinkPathForOne(absPath)
+           changeLocalLinkPathForOne(absPath)
+           changeQtLinkPathForOne(absPath)
+           shortName="@executable_path/../../plugins/platforms/"+re.sub("^.*\/","",absPath)
+           changeId(absPath,shortName)
+def changeQtPluginLinkPath(folder):
+    for dirname, dirnames, filenames in os.walk(folder):
+       for filename in filenames:
+           absPath=os.path.join(dirname, filename)
+           changeGlobalLinkPathForOne(absPath)
+           changeLocalLinkPathForOne(absPath)
+           changeQtLinkPathForOne(absPath)
+           shortName="@executable_path/../../plugins/imageformats/"+re.sub("^.*\/","",absPath)
+           changeId(absPath,shortName)
+def changeBinLinkPath(folder):
+    for dirname, dirnames, filenames in os.walk(folder):
+       for filename in filenames:
+           absPath=os.path.join(dirname, filename)
+           changeGlobalLinkPathForOne(absPath)
+           changeLocalLinkPathForOne(absPath)
+           changeQtLinkPathForOne(absPath)
+           shortName="@executable_path/bin/"+re.sub("^.*\/","",absPath)
+           changeId(absPath,shortName)
+            
+def changePluginLinkPath(folder,relFolder):
+    for dirname, dirnames, filenames in os.walk(folder):
+       for filename in filenames:
+           absPath=os.path.join(dirname, filename)
+           changeGlobalLinkPathForOne(absPath)
+           changeQtLinkPathForOne(absPath)
+           shortName="@executable_path/lib/"+relFolder+re.sub("^.*\/","",absPath)
+           changeId(absPath,shortName)
+#
+#
+#
+def myChmod(dst):
+        log("chmod <"+dst+">")
+        cmd="/bin/chmod" + " -R 755  "+dst
+        log("Exec <"+cmd+">")
+        subprocess.call(cmd, shell=True)
+
+def changeQtFileSelfLinkPath(fl,modu):
+           shortName="@executable_path/../../Frameworks/"+modu+".framework/Versions/5/"+modu
+           cmd="/usr/bin/install_name_tool -id "+shortName+" "+fl
+           log(cmd)
+           subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
+def changeQtLinkPathForOne(f):
+    deps=getGlobalDepsQtOnly(f)
+    for d in deps:
+        shortName=getShortName(d)
+        shortName="@executable_path/../../Frameworks/"+shortName+".framework/Versions/5/"+shortName
+        changeSymbol(f,d,shortName)
+    deps2=getRpathDepsOnly(f)
+    for d in deps2:
+        shortName2=re.sub('@rpath','@executable_path/../../Frameworks/')
+        changeSymbol(f,d,shortName2)
+
+#
+def myMkDir(target):
+        if(os.path.exists(target)):
+                return
+        os.makedirs(target)   
+#         
+def myCopyTree(src,dst):
+	log(src+"->"+dst)
+        if(not os.path.exists(src)):
+                return
+        shutil.copytree(src,dst)            
+        myChmod(dst)
+def myCopyFile(src,dst):
+        if(not os.path.exists(src)):
+                return
+        shutil.copy(src,dst)            
+        myChmod(dst)
+##
+def copyQtFiles(targetFolder):
+        myMkDir(targetFolder)
+        for q in qts:
+               print q
+               if(os.path.exists(targetFolder+'/'+q+'.framework')):
+                               log(q+" already copied")
+               else:
+                   log("Copying"+q+' to '+targetFolder)
+                   src='/usr/local/opt/qt5/lib/'+q+'.framework'
+                   dst=targetFolder+'/'+q+'.framework'
+                   myMkDir(dst)
+                   src=src+'/Versions/5/'
+                   dst=dst+'/Versions/'
+                   myMkDir(dst)
+                   dst=dst+'/5/'
+                   myMkDir(dst)
+                   print "Copying "+dst+'Resources'
+                   myCopyTree(src+'Resources',dst+'Resources')
+                   print "Copying "+dst+q
+                   myCopyFile(src+q,dst+q)
+                   changeQtFileSelfLinkPath(dst+q,q)
+                   changeQtLinkPathForOne(dst+q) 
+                   changeGlobalLinkPathForOne(dst+q)
+        # Also copy plugins
+        myMkDir(qtPluginFolder)
+	myCopyTree('/usr/local/opt/qt5/plugins/imageformats',qtPluginFolder+'/imageformats')
+	myCopyTree('/usr/local/opt/qt5/plugins/platforms',qtPluginFolder+'/platforms')
+#################################################################
+# Step 1 : Copy system files so we have a standalone package
+#
+#################################################################
+print "Copying Qt framework"
+copyQtFiles(frameWorkFolder)
+print "Copying Qt framework dependencies"
+copyQtDeps(qts,libFolder)
+print "Copying system files"
+#copyFiles(binFolder,libFolder)
+processed=1
+# Copy file until all of them are there
+while not processed == 0:
+        processed=copyFiles(libFolder,libFolder)
+#################################################################
+# Step 2 :  Change link name so that they are all executable_path
+#               relative
+#################################################################
+print "Adjusting dependencies"
+changeBinLinkPath(binFolder)
+changeLibLinkPath(libFolder)
+changeQtPluginLinkPath(qtPluginFolder)
+subFolders="audioDecoder",    "audioEncoders",   "autoScripts",     "demuxers",        "muxers",          "scriptEngines",   "videoEncoders",   "videoFilters"
+for s in subFolders:
+        relFolder="ADM_plugins6/"+s
+        changePluginLinkPath(libFolder+"/"+relFolder,relFolder)
+changeQtPlatformLinkPath(binFolder+'/platforms')
+        
+

avidemux_2.6.13.tar.gz/cmake/plugin_cli.cmake Added

avidemux_2.6.13.tar.gz/cmake/plugin_qt4.cmake Added

avidemux_2.6.12.tar.gz/cmake/vd_plugin.cmake -> avidemux_2.6.13.tar.gz/cmake/vd_plugin.cmake Changed

avidemux_2.6.12.tar.gz/cmake/ve_plugin.cmake -> avidemux_2.6.13.tar.gz/cmake/ve_plugin.cmake Changed

avidemux_2.6.12.tar.gz/cmake/ve_plugin_qt4.cmake -> avidemux_2.6.13.tar.gz/cmake/ve_plugin_qt4.cmake Changed

avidemux_2.6.12.tar.gz/cmake/vf_plugin.cmake -> avidemux_2.6.13.tar.gz/cmake/vf_plugin.cmake Changed

avidemux_2.6.12.tar.gz/cmake/vf_plugin_cli.cmake -> avidemux_2.6.13.tar.gz/cmake/vf_plugin_cli.cmake Changed

avidemux_2.6.12.tar.gz/cmake/vf_plugin_gtk.cmake -> avidemux_2.6.13.tar.gz/cmake/vf_plugin_gtk.cmake Changed

avidemux_2.6.12.tar.gz/cmake/vf_plugin_qt4.cmake -> avidemux_2.6.13.tar.gz/cmake/vf_plugin_qt4.cmake Changed

avidemux_2.6.12.tar.gz/cmake/vf_plugin_qt4gl.cmake -> avidemux_2.6.13.tar.gz/cmake/vf_plugin_qt4gl.cmake Changed

avidemux_2.6.13.tar.gz/createDebFromSourceUbuntu.bash Added

avidemux_2.6.13.tar.gz/createRpmFromSourceFedora.bash Added

avidemux_2.6.12.tar.gz/foreignBuilds/cross_mingw64_core -> avidemux_2.6.13.tar.gz/foreignBuilds/cross_mingw64_core Changed

avidemux_2.6.12.tar.gz/foreignBuilds/cross_mingw64_plugins -> avidemux_2.6.13.tar.gz/foreignBuilds/cross_mingw64_plugins Changed

avidemux_2.6.12.tar.gz/foreignBuilds/cross_mingw64_qt4 -> avidemux_2.6.13.tar.gz/foreignBuilds/cross_mingw64_qt4 Changed

avidemux_2.6.12.tar.gz/foreignBuilds/cross_mingw64_qt5 -> avidemux_2.6.13.tar.gz/foreignBuilds/cross_mingw64_qt5 Changed

avidemux_2.6.12.tar.gz/foreignBuilds/cross_mingw64_qt5_plugins -> avidemux_2.6.13.tar.gz/foreignBuilds/cross_mingw64_qt5_plugins Changed

avidemux_2.6.13.tar.gz/makeAppImage.sh Added

avidemux_2.6.12.tar.gz/myOwnPlugins/muxer/muxerLmkvAudio.cpp -> avidemux_2.6.13.tar.gz/myOwnPlugins/muxer/muxerLmkvAudio.cpp Changed

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/logo Added

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/logo/ADM_vidLogo.cpp Changed

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/logo/CMakeLists.txt Added

@@ -0,0 +1,77 @@
+###################################################
+MESSAGE("#####################################")
+MESSAGE("Custom videoFilter plugin template Started")
+MESSAGE("#####################################")
+MESSAGE("")
+
+SET(ADM_PROJECT AdmLogoVideoFilter)
+#
+#
+SET(PLUGINS TRUE)
+SET(DO_COMMON TRUE)
+SET(AVIDEMUX_VERSION 2.6)                 # important !
+SET(AVIDEMUX_EXTERNAL_BUILD True)         # important !
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR)
+######################################################
+# Try to locate & setup avidemux development files
+######################################################
+
+MESSAGE(STATUS "Checking for avidemux development files ..")
+
+SET(ADM_HEADER_DIR ${CMAKE_INSTALL_PREFIX}/include/avidemux/${AVIDEMUX_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_VERSION}")
+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}/admCoreIncludesExternalBuild.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 admCoreIncludesExternalBuild.cmake in  ${ADM_CMAKE_DIR}")
+        MESSAGE(FATAL_ERROR  "Aborting")
+endif(NOT EXISTS "${ADM_CMAKE_DIR}/admCoreIncludesExternalBuild.cmake")
+MESSAGE(STATUS "Found cmake subfolder.good.")
+
+
+include(${ADM_CMAKE_DIR}/admCoreIncludesExternalBuild.cmake)
+include(${ADM_CMAKE_DIR}/admConfigHelper.cmake)
+########################################
+# Add include dirs
+########################################
+SET(AVIDEMUX_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
+MARK_AS_ADVANCED(AVIDEMUX_INSTALL_DIR)
+include(admInstallDir)
+#########################################
+# Get regular stuff from main app
+#########################################
+LINK_DIRECTORIES("${AVIDEMUX_SEARCH_LIB_DIR}")
+INCLUDE_DIRECTORIES(${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/${AVIDEMUX_VERSION}/)
+
+IF (FRESH_BUILD)
+	MESSAGE("")
+ENDIF (FRESH_BUILD)
+
+########################################
+# Global options
+########################################
+OPTION(VERBOSE "" OFF)
+################################################
+# Now really define our plugin...
+###############################################
+INCLUDE(vf_plugin)
+
+
+SET(ADM_vf_logo_SRCS ADM_vidLogo.cpp)
+
+ADD_VIDEO_FILTER(ADM_vf_logo_sample ${ADM_vf_logo_SRCS})
+TARGET_LINK_LIBRARIES(ADM_vf_logo_sample ADM_coreImageLoader6 )
+INIT_VIDEO_FILTER(ADM_vf_logo_sample)
+INSTALL_VIDEO_FILTER(ADM_vf_logo_sample)

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/logo/logo.conf Changed

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/logo/logo.h Changed

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/logo/logo_desc.cpp Changed

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/logo/readme.txt Added

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader Added

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/CMakeLists.txt Added

@@ -0,0 +1,98 @@
+###################################################
+MESSAGE("#####################################")
+MESSAGE("Custom videoFilter plugin template Started")
+MESSAGE("#####################################")
+MESSAGE("")
+ADD_DEFINITIONS("-g")
+SET(ADM_PROJECT AdmLogoVideoFilter)
+#
+SET(PLUGINS TRUE)
+SET(DO_COMMON TRUE)
+SET(AVIDEMUX_VERSION 2.6)                 # important !
+SET(AVIDEMUX_EXTERNAL_BUILD True)         # important !
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR)
+######################################################
+# Try to locate & setup avidemux development files
+######################################################
+
+MESSAGE(STATUS "Checking for avidemux development files ..")
+
+SET(ADM_HEADER_DIR ${CMAKE_INSTALL_PREFIX}/include/avidemux/${AVIDEMUX_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_VERSION}")
+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}/admCoreIncludesExternalBuild.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 admCoreIncludesExternalBuild.cmake in  ${ADM_CMAKE_DIR}")
+        MESSAGE(FATAL_ERROR  "Aborting")
+endif(NOT EXISTS "${ADM_CMAKE_DIR}/admCoreIncludesExternalBuild.cmake")
+MESSAGE(STATUS "Found cmake subfolder.good.")
+#
+#
+# Check QTX openGL
+include(admConfigHelper)
+include(admCheckQt5)
+checkQt5()
+#
+include_directories( ${QT_QTOPENGL_INCLUDE_DIR} )
+
+#
+# Check with have the Qt4/5 header
+#
+MESSAGE(STATUS "Checking for avidemux openGl subfolder (${QT_EXTENSION})")
+if(NOT EXISTS "${ADM_HEADER_DIR}/${QT_EXTENSION}/ADM_openGL/ADM_openGl.h")
+        MESSAGE(STATUS  "Make sure you installed all the files.\n I cannot find avidemux QT folder .\n")
+        MESSAGE(STATUS  "Set CMAKE_INSTALL_PREFIX to the install folder, current value is ${CMAKE_INSTALL_PREFIX}")
+        MESSAGE(STATUS  "I was looking for ADM_openGL/ADM_openGl.h in  ${ADM_HEADER_DIR}/${QT_EXTENSION}/ADM_openGL/")
+        MESSAGE(FATAL_ERROR  "Aborting")
+endif(NOT EXISTS "${ADM_HEADER_DIR}/${QT_EXTENSION}/ADM_openGL/ADM_openGl.h")
+include(${ADM_CMAKE_DIR}/admCoreIncludesExternalBuild.cmake)
+include(${ADM_CMAKE_DIR}/admConfigHelper.cmake)
+########################################
+# Add include dirs
+########################################
+SET(AVIDEMUX_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
+MARK_AS_ADVANCED(AVIDEMUX_INSTALL_DIR)
+include(admInstallDir)
+#########################################
+# Get regular stuff from main app
+#########################################
+LINK_DIRECTORIES("${AVIDEMUX_SEARCH_LIB_DIR}")
+INCLUDE_DIRECTORIES(${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/${AVIDEMUX_VERSION}/)
+INCLUDE_DIRECTORIES(${ADM_HEADER_DIR}/${QT_EXTENSION})
+INCLUDE_DIRECTORIES(${ADM_HEADER_DIR}/${QT_EXTENSION}/ADM_openGL)
+INCLUDE_DIRECTORIES(${ADM_HEADER_DIR}/${QT_EXTENSION}/ADM_UIs)
+
+IF (FRESH_BUILD)
+	MESSAGE("")
+ENDIF (FRESH_BUILD)
+
+########################################
+# Global options
+########################################
+OPTION(VERBOSE "" OFF)
+################################################
+# Now really define our plugin...
+###############################################
+INCLUDE(vf_plugin)
+INCLUDE(vf_plugin_qt4gl)
+ADD_DEFINITIONS( "-DADM_UI_TYPE_BUILD=4")
+
+SET(ADM_vf_shader_SRCS shader.cpp)
+SET(OOP GL)
+ADD_VIDEO_FILTER(ADM_vf_shader_sample ${ADM_vf_shader_SRCS})
+TARGET_LINK_LIBRARIES(ADM_vf_shader_sample  ADM_UI${QT_LIBRARY_EXTENSION}6   ADM_coreImageLoader6 ADM_openGL${QT_LIBRARY_EXTENSION}6 ${QT_QTOPENGL_LIBRARIES} )
+TARGET_LINK_LIBRARIES(ADM_vf_shader_sample  ${OOP} )
+INIT_VIDEO_FILTER(ADM_vf_shader_sample)
+INSTALL_VIDEO_FILTER(ADM_vf_shader_sample ${QT_EXTENSION})

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/readme.txt Added

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/shader.cpp Added

@@ -0,0 +1,244 @@
+/** *************************************************************************
+                    \file     shaderLoader
+                    \brief    Rotate picture
+
+   
+                    copyright            : (C) 2011 by mean
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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_openGl.h"
+#define ADM_LEGACY_PROGGY
+#include "ADM_default.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "T_openGLFilter.h"
+#include "ADM_clock.h"
+#include "DIA_factory.h"
+#include "shaderLoader.h"
+#include "shaderLoader_desc.cpp"
+/**
+    \class shaderLoader
+*/
+class shaderLoader : public  ADM_coreVideoFilterQtGl
+{
+protected:
+                shaderLoaderConf params;
+                GLuint       glList;
+                ADMImage    *original;
+                bool         ready;
+                std::string  erString;
+                bool         genQuad(void);
+
+protected:
+                bool        render(ADMImage *image,ADM_PLANE plane,QGLFramebufferObject *fbo);
+public:
+                             shaderLoader(ADM_coreVideoFilter *previous,CONFcouple *conf);
+                            ~shaderLoader();
+
+        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
+};
+
+// Add the hook to make it valid plugin
+DECLARE_VIDEO_FILTER(   shaderLoader,   // Class
+                        1,0,0,              // Version
+                        ADM_UI_QT4+ADM_FEATURE_OPENGL,         // UI
+                        VF_OPENGL,            // Category
+                        "shaderLoader",            // internal name (must be uniq!)
+                        "Shader Loader",            // Display name
+                        "Run an external shader program." // Description
+                    );
+
+// Now implements the interesting parts
+/**
+    \fn shaderLoader
+    \brief constructor
+*/
+shaderLoader::shaderLoader(  ADM_coreVideoFilter *in,CONFcouple *setup) : ADM_coreVideoFilterQtGl(in,setup)
+{
+        if(!setup || !ADM_paramLoad(setup,shaderLoaderConf_param,&params))
+        {
+            params.shaderFile=strdup("");
+        }
+        original=new ADMImageDefault(in->getInfo()->width,in->getInfo()->height);
+        _parentQGL->makeCurrent();
+        fboY->bind();
+        ready=true;
+       
+        printf("Compiling shader \n");
+        glProgramY = new QGLShaderProgram(_context);
+        ADM_assert(glProgramY);
+        if ( !glProgramY->addShaderFromSourceFile(QGLShader::Fragment, params.shaderFile))
+        {
+            ready=false;
+            erString="Compiling shader failed"+std::string(glProgramY->log().toUtf8().constData());
+        }
+        if ( ready && !glProgramY->link())
+        {
+            ready=false;
+            erString=std::string( glProgramY->log().toUtf8().constData());
+        }
+
+        if ( ready && ! glProgramY->bind())
+        {
+                ready=false;
+                erString=std::string("OpenGl bind failed");
+        }
+        glList=glGenLists(1);
+        genQuad();
+        fboY->release();
+        _parentQGL->doneCurrent();
+
+}
+/**
+    \fn shaderLoader
+    \brief destructor
+*/
+shaderLoader::~shaderLoader()
+{
+    if(original) delete original;
+    original=NULL;
+    glDeleteLists(glList,1);
+
+}
+
+/**
+    \fn getFrame
+    \brief Get a processed frame
+*/
+bool shaderLoader::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    // since we do nothing, just get the output of previous filter
+    if(false==previousFilter->getNextFrame(fn,original))
+    {
+        ADM_warning("glRotate : Cannot get frame\n");
+        return false;
+    }
+    if(!ready)
+    {
+        ADM_info("OpenGl shader not loaded (%s)\n",erString.c_str());
+        image->duplicateFull(original);
+        image->printString(2,2,erString.c_str());
+        return true;
+    }
+    _parentQGL->makeCurrent();
+    glPushMatrix();
+    // size is the last one...
+    fboY->bind();
+
+    glProgramY->setUniformValue("myTextureU", 1); 
+    glProgramY->setUniformValue("myTextureV", 2); 
+    glProgramY->setUniformValue("myTextureY", 0); 
+    glProgramY->setUniformValue("pts", (GLfloat)original->Pts); 
+
+    uploadAllPlanes(original);
+
+    render(image,PLANAR_Y,fboY);
+
+    downloadTextures(image,fboY);
+
+    fboY->release();
+    firstRun=false;
+    glPopMatrix();
+    _parentQGL->doneCurrent();
+    image->copyInfo(original);
+    return true;
+}
+/**
+    \fn getCoupledConf
+    \brief Return our current configuration as couple name=value
+*/
+bool         shaderLoader::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, shaderLoaderConf_param,&params);
+}
+
+void shaderLoader::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, shaderLoaderConf_param, &params);
+}
+/**
+    \fn getConfiguration
+    \brief Return current setting as a string
+*/
+const char *shaderLoader::getConfiguration(void)
+{
+    static char st200;
+    snprintf(st,199,"Shader Loader %s",params.shaderFile);
+    return st;
+}
+
+/**
+    \fn configure
+*/
+bool shaderLoader::configure( void) 
+{
+    char *name=strdup(params.shaderFile);
+    diaElemFile shader(0,&name,"ShaderFile to load");
+     
+     diaElem *elems={&shader};
+     
+     if(diaFactoryRun(QT_TR_NOOP("ShaderLoader"),sizeof(elems)/sizeof(diaElem *),elems))
+     {
+                params.shaderFile=strdup(name); // memleak
+                return true;
+     }
+     free(name); 
+     return false;
+}
+/**
+ * 
+ * @return 
+ */
+bool shaderLoader::genQuad(void)
+{
+  int width=info.width;
+  int height=info.height;
+
+#define POINT(a,b)  glTexCoord2i(a, b);glVertex2i(a, b);  
+  
+  glDeleteLists(glList,1);
+  glNewList(glList,GL_COMPILE);
+  glBegin(GL_QUADS);
+    int x=0,y=0;
+
+    POINT(0,0);
+    POINT(width,0);
+    POINT(width,height);
+    POINT(0,height);
+
+  glEnd();
+  glEndList();
+  return true;
+}
+
+
+/**
+    \fn render
+*/
+bool shaderLoader::render(ADMImage *image,ADM_PLANE plane,QGLFramebufferObject *fbo)
+{
+    int width=image->GetWidth(plane);
+    int height=image->GetHeight(plane);
+
+    glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
+	glViewport(0, 0, width, height);
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glOrtho(0, width, 0, height, -1, 1);
+    glCallList(glList);
+
+    return true;
+}
+//EOF

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/shader.h Added

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/shader1.shader Added

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/shader2.shader Added

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/shader3.shader Added

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/shaderLoader.conf Added

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/shaderLoader.h Added

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/shaderLoader_desc.cpp Added

avidemux_2.6.13.tar.gz/myOwnPlugins/videoFilter/openGlShaderLoader/shaderLoader_json.cpp Added

ffmpeg-2.8.6.tar.bz2 Deleted

Build Results
RPM Lint

Refresh

Comments for request 2853 0

Request History

enzokiel created request almost 10 years ago

Update to version 2.6.13

enzokiel accepted request almost 10 years ago

Please add a comment