Packman Build Service PMBS

avidemux.changes Changed

avidemux.spec Changed

@@ -1,10 +1,7 @@
-#BuildRequires:	-post-build-checks
-
-# norootforbuild
 
 Name:		avidemux
-Version:	2.5.5
-Release:	2
+Version:	2.5.6
+Release:	9000.gop.1
 
 Summary:	Video processing tool
 URL:		http://fixounet.free.fr/avidemux/
@@ -22,15 +19,15 @@
 BuildRoot:	%{_tmppath}/buildroot-%{name}-%{version}
 
 # Base RPM
-BuildRequires:	cmake gcc-c++ gettext-devel gtk2-devel libqt4-devel libxml2-devel
-BuildRequires:	libxslt-devel pkgconfig SDL-devel update-desktop-files
+BuildRequires:	cmake gcc-c++ gettext-runtime gtk2-devel libqt4-devel libxml2-devel
+BuildRequires:	libxslt-devel pkg-config libSDL-devel update-desktop-files
 
 # Codecs
-BuildRequires:	alsa-devel arts-devel libaften-devel libamrnb-devel
-BuildRequires:	libamrwb-devel libesd-devel libfaac-devel libfaad2-devel
+BuildRequires:	alsa-devel arts-devel
+BuildRequires:	libesd-devel libfaac-devel libfaad2-devel
 BuildRequires:	libdca-devel libjack-devel libmp3lame-devel libopencore-amr-devel
 BuildRequires:	libpulse-devel libsamplerate-devel libsndfile-devel libx264-devel
-BuildRequires:	libxvidcore-devel zypper yasm
+BuildRequires:	libxvidcore-devel yasm
 
 %description
 Avidemux is a free video editor designed for simple cutting, filtering and
@@ -85,11 +82,13 @@
 
 This package contains the arts output plugin.
 
+%lang_package
+
 
 %prep
 %setup -q -n "%{name}_%{version}"
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
+#%patch1 -p1
 
 
 %build
@@ -159,18 +158,18 @@
 %__rm -rf "%{buildroot}"
 
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root)
 %{_bindir}/avidemux2_cli
 %{_datadir}/pixmaps/%{name}.png
 %{_libdir}/libADM_UICli.so
 %{_libdir}/libADM_render_cli.so
-%{_libdir}/libADM5avcodec.so.52
+%{_libdir}/libADM5avcodec.so.53
 #%{_libdir}/libADM5avcore.so.0
-%{_libdir}/libADM5avformat.so.52
-%{_libdir}/libADM5avutil.so.50
+%{_libdir}/libADM5avformat.so.53
+%{_libdir}/libADM5avutil.so.51
 %{_libdir}/libADM5postproc.so.51
-%{_libdir}/libADM5swscale.so.0
+%{_libdir}/libADM5swscale.so.2
 %{_libdir}/libADM_core.so
 %{_libdir}/libADM_coreAudio.so
 %{_libdir}/libADM_coreImage.so
@@ -197,7 +196,6 @@
 %{_libdir}/ADM_plugins/audioDevices/libADM_av_pulseAudioSimple.so
 %{_libdir}/ADM_plugins/audioDevices/libADM_av_sdl.so
 %dir %{_libdir}/ADM_plugins/audioEncoders
-%{_libdir}/ADM_plugins/audioEncoders/libADM_ae_aften.so
 %{_libdir}/ADM_plugins/audioEncoders/libADM_ae_faac.so
 %{_libdir}/ADM_plugins/audioEncoders/libADM_ae_lame.so
 %{_libdir}/ADM_plugins/audioEncoders/libADM_ae_lav_ac3.so
@@ -310,7 +308,6 @@
 %{_libdir}/ADM_plugins/videoFilter/libADM_vidChromaU.so
 %{_libdir}/ADM_plugins/videoFilter/libADM_vidChromaV.so
 
-
 %files gtk
 %defattr(-,root,root)
 %{_bindir}/avidemux2_gtk
@@ -363,6 +360,8 @@
 %defattr(-,root,root)
 %{_libdir}/ADM_plugins/audioDevices/libADM_av_arts.so
 
+%files lang -f %{name}.lang
+%defattr(-,root,root)
+
 
 %changelog
-# vim: set sw=4 ts=4 et:

avidemux_2.5.5.tar.gz/avidemux/ADM_core/src/ADM_crashdump.cpp Deleted

@@ -1,363 +0,0 @@
-/***************************************************************************
-  Try to display interesting crash dump
-
-    copyright            : (C) 2007 by mean, (C) 2007 Gruntster
-    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 <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <math.h>
-
-#ifdef __MINGW32__
-#include <windows.h>
-#include <excpt.h>
-#include <imagehlp.h>
-#else
-#include <cxxabi.h>
-#endif
-
-#include "ADM_default.h"
-
-// Our callback to give UI formatted informations....
-static ADM_saveFunction *mysaveFunction=NULL;
-static ADM_fatalFunction *myFatalFunction=NULL;
-/**
-        \fn ADM_setCrashHook
-        \brief install crash handlers (save + display)
-*/
-void ADM_setCrashHook(ADM_saveFunction *save, ADM_fatalFunction *fatal)
-{
-        mysaveFunction=save;
-        myFatalFunction=fatal;
-}
-
-extern char *ADM_getBaseDir(void);
-extern void A_parseECMAScript(const char *name);
-
-#ifdef __APPLE__
-void installSigHandler() {}
-
-void ADM_backTrack(const char *info,int lineno,const char *file)
-{
-	char bfr[1024];
-
-	if (mysaveFunction)
-		mysaveFunction();
-
-	snprintf(bfr,1024,"%s\n file %s, line %d\n", info, file, lineno);
-
-	if(myFatalFunction)
-		myFatalFunction("Crash",bfr);
-
-	exit(-1);
-}
-#elif defined(__MINGW32__)
-typedef struct STACK_FRAME
-{
-    STACK_FRAME* ebp;	// address of the calling function frame
-    uint8_t* retAddr;	// return address
-    uint32_t param[0];	// parameter list (could be empty)
-} STACK_FRAME;
-
-static void dumpFrame(void* processId, void* frameAddr)
-{
-#ifdef ADM_CPU_X86_64
-#define ARCH_DWORD DWORD64
-#else
-#define ARCH_DWORD DWORD
-#endif
-
-	MEMORY_BASIC_INFORMATION mbi;
-	char moduleName[MAX_PATH];
-	HMODULE moduleAddr;
-	ARCH_DWORD symDisplacement;
-	IMAGEHLP_SYMBOL* pSymbol;
-
-	if (VirtualQuery(frameAddr, &mbi, sizeof(mbi)))
-	{
-		moduleName[0] = 0;
-		moduleAddr = (HMODULE)mbi.AllocationBase;
-		
-		GetModuleFileName(moduleAddr, moduleName, MAX_PATH);
-
-		printf("%s(", moduleName);
-
-		if (SymGetSymFromAddr(processId, (ARCH_DWORD)frameAddr, &symDisplacement, pSymbol))
-			printf("%s", pSymbol->Name);
-		else
-			printf("<unknown>");
-
-		printf("+0x%X) [0x%08X]\n", (ARCH_DWORD)frameAddr - (ARCH_DWORD)moduleAddr, frameAddr);
-
-		fflush(stdout);
-	}
-}
-	
-static void dumpExceptionInfo(void* processId, struct _EXCEPTION_RECORD* pExceptionRec, struct _CONTEXT* pContextRecord)
-{
-	printf("\n*********** EXCEPTION **************\n");
-	printf("Registers:\n");
-#ifdef ADM_CPU_X86_64
-	printf("RAX: %08X  RBX: %08X  RCX: %08X  RDX: %08X  RSI: %08X  RDI: %08X  RSP: %08X  RBP: %08X\n", pContextRecord->Rax, pContextRecord->Rbx, pContextRecord->Rcx, pContextRecord->Rdx, pContextRecord->Rsi, pContextRecord->Rdi, pContextRecord->Rsp, pContextRecord->Rbp);
-	printf("R8: %08X  R9: %08X  R10: %08X  R11: %08X  R12: %08X  R13: %08X  R14: %08X  R15: %08X\n", pContextRecord->R8, pContextRecord->R9, pContextRecord->R10, pContextRecord->R11, pContextRecord->R12, pContextRecord->R13, pContextRecord->R14, pContextRecord->R15);
-	printf("RIP: %08X  EFlags: %08X\n\n", pContextRecord->Rip, pContextRecord->EFlags);
-#else
-	printf("EAX: %08X  EBX: %08X  ECX: %08X  EDX: %08X  ESI: %08X\n", pContextRecord->Eax, pContextRecord->Ebx, pContextRecord->Ecx, pContextRecord->Edx, pContextRecord->Esi);
-	printf("EDI: %08X  ESP: %08X  EBP: %08X  EIP: %08X  EFlags: %08X\n\n", pContextRecord->Edi, pContextRecord->Esp, pContextRecord->Ebp, pContextRecord->Eip, pContextRecord->EFlags);
-#endif
-
-	printf("Exception Code: ");
-
-	switch (pExceptionRec->ExceptionCode)
-	{
-		case EXCEPTION_ACCESS_VIOLATION:
-			printf("EXCEPTION_ACCESS_VIOLATION");
-			break;
-		case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
-			printf("EXCEPTION_ARRAY_BOUNDS_EXCEEDED");
-			break;
-		case EXCEPTION_BREAKPOINT:
-			printf("EXCEPTION_BREAKPOINT");
-			break;
-		case EXCEPTION_DATATYPE_MISALIGNMENT:
-			printf("EXCEPTION_DATATYPE_MISALIGNMENT");
-			break;
-		case EXCEPTION_FLT_DENORMAL_OPERAND:
-			printf("EXCEPTION_FLT_DENORMAL_OPERAND");
-			break;
-		case EXCEPTION_FLT_DIVIDE_BY_ZERO:
-			printf("EXCEPTION_FLT_DIVIDE_BY_ZERO");
-			break;
-		case EXCEPTION_FLT_INEXACT_RESULT:
-			printf("EXCEPTION_FLT_INEXACT_RESULT");
-			break;
-		case EXCEPTION_FLT_INVALID_OPERATION:
-			printf("EXCEPTION_FLT_INVALID_OPERATION");
-			break;
-		case EXCEPTION_FLT_OVERFLOW:
-			printf("EXCEPTION_FLT_OVERFLOW");
-			break;
-		case EXCEPTION_FLT_STACK_CHECK:
-			printf("EXCEPTION_FLT_STACK_CHECK");
-			break;
-		case EXCEPTION_FLT_UNDERFLOW:
-			printf("EXCEPTION_FLT_UNDERFLOW");
-			break;
-		case EXCEPTION_ILLEGAL_INSTRUCTION:
-			printf("EXCEPTION_ILLEGAL_INSTRUCTION");
-			break;
-		case EXCEPTION_IN_PAGE_ERROR:
-			printf("EXCEPTION_IN_PAGE_ERROR");
-			break;
-		case EXCEPTION_INT_DIVIDE_BY_ZERO:
-			printf("EXCEPTION_INT_DIVIDE_BY_ZERO");
-			break;
-		case EXCEPTION_INT_OVERFLOW:
-			printf("EXCEPTION_INT_OVERFLOW");
-			break;
-		case EXCEPTION_INVALID_DISPOSITION:
-			printf("EXCEPTION_INVALID_DISPOSITION");
-			break;
-		case EXCEPTION_NONCONTINUABLE_EXCEPTION:
-			printf("EXCEPTION_NONCONTINUABLE_EXCEPTION");
-			break;
-		case EXCEPTION_PRIV_INSTRUCTION:
-			printf("EXCEPTION_PRIV_INSTRUCTION");
-			break;
-		case EXCEPTION_SINGLE_STEP:
-			printf("EXCEPTION_SINGLE_STEP");
-			break;
-		case EXCEPTION_STACK_OVERFLOW:
-			printf("EXCEPTION_STACK_OVERFLOW");
-			break;
-		default:
-			printf("UNKNOWN");
-	}
-	
-	printf(" (%08X)\n", pExceptionRec->ExceptionCode);
-	printf("Exception Flags: %08X\n", pExceptionRec->ExceptionFlags);
-
-	printf("\nOrigin:\n");
-
-#ifdef ADM_CPU_X86_64
-	dumpFrame(processId, (void*)pContextRecord->Rip);
-#else
-	dumpFrame(processId, (void*)pContextRecord->Eip);
-#endif

avidemux_2.5.5.tar.gz/avidemux/ADM_libraries/ffmpeg-0.7-rc1.tar.gz Deleted

avidemux_2.5.5.tar.gz/cmake/patches/libavcodec_utils.c.patch Deleted

avidemux_2.5.5.tar.gz/cmake/patches/libavformat_file.c.patch Deleted

@@ -1,78 +0,0 @@
---- libavformat/file.c.orig	2011-05-10 22:40:30 +0100
-+++ libavformat/file.c	2011-05-10 22:40:30 +0100
-@@ -31,6 +31,75 @@
- #include "os_support.h"
- #include "url.h"
- 
-+// GRUNTSTER start
-+#ifdef __WIN32
-+#include <windows.h>
-+
-+int utf8StringToWideChar(const char *utf8String, int utf8StringLength, wchar_t *wideCharString);
-+int ADM_open(const char *path, int oflag, ...);
-+
-+int utf8StringToWideChar(const char *utf8String, int utf8StringLength, wchar_t *wideCharString)
-+{
-+	int wideCharStringLength = MultiByteToWideChar(CP_UTF8, 0, utf8String, utf8StringLength, NULL, 0);
-+
-+	if (wideCharString)
-+		MultiByteToWideChar(CP_UTF8, 0, utf8String, utf8StringLength, wideCharString, wideCharStringLength);
-+
-+	return wideCharStringLength;
-+}
-+
-+int ADM_open(const char *path, int oflag, ...)
-+{
-+	int fileNameLength = utf8StringToWideChar(path, -1, NULL);
-+	wchar_t wcFile[fileNameLength];
-+	int creation = 0, access = 0;
-+	HANDLE hFile;
-+
-+	utf8StringToWideChar(path, -1, 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 open ADM_open
-+#endif
-+// GRUNTSTER end
- 
- /* standard file protocol */
-

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/fontconfig/libtool.patch Deleted

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/libvorbis/libtool.patch Deleted

avidemux_2.5.5.tar.gz/CMakeLists.txt -> avidemux_2.5.6.tar.gz/CMakeLists.txt Changed

avidemux_2.5.5.tar.gz/autononreg/fcctest.js -> avidemux_2.5.6.tar.gz/autononreg/fcctest.js Changed

avidemux_2.5.5.tar.gz/autononreg/fpstest.js -> avidemux_2.5.6.tar.gz/autononreg/fpstest.js Changed

avidemux_2.5.5.tar.gz/autononreg/nbframestest.js -> avidemux_2.5.6.tar.gz/autononreg/nbframestest.js Changed

avidemux_2.5.5.tar.gz/autononreg/width.js -> avidemux_2.5.6.tar.gz/autononreg/width.js Changed

avidemux_2.5.6.tar.gz/avidemux/ADM_UIs/ADM_QT4/include/Q_mswin.h Added

avidemux_2.5.5.tar.gz/avidemux/ADM_UIs/ADM_QT4/src/CMakeLists.txt -> avidemux_2.5.6.tar.gz/avidemux/ADM_UIs/ADM_QT4/src/CMakeLists.txt Changed

avidemux_2.5.6.tar.gz/avidemux/ADM_UIs/ADM_QT4/src/Q_mswin.cpp Added

avidemux_2.5.5.tar.gz/avidemux/ADM_audio/audioac3ex.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_audio/audioac3ex.cpp Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_audio/audioex.h -> avidemux_2.5.6.tar.gz/avidemux/ADM_audio/audioex.h Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_audio/audiomp3ex.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_audio/audiomp3ex.cpp Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_audio/audiosource_ext.h -> avidemux_2.5.6.tar.gz/avidemux/ADM_audio/audiosource_ext.h Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_audio/audiowavex.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_audio/audiowavex.cpp Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_audiocodec/ADM_codecwma.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_audiocodec/ADM_codecwma.cpp Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_audiofilter/audio_encoderWrapper.h -> avidemux_2.5.6.tar.gz/avidemux/ADM_audiofilter/audio_encoderWrapper.h Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_codecs/ADM_ffmp43.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_codecs/ADM_ffmp43.cpp Changed

@@ -278,16 +278,15 @@
 }
 uint8_t decoderFF::decodeHeaderOnly (void)
 {
-  if (codecId == CODEC_ID_H264)
-    _context->hurry_up = 4;
-  else
-    _context->hurry_up = 5;
-  printf ("\n[lavc] Hurry up\n");
+  _context->skip_frame = AVDISCARD_ALL;
+
+  printf ("\n[lavc] decode header only\n");
   return 1;
 }
 uint8_t decoderFF::decodeFull (void)
 {
-  _context->hurry_up = 0;
+  _context->skip_frame = AVDISCARD_DEFAULT;
+
   printf ("\n[lavc] full decoding\n");
   return 1;
 }
@@ -340,13 +339,13 @@
 
   ret = avcodec_decode_video2(_context, &_frame, &got_picture, &avpkt);
   out->_qStride = 0;		//Default = no quant
-  if (0 > ret && !_context->hurry_up)
+  if (0 > ret && _context->skip_frame <= AVDISCARD_DEFAULT)
     {
       printf ("\n[lavc] error in FFMP43/mpeg4!\n");
       printf ("[lavc] Err: %d, size :%d\n", ret, in->dataLength);
       return 0;
     }
-  if (!got_picture && !_context->hurry_up)
+  if (!got_picture && _context->skip_frame <= AVDISCARD_DEFAULT)
     {
       // Some encoder code a vop header with the 
       // vop flag set to 0
@@ -385,7 +384,7 @@
       //return 1;
       return 0;
     }
-  if (_context->hurry_up)
+  if (_context->skip_frame > AVDISCARD_DEFAULT)
     {
       out->flags = frameType ();
       return 1;
@@ -601,7 +600,8 @@
 
 uint8_t   decoderFFH264::uncompress (ADMCompressedImage * in, ADMImage * out)
 {
-  if(!_context->hurry_up) return decoderFF::uncompress (in, out);
+  if (_context->skip_frame <= AVDISCARD_DEFAULT)
+	  return decoderFF::uncompress (in, out);
   
   uint32_t nalSize, isAvc;
   av_getAVCStreamInfo(_context,&nalSize,&isAvc);

avidemux_2.5.5.tar.gz/avidemux/ADM_core/include/ADM_assert.h -> avidemux_2.5.6.tar.gz/avidemux/ADM_core/include/ADM_assert.h Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_core/include/ADM_mangle.h -> avidemux_2.5.6.tar.gz/avidemux/ADM_core/include/ADM_mangle.h Changed

avidemux_2.5.6.tar.gz/avidemux/ADM_core/src/ADM_crashdump_apple.cpp Added

@@ -0,0 +1,54 @@
+/***************************************************************************
+  Try to display interesting crash dump
+
+    copyright            : (C) 2007 by mean, (C) 2007 Gruntster
+    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 <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <unistd.h>
+#include <cxxabi.h>
+
+#include "ADM_default.h"
+
+// Our callback to give UI formatted informations....
+static ADM_saveFunction *mysaveFunction=NULL;
+static ADM_fatalFunction *myFatalFunction=NULL;
+/**
+        \fn ADM_setCrashHook
+        \brief install crash handlers (save + display)
+*/
+void ADM_setCrashHook(ADM_saveFunction *save, ADM_fatalFunction *fatal)
+{
+        mysaveFunction=save;
+        myFatalFunction=fatal;
+}
+
+void installSigHandler() {}
+
+void ADM_backTrack(const char *info,int lineno,const char *file)
+{
+	char bfr[1024];
+
+	if (mysaveFunction)
+		mysaveFunction();
+
+	snprintf(bfr,1024,"%s\n file %s, line %d\n", info, file, lineno);
+
+	if(myFatalFunction)
+		myFatalFunction("Crash",bfr);
+
+	exit(-1);
+}

avidemux_2.5.6.tar.gz/avidemux/ADM_core/src/ADM_crashdump_mswin.cpp Added

@@ -0,0 +1,290 @@
+/***************************************************************************
+  Try to display interesting crash dump
+
+    copyright            : (C) 2007 by mean, (C) 2007 Gruntster
+    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 <stdio.h>
+#include <windows.h>
+#include <imagehlp.h>
+#include <cxxabi.h>
+
+extern "C"
+{
+typedef void ADM_saveFunction(void);
+typedef void ADM_fatalFunction(const char *title, const char *info);
+void ADM_setCrashHook(ADM_saveFunction *save, ADM_fatalFunction *fatal);
+void ADM_backTrack(const char *info, int lineno, const char *file);
+}
+
+static ADM_saveFunction *mysaveFunction = NULL;
+static ADM_fatalFunction *myFatalFunction = NULL;
+
+void ADM_setCrashHook(ADM_saveFunction *save, ADM_fatalFunction *fatal)
+{
+	mysaveFunction = save;
+	myFatalFunction = fatal;
+}
+
+static void PrintFunction(const char *moduleName, const char *functionName, DWORD_PTR frameAddress, DWORD_PTR frameOffset)
+{
+	if (functionName)
+	{
+		char *cxaFunction = (char*)malloc(strlen(functionName) + 2);
+
+		cxaFunction[0] = '_';
+		strcpy(cxaFunction + 1, functionName);
+
+		int status;
+		char *demangledName = __cxxabiv1::__cxa_demangle(cxaFunction, NULL, NULL, &status);
+
+		free(cxaFunction);
+
+		if (status == 0)
+			printf(demangledName);
+		else
+			printf(functionName);
+
+		if (demangledName)
+			free(demangledName);
+	}
+	else
+		printf("unknown function");
+
+	if (frameOffset)
+		printf(" <+0x%X>", frameOffset);
+
+	if (moduleName)
+		printf("  [%s]\n", moduleName);
+	else
+		printf("  [unknown module]\n");
+
+	fflush(stdout);
+}
+
+static bool DumpFrame(void *process, DWORD_PTR frameAddress)
+{
+	const int functionLength = 255;
+	IMAGEHLP_SYMBOL *symbol = (IMAGEHLP_SYMBOL*)malloc(sizeof(IMAGEHLP_SYMBOL) + functionLength);
+	DWORD_PTR moduleBase = SymGetModuleBase(process, frameAddress);
+	const char *moduleName = NULL, *functionName = NULL;
+	DWORD_PTR displacement;
+	char moduleFilename[MAX_PATH];
+
+	symbol->SizeOfStruct = (sizeof(*symbol)) + functionLength;
+	symbol->MaxNameLength = functionLength - 1;
+
+	if (moduleBase && GetModuleFileName((HINSTANCE)moduleBase, moduleFilename, MAX_PATH))
+		moduleName = moduleFilename;
+
+	if (SymGetSymFromAddr(process, frameAddress, &displacement, symbol))
+		functionName = symbol->Name;
+
+	PrintFunction(moduleName, functionName, frameAddress, displacement);
+
+	free(symbol);
+}
+
+static void DumpExceptionInfo(void *processId, struct _EXCEPTION_RECORD *exceptionRec, struct _CONTEXT *contextRecord)
+{
+	printf("\n*********** EXCEPTION **************\n");
+	printf("Registers:\n");
+#ifdef _WIN64
+	printf("RAX: %08X  RBX: %08X  RCX: %08X  RDX: %08X  RSI: %08X  RDI: %08X  RSP: %08X  RBP: %08X\n", contextRecord->Rax, contextRecord->Rbx, contextRecord->Rcx, contextRecord->Rdx, contextRecord->Rsi, contextRecord->Rdi, contextRecord->Rsp, contextRecord->Rbp);
+	printf("R8: %08X  R9: %08X  R10: %08X  R11: %08X  R12: %08X  R13: %08X  R14: %08X  R15: %08X\n", contextRecord->R8, contextRecord->R9, contextRecord->R10, contextRecord->R11, contextRecord->R12, contextRecord->R13, contextRecord->R14, contextRecord->R15);
+	printf("RIP: %08X  EFlags: %08X\n\n", contextRecord->Rip, contextRecord->EFlags);
+#else
+	printf("EAX: %08X  EBX: %08X  ECX: %08X  EDX: %08X  ESI: %08X\n", contextRecord->Eax, contextRecord->Ebx, contextRecord->Ecx, contextRecord->Edx, contextRecord->Esi);
+	printf("EDI: %08X  ESP: %08X  EBP: %08X  EIP: %08X  EFlags: %08X\n\n", contextRecord->Edi, contextRecord->Esp, contextRecord->Ebp, contextRecord->Eip, contextRecord->EFlags);
+#endif
+
+	printf("Exception Code: ");
+
+	switch (exceptionRec->ExceptionCode)
+	{
+		case EXCEPTION_ACCESS_VIOLATION:
+			printf("EXCEPTION_ACCESS_VIOLATION");
+			break;
+		case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
+			printf("EXCEPTION_ARRAY_BOUNDS_EXCEEDED");
+			break;
+		case EXCEPTION_BREAKPOINT:
+			printf("EXCEPTION_BREAKPOINT");
+			break;
+		case EXCEPTION_DATATYPE_MISALIGNMENT:
+			printf("EXCEPTION_DATATYPE_MISALIGNMENT");
+			break;
+		case EXCEPTION_FLT_DENORMAL_OPERAND:
+			printf("EXCEPTION_FLT_DENORMAL_OPERAND");
+			break;
+		case EXCEPTION_FLT_DIVIDE_BY_ZERO:
+			printf("EXCEPTION_FLT_DIVIDE_BY_ZERO");
+			break;
+		case EXCEPTION_FLT_INEXACT_RESULT:
+			printf("EXCEPTION_FLT_INEXACT_RESULT");
+			break;
+		case EXCEPTION_FLT_INVALID_OPERATION:
+			printf("EXCEPTION_FLT_INVALID_OPERATION");
+			break;
+		case EXCEPTION_FLT_OVERFLOW:
+			printf("EXCEPTION_FLT_OVERFLOW");
+			break;
+		case EXCEPTION_FLT_STACK_CHECK:
+			printf("EXCEPTION_FLT_STACK_CHECK");
+			break;
+		case EXCEPTION_FLT_UNDERFLOW:
+			printf("EXCEPTION_FLT_UNDERFLOW");
+			break;
+		case EXCEPTION_ILLEGAL_INSTRUCTION:
+			printf("EXCEPTION_ILLEGAL_INSTRUCTION");
+			break;
+		case EXCEPTION_IN_PAGE_ERROR:
+			printf("EXCEPTION_IN_PAGE_ERROR");
+			break;
+		case EXCEPTION_INT_DIVIDE_BY_ZERO:
+			printf("EXCEPTION_INT_DIVIDE_BY_ZERO");
+			break;
+		case EXCEPTION_INT_OVERFLOW:
+			printf("EXCEPTION_INT_OVERFLOW");
+			break;
+		case EXCEPTION_INVALID_DISPOSITION:
+			printf("EXCEPTION_INVALID_DISPOSITION");
+			break;
+		case EXCEPTION_NONCONTINUABLE_EXCEPTION:
+			printf("EXCEPTION_NONCONTINUABLE_EXCEPTION");
+			break;
+		case EXCEPTION_PRIV_INSTRUCTION:
+			printf("EXCEPTION_PRIV_INSTRUCTION");
+			break;
+		case EXCEPTION_SINGLE_STEP:
+			printf("EXCEPTION_SINGLE_STEP");
+			break;
+		case EXCEPTION_STACK_OVERFLOW:
+			printf("EXCEPTION_STACK_OVERFLOW");
+			break;
+		default:
+			printf("UNKNOWN");
+	}
+	
+	printf(" (%08X)\n", exceptionRec->ExceptionCode);
+	printf("Exception Flags: %08X\n", exceptionRec->ExceptionFlags);
+
+	printf("\nOrigin:\n");
+
+#ifdef _WIN64
+	DumpFrame(processId, contextRecord->Rip);
+#else
+	DumpFrame(processId, contextRecord->Eip);
+#endif
+
+	printf("*********** EXCEPTION **************\n");
+	fflush(stdout);
+}
+
+void DumpBackTrace(void *processId)
+{
+	printf("\n*********** BACKTRACE **************\n");
+
+	typedef VOID NTAPI RtlCaptureContext_(PCONTEXT ContextRecord);
+

avidemux_2.5.6.tar.gz/avidemux/ADM_core/src/ADM_crashdump_unix.cpp Added

@@ -0,0 +1,109 @@
+/***************************************************************************
+  Try to display interesting crash dump
+
+    copyright            : (C) 2007 by mean, (C) 2007 Gruntster
+    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 <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <unistd.h>
+#include <cxxabi.h>
+#include <signal.h>
+#include <execinfo.h>
+
+#include "ADM_default.h"
+
+// Our callback to give UI formatted informations....
+static ADM_saveFunction *mysaveFunction=NULL;
+static ADM_fatalFunction *myFatalFunction=NULL;
+
+/**
+        \fn ADM_setCrashHook
+        \brief install crash handlers (save + display)
+*/
+void ADM_setCrashHook(ADM_saveFunction *save, ADM_fatalFunction *fatal)
+{
+        mysaveFunction=save;
+        myFatalFunction=fatal;
+}
+
+/**
+      \fn sig_segfault_handler
+      \brief our segfault handler
+*/
+void sig_segfault_handler(int signo)
+{
+     static int running=0;
+      if(running) 
+      {
+        signo=0;
+        exit(1);
+      }
+      running=0; 
+      ADM_backTrack("Segfault",0,"??");
+}
+
+void installSigHandler()
+{
+    signal(11, sig_segfault_handler); // show stacktrace on default
+}
+
+void ADM_backTrack(const char *info,int lineno,const char *file)
+{
+	char wholeStuff[2048];
+    char buffer[2048];
+    char in[2048];
+	void *stack[20];
+	char **functions;
+	int count, i;
+
+	wholeStuff[0]=0;
+
+	if(mysaveFunction)
+		mysaveFunction();
+
+	printf("\n*********** BACKTRACK **************\n");
+
+	count = backtrace(stack, 20);
+	functions = backtrace_symbols(stack, count);
+	sprintf(wholeStuff,"%s\n at line %d, file %s",info,lineno,file);
+    int status;
+    size_t size=2047;
+    // it looks like that xxxx (functionName+0x***) XXXX
+	for (i=0; i < count; i++) 
+	{
+        char *s=strstr(functions[i],"(");
+        buffer[0]=0;
+        if(s && strstr(s+1,"+"))
+        {
+            strcpy(in,s+1);
+            char *e=strstr(in,"+");
+            *e=0;                
+            __cxxabiv1::__cxa_demangle(in,buffer,&size,&status);
+            if(status) strcpy(buffer,in);
+        }else       
+            strcpy(buffer,functions[i]);
+        printf("%s:%d:<%s>:%d\n",functions[i],i,buffer,status);
+		strcat(wholeStuff,buffer);
+		strcat(wholeStuff,"\n");
+	}
+
+	printf("*********** BACKTRACK **************\n");
+
+	if(myFatalFunction)
+		myFatalFunction("Crash", wholeStuff); // FIXME
+
+	exit(-1); // _exit(1) ???
+}

avidemux_2.5.5.tar.gz/avidemux/ADM_core/src/ADM_memcpy.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_core/src/ADM_memcpy.cpp Changed

@@ -375,32 +375,6 @@
 }
 #endif /* ARCH_X86 */
 
-static struct {
-  const char *name;
-  void *(* function)(void *to, const void *from, size_t len);
-
-  uint64_t time; /* This type could be used for non-MSC build too! */
-
-  uint32_t cpu_require;
-} memcpy_method[] =
-{
-  { NULL, NULL, 0, 0 },
-  { "libc memcpy()", memcpy, 0, 0 },
-#if defined(ADM_CPU_X86)
-  { "linux kernel memcpy()", linux_kernel_memcpy, 0, 0 },
-#if defined(ADM_CPU_X86)
-  { "MMX optimized memcpy()", mmx_memcpy, 0, FF_MM_MMX },
-  { "MMXEXT optimized memcpy()", mmx2_memcpy, 0, FF_MM_MMXEXT },
-  { "SSE optimized memcpy()", sse_memcpy, 0, FF_MM_MMXEXT|FF_MM_SSE },
-#endif
-#endif /* ARCH_X86 */
-#if 0 && defined(ADM_CPU_PPC) && !defined (__APPLE__)
-  { "ppcasm_memcpy()", ppcasm_memcpy, 0, 0 },
-  { "ppcasm_cacheable_memcpy()", ppcasm_cacheable_memcpy, 0, FF_MM_ACCEL_PPC_CACHE32 },
-#endif /* ARCH_PPC && !HOST_OS_DARWIN */
-  { NULL, NULL, 0, 0 }
-};
-
 #if defined(ADM_CPU_X86)
 static unsigned long long int rdtsc(void)
 {

avidemux_2.5.5.tar.gz/avidemux/ADM_core/src/ADM_win32.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_core/src/ADM_win32.cpp Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_core/src/CMakeLists.txt -> avidemux_2.5.6.tar.gz/avidemux/ADM_core/src/CMakeLists.txt Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_coreImage/src/ADM_vidFieldBlend.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_coreImage/src/ADM_vidFieldBlend.cpp Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_coreImage/src/CMakeLists.txt -> avidemux_2.5.6.tar.gz/avidemux/ADM_coreImage/src/CMakeLists.txt Changed

@@ -1,30 +1,31 @@
-SET(ADM_coreImage_SRCS 
-	ADM_confCouple.cpp  
-        ADM_videoFilter.cpp  
-        ADM_videoFilterCache.cpp
-        ADM_image.cpp  
-        ADM_imageUtils.cpp
-        ADM_imageResizer.cpp
-        yuv.cpp
-        rgb2yuv.cpp
-        ADM_colorspace.cpp
-        ADM_rgb.cpp
-        ADM_pp.cpp
-        ADM_print.cpp
-        ADM_vidFieldUtil.cpp
-        ADM_vidFields.cpp
-        ADM_vidFieldASM.cpp
-        ADM_vidFieldBlend.cpp
-        ADM_interlaceUtil.cpp
-        DIA_flyDialog.cpp
-)
-
-ADD_LIBRARY(ADM_coreImage SHARED ${ADM_coreImage_SRCS})
-ADD_SOURCE_CFLAGS(DIA_flyDialog.cpp " -DADM_UI_TYPE_BUILD=99")
-IF (APPLE)
-	TARGET_LINK_LIBRARIES(ADM_coreImage -Wl,-read_only_relocs,suppress)
-ENDIF (APPLE)
-
-TARGET_LINK_LIBRARIES(ADM_coreImage ADM_core ADM_coreUI ADM_libswscale ADM_libpostproc)
-add_dependencies(ADM_coreImage ffmpeg)
-INSTALL(TARGETS ADM_coreImage RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib${LIB_SUFFIX}  ARCHIVE DESTINATION lib${LIB_SUFFIX})
+SET(ADM_coreImage_SRCS 
+	ADM_confCouple.cpp  
+        ADM_videoFilter.cpp  
+        ADM_videoFilterCache.cpp
+        ADM_image.cpp  
+        ADM_imageUtils.cpp
+        ADM_imageResizer.cpp
+        yuv.cpp
+        rgb2yuv.cpp
+        ADM_colorspace.cpp
+        ADM_rgb.cpp
+        ADM_pp.cpp
+        ADM_print.cpp
+        ADM_vidFieldUtil.cpp
+        ADM_vidFields.cpp
+        ADM_vidFieldASM.cpp
+        ADM_vidFieldBlend.cpp
+        ADM_interlaceUtil.cpp
+        DIA_flyDialog.cpp
+)
+
+ADD_LIBRARY(ADM_coreImage SHARED ${ADM_coreImage_SRCS})
+ADD_SOURCE_CFLAGS(DIA_flyDialog.cpp " -DADM_UI_TYPE_BUILD=99")
+
+IF (APPLE AND NOT ADM_CPU_X86_64)
+    TARGET_LINK_LIBRARIES(ADM_coreImage -Wl,-read_only_relocs,suppress)
+ENDIF (APPLE AND NOT ADM_CPU_X86_64)
+
+TARGET_LINK_LIBRARIES(ADM_coreImage ADM_core ADM_coreUI ADM_libswscale ADM_libpostproc)
+add_dependencies(ADM_coreImage ffmpeg)
+INSTALL(TARGETS ADM_coreImage RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib${LIB_SUFFIX}  ARCHIVE DESTINATION lib${LIB_SUFFIX})

avidemux_2.5.5.tar.gz/avidemux/ADM_coreUI/include/DIA_factory.h -> avidemux_2.5.6.tar.gz/avidemux/ADM_coreUI/include/DIA_factory.h Changed

@@ -206,7 +206,7 @@
 };
 /*********************************************/
 typedef diaElem *CREATE_TOGGLE_UINT(uint32_t *toggleValue,const char *toggleTitle, uint32_t *uintval, 
-								const char *name,uint32_t min,uint32_t max,const char *tip=NULL);
+								const char *name,uint32_t min,uint32_t max,const char *tip);
 class diaElemToggleUint : public diaElem
 {
   protected:
@@ -226,7 +226,7 @@
   int getRequiredLayout(void);
 };
 typedef diaElem *CREATE_TOGGLE_INT(uint32_t *toggleValue,const char *toggleTitle, int32_t *intval, 
-									const char *name,int32_t min,int32_t max,const char *tip=NULL);
+									const char *name,int32_t min,int32_t max,const char *tip);
 class diaElemToggleInt : public diaElem
 {
   protected:
@@ -620,7 +620,7 @@
   void updateMe(void);
 };
 /**********************************************/
-typedef diaElem *(CREATE_THREADCOUNT_T)(uint32_t *value, const char *title, const char *tip = NULL);
+typedef diaElem *(CREATE_THREADCOUNT_T)(uint32_t *value, const char *title, const char *tip);
 class diaElemThreadCount : public diaElem
 {
 
@@ -634,7 +634,7 @@
   void updateMe(void);
 };
 /**********************************************/
-typedef diaElem *(CREATE_ASPECTRATIO_T)(uint32_t *value, const char *title, const char *tip = NULL);
+typedef diaElem *(CREATE_ASPECTRATIO_T)(uint32_t *value, const char *title, const char *tip);
 class diaElemAspectRatio : public diaElem
 {
 public:

avidemux_2.5.5.tar.gz/avidemux/ADM_encoder/ADM_externalEncoder.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_encoder/ADM_externalEncoder.cpp Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_encoder/ADM_pluginLoad.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_encoder/ADM_pluginLoad.cpp Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_inputs/ADM_flv/ADM_flv.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_inputs/ADM_flv/ADM_flv.cpp Changed

@@ -85,13 +85,27 @@
     \fn     readFlvString
     \brief  read pascal like string
 */
+#define FLV_MAX_STRING 255
 char *flvHeader::readFlvString(void)
 {
-static char stringz[255];
+static uint8_t stringz[FLV_MAX_STRING+1];
     int size=read16();
-    read(size,(uint8_t *)stringz);
+    if(size>FLV_MAX_STRING)
+    {
+        int pre=FLV_MAX_STRING;
+        read(pre,stringz);
+        printf("String way too large :%d\n",size);
+        mixDump(stringz,pre);
+        stringz[0]='X';
+        stringz[1]='X';
+        stringz[2]=0;
+        stringz[FLV_MAX_STRING]=0;
+        Skip(size-FLV_MAX_STRING);
+        return (char *)stringz;
+    }
+    read(size,stringz);
     stringz[size]=0;
-    return stringz;
+    return (char *)stringz;
 }
 
 extern "C" {
@@ -212,24 +226,18 @@
 uint8_t flvHeader::parseMetaData(uint32_t remaining)
 {
     uint32_t endPos=ftello(_fd)+remaining;
+    // Check the first one is onMetaData...
+    uint8_t type=read8();
+    char *z;
+    if(type!=AMF_DATA_TYPE_STRING) // String!
+        goto endit;
+    z=readFlvString();
+    printf("[FlashString] %s\n",z);
+    if(z && strncmp(z,"onMetaData",10)) goto endit;
+    // Normally the next one is mixed array
+    while(ftello(_fd)<endPos-4)
     {
-        // Check the first one is onMetaData...
-        uint8_t type=read8();
-        if(type!=AMF_DATA_TYPE_STRING) // String!
-            goto endit;
-        char *z=readFlvString();
-        printf("[FlashString] %s\n",z);
-        if(z && strncmp(z,"onMetaData",10)) goto endit;
-        // Normally the next one is mixed array
-        Skip(4);
-        Skip(1);
-        while(ftello(_fd)<endPos-4)
-        {
-            char *s=readFlvString();
-            printf("[FlvType]  String : %s ",s);
-            
-            if(false==parseOneMeta(s,endPos)) goto endit;
-        }
+         if(false==parseOneMeta("meta",endPos)) goto endit;
     }
 endit:
     fseeko(_fd,endPos,SEEK_SET);

avidemux_2.5.5.tar.gz/avidemux/ADM_inputs/ADM_matroska/ADM_mkvEntries.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_inputs/ADM_matroska/ADM_mkvEntries.cpp Changed

avidemux_2.5.6.tar.gz/avidemux/ADM_libraries/ffmpeg-0.9.tar.bz2 Added

avidemux_2.5.5.tar.gz/avidemux/ADM_outputs/ADM_lavformat.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_outputs/ADM_lavformat.cpp Changed

@@ -190,8 +190,9 @@
 
 					 break;
                 case MUXER_MATROSKA:
-                        strcpy(oc->title,"Avidemux");
-                        strcpy(oc->author,"Avidemux");
+						av_dict_set(&oc->metadata, "title", "Avidemux", 0);
+						av_dict_set(&oc->metadata, "author", "Avidemux", 0);
+
                         if(isMpeg4Compatible(info->fcc))
                         {
                                 c->codec_id = CODEC_ID_MPEG4;
@@ -225,11 +226,9 @@
                 case MUXER_MP4:
                 case MUXER_PSP:
                 {
-                        // probably a memeleak here
-                        char *foo=ADM_strdup(filename);
+                        av_dict_set(&oc->metadata, "title", ADM_GetFileName(filename), 0);
+						av_dict_set(&oc->metadata, "author", "Avidemux", 0);
 
-                        strcpy(oc->title,ADM_GetFileName(foo));
-                        strcpy(oc->author,"Avidemux");
                         if(isMpeg4Compatible(info->fcc))
                         {
                                 c->codec_id = CODEC_ID_MPEG4;
@@ -335,7 +334,7 @@
 			ADM_assert(0);
 	}
 
-	c->codec_type = CODEC_TYPE_VIDEO;
+	c->codec_type = AVMEDIA_TYPE_VIDEO;
 	c->flags=CODEC_FLAG_QSCALE;
 	c->width = info->width;
 	c->height = info->height;
@@ -442,7 +441,7 @@
                           return 0;
                           break;
           }
-          c->codec_type = CODEC_TYPE_AUDIO;
+          c->codec_type = AVMEDIA_TYPE_AUDIO;
 
           c->bit_rate = audioheader->byterate*8;
           c->rc_buffer_size=(c->bit_rate/(2*8)); // 500 ms worth
@@ -488,19 +487,14 @@
 	oc->preload=AV_TIME_BASE/10; // 100 ms preloading
 	oc->max_delay=200*1000; // 500 ms
 
-	if (av_set_parameters(oc, NULL) < 0)
+	if (avio_open(&(oc->pb), filename, AVIO_FLAG_WRITE) < 0)
 	{
-		printf("Lav: set param failed \n");
+		printf("Lav: Failed to open file :%s\n",filename);
 		return 0;
 	}
-	 if (url_fopen(&(oc->pb), filename, URL_WRONLY) < 0)
-	 {
-	 	printf("Lav: Failed to open file :%s\n",filename);
-		return 0;
-        }
 
-	ADM_assert(av_write_header(oc)>=0);
-	dump_format(oc, 0, filename, 1);
+	ADM_assert(avformat_write_header(oc, NULL)>=0);
+	av_dump_format(oc, 0, filename, 1);
 
 
 	printf("lavformat mpeg muxer initialized\n");
@@ -546,7 +540,7 @@
             aprintf("Adm audio dts: %"LLU"\n",pkt.dts);
             //printf("F:%f Q:%u D=%u\n",f,pkt.pts,timeInUs-_lastAudioDts);
 
-            pkt.flags |= PKT_FLAG_KEY;
+            pkt.flags |= AV_PKT_FLAG_KEY;
             pkt.data= buf;
             pkt.size= len;
             pkt.stream_index=1;
@@ -640,12 +634,12 @@
         if(_type==MUXER_MP4 || _type==MUXER_PSP || _type==MUXER_FLV || _type==MUXER_MATROSKA)
         {
             if(bitstream->flags & AVI_KEY_FRAME)
-                        pkt.flags |= PKT_FLAG_KEY;
+                        pkt.flags |= AV_PKT_FLAG_KEY;
         }else
             if(!bitstream->data[0] &&  !bitstream->data[1] && bitstream->data[2]==1)
 	{
             if(bitstream->data[3]==0xb3 || bitstream->data[3]==0xb8 ) // Seq start or gop start
-		pkt.flags |= PKT_FLAG_KEY;
+		pkt.flags |= AV_PKT_FLAG_KEY;
 		//printf("Intra\n");
 	}
     //printf("Adm video dts=:%u\n",pkt.dts);
@@ -673,7 +667,7 @@
 		// Flush
 		// Cause deadlock :
 		av_write_trailer(oc);
-		url_fclose((oc->pb));
+		avio_close(oc->pb);
 
 	}
 	if(audio_st)

avidemux_2.5.5.tar.gz/avidemux/ADM_script/ADM_JSAvidemux.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_script/ADM_JSAvidemux.cpp Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_script/ADM_JSAvidemuxAudio.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_script/ADM_JSAvidemuxAudio.cpp Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_script/ADM_JSFunctions.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_script/ADM_JSFunctions.cpp Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_toolkit/automation.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_toolkit/automation.cpp Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_encoding.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_encoding.cpp Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_jobs.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_jobs.cpp Changed

@@ -108,7 +108,7 @@
         //
          
         int running=1;
-        gtk_widget_set_usize(WID(treeview1), 180, 300);
+        //gtk_widget_set_usize(WID(treeview1), -1, -1);
         while(running)
         {
                 int sel=0,event;
@@ -260,6 +260,7 @@
   gtk_box_pack_start (GTK_BOX (dialog_vbox1), hbox1, TRUE, TRUE, 0);
 
   scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_size_request (dialog1, 500, 250);
   gtk_widget_show (scrolledwindow1);
   gtk_box_pack_start (GTK_BOX (hbox1), scrolledwindow1, TRUE, TRUE, 0);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -268,7 +269,7 @@
   treeview1 = gtk_tree_view_new ();
   gtk_widget_show (treeview1);
   gtk_container_add (GTK_CONTAINER (scrolledwindow1), treeview1);
-  //gtk_widget_set_size_request (treeview1, 300, -1);
+  gtk_widget_set_size_request (treeview1, 500, 250);
 
   vbuttonbox1 = gtk_vbutton_box_new ();
   gtk_widget_show (vbuttonbox1);

avidemux_2.5.5.tar.gz/avidemux/ADM_userInterfaces/ADM_GTK/ADM_gui2/GUI_bindings.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_userInterfaces/ADM_GTK/ADM_gui2/GUI_bindings.cpp Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_userInterfaces/ADM_GTK/ADM_gui2/GUI_main2.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_userInterfaces/ADM_GTK/ADM_gui2/GUI_main2.cpp Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_userInterfaces/ADM_GTK/glade/gtk2_build.glade -> avidemux_2.5.6.tar.gz/avidemux/ADM_userInterfaces/ADM_GTK/glade/gtk2_build.glade Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/CMakeLists.txt -> avidemux_2.5.6.tar.gz/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/CMakeLists.txt Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_encoding.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_encoding.cpp Changed

@@ -24,14 +24,17 @@
 #include "ADM_video/ADM_vidMisc.h"
 #include "../ADM_gui/ADM_qtray.h"
 #include "ADM_toolkitQt.h"
+#include "Q_gui2.h"
 
 extern void UI_iconify(void);
 extern void UI_deiconify(void);
 extern void UI_purge(void);
+extern MainWindow *QuiMainWindows;
 static int stopReq=0;
 
 encodingWindow::encodingWindow(QWidget *parent, bool useTray) : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinimizeButtonHint)
 {
+	this->_phase = 0;
 	this->useTray = useTray;
 	ui.setupUi(this);
 
@@ -92,9 +95,16 @@
 
 void encodingWindow::closeEvent(QCloseEvent *event)
 {
+#ifdef __WIN32
+	QuiMainWindows->mswin.setProgressState(TBPF_PAUSED);
+#endif
+
 	if (GUI_Alternate((char*)encodingWindow::tr("The encoding is paused. Do you want to resume or abort?").toUtf8().constData(),
 		(char*)encodingWindow::tr("Resume").toUtf8().constData(), (char*)encodingWindow::tr("Abort").toUtf8().constData()))
 	{
+#ifdef __WIN32
+		QuiMainWindows->mswin.setProgressState(TBPF_NORMAL);
+#endif
 		stopReq = 0;
 		event->ignore();
 	}
@@ -149,7 +159,7 @@
 /*************************************/
 static char string[80];
 static encodingWindow *window=NULL;
-extern QDialog *QuiMainWindows;
+
 DIA_encoding::DIA_encoding( uint32_t fps1000 )
 {
 	uint32_t useTray = 0;
@@ -209,6 +219,10 @@
 }
 DIA_encoding::~DIA_encoding( )
 {
+#ifdef __WIN32
+	QuiMainWindows->mswin.setProgressState(TBPF_NOPROGRESS);
+#endif
+
 	bool shutdownRequired = (window->ui.checkBoxShutdown->checkState() == Qt::Checked);
 
 	setpriority(PRIO_PROCESS, 0, _originalPriority);
@@ -255,6 +269,14 @@
           ADM_assert(window);
           WRITEM(labelPhasis,n);
 
+		  if (strcmp(n, QT_TR_NOOP("1st Pass")) == 0)
+		  {
+			  window->_phase = 1;
+		  }
+		  else if (strcmp(n, QT_TR_NOOP("2nd Pass")) == 0)
+		  {
+			  window->_phase = 2;
+		  }
 }
 /**
     \fn setAudioCodec(const char *n)
@@ -435,6 +457,17 @@
             f=f/_total;
             WIDGET(progressBar)->setValue((int)f);
 
+#ifdef __WIN32
+			if (window->_phase == 0)
+			{
+				QuiMainWindows->mswin.setProgressValue((int)(f * 100), 10000);
+			}
+			else
+			{
+				QuiMainWindows->mswin.setProgressValue(((int)(f * 50)) + ((window->_phase - 1) * 5000), 10000);
+			}
+#endif
+
 			if(tray)
 				tray->setPercent((int)f);

avidemux_2.5.5.tar.gz/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_encoding.h -> avidemux_2.5.6.tar.gz/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_encoding.h Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/Q_gui2.cpp -> avidemux_2.5.6.tar.gz/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/Q_gui2.cpp Changed

@@ -14,7 +14,6 @@
 #include "config.h"
 #undef QT_TR_NOOP
 
-#include <QtCore/QUrl>
 #include <QtCore/QDir>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QGraphicsView>
@@ -33,6 +32,7 @@
 #include "gtkgui.h"
 #include "DIA_coreToolkit.h"
 #include "ADM_userInterfaces/ADM_render/GUI_renderInternal.h"
+#include "ADM_audiofilter/audioeng_buildfilters.h"
 
 extern int global_argc;
 extern char **global_argv;
@@ -53,11 +53,12 @@
 extern void destroyTranslator(void);
 extern ADM_RENDER_TYPE UI_getPreferredRender(void);
 extern int A_openAvi(const char *name);
-extern int A_appendAvi(const char *name);
+extern int A_appendAvi(const char *name, bool silent);
 extern char *actual_workbench_file;
 extern void FileSel_ReadWrite(SELFILE_CB *cb, int rw, const char *name, const char *actual_workbench_file);
 extern bool A_parseECMAScript(const char *name);
 extern void saveCrashProject(void);
+extern bool loadAudio(const char *filename);
 
 int SliderIsShifted=0;
 static void setupMenus(void);
@@ -106,10 +107,17 @@
 void UI_updateFrameCount(uint32_t curFrame);
 void UI_updateTimeCount(uint32_t curFrame,uint32_t fps);
 extern void UI_purge(void);
-/*
-    Declare the class that will be our main window
 
-*/
+class FileDropEvent : public QEvent
+{
+public:
+	QList<QUrl> files;
+
+	FileDropEvent(QList<QUrl> files) : QEvent(QEvent::User)
+	{
+		this->files = files;
+	}
+};
 
 void MainWindow::comboChanged(int z)
 {
@@ -235,6 +243,10 @@
 	qtRegisterDialog(this);
 	ui.setupUi(this);
 
+#ifdef __WIN32
+	mswin.init(this->winId());
+#endif
+
 	this->setStatusBar(0);
 	this->adjustSize();
 
@@ -480,6 +492,9 @@
 			}
 
 			break;
+		case QEvent::User:
+			this->openFiles(((FileDropEvent*)event)->files);
+			break;
 	}
 
 	return QObject::eventFilter(watched, event);
@@ -498,30 +513,38 @@
 
 void MainWindow::dropEvent(QDropEvent *event)
 {
-	QList<QUrl> urlList;
-	QString fileName;
+	if (event->mimeData()->hasUrls())
+	{
+		QCoreApplication::postEvent(this, new FileDropEvent(event->mimeData()->urls()));
+
+		event->acceptProposedAction();
+	}
+}
+
+void MainWindow::openFiles(QList<QUrl> urlList)
+{
 	QFileInfo info;
 
-	if (event->mimeData()->hasUrls())
+	for (int fileIndex = 0; fileIndex < urlList.size(); fileIndex++)
 	{
-		urlList = event->mimeData()->urls();
+		QString fileName = urlList[fileIndex].toLocalFile();
+		QFileInfo info(fileName);
 
-		for (int fileIndex = 0; fileIndex < urlList.size(); fileIndex++)
+		if (info.isFile())
 		{
-			fileName = urlList[fileIndex].toLocalFile();
-			info.setFile(fileName);
-
-			if (info.isFile())
+			if (avifileinfo)
 			{
-				if (avifileinfo)
-					FileSel_ReadWrite(reinterpret_cast <void (*)(const char *)> (A_appendAvi), 0, fileName.toUtf8().data(), actual_workbench_file);
-				else
-					FileSel_ReadWrite(reinterpret_cast <void (*)(const char *)> (A_openAvi), 0, fileName.toUtf8().data(), actual_workbench_file);
+				if (!A_appendAvi(fileName.toUtf8().constData(), 1))
+				{
+					loadAudio(fileName.toUtf8().constData());
+				}
+			}
+			else
+			{
+				FileSel_ReadWrite(reinterpret_cast <void (*)(const char *)> (A_openAvi), 0, fileName.toUtf8().data(), actual_workbench_file);
 			}
 		}
 	}
-
-	event->acceptProposedAction();
 }
 
 void MainWindow::previousIntraFrame(void)
@@ -673,6 +696,14 @@
 	clearCustomMenu();
 	renderDestroy();
 }
+
+#ifdef __WIN32
+bool MainWindow::winEvent(MSG *message, long *result)
+{
+    return mswin.winEvent(message, result);
+}
+#endif
+
 static const UI_FUNCTIONS_T UI_Hooks=
     {
         ADM_RENDER_API_VERSION_NUMBER,

avidemux_2.5.5.tar.gz/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/Q_gui2.h -> avidemux_2.5.6.tar.gz/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/Q_gui2.h Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui2.ui -> avidemux_2.5.6.tar.gz/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui2.ui Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_userInterfaces/ADM_QT4/CMakeLists.txt -> avidemux_2.5.6.tar.gz/avidemux/ADM_userInterfaces/ADM_QT4/CMakeLists.txt Changed

avidemux_2.5.5.tar.gz/avidemux/ADM_userInterfaces/ADM_render/GUI_qtGlRender.h -> avidemux_2.5.6.tar.gz/avidemux/ADM_userInterfaces/ADM_render/GUI_qtGlRender.h Changed

avidemux_2.5.5.tar.gz/avidemux/CMakeLists.txt -> avidemux_2.5.6.tar.gz/avidemux/CMakeLists.txt Changed

avidemux_2.5.5.tar.gz/avidemux/gtk_gui.cpp -> avidemux_2.5.6.tar.gz/avidemux/gtk_gui.cpp Changed

@@ -70,13 +70,13 @@
 void A_saveBunchJpg( const char *name);
 void A_requantize(void);
 int A_saveJpg (char *name);
-int A_loadWave (char *name);
-int A_loadAC3 (char *name);
-int A_loadMP3 (char *name);
+int A_loadWave (const char *name);
+int A_loadAC3 (const char *name);
+int A_loadMP3 (const char *name);
 int A_loadNone( void );
 void A_saveAudioDecodedTest (char *name);
 int A_openAvi2 (const char *name, uint8_t mode);
-int A_appendAvi (const char *name);
+int A_appendAvi (const char *name, bool silent = 0);
 void A_externalAudioTrack( void );
 
 void HandleAction (Action action);
@@ -95,7 +95,6 @@
 			    const char *title);
 extern void GUI_setMarks (uint32_t a, uint32_t b);
 extern void saveMpegFile (char *name);
-//static void A_selectEncoder ( void );
 extern uint8_t A_SaveAudioDualAudio (const char *a);
 
 void A_Resync(void);
@@ -341,15 +340,6 @@
       cleanUp (); 
       exit (0);
       break;
-/*			case ACT_SelectEncoder:
-				
-						A_selectEncoder();
-  	  			return;
-						break;*/
-    case ACT_SelectEncoder:
-      GUI_Error_HIG (QT_TR_NOOP("Obsolete"), NULL);
-      break;
-
     default:
       break;
 
@@ -1131,35 +1121,42 @@
 //___________________________________________
 //  Append an AVI to the existing one
 //___________________________________________
-int
-A_appendAvi (const char *name)
+int	A_appendAvi (const char *name, bool silent)
 {
 	char *path = ADM_fixupPath(name);
 
-  if (playing)
-    return 0;
-  DIA_StartBusy ();
-  if (!video_body->addFile (path))
-    {
-      DIA_StopBusy ();
-      GUI_Error_HIG (QT_TR_NOOP("Something failed when appending"), NULL);
-	  delete [] path;
-      return 0;
-    }
-  delete [] path;
-  DIA_StopBusy ();
+	if (playing)
+		return 0;
 
+	DIA_StartBusy ();
 
-  video_body->dumpSeg ();
-  if (!video_body->updateVideoInfo (avifileinfo))
-    {
-      GUI_Error_HIG (QT_TR_NOOP("Something bad happened (II)"), NULL);
-      return 0;
-    }
+	if (!video_body->addFile (path))
+	{
+		DIA_StopBusy ();
 
-  ReSync ();
-  UI_setMarkers (frameStart, frameEnd);
-  return 1;
+		if (!silent)
+			GUI_Error_HIG (QT_TR_NOOP("Something failed when appending"), NULL);
+
+		delete [] path;
+		return 0;
+	}
+
+	delete [] path;
+	DIA_StopBusy ();
+
+	video_body->dumpSeg ();
+	if (!video_body->updateVideoInfo (avifileinfo))
+	{
+		if (!silent)
+			GUI_Error_HIG (QT_TR_NOOP("Something bad happened (II)"), NULL);
+
+		return 0;
+	}
+
+	ReSync ();
+	UI_setMarkers (frameStart, frameEnd);
+
+	return 1;
 }
 
 //
@@ -1390,14 +1387,7 @@
         GUI_Error_HIG (QT_TR_NOOP("BMP op failed"),QT_TR_NOOP( "Saving %s as a BMP file failed."), ADM_GetFileName(name));
 }
 
-//_____________________________________________________________
-//
-//              Load AC3
-//
-//
-//_____________________________________________________________
-int
-A_loadAC3 (char *name)
+int A_loadAC3 (const char *name)
 {
 	char *path = ADM_fixupPath(name);
 
@@ -1409,13 +1399,13 @@
 
   if (ac3->open (path) == 0)
     {
-      GUI_Error_HIG (QT_TR_NOOP("Failed to open the file"), QT_TR_NOOP("Not a WAV file?"));
-      printf ("%s", QT_TR_NOOP("WAV open file failed..."));
+      GUI_Error_HIG (QT_TR_NOOP("Failed to open the file"), QT_TR_NOOP("Not an AC3 file?"));
+      printf("AC3 open file failed...");
       delete ac3;
 	  delete [] path;
       return 0;
     }
-  //currentaudiostream=wav;
+
   A_changeAudioStream (ac3, AudioAC3,path);
   wavinfo = currentaudiostream->getInfo ();
   delete [] path;
@@ -1426,13 +1416,7 @@
  	A_changeAudioStream ((AVDMGenericAudioStream *) NULL, AudioNone,NULL);
 }
 
-//_____________________________________________________________
-//
-//              Load MP3 and identify wavfmt infos to fill avi header
-//              -> use mad ?
-//
-//_____________________________________________________________
-int A_loadMP3(char *name)
+int A_loadMP3(const char *name)
 {
 	char *path = ADM_fixupPath(name);
 
@@ -1442,27 +1426,20 @@
 
     if (mp3->open(path) == 0)
       {
+		  GUI_Error_HIG (QT_TR_NOOP("Failed to open the file"), QT_TR_NOOP("Not an MP3 file?"));
           printf("MP3 open file failed...");
           delete mp3;
 		  delete [] path;
           return 0;
       }
 
-    //currentaudiostream=mp3;
     A_changeAudioStream(mp3, AudioMP3,path);
     wavinfo = currentaudiostream->getInfo();
 	delete [] path;
     return 1;
 }
-//_____________________________________________________________
-//
-//              Load wave
-//              
-//
-//_____________________________________________________________
 
-int
-A_loadWave (char *name)
+int A_loadWave (const char *name)
 {
 	char *path = ADM_fixupPath(name);
 
@@ -1487,6 +1464,48 @@
   delete [] path;
   return 1;
 }
+
+bool loadAudio(const char *filename)
+{
+	AudioSource audioType = AudioInvalid;
+	bool loaded = false;
+
+	if (avifileinfo)
+	{
+		AVDMMP3AudioStream *mp3 = new AVDMMP3AudioStream();
+		AVDMAC3AudioStream *ac3 = new AVDMAC3AudioStream();

avidemux_2.5.5.tar.gz/avidemux/main.cpp -> avidemux_2.5.6.tar.gz/avidemux/main.cpp Changed

@@ -17,11 +17,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifdef __MINGW32__
-#include <windows.h>
-#include <excpt.h>
-#endif
-
 #include "config.h"
 #include "ADM_default.h"
 #include "ADM_threads.h"
@@ -47,9 +42,7 @@
 #include "ADM_userInterfaces/ADM_render/GUI_sdlRender.h"
 #endif
 
-
 void onexit( void );
-//extern void automation(int argc, char **argv);
 
 extern void registerVideoFilters( void );
 extern void filterCleanUp( void );
@@ -69,13 +62,16 @@
 extern void loadPlugins(void);
 extern void InitFactory(void);
 extern void InitCoreToolkit(void);
-#ifdef __MINGW32__
-extern EXCEPTION_DISPOSITION exceptionHandler(struct _EXCEPTION_RECORD* pExceptionRec, void* pEstablisherFrame, struct _CONTEXT* pContextRecord, void* pDispatcherContext);
+
+#if defined(_WIN64)
+extern LONG WINAPI ExceptionFilter(struct _EXCEPTION_POINTERS *exceptionInfo);
+#elif defined(_WIN32)
+extern EXCEPTION_DISPOSITION ExceptionHandler(struct _EXCEPTION_RECORD *exceptionRecord, void *establisherFrame, struct _CONTEXT *contextRecord, void *dispatcherContext);
 #else
 extern void installSigHandler(void);
 #endif
 
-#ifdef __WIN32
+#ifdef _WIN32
 extern bool getWindowsVersion(char* version);
 extern void redirectStdoutToFile(void);
 #endif
@@ -103,7 +99,7 @@
 	char uiDesc[15];
 	getUIDescription(uiDesc);
 
-#if defined(__WIN32)
+#if defined(_WIN32)
 	if (strcmp(uiDesc, "CLI") != 0)
 		redirectStdoutToFile();
 #endif
@@ -112,7 +108,7 @@
 	new_progname = argv[0];
 #endif
 
-#ifndef __MINGW32__
+#ifndef _WIN32
 	// thx smurf uk :)
     installSigHandler();
 #endif
@@ -141,7 +137,7 @@
 
 	printf("Build Target: ");
 
-#if defined(__WIN32)
+#if defined(_WIN32)
 	printf("Microsoft Windows");
 #elif defined(__APPLE__)
 	printf("Apple");
@@ -159,7 +155,7 @@
 
 	printf("\nUser Interface: %s\n", uiDesc);
 
-#ifdef __WIN32
+#ifdef _WIN32
 	char version[250];
 
 	if (getWindowsVersion(version))
@@ -172,7 +168,9 @@
 
 	// Start counting memory
 	ADM_memStatInit();
+#ifndef __APPLE__
     ADM_InitMemcpy();
+#endif
 	printf("\nInitialising prefs\n");
 	initPrefs();
 	prefs->load();
@@ -188,7 +186,7 @@
 
 	atexit(onexit);
 
-#ifdef __MINGW32__
+#ifdef _WIN32
     win32_netInit();
 #endif
 
@@ -270,14 +268,16 @@
     else
 		ADM_assert(0); 
 
-#ifdef __MINGW32__
-	__try1(exceptionHandler);
+#if defined(_WIN64)
+	SetUnhandledExceptionFilter(ExceptionFilter);
+#elif defined(_WIN32)
+	__try1(ExceptionHandler);
 #endif
 
     UI_RunApp();
 
-#ifdef __MINGW32__
-	__except1(exceptionHandler);
+#if defined(_WIN32) && defined(_X86_)
+	__except1;
 #endif
 
     printf("Normal exit\n");

avidemux_2.5.5.tar.gz/cmake/ADM_coreConfig.h.cmake -> avidemux_2.5.6.tar.gz/cmake/ADM_coreConfig.h.cmake Changed

avidemux_2.5.5.tar.gz/cmake/admFFmpegBuild.cmake -> avidemux_2.5.6.tar.gz/cmake/admFFmpegBuild.cmake Changed

@@ -1,7 +1,7 @@
 include(admFFmpegUtil)
 
-set(FFMPEG_VERSION 0.7-rc1)
-set(FFMPEG_SOURCE_ARCHIVE "ffmpeg-${FFMPEG_VERSION}.tar.gz")
+set(FFMPEG_VERSION 0.9)
+set(FFMPEG_SOURCE_ARCHIVE "ffmpeg-${FFMPEG_VERSION}.tar.bz2")
 set(FFMPEG_SOURCE_ARCHIVE_DIR "ffmpeg-${FFMPEG_VERSION}")
 
 #set(FFMPEG_VERSION 26061)	# http://git.ffmpeg.org/?p=ffmpeg;a=snapshot;h=2be4fa05c5528073bcfc472d1c23f2d77b679a9d;sf=tgz
@@ -14,7 +14,7 @@
 set(FFMPEG_DECODERS  adpcm_ima_amv  amv  bmp  cinepak  cyuv  dca  dvbsub  dvvideo  ffv1  ffvhuff  flac  flv  fraps  h263  h264  huffyuv
 					 mjpeg  mjpegb  mpeg2video  mpeg4  msmpeg4v2  msmpeg4v3  msvideo1  nellymoser  png  qdm2  rawvideo  snow  svq3
 					 theora  tscc  vc1  vp3  vp6  vp6a  vp6f  wmav2  wmv1  wmv2  wmv3)
-set(FFMPEG_ENCODERS  ac3  ac3_fixed  ac3_float  dvvideo  ffv1  ffvhuff  flv  h263  huffyuv  mjpeg  mp2  mpeg1video  mpeg2video  mpeg4  snow)
+set(FFMPEG_ENCODERS  ac3_fixed  dvvideo  ffv1  ffvhuff  flv  h263  huffyuv  mjpeg  mp2  mpeg1video  mpeg2video  mpeg4  snow)
 set(FFMPEG_MUXERS  flv  matroska  mpeg1vcd  mpeg2dvd  mpeg2svcd  mpegts  mov  mp4  psp)
 set(FFMPEG_PARSERS  ac3  h263  h264  mpeg4video)
 set(FFMPEG_PROTOCOLS  file)

avidemux_2.5.5.tar.gz/cmake/admFFmpegPrepareTar.cmake -> avidemux_2.5.6.tar.gz/cmake/admFFmpegPrepareTar.cmake Changed

@@ -6,22 +6,23 @@
 #set(SWSCALE_SOURCE_ARCHIVE "libswscale_r${SWSCALE_VERSION}.tar.gz")
 
 if (EXISTS "${LIBRARY_SOURCE_DIR}/${FFMPEG_SOURCE_ARCHIVE}") # AND EXISTS "${LIBRARY_SOURCE_DIR}/${SWSCALE_SOURCE_ARCHIVE}")
-	if (NOT EXISTS "${FFMPEG_SOURCE_DIR}/ffmpeg.c" OR NOT ${LAST_FFMPEG_VERSION} EQUAL ${FFMPEG_VERSION})
+	if (NOT EXISTS "${FFMPEG_SOURCE_DIR}/ffmpeg.c" OR NOT "${LAST_FFMPEG_VERSION}" STREQUAL "${FFMPEG_VERSION}")
 		find_package(Tar)
+		message(STATUS "Extracting FFmpeg")
 
 		execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "ffmpeg"
 					WORKING_DIRECTORY "${LIBRARY_SOURCE_DIR}")
 
-		execute_process(COMMAND ${TAR_EXECUTABLE} xvf ${FFMPEG_SOURCE_ARCHIVE}
+		execute_process(COMMAND ${TAR_EXECUTABLE} xvfj ${FFMPEG_SOURCE_ARCHIVE}
 					WORKING_DIRECTORY "${LIBRARY_SOURCE_DIR}"
 					${ffmpegExtractOutput})
 
-		execute_process(COMMAND ${CMAKE_COMMAND} -E rename "ffmpeg-0.7-rc1" "ffmpeg"
+		execute_process(COMMAND ${CMAKE_COMMAND} -E rename "${FFMPEG_SOURCE_ARCHIVE_DIR}" "ffmpeg"
 					WORKING_DIRECTORY "${LIBRARY_SOURCE_DIR}")
 
 		set(FFMPEG_PERFORM_PATCH 1)
 		set(FFMPEG_PERFORM_BUILD 1)
-	endif (NOT EXISTS "${FFMPEG_SOURCE_DIR}/ffmpeg.c" OR NOT ${LAST_FFMPEG_VERSION} EQUAL ${FFMPEG_VERSION})
+	endif (NOT EXISTS "${FFMPEG_SOURCE_DIR}/ffmpeg.c" OR NOT "${LAST_FFMPEG_VERSION}" STREQUAL "${FFMPEG_VERSION}")
 
 	#if (NOT EXISTS "${FFMPEG_SOURCE_DIR}/libswscale/swscale.c" OR NOT ${LAST_SWSCALE_VERSION} EQUAL ${SWSCALE_VERSION})
 		#find_package(Tar)

avidemux_2.5.5.tar.gz/cmake/admGetRevision.cmake -> avidemux_2.5.6.tar.gz/cmake/admGetRevision.cmake Changed

avidemux_2.5.5.tar.gz/cmake/patches/common.mak.diff -> avidemux_2.5.6.tar.gz/cmake/patches/common.mak.diff Changed

avidemux_2.5.5.tar.gz/cmake/patches/createPatches.sh -> avidemux_2.5.6.tar.gz/cmake/patches/createPatches.sh Changed

avidemux_2.5.5.tar.gz/cmake/patches/libavcodec_avcodec.h.patch -> avidemux_2.5.6.tar.gz/cmake/patches/libavcodec_avcodec.h.patch Changed

@@ -1,15 +1,15 @@
---- libavcodec/avcodec.h.orig	2011-05-10 22:40:28 +0100
-+++ libavcodec/avcodec.h	2011-05-10 22:40:28 +0100
-@@ -636,6 +636,8 @@
- #define CODEC_FLAG2_PSY           0x00080000 ///< Use psycho visual optimizations.
- #define CODEC_FLAG2_SSIM          0x00100000 ///< Compute SSIM during encoding, error[] values are undefined.
- #define CODEC_FLAG2_INTRA_REFRESH 0x00200000 ///< Use periodic insertion of intra blocks instead of keyframes.
+--- ../ffmpeg-0.9/libavcodec/avcodec.h	2011-12-14 15:00:28 +0000
++++ libavcodec/avcodec.h	2011-12-14 15:00:28 +0000
+@@ -690,6 +690,8 @@
+ #define CODEC_FLAG2_INTRA_VLC     0x00000800 ///< Use MPEG-2 intra VLC table.
+ #define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000 ///< timecode is in drop frame format.
+ #define CODEC_FLAG2_NON_LINEAR_QUANT 0x00010000 ///< Use MPEG-2 nonlinear quantizer.
 +//MEANX: NEVER EVER USE CLOSED GOP ?
 +#define CODEC_FLAG2_32_PULLDOWN   0x80000000
- 
- /* Unsupported options :
-  *              Syntax Arithmetic coding (SAC)
-@@ -1589,6 +1591,7 @@
+ #endif
+ #if FF_API_MJPEG_GLOBAL_OPTS
+ #define CODEC_FLAG_EXTERN_HUFF     0x1000   ///< Use external Huffman table (for MJPEG).
+@@ -1806,6 +1808,7 @@
       * - decoding: unused
       */
      int rc_max_rate;
@@ -17,7 +17,7 @@
  
      /**
       * minimum bitrate
-@@ -1603,6 +1606,8 @@
+@@ -1820,6 +1823,8 @@
       * - decoding: unused
       */
      int rc_buffer_size;

avidemux_2.5.5.tar.gz/cmake/patches/libavcodec_ffv1.c.patch -> avidemux_2.5.6.tar.gz/cmake/patches/libavcodec_ffv1.c.patch Changed

avidemux_2.5.5.tar.gz/cmake/patches/libavcodec_h263dec.c.patch -> avidemux_2.5.6.tar.gz/cmake/patches/libavcodec_h263dec.c.patch Changed

@@ -1,6 +1,6 @@
---- libavcodec/h263dec.c.orig	2011-05-10 22:40:29 +0100
-+++ libavcodec/h263dec.c	2011-05-10 22:40:29 +0100
-@@ -121,6 +121,25 @@
+--- ../ffmpeg-0.9/libavcodec/h263dec.c	2011-12-14 15:00:28 +0000
++++ libavcodec/h263dec.c	2011-12-14 15:00:28 +0000
+@@ -117,6 +117,25 @@
  
      return 0;
  }
@@ -26,31 +26,29 @@
  
  av_cold int ff_h263_decode_end(AVCodecContext *avctx)
  {
-@@ -437,6 +456,12 @@
+@@ -433,6 +452,12 @@
      } else {
          ret = h263_decode_picture_header(s);
      }
 +	//MEANX we need to do it here also for quicktime file / ctts atom 
 +        // we need the correct frame type, and qt file may contain 
 +        // vop not coded frame.
-+        pict->pict_type=s->current_picture.pict_type= s->pict_type;
-+        pict->key_frame=s->current_picture.key_frame= s->pict_type == FF_I_TYPE;
++        pict->pict_type=s->current_picture.f.pict_type= s->pict_type;
++        pict->key_frame=s->current_picture.f.key_frame= s->pict_type == FF_I_TYPE;
 +        //MEANX
  
      if(ret==FRAME_SKIPPED) return get_consumed_bytes(s, buf_size);
  
-@@ -738,6 +763,14 @@
+@@ -717,6 +742,12 @@
  
- assert(s->current_picture.pict_type == s->current_picture_ptr->pict_type);
- assert(s->current_picture.pict_type == s->pict_type);
+     assert(s->current_picture.f.pict_type == s->current_picture_ptr->f.pict_type);
+     assert(s->current_picture.f.pict_type == s->pict_type);
++
 +/* MEANX */
-+  if(s->current_picture_ptr)
-+      s->current_picture_ptr->opaque=pict->opaque;
++    if(s->current_picture_ptr)
++        s->current_picture_ptr->f.opaque=pict->opaque;
 +/* MEANX */
 +
-+
-+
-+
-     if (s->pict_type == FF_B_TYPE || s->low_delay) {
+     if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) {
          *pict= *(AVFrame*)s->current_picture_ptr;
      } else if (s->last_picture_ptr != NULL) {

avidemux_2.5.5.tar.gz/cmake/patches/libavcodec_h264.c.patch -> avidemux_2.5.6.tar.gz/cmake/patches/libavcodec_h264.c.patch Changed

avidemux_2.5.6.tar.gz/cmake/patches/libavcodec_libavcodec.v.patch Added

avidemux_2.5.5.tar.gz/cmake/patches/libavcodec_mpeg12.c.patch -> avidemux_2.5.6.tar.gz/cmake/patches/libavcodec_mpeg12.c.patch Changed

avidemux_2.5.5.tar.gz/cmake/patches/libavcodec_mpeg12enc.c.patch -> avidemux_2.5.6.tar.gz/cmake/patches/libavcodec_mpeg12enc.c.patch Changed

@@ -1,6 +1,6 @@
---- libavcodec/mpeg12enc.c.old	2010-12-20 13:49:24 +0000
-+++ libavcodec/mpeg12enc.c	2010-12-20 13:49:24 +0000
-@@ -127,10 +127,19 @@
+--- ../ffmpeg-0.9/libavcodec/mpeg12enc.c	2011-12-14 15:00:29 +0000
++++ libavcodec/mpeg12enc.c	2011-12-14 15:00:29 +0000
+@@ -122,10 +122,19 @@
              s->frame_rate_index= i;
          }
      }
@@ -20,7 +20,7 @@
  }
  
  static av_cold int encode_init(AVCodecContext *avctx)
-@@ -209,6 +218,7 @@
+@@ -220,6 +229,7 @@
              put_sbits(&s->pb, 12, s->width );
              put_sbits(&s->pb, 12, s->height);
  
@@ -28,7 +28,7 @@
              for(i=1; i<15; i++){
                  float error= aspect_ratio;
                  if(s->codec_id == CODEC_ID_MPEG1VIDEO || i <=1)
-@@ -223,20 +233,44 @@
+@@ -234,20 +244,44 @@
                      s->aspect_ratio_info= i;
                  }
              }
@@ -79,7 +79,7 @@
              else
                  /* VBV calculation: Scaled so that a VCD has the proper VBV size of 40 kilobytes */
                  vbv_buffer_size = (( 20 * s->bit_rate) / (1151929 / 2)) * 8 * 1024;
-@@ -269,8 +303,17 @@
+@@ -280,8 +314,17 @@
  
                  put_bits(&s->pb, 3, s->avctx->profile); //profile
                  put_bits(&s->pb, 4, s->avctx->level); //level
@@ -98,7 +98,7 @@
                  put_bits(&s->pb, 2, s->chroma_format);
                  put_bits(&s->pb, 2, s->width >>12);
                  put_bits(&s->pb, 2, s->height>>12);
-@@ -339,6 +382,8 @@
+@@ -346,6 +389,8 @@
  
  void mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
  {
@@ -107,7 +107,7 @@
      mpeg1_encode_sequence_header(s);
  
      /* mpeg1 picture header */
-@@ -375,6 +420,49 @@
+@@ -382,6 +427,49 @@
  
      s->frame_pred_frame_dct = 1;
      if(s->codec_id == CODEC_ID_MPEG2VIDEO){
@@ -144,7 +144,7 @@
 +                        tff=0; /* no repeat */
 +                } else 
 +                {
-+                        tff= s->current_picture_ptr->top_field_first;
++                        tff= s->current_picture_ptr->f.top_field_first;
 +                }
 +                rff=s->repeat_first_field;
 +        
@@ -156,25 +156,25 @@
 +
          put_header(s, EXT_START_CODE);
          put_bits(&s->pb, 4, 8); //pic ext
-         if (s->pict_type == FF_P_TYPE || s->pict_type == FF_B_TYPE) {
-@@ -393,11 +481,16 @@
+         if (s->pict_type == AV_PICTURE_TYPE_P || s->pict_type == AV_PICTURE_TYPE_B) {
+@@ -400,11 +488,16 @@
  
          assert(s->picture_structure == PICT_FRAME);
          put_bits(&s->pb, 2, s->picture_structure);
-+#if 0 //MEANX
 +
++#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->top_field_first);
+             put_bits(&s->pb, 1, s->current_picture_ptr->f.top_field_first);
          }
 +#endif
-+         put_bits(&s->pb, 1, tff);  //MEANX PULLDOWN
++        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;
-@@ -407,7 +500,10 @@
+@@ -414,7 +507,10 @@
          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);

avidemux_2.5.5.tar.gz/cmake/patches/libavcodec_mpegvideo.c.patch -> avidemux_2.5.6.tar.gz/cmake/patches/libavcodec_mpegvideo.c.patch Changed

@@ -1,15 +1,24 @@
---- libavcodec/mpegvideo.c.orig	2011-05-10 22:40:30 +0100
-+++ libavcodec/mpegvideo.c	2011-05-10 22:40:29 +0100
-@@ -735,7 +735,11 @@
-     FF_ALLOCZ_OR_GOTO(s->avctx, s->prev_pict_types, PREV_PICT_TYPES_BUFFER_SIZE, fail);
+--- ../ffmpeg-0.9/libavcodec/mpegvideo.c	2011-12-14 15:00:29 +0000
++++ libavcodec/mpegvideo.c	2011-12-14 15:00:29 +0000
+@@ -840,15 +840,18 @@
+         FF_ALLOCZ_OR_GOTO(s->avctx, s->prev_pict_types, PREV_PICT_TYPES_BUFFER_SIZE, fail);
  
-     s->parse_context.state= -1;
--    if((s->avctx->debug&(FF_DEBUG_VIS_QP|FF_DEBUG_VIS_MB_TYPE)) || (s->avctx->debug_mv)){
-+ //MEANX: Allocate them always, as they may be free when we decode 1st image
+         s->parse_context.state = -1;
+-        if ((s->avctx->debug & (FF_DEBUG_VIS_QP | FF_DEBUG_VIS_MB_TYPE)) ||
+-            s->avctx->debug_mv) {
 +
-+    // MEANXif((s->avctx->debug&(FF_DEBUG_VIS_QP|FF_DEBUG_VIS_MB_TYPE)) || (s->avctx->debug_mv)){
-+if(1){ // MEANX
++        //MEANX: Allocate them always, as they may be free when we decode 1st image
 +
-        s->visualization_buffer[0] = av_malloc((s->mb_width*16 + 2*EDGE_WIDTH) * s->mb_height*16 + 2*EDGE_WIDTH);
-        s->visualization_buffer[1] = av_malloc((s->mb_width*16 + 2*EDGE_WIDTH) * s->mb_height*16 + 2*EDGE_WIDTH);
-        s->visualization_buffer[2] = av_malloc((s->mb_width*16 + 2*EDGE_WIDTH) * s->mb_height*16 + 2*EDGE_WIDTH);
++        //if ((s->avctx->debug & (FF_DEBUG_VIS_QP | FF_DEBUG_VIS_MB_TYPE)) ||
++        //  s->avctx->debug_mv) {
+             s->visualization_buffer[0] = av_malloc((s->mb_width * 16 +
+                         2 * EDGE_WIDTH) * s->mb_height * 16 + 2 * EDGE_WIDTH);
+             s->visualization_buffer[1] = av_malloc((s->mb_width * 16 +
+                         2 * EDGE_WIDTH) * s->mb_height * 16 + 2 * EDGE_WIDTH);
+             s->visualization_buffer[2] = av_malloc((s->mb_width * 16 +
+                         2 * EDGE_WIDTH) * s->mb_height * 16 + 2 * EDGE_WIDTH);
+-        }
++        //}
+ 
+         s->context_initialized = 1;
+         s->thread_context[0]   = s;

avidemux_2.5.5.tar.gz/cmake/patches/libavcodec_mpegvideo_enc.c.patch -> avidemux_2.5.6.tar.gz/cmake/patches/libavcodec_mpegvideo_enc.c.patch Changed

avidemux_2.5.5.tar.gz/cmake/patches/libavcodec_vc1dec.c.patch -> avidemux_2.5.6.tar.gz/cmake/patches/libavcodec_vc1dec.c.patch Changed

avidemux_2.5.5.tar.gz/cmake/patches/libavformat_isom.c.patch -> avidemux_2.5.6.tar.gz/cmake/patches/libavformat_isom.c.patch Changed

@@ -1,14 +1,15 @@
---- libavformat/isom.c.orig	2011-05-10 22:40:30 +0100
-+++ libavformat/isom.c	2011-05-10 22:40:30 +0100
-@@ -234,7 +234,10 @@
-     { CODEC_ID_MP1, MKTAG('.', 'm', 'p', '1') }, /* MPEG layer 1 */
-     { CODEC_ID_MP2, MKTAG('.', 'm', 'p', '2') }, /* MPEG layer 2 */
- 
--    { CODEC_ID_MP3, MKTAG('.', 'm', 'p', '3') }, /* MPEG layer 3 */ /* sample files at http://www.3ivx.com/showcase.html use this tag */
-+    //MEANX { CODEC_ID_MP3, MKTAG('.', 'm', 'p', '3') }, /* MPEG layer 3 */ /* sample files at http://www.3ivx.com/showcase.html use this tag */
-+     { CODEC_ID_MP3, MKTAG( 'm', 'p', '4','a') },
-+     { CODEC_ID_MP2, MKTAG( 'm', 'p', '4', 'a') },
-+    // /MEANX
-     { CODEC_ID_MP3, 0x6D730055 }, /* MPEG layer 3 */
- 
- /*  { CODEC_ID_OGG_VORBIS, MKTAG('O', 'g', 'g', 'S') }, *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */
+--- ../ffmpeg-0.9/libavformat/isom.c	2011-12-14 15:00:29 +0000
++++ libavformat/isom.c	2011-12-14 15:00:29 +0000
+@@ -241,7 +241,11 @@
+     { CODEC_ID_MACE6,           MKTAG('M', 'A', 'C', '6') },
+     { CODEC_ID_MP1,             MKTAG('.', 'm', 'p', '1') },
+     { CODEC_ID_MP2,             MKTAG('.', 'm', 'p', '2') },
+-    { CODEC_ID_MP3,             MKTAG('.', 'm', 'p', '3') },
++//MEANX
++  //{ CODEC_ID_MP3,             MKTAG('.', 'm', 'p', '3') },
++    { CODEC_ID_MP3,             MKTAG('m', 'p', '4', 'a') },
++    { CODEC_ID_MP2,             MKTAG('m', 'p', '4', 'a') },
++// /MEANX
+     { CODEC_ID_MP3,             0x6D730055                },
+     { CODEC_ID_NELLYMOSER,      MKTAG('n', 'm', 'o', 's') }, /* Flash Media Server */
+     { CODEC_ID_PCM_ALAW,        MKTAG('a', 'l', 'a', 'w') },

avidemux_2.5.5.tar.gz/cmake/patches/libavformat_matroskaenc.c.patch -> avidemux_2.5.6.tar.gz/cmake/patches/libavformat_matroskaenc.c.patch Changed

@@ -1,6 +1,6 @@
---- libavformat/matroskaenc.c.orig	2011-05-10 22:40:30 +0100
-+++ libavformat/matroskaenc.c	2011-05-10 22:40:30 +0100
-@@ -410,6 +410,7 @@
+--- ../ffmpeg-0.9/libavformat/matroskaenc.c	2011-12-14 15:00:29 +0000
++++ libavformat/matroskaenc.c	2011-12-14 15:00:29 +0000
+@@ -418,6 +418,7 @@
  
  static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, AVCodecContext *codec)
  {
@@ -8,7 +8,7 @@
      uint8_t *header_start[3];
      int header_len[3];
      int first_header_size;
-@@ -434,6 +435,28 @@
+@@ -442,6 +443,28 @@
          avio_write(pb, header_start[j], header_len[j]);
  
      return 0;
@@ -37,28 +37,28 @@
  }
  
  static void get_aac_sample_rates(AVFormatContext *s, AVCodecContext *codec, int *sample_rate, int *output_sample_rate)
-@@ -538,6 +561,24 @@
+@@ -552,6 +575,24 @@
          put_ebml_uint (pb, MATROSKA_ID_TRACKUID        , i + 1);
          put_ebml_uint (pb, MATROSKA_ID_TRACKFLAGLACING , 0);    // no lacing (yet)
  
 + 		/**  MEANX : Add a default duration for video **/
-+ 		if(codec->codec_type==CODEC_TYPE_VIDEO)
-+ 		{
-+ 			if(codec->time_base.den && codec->time_base.num)
-+ 			{
-+ 				int num = codec->time_base.num;
-+ 				int den = codec->time_base.den;
-+ 				unsigned int default_duration;
-+ 				float period = num;
++        if(codec->codec_type == AVMEDIA_TYPE_VIDEO)
++        {
++            if(codec->time_base.den && codec->time_base.num)
++            {
++                int num = codec->time_base.num;
++                int den = codec->time_base.den;
++                unsigned int default_duration;
++                float period = num;
 + 
-+ 				period /= den;
-+ 				period *= 1000*1000*1000; // in ns
-+ 				default_duration = (unsigned int)floor(period);
-+ 				put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, default_duration);
-+ 			}
-+ 		}
-+ 		/**  MEANX : Add a default duration for video **/
++                period /= den;
++                period *= 1000 * 1000 * 1000; // in ns
++                default_duration = (unsigned int)floor(period);
++                put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, default_duration);
++            }
++        }
++        /**  MEANX : Add a default duration for video **/
 +
-         if ((tag = av_metadata_get(st->metadata, "title", NULL, 0)))
+         if ((tag = av_dict_get(st->metadata, "title", NULL, 0)))
              put_ebml_string(pb, MATROSKA_ID_TRACKNAME, tag->value);
-         tag = av_metadata_get(st->metadata, "language", NULL, 0);
+         tag = av_dict_get(st->metadata, "language", NULL, 0);

avidemux_2.5.5.tar.gz/cmake/patches/libavutil_avutil.h.patch -> avidemux_2.5.6.tar.gz/cmake/patches/libavutil_avutil.h.patch Changed

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/Set Common Environment Variables.bat -> avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/Set Common Environment Variables.bat Changed

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/avidemux/Package Notes.xml -> avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/avidemux/Package Notes.xml Changed

@@ -1,284 +1,334 @@
 <?xml version="1.0"?>
 <log>
-	<buildentry revision="6796" date="2010-11-28">
-		<comment>Updated aften to version git version (commit: c0bd512c93b1186c28b45cc66f6e4f70fd41191c).</comment>
-		<comment>Updated libogg to version 1.2.1.</comment>
-		<comment>Updated libvorbis to version 1.3.2.</comment>
-		<comment>Updated libvpx to version 0.9.5.</comment>
-		<comment>Updated Qt to version 4.7.1.</comment>
-		<comment>Updated x264 to r1804.</comment>
-	</buildentry>
-	<buildentry revision="6714 [2.5.4 Final]" date="2010-11-01">
-		<comment>Updated Avisynth Proxy GUI to version 2.20.</comment>
-	</buildentry>
-	<buildentry revision="6689" date="2010-09-29">
-		<comment>Updated ATK to version 1.32.0-1.</comment>
-		<comment>Updated GLib to version 2.26.0-2.</comment>
-		<comment>Updated GTK+ to version 2.20.1-3.</comment>
-		<comment>Updated Pango to version 1.28.1-2.</comment>
-		<comment>Updated Qt to version 4.7.0.</comment>
-		<comment>Updated x264 to r1732.</comment>
-	</buildentry>
-	<buildentry revision="6636" date="2010-09-21">
-		<comment>Updated Cairo to version 1.10.0-1.</comment>
-		<comment>Compiled with GCC 4.5.2 pre-release (20100917)</comment>
-		<comment>Updated Qt to version 4.6.3.</comment>
-		<comment>Updated x264 to r1724.</comment>
-	</buildentry>
-	<buildentry revision="6587" date="2010-09-05">
-		<comment>Compiled with GCC 4.5.1.</comment>
-		<comment>Updated Cairo to version 1.8.10-4.</comment>
-		<comment>Updated Freetype to version 2.4.2-1.</comment>
-		<comment>Updated GLib to version 2.24.2-1.</comment>
-		<comment>Updated libvpx to version 0.9.2.</comment>
-		<comment>Updated NSPR to version 4.8.6.</comment>
-		<comment>Updated Pango to version 1.28.1-1.</comment>
-		<comment>Updated x264 to r1713.</comment>
-		<comment>Updated zlib to version 1.2.5-2.</comment>
-	</buildentry>
-	<buildentry revision="6502" date="2010-08-03">
-		<comment>Updated x264 to r1688.</comment>
-	</buildentry>
-	<buildentry revision="6442" date="2010-07-06">
-		<comment>Compiled with GCC 4.4.5 pre-release (r161668).</comment>
-		<comment>Updated libvpx to version 0.9.1.</comment>
-		<comment>Updated x264 to r1666.</comment>
-	</buildentry>
-	<buildentry revision="6370" date="2010-06-13">
-		<comment>Added libvpx, git version (commit: 5ef25a9728507d259c6ccd05064ce1208e7abd9f).</comment>
-		<comment>Updated x264 to r1624.</comment>
-	</buildentry>
-	<buildentry revision="6340" date="2010-06-07">
-	</buildentry>
-	<buildentry revision="6303" date="2010-06-04">
-	</buildentry>
-	<buildentry revision="6288" date="2010-06-01">
-	</buildentry>
-	<buildentry revision="6261" date="2010-05-27">
-		<comment>Updated x264 to r1613.</comment>
-	</buildentry>
-	<buildentry revision="6195" date="2010-05-16">
-		<comment>Updated Freetype to version 2.3.12-1.</comment>
-		<comment>Updated GLib to version 2.24.1-1.</comment>
-		<comment>Updated GTK+ to version 2.20.1-1.</comment>
-		<comment>Updated x264 to r1583.</comment>
-	</buildentry>
-	<buildentry revision="6161 [2.5.3 Final]" date="2010-05-16">
-		<comment>Updated Avisynth Proxy GUI to version 2.12.</comment>
-	</buildentry>
-	<buildentry revision="6129" date="2010-04-15">
-		<comment>Updated x264 to r1542.</comment>
-	</buildentry>
-	<buildentry revision="6121" date="2010-04-11">
-		<comment>Updated ATK to version 1.30.0-1.</comment>
-		<comment>Updated Cairo to version 1.8.10-3.</comment>
-		<comment>Updated GLib to version 2.24.0-2.</comment>
-		<comment>Updated GTK+ to version 2.20.0-1.</comment>
-		<comment>Updated Libxml2 to version 2.7.7-1.</comment>
-		<comment>Updated Pango to version 1.28.0-1.</comment>
-		<comment>Updated x264 to r1523.</comment>
-		<comment>Updated zlib to version 1.2.4-2.</comment>
-	</buildentry>
-	<buildentry revision="6083" date="2010-04-06">
-	</buildentry>
-	<buildentry revision="6064" date="2010-04-05">
-		<comment>Updated x264 to r1510.</comment>
-	</buildentry>
-	<buildentry revision="6028" date="2010-03-27">
-		<comment>Updated Avisynth Proxy GUI to version 2.11.</comment>
-		<comment>Updated GLib to version 2.22.5-1.</comment>
-		<comment>Updated GTK+ to version 2.18.9-1.</comment>
-		<comment>Updated LAME to version 3.98.4.</comment>
-		<comment>Updated Ogg to version 1.2.0.</comment>
-		<comment>Updated NSPR to version 4.8.4.</comment>
-		<comment>Updated Vorbis to version 1.3.1.</comment>
-	</buildentry>
-	<buildentry revision="5955" date="2010-02-28">
-		<comment>Compiled with GCC 4.4.3.</comment>
-		<comment>Updated Cairo to version 1.8.10-1.</comment>
-		<comment>Updated Freetype to version 2.3.11-2.</comment>
-		<comment>Updated GTK+ to version 2.18.7-1.</comment>
-		<comment>Updated LAME to version 3.98.3.</comment>
-		<comment>Updated libpng to version 1.4.0-1.</comment>
-		<comment>Updated NSPR to version 4.8.3.</comment>
-		<comment>Updated Pango to version 1.26.2-1.</comment>
-		<comment>Updated Qt to version 4.6.2.</comment>
-		<comment>Updated x264 to r1471.</comment>
-	</buildentry>
-	<buildentry revision="5869" date="2010-01-23">
-		<comment>Updated GLib to version 2.22.4-1.</comment>
-		<comment>Updated Qt to version 4.6.1.</comment>
-		<comment>Updated x264 to r1400.</comment>
-	</buildentry>
-	<buildentry revision="5830" date="2010-01-07">
-		<comment>Compiled with GCC 4.4.3 pre-release (r155431).</comment>
-	</buildentry>
-	<buildentry revision="5810" date="2010-01-02">
-	</buildentry>
-	<buildentry revision="5801" date="2009-12-31">
-	</buildentry>
-	<buildentry revision="5775" date="2009-12-29">
-	</buildentry>
-	<buildentry revision="5747" date="2009-12-28">
-	</buildentry>
-	<buildentry revision="5676" date="2009-12-20">
-		<comment>Packaged using NSIS 2.46.</comment>
-		<comment>Updated GTK+ to version 2.18.5-1.</comment>
-		<comment>Updated libpng to version 1.2.40-1.</comment>
-		<comment>Updated Pango to version 1.26.1-1.</comment>
-		<comment>Updated Qt to version 4.6.0.</comment>
-		<comment>Updated x264 to r1376.</comment>
-	</buildentry>
-	<buildentry revision="5660 [2.5.2 Final]" date="2009-12-19">
-	</buildentry>
-	<buildentry revision="5636 [2.5.2 RC1]" date="2009-12-12">
-	</buildentry>
-	<buildentry revision="5602" date="2009-11-30">
-	</buildentry>
-	<buildentry revision="5590" date="2009-11-28">
-		<comment>Updated Cairo to version 1.8.8-3.</comment>
-		<comment>Updated Fontconfig to version 2.8.0-1.</comment>
-		<comment>Updated Freetype to version 2.3.11-1.</comment>
-		<comment>Updated GLib to version 2.22.2-1.</comment>
-		<comment>Updated GTK+ to version 2.18.3-1.</comment>
-		<comment>Updated Pango to version 1.26.0-1.</comment>
-		<comment>Updated x264 to r1352.</comment>
-	</buildentry>
-	<buildentry revision="5567" date="2009-11-26">
-	</buildentry>
-	<buildentry revision="5558" date="2009-11-24">
-	</buildentry>
-	<buildentry revision="5546" date="2009-11-23">
-		<comment>Updated x264 to r1347.</comment>
-	</buildentry>
-	<buildentry revision="5530" date="2009-11-19">
-		<comment>Updated x264 to r1342.</comment>
-	</buildentry>
-	<buildentry revision="5422" date="2009-10-27">
-		<comment>Updated SDL to version 1.2.14.</comment>
-		<comment>Updated x264 to r1310.</comment>
-	</buildentry>
-	<buildentry revision="5369" date="2009-10-05">
-		<comment>Updated ATK to version 1.28.0-1.</comment>
-		<comment>Updated Fontconfig to version 2.7.3-1.</comment>
-		<comment>Updated GLib to version 2.22.1-1.</comment>
-		<comment>Updated GTK+ to version 2.18.1-1.</comment>
-		<comment>Updated libpng to version 1.2.39-1.</comment>
-		<comment>Updated Libxml2 to version 2.7.4-1.</comment>
-		<comment>Updated NSPR to version 4.8.</comment>
-		<comment>Updated opencore-amr to version 0.1.2.</comment>
-		<comment>Updated Qt to version 4.5.3.</comment>
-		<comment>Updated x264 to r1271.</comment>
-	</buildentry>
-	<buildentry revision="5341" date="2009-09-17">
-		<comment>Updated x264 to r1259.</comment>
-	</buildentry>
-	<buildentry revision="5327" date="2009-09-09">
-		<comment>Updated x264 to r1251.</comment>
-	</buildentry>
-	<buildentry revision="5281" date="2009-08-29">
-		<comment>Updated x264 to r1240.</comment>
-	</buildentry>
-	<buildentry revision="5273" date="2009-08-27">
-		<comment>Updated x264 to r1235.</comment>
-		<comment>Updated Xvid to version 1.2.2.</comment>
-	</buildentry>
-	<buildentry revision="5268" date="2009-08-23">
-		<comment>Updated x264 to r1222.</comment>
-	</buildentry>
-	<buildentry revision="5249 [2.5.1 Final]" date="2009-08-16">
-		<comment>Updated Fontconfig to version 2.7.1-2.</comment>
-	</buildentry>
-	<buildentry revision="5234" date="2009-08-12">
-		<comment>Updated Cairo to version 1.8.8-1.</comment>
-		<comment>Updated Fontconfig to version 2.7.1-1.</comment>
-		<comment>Updated Freetype to version 2.3.9-1.</comment>
-		<comment>Updated GLib to version 2.20.4-1.</comment>
-		<comment>Updated GTK+ to version 2.16.5-1.</comment>
-		<comment>Updated libpng to version 1.2.38-1.</comment>
-		<comment>Updated Pango to version 1.24.5-1.</comment>

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/avidemux/Set Avidemux Environment Variables.bat -> avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/avidemux/Set Avidemux Environment Variables.bat Changed

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/avidemux/Tools/package_notes.xslt -> avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/avidemux/Tools/package_notes.xslt Changed

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/faac/Perform Build.bat -> avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/faac/Perform Build.bat Changed

avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/faac/makefile Added

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/faad/Perform Build.bat -> avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/faad/Perform Build.bat Changed

avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/faad/makefile Added

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/fontconfig/Perform Build.bat -> avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/fontconfig/Perform Build.bat Changed

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/js/Perform Build.bat -> avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/js/Perform Build.bat Changed

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/js/WINNT6.1.mk -> avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/js/WINNT6.1.mk Changed

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/lame/Perform Build.bat -> avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/lame/Perform Build.bat Changed

avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/lame/vbrquantize.c.patch Added

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/libogg/Perform Build.bat -> avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/libogg/Perform Build.bat Changed

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/libvorbis/Perform Build.bat -> avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/libvorbis/Perform Build.bat Changed

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/libvpx/Perform Build.bat -> avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/libvpx/Perform Build.bat Changed

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/libvpx/configure.sh.patch -> avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/libvpx/configure.sh.patch Changed

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/nspr/Perform Build.bat -> avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/nspr/Perform Build.bat Changed

@@ -20,15 +20,15 @@
 call "../Set Common Environment Variables"
 if errorlevel 1 goto end
 
-set package=nspr-4.8.6.tar.gz
-set sourceFolder=nspr-4.8.6-%BuildBits%
-set tarFolder=nspr-4.8.6
+set package=nspr-4.8.9.tar.gz
+set sourceFolder=nspr-4.8.9-%BuildBits%
+set tarFolder=nspr-4.8.9
 set curDir=%CD%
 
 if not exist %package% (
 	echo.
 	echo Downloading
-	wget ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.6/src/%package%
+	wget ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.9/src/%package%
 )
 
 if errorlevel 1 goto end
@@ -51,6 +51,10 @@
 )
 
 echo.
+echo Patching
+patch -p0 -i "%curDir%\configure%BuildBits%.patch"
+
+echo.
 echo Configuring
 cd mozilla\nsprpub
 sh ./configure --prefix="%usrLocalDir%" --enable-strip --enable-win32-target=WIN95 --enable-optimize --disable-debug
@@ -69,7 +73,8 @@
 copy "%usrLocalDir%\bin\nspr4.dll" "%admBuildDir%"
 
 pexports "%usrLocalDir%/bin/nspr4.dll" > nspr4.def
-dlltool -d nspr4.def -l "%usrLocalDir%/lib/nspr4.dll.a"
+if "%BuildBits%" == "32" dlltool -d nspr4.def -l "%usrLocalDir%/lib/nspr4.dll.a" -m i386 --as-flags=--32
+if "%BuildBits%" == "64" dlltool -d nspr4.def -l "%usrLocalDir%/lib/nspr4.dll.a"
 
 goto end

avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/nspr/configure32.patch Added

avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/nspr/configure64.patch Added

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/x264/Perform Build.bat -> avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/x264/Perform Build.bat Changed

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/xvid/Perform Build.bat -> avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/xvid/Perform Build.bat Changed

avidemux_2.5.5.tar.gz/platforms/windows/build_scripts/xvid/configure.patch -> avidemux_2.5.6.tar.gz/platforms/windows/build_scripts/xvid/configure.patch Changed

avidemux_2.5.5.tar.gz/platforms/windows/installer/avidemux.nsi -> avidemux_2.5.6.tar.gz/platforms/windows/installer/avidemux.nsi Changed

avidemux_2.5.5.tar.gz/plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.cpp -> avidemux_2.5.6.tar.gz/plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.cpp Changed

@@ -14,22 +14,26 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include "config.h"
 
 #ifdef __APPLE__
 #include <stdio.h>
 #include <stdlib.h>
 #include <pthread.h>
 #include <AudioUnit/AudioUnit.h>
+#include <CoreAudio/AudioHardware.h>
+#include <CoreServices/CoreServices.h>
 
 #include "ADM_default.h"
 #include "ADM_assert.h"
 #include "ADM_audiodevice.h"
-#include "ADM_audiodevice/ADM_deviceAudioCore.h"
+#include "ADM_audioDeviceInternal.h"
+#include "ADM_deviceAudioCore.h"
 #include "ADM_osSupport/ADM_debugID.h"
 #define MODULE_NAME  MODULE_ADEVICE
 #include "ADM_osSupport/ADM_debug.h"
 
+ADM_DECLARE_AUDIODEVICE(CoreAudio,coreAudioDevice,1,0,0,"CoreAudio audio device (c) mean");
+
 #define BUFFER_SIZE (500*48000)
 
 static Component comp = NULL;
@@ -135,7 +139,7 @@
         return 0; \
     }
 
-uint8_t coreAudioDevice::init(uint8_t channels, uint32_t fq) 
+uint8_t coreAudioDevice::init(uint32_t channels, uint32_t fq) 
 {
 	_channels = channels;

avidemux_2.5.5.tar.gz/plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.h -> avidemux_2.5.6.tar.gz/plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.h Changed

avidemux_2.5.5.tar.gz/plugins/ADM_audioDevices/AudioCore/CMakeLists.txt -> avidemux_2.5.6.tar.gz/plugins/ADM_audioDevices/AudioCore/CMakeLists.txt Changed

avidemux_2.5.5.tar.gz/plugins/ADM_audioDevices/CMakeLists.txt -> avidemux_2.5.6.tar.gz/plugins/ADM_audioDevices/CMakeLists.txt Changed

avidemux_2.5.5.tar.gz/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp -> avidemux_2.5.6.tar.gz/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp Changed

avidemux_2.5.5.tar.gz/plugins/ADM_videoEncoder/ADM_vidEnc_avcodec/encoder.cpp -> avidemux_2.5.6.tar.gz/plugins/ADM_videoEncoder/ADM_vidEnc_avcodec/encoder.cpp Changed

@@ -358,7 +358,7 @@
 		return ADM_VIDENC_ERR_CLOSED;
 
 	_frame.key_frame = 0;
-	_frame.pict_type = 0;
+	_frame.pict_type = (AVPictureType)0;
 
 	if (_supportedCsps[0] == ADM_CSP_YV12)
 	{
@@ -433,7 +433,6 @@
 	printf("height: %d\n", _context->height);
 	printf("gop_size: %d\n", _context->gop_size);
 	printf("pix_fmt: %d\n", _context->pix_fmt);
-	printf("rate_emu: %d\n", _context->rate_emu);
 	printf("frame_size: %d\n", _context->frame_size);
 	printf("frame_number: %d\n", _context->frame_number);
 	printf("delay: %d\n", _context->delay);
@@ -446,7 +445,7 @@
 	printf("b_quant_factor: %f\n", _context->b_quant_factor);
 	printf("rc_strategy: %d\n", _context->rc_strategy);
 	printf("b_frame_strategy: %d\n", _context->b_frame_strategy);
-	printf("hurry_up: %d\n", _context->hurry_up);
+	printf("skip_frame: %d\n", _context->skip_frame);
 	printf("rtp_payload_size: %d\n", _context->rtp_payload_size);
 	printf("mv_bits: %d\n", _context->mv_bits);
 	printf("header_bits: %d\n", _context->header_bits);
@@ -501,8 +500,6 @@
 	printf("sample_aspect_ratio: %d, %d\n", _context->sample_aspect_ratio.num, _context->sample_aspect_ratio.den);
 	printf("debug: %d\n", _context->debug);
 	printf("debug_mv: %d\n", _context->debug_mv);
-	printf("mb_qmin: %d\n", _context->mb_qmin);
-	printf("mb_qmax: %d\n", _context->mb_qmax);
 	printf("me_cmp: %d\n", _context->me_cmp);
 	printf("me_sub_cmp: %d\n", _context->me_sub_cmp);
 	printf("mb_cmp: %d\n", _context->mb_cmp);
@@ -578,7 +575,6 @@
 	printf("mv0_threshold: %d\n", _context->mv0_threshold);
 	printf("b_sensitivity: %d\n", _context->b_sensitivity);
 	printf("compression_level: %d\n", _context->compression_level);
-	printf("use_lpc: %d\n", _context->use_lpc);
 	printf("lpc_coeff_precision: %d\n", _context->lpc_coeff_precision);
 	printf("min_prediction_order: %d\n", _context->min_prediction_order);
 	printf("max_prediction_order: %d\n", _context->max_prediction_order);

avidemux_2.5.5.tar.gz/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp -> avidemux_2.5.6.tar.gz/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp Changed

avidemux_2.5.5.tar.gz/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp -> avidemux_2.5.6.tar.gz/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp Changed

avidemux_2.5.5.tar.gz/plugins/ADM_videoFilters/FluxSmooth/CMakeLists.txt -> avidemux_2.5.6.tar.gz/plugins/ADM_videoFilters/FluxSmooth/CMakeLists.txt Changed

avidemux_2.5.5.tar.gz/plugins/ADM_videoFilters/ResampleFps/CMakeLists.txt -> avidemux_2.5.6.tar.gz/plugins/ADM_videoFilters/ResampleFps/CMakeLists.txt Changed

avidemux_2.5.5.tar.gz/plugins/ADM_videoFilters/Yadif/ADM_vidYadif_asm.c -> avidemux_2.5.6.tar.gz/plugins/ADM_videoFilters/Yadif/ADM_vidYadif_asm.c Changed

avidemux_2.5.6.tar.gz/po/avidemux_el.qm Added

avidemux_2.5.5.tar.gz/po/avidemux_el.ts -> avidemux_2.5.6.tar.gz/po/avidemux_el.ts Changed

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.0" language="el_GR" sourcelanguage="en">
 <context>
     <name></name>
     <message>
         <location filename="../plugins/ADM_videoFilters/Tdeint/DIA_tdeint.cpp" line="69"/>
         <source>0</source>
-        <translation type="unfinished">0</translation>
+        <translation>0</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_encoder/ADM_encCodecDesc.h" line="11"/>
@@ -37,14 +37,14 @@
         <location filename="../avidemux/ADM_outputs/oplug_mpeg/op_mpegpass.cpp" line="177"/>
         <location filename="../avidemux/ADM_outputs/oplug_mpegFF/oplug_vcdff.cpp" line="339"/>
         <source>Copy</source>
-        <translation type="unfinished">Αντιγραφή</translation>
+        <translation>Αντιγραφή</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_outputs/oplug_dummy/oplug_dummy.cpp" line="124"/>
         <location filename="../avidemux/ADM_outputs/oplug_flv/oplug_flv.cpp" line="172"/>
         <location filename="../avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp" line="140"/>
         <source>Cannot initialize the video stream</source>
-        <translation type="unfinished">Αδύνατη η  αρχικοποίηση της ροής βίντεο</translation>
+        <translation>Αδύνατη η  αρχικοποίηση της ροής βίντεο</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_outputs/oplug_dummy/oplug_dummy.cpp" line="129"/>
@@ -62,14 +62,14 @@
         <location filename="../avidemux/gtk_gui.cpp" line="2057"/>
         <location filename="../avidemux/gtk_gui.cpp" line="2156"/>
         <source>None</source>
-        <translation type="unfinished">Καμία</translation>
+        <translation>Καμία</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_outputs/oplug_dummy/oplug_dummy.cpp" line="138"/>
         <location filename="../avidemux/ADM_outputs/oplug_flv/oplug_flv.cpp" line="186"/>
         <location filename="../avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp" line="175"/>
         <source>Filter init failed</source>
-        <translation type="unfinished">Η αρχικοποίηση του φίλτρου απέτυχε</translation>
+        <translation>Η αρχικοποίηση του φίλτρου απέτυχε</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_outputs/oplug_dummy/oplug_dummy.cpp" line="142"/>
@@ -88,7 +88,7 @@
         <location filename="../avidemux/ADM_outputs/oplug_mpegFF/oplug_vcdff.cpp" line="266"/>
         <location filename="../avidemux/ADM_outputs/oplug_mpegFF/oplug_vcdff.cpp" line="444"/>
         <source>Error while encoding</source>
-        <translation type="unfinished">Σφάλμα κατά την κωδικοποίηση</translation>
+        <translation>Σφάλμα κατά την κωδικοποίηση</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_outputs/oplug_dummy/oplug_dummy.cpp" line="202"/>
@@ -105,108 +105,102 @@
         <location filename="../avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp" line="456"/>
         <source>The beginning frame is not a key frame.
 Please move the A marker.</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="166"/>
         <source>_Use systray while encoding</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="167"/>
         <source>_Accept non-standard audio frequency for DVD</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="168"/>
         <source>Create _OpenDML files</source>
-        <translation type="unfinished">Δημιουργία αρχείων _OpenDML</translation>
+        <translation>Δημιουργία αρχείων _OpenDML</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="169"/>
         <source>Automatically _index MPEG files</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="170"/>
         <source>Automatically _swap A and B if A&gt;B</source>
-        <translation type="unfinished">Αυτόματη _εναλλαγή A και B, αν A&gt;B</translation>
+        <translation>Αυτόματη _εναλλαγή A και B, αν A&gt;B</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="171"/>
         <source>_Disable NUV audio sync</source>
-        <translation type="unfinished">_Απενεργοποίηση συγχρονισμού ήχου NUV</translation>
+        <translation>_Απενεργοποίηση συγχρονισμού ήχου NUV</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="173"/>
         <source>Automatically _build VBR map</source>
-        <translation type="unfinished">Αυτόματο χτίσιμο του χάρτη VBR</translation>
+        <translation>Αυτόματο χτίσιμο του χάρτη VBR</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="174"/>
         <source>Automatically _rebuild index</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="175"/>
         <source>Automatically remove _packed bitstream</source>
-        <translation type="unfinished">
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="177"/>
         <source>SIMD</source>
-        <translation type="unfinished">SIMD</translation>
+        <translation>SIMD</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="179"/>
         <source>Enable all SIMD</source>
-        <translation type="unfinished">Ενεργοποίηση όλων των SIMD</translation>
+        <translation>Ενεργοποίηση όλων των SIMD</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="180"/>
         <source>Enable MMX</source>
-        <translation type="unfinished">Ενεργοποίηση MMX</translation>
+        <translation>Ενεργοποίηση MMX</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="181"/>
         <source>Enable MMXEXT</source>
-        <translation type="unfinished">Ενεργοποίηση MMXEXT</translation>
+        <translation>Ενεργοποίηση MMXEXT</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="182"/>
         <source>Enable 3DNOW</source>
-        <translation type="unfinished">Ενεργοποίηση 3DNOW</translation>
+        <translation>Ενεργοποίηση 3DNOW</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="183"/>
         <source>Enable 3DNOWEXT</source>
-        <translation type="unfinished">Ενεργοποίηση 3DNOWEXT</translation>
+        <translation>Ενεργοποίηση 3DNOWEXT</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="184"/>
         <source>Enable SSE</source>
-        <translation type="unfinished">Ενεργοποίηση SSE</translation>
+        <translation>Ενεργοποίηση SSE</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="185"/>
         <source>Enable SSE2</source>
-        <translation type="unfinished">Ενεργοποίηση SSE2</translation>
+        <translation>Ενεργοποίηση SSE2</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="186"/>
         <source>Enable SSE3</source>
-        <translation type="unfinished">Ενεργοποίηση SSE3</translation>
+        <translation>Ενεργοποίηση SSE3</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="187"/>
         <source>Enable SSSE3</source>
-        <translation type="unfinished">Ενεργοποίηση SSSE3</translation>
+        <translation>Ενεργοποίηση SSSE3</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="208"/>
@@ -221,48 +215,47 @@
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="215"/>
         <source>Above normal</source>
-        <translation type="unfinished">Πάνω από το κανονικό</translation>
+        <translation>Πάνω από το κανονικό</translation>
     </message>
     <message>
         <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="217"/>
         <source>Below normal</source>
-        <translation type="unfinished">Κάτω από το κανονικό</translation>
+        <translation>Κάτω από το κανονικό</translation>
     </message>

avidemux_2.5.5.tar.gz/po/avidemux_it.ts -> avidemux_2.5.6.tar.gz/po/avidemux_it.ts Changed

@@ -4,3642 +4,2806 @@
 <context>
     <name></name>
     <message>
-        <location filename="../avidemux/ADM_outputs/oplug_dummy/oplug_dummy.cpp" line="124"/>
-        <location filename="../avidemux/ADM_outputs/oplug_flv/oplug_flv.cpp" line="172"/>
-        <location filename="../avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp" line="140"/>
         <source>Cannot initialize the video stream</source>
-        <translation>Impossibile inizializzare il flusso video</translation>
+        <translation type="obsolete">Impossibile inizializzare il flusso video</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_outputs/oplug_dummy/oplug_dummy.cpp" line="129"/>
         <source>Dummy</source>
-        <translation>Fittizio</translation>
+        <translation type="obsolete">Fittizio</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_outputs/oplug_dummy/oplug_dummy.cpp" line="130"/>
-        <location filename="../avidemux/ADM_outputs/oplug_flv/oplug_flv.cpp" line="178"/>
-        <location filename="../avidemux/ADM_outputs/oplug_flv/oplug_flv.cpp" line="230"/>
-        <location filename="../avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp" line="148"/>
-        <location filename="../avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp" line="242"/>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="66"/>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="75"/>
-        <location filename="../avidemux/gtk_gui.cpp" line="2060"/>
-        <location filename="../avidemux/gtk_gui.cpp" line="2159"/>
         <source>None</source>
-        <translation>Nessuno</translation>
+        <translation type="obsolete">Nessuno</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_outputs/oplug_dummy/oplug_dummy.cpp" line="138"/>
-        <location filename="../avidemux/ADM_outputs/oplug_flv/oplug_flv.cpp" line="186"/>
-        <location filename="../avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp" line="175"/>
         <source>Filter init failed</source>
-        <translation>Inizializzazione filtro fallita</translation>
+        <translation type="obsolete">Inizializzazione filtro fallita</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_outputs/oplug_dummy/oplug_dummy.cpp" line="142"/>
-        <location filename="../avidemux/ADM_outputs/oplug_flv/oplug_flv.cpp" line="190"/>
-        <location filename="../avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp" line="186"/>
-        <location filename="../avidemux/ADM_outputs/oplug_mpegFF/oplug_vcdff.cpp" line="333"/>
         <source>Encoding</source>
-        <translation>Codifica</translation>
+        <translation type="obsolete">Codifica</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_outputs/oplug_dummy/oplug_dummy.cpp" line="195"/>
-        <location filename="../avidemux/ADM_outputs/oplug_flv/oplug_flv.cpp" line="311"/>
-        <location filename="../avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp" line="297"/>
-        <location filename="../avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp" line="449"/>
-        <location filename="../avidemux/ADM_outputs/oplug_mpeg/op_mpegpass.cpp" line="304"/>
-        <location filename="../avidemux/ADM_outputs/oplug_mpegFF/oplug_vcdff.cpp" line="266"/>
-        <location filename="../avidemux/ADM_outputs/oplug_mpegFF/oplug_vcdff.cpp" line="444"/>
         <source>Error while encoding</source>
-        <translation>Errore durante la codifica</translation>
+        <translation type="obsolete">Errore durante la codifica</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_outputs/oplug_dummy/oplug_dummy.cpp" line="202"/>
-        <location filename="../avidemux/ADM_outputs/oplug_flv/oplug_flv.cpp" line="318"/>
-        <location filename="../avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp" line="304"/>
-        <location filename="../avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp" line="456"/>
         <source>KeyFrame error</source>
-        <translation>Errore fotogramma chiave</translation>
+        <translation type="obsolete">Errore fotogramma chiave</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_outputs/oplug_dummy/oplug_dummy.cpp" line="202"/>
-        <location filename="../avidemux/ADM_outputs/oplug_flv/oplug_flv.cpp" line="318"/>
-        <location filename="../avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp" line="304"/>
-        <location filename="../avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp" line="456"/>
         <source>The beginning frame is not a key frame.
 Please move the A marker.</source>
-        <translation>Il fotogramma iniziale non è un fotogramma chiave.
+        <translation type="obsolete">Il fotogramma iniziale non è un fotogramma chiave.
 Spostare il segnalibro A.</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="48"/>
         <source>_Dynamic range compression</source>
-        <translation>Compressione intervallo _dinamico</translation>
+        <translation type="obsolete">Compressione intervallo _dinamico</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="50"/>
         <source>_Time shift (ms):</source>
-        <translation>_Ritardo (ms):</translation>
+        <translation type="obsolete">_Ritardo (ms):</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="50"/>
         <source>Time shift value (ms)</source>
-        <translation>Ritardo (ms)</translation>
+        <translation type="obsolete">Ritardo (ms)</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="58"/>
         <source>R_esampling (Hz):</source>
-        <translation>Ricampionam_ento (Hz):</translation>
+        <translation type="obsolete">Ricampionam_ento (Hz):</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="58"/>
         <source>Resampling frequency (Hz)</source>
-        <translation>Frequenza di ricampionamento (Hz)</translation>
+        <translation type="obsolete">Frequenza di ricampionamento (Hz)</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="67"/>
         <source>Film to PAL</source>
-        <translation>Da film a PAL</translation>
+        <translation type="obsolete">Da film a PAL</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="68"/>
         <source>PAL to Film</source>
-        <translation>Da PAL a film</translation>
+        <translation type="obsolete">Da PAL a film</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="71"/>
         <source>_Frame rate change:</source>
-        <translation>Variazione _frame rate:</translation>
+        <translation type="obsolete">Variazione _frame rate:</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="76"/>
         <source>Automatic (max -3 dB)</source>
-        <translation>Automatico (massimo -3 dB)</translation>
+        <translation type="obsolete">Automatico (massimo -3 dB)</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="77"/>
         <source>Manual</source>
-        <translation>Manuale</translation>
+        <translation type="obsolete">Manuale</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="79"/>
         <source>_Gain mode:</source>
-        <translation>Modalità _guadagno:</translation>
+        <translation type="obsolete">Modalità _guadagno:</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="81"/>
         <source>G_ain value:</source>
-        <translation>V_alore guadagno:</translation>
+        <translation type="obsolete">V_alore guadagno:</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="83"/>
         <source>Gain</source>
-        <translation>Amplificazione</translation>
+        <translation type="obsolete">Amplificazione</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="88"/>
         <source>No change</source>
-        <translation>Nessun cambiamento</translation>
+        <translation type="obsolete">Nessun cambiamento</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="89"/>
-        <location filename="../plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="290"/>
-        <location filename="../plugins/ADM_audioEncoders/twolame/audioencoder_twolame.cpp" line="213"/>
         <source>Mono</source>
-        <translation>Mono</translation>
+        <translation type="obsolete">Mono</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="90"/>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp" line="266"/>
-        <location filename="../plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="288"/>
-        <location filename="../plugins/ADM_audioEncoders/twolame/audioencoder_twolame.cpp" line="211"/>
         <source>Stereo</source>
-        <translation>Stereo</translation>
+        <translation type="obsolete">Stereo</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="91"/>
         <source>Stereo+surround</source>
-        <translation>Stereo + surround</translation>
+        <translation type="obsolete">Stereo + surround</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="92"/>
         <source>Stereo+center</source>
-        <translation>Stereo + centro</translation>
+        <translation type="obsolete">Stereo + centro</translation>
     </message>
     <message>
-        <location filename="../avidemux/ADM_userInterfaces/ADM_commonUI/DIA_audioFilter.cpp" line="93"/>
         <source>Stereo+center+surround</source>
-        <translation>Stereo + centro + surround</translation>
+        <translation type="obsolete">Stereo + centro + surround</translation>
     </message>
     <message>

avidemux_2.5.5.tar.gz/po/de.po -> avidemux_2.5.6.tar.gz/po/de.po Changed

avidemux_2.5.5.tar.gz/po/el.po -> avidemux_2.5.6.tar.gz/po/el.po Changed

@@ -1,9528 +1,9271 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Avidemux el 004\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-13 21:49+0100\n"
-"PO-Revision-Date: 2008-03-10 20:36+0200\n"
-"Last-Translator: nikos papadopoulos <231036448@freemail.gr>\n"
-"Language-Team: GREEK <231036448@freemail.gr>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Greek\n"
-"X-Poedit-Country: GREECE\n"
-
-#: avidemux/ADM_editor/ADM_outputfmt.h:54
-#: avidemux/ADM_outputs/oplug_avi/op_avisave.cpp:369
-#: avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_calculator.cpp:496
-msgid "AVI"
-msgstr "AVI"
-
-#: avidemux/ADM_editor/ADM_outputfmt.h:55
-msgid "AVI, dual audio"
-msgstr "AVI, διπλού ήχου"
-
-#: avidemux/ADM_editor/ADM_outputfmt.h:56
-msgid "AVI, pack VOP"
-msgstr ""
-
-#: avidemux/ADM_editor/ADM_outputfmt.h:57
-msgid "AVI, unpack VOP"
-msgstr ""
-
-#: avidemux/ADM_editor/ADM_outputfmt.h:58
-msgid "MPEG-PS (A+V)"
-msgstr "MPEG-PS (A+V)"
-
-#: avidemux/ADM_editor/ADM_outputfmt.h:59
-msgid "MPEG-TS (A+V)"
-msgstr "MPEG-TS (A+V)"
-
-#: avidemux/ADM_editor/ADM_outputfmt.h:60
-msgid "MPEG video"
-msgstr "Βίντεο MPEG"
-
-#: avidemux/ADM_editor/ADM_outputfmt.h:61
-#: avidemux/ADM_outputs/oplug_avi/op_avisave.cpp:493
-#: avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp:116
-msgid "MP4"
-msgstr "MP4"
-
-#: avidemux/ADM_editor/ADM_outputfmt.h:62
-msgid "MP4 (PSP)"
-msgstr ""
-
-#: avidemux/ADM_editor/ADM_outputfmt.h:63
-#: avidemux/ADM_outputs/oplug_ogm/op_ogsave.cpp:108
-#: avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_calculator.cpp:500
-msgid "OGM"
-msgstr "OGM"
-
-#: avidemux/ADM_editor/ADM_outputfmt.h:64
-#: avidemux/ADM_outputs/oplug_flv/oplug_flv.cpp:177
-#: avidemux/ADM_outputs/oplug_flv/oplug_flv.cpp:244
-msgid "FLV"
-msgstr "FLV"
-
-#: avidemux/ADM_editor/ADM_outputfmt.h:65
-#: avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp:117
-msgid "MKV"
-msgstr "MKV"
-
-#: avidemux/ADM_editor/ADM_outputfmt.h:66
-msgid "DUMMY"
-msgstr "ΕΙΚΟΝΙΚΟ"
-
-#: avidemux/ADM_encoder/ADM_encCodecDesc.h:11
-msgid "YV12 (raw)"
-msgstr ""
-
-#: avidemux/ADM_encoder/ADM_encCodecDesc.h:30
-msgid "MPEG-2 requant"
-msgstr ""
-
-#: avidemux/ADM_encoder/ADM_encCodecDesc.h:47
-msgid "dummy"
-msgstr ""
-
-#: avidemux/ADM_encoder/ADM_encCodecDesc.h:50
-#: avidemux/ADM_encoder/adm_encCopy.cpp:85
-#: avidemux/ADM_outputs/oplug_avi/op_avisave.cpp:271
-#: avidemux/ADM_outputs/oplug_avi/op_avisave.cpp:367
-#: avidemux/ADM_outputs/oplug_dummy/oplug_dummy.cpp:132
-#: avidemux/ADM_outputs/oplug_dummy/oplug_dummy.cpp:164
-#: avidemux/ADM_outputs/oplug_flv/oplug_flv.cpp:180
-#: avidemux/ADM_outputs/oplug_flv/oplug_flv.cpp:226
-#: avidemux/ADM_outputs/oplug_flv/oplug_flv.cpp:247
-#: avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp:150
-#: avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp:238
-#: avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp:250
-#: avidemux/ADM_outputs/oplug_mpeg/op_mpegpass.cpp:173
-#: avidemux/ADM_outputs/oplug_mpeg/op_mpegpass.cpp:177
-#: avidemux/ADM_outputs/oplug_mpegFF/oplug_vcdff.cpp:339
-#: avidemux/ADM_outputs/oplug_ogm/op_ogaudio.cpp:86
-#: avidemux/ADM_outputs/oplug_ogm/op_ogsavecopy.cpp:55
-#: avidemux/ADM_userInterfaces/ADM_GTK/ADM_gui2/GUI_main2.cpp:1042
-#: avidemux/ADM_userInterfaces/ADM_GTK/ADM_gui2/GUI_main2.cpp:1082
-msgid "Copy"
-msgstr "Αντιγραφή"
-
-#: avidemux/ADM_encoder/adm_encyv12.h:70
-msgid "YV12"
-msgstr ""
-
-#: avidemux/ADM_audio/audiotimeline.cpp:78
-#: avidemux/ADM_audio/audiotimeline.cpp:89
-msgid "Building VBR map"
-msgstr "Χτίσιμο χάρτη VBR"
-
-#: avidemux/ADM_audiocodec/ADM_codecwma.cpp:93
-msgid "Internal error"
-msgstr "Εσωτερικό σφάλμα"
-
-#: avidemux/ADM_audiocodec/ADM_codecwma.cpp:93
-msgid "Cannot open WMA2 codec."
-msgstr "Αδύνατο το άνοιγμα του κώδικα WMA2 ."
-
-#: avidemux/ADM_audiofilter/audiofilter_buildchain.cpp:288
-msgid "Codec Error"
-msgstr "Σφάλμα Κώδικα"
-
-#: avidemux/ADM_audiofilter/audiofilter_buildchain.cpp:288
-msgid ""
-"The number of channels is greater than what the selected audio codec can "
-"do.\n"
-"Either change codec or use the mixer filter to have less channels."
-msgstr ""
-"Ο αριθμός των καναλιών είναι μεγαλύτερος από αυτά που μπορεί να επιτύχει ο "
-"κώδικας ήχου.\n"
-"Είτε άλλαξε κώδικα, είτε χρησιμοποίησε το φίλτρο μίξης, για να έχεις "
-"λιγότερα κανάλια."
-
-#: avidemux/ADM_audiofilter/audiofilter_buildchain.cpp:300
-msgid "[BuildChain] Encoder initialization failed"
-msgstr ""
-
-#: avidemux/ADM_audiofilter/audiofilter_buildchain.cpp:300
-msgid ""
-"Not activated, make sure number of channels and bitrate are compatible with "
-"encoder!"
-msgstr ""
-
-#: avidemux/ADM_codecs/ADM_ffmp43.cpp:44
-msgid "Internal error finding codec"
-msgstr "Εσωτερικό σφάλμα στην εύρεση του κώδικα"
-
-#: avidemux/ADM_coreUI/src/DIA_fileSel.cpp:127
-#: avidemux/ADM_ocr/adm_glyph.cpp:217
-#: avidemux/ADM_outputs/oplug_mpegFF/oplug_vcdff.cpp:326
-#: avidemux/ADM_outputs/oplug_ogm/op_ogsave.cpp:101
-#: avidemux/ADM_userInterfaces/ADM_commonUI/DIA_ocr.cpp:103
-#: avidemux/ADM_userInterfaces/ADM_commonUI/DIA_ocr.cpp:108
-#: avidemux/ADM_userInterfaces/ADM_commonUI/DIA_ocr.cpp:115
-#: avidemux/ADM_userInterfaces/ADM_commonUI/DIA_ocr.cpp:124
-#: avidemux/ADM_userInterfaces/ADM_commonUI/DIA_ocr.cpp:221
-#: avidemux/ADM_userInterfaces/ADM_commonUI/DIA_ocr.cpp:227
-#: avidemux/ADM_userInterfaces/ADM_commonUI/DIA_ocr.cpp:234
-#: avidemux/ADM_userInterfaces/ADM_commonUI/DIA_ocr.cpp:243
-#: avidemux/gtk_gui.cpp:944 avidemux/gtk_gui.cpp:1554
-#: avidemux/gtk_gui.cpp:2688
-msgid "File error"
-msgstr "Σφάλμα αρχείου"
-
-#: avidemux/ADM_coreUI/src/DIA_fileSel.cpp:127 avidemux/gtk_gui.cpp:941
-#, c-format
-msgid "Cannot open \"%s\"."
-msgstr "Αδύνατο το άνοιγμα του \"%s\"."
-
-#: avidemux/ADM_coreUI/src/DIA_fileSel.cpp:140
-#, c-format
-msgid ""
-"%s already exists.\n"
-"\n"
-"Do you want to replace it?"
-msgstr ""
-"Το %s υπάρχει ήδη.\n"
-"\n"
-"Θέλετε να αντικατασταθεί;"
-
-#: avidemux/ADM_coreUI/src/DIA_fileSel.cpp:167
-#: avidemux/ADM_coreUI/src/DIA_fileSel.cpp:181
-msgid "It is possible that you are trying to overwrite an input file!"
-msgstr ""
-"Είναι πιθανό να προσπαθείς να επαναγράψεις ένα αρχείο δεδομένων εισόδου!"
-

avidemux_2.5.5.tar.gz/po/hu.po -> avidemux_2.5.6.tar.gz/po/hu.po Changed

@@ -1,19 +1,19 @@
 # Translation of Avidemux to Hungarian
 # Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Avidemux package.
-# László Andrássy <andrassy.laszlo@gmail.com>, 2009-2010.
+# László Andrássy <andrassy.laszlo@gmail.com>, 2009-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Avidemux_SVN_6997\n"
+"Project-Id-Version: Avidemux_SVN_7629\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-14 19:03+0100\n"
-"PO-Revision-Date: 2011-02-16 09:29+0100\n"
+"PO-Revision-Date: 2011-10-28 08:40+0100\n"
 "Last-Translator: Andrássy László <andrassy.laszlo@gmail.com>\n"
-"Language-Team: Hungarian\n"
+"Language-Team: Hungarian <andrassy.laszlo@gmail.com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "PO-Creation-Date: 2009-10-19 09:25+0100\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -4156,7 +4156,7 @@
 
 #: avidemux/ADM_userInterfaces/ADM_GTK/ADM_gui2/GUI_main2.cpp:888
 msgid "Go to _Time..."
-msgstr "Időponthoz _ugrás..."
+msgstr "Ugrás _időponthoz..."
 
 #: avidemux/ADM_userInterfaces/ADM_GTK/ADM_gui2/GUI_main2.cpp:899
 msgid "_Custom"

avidemux_2.5.5.tar.gz/po/it.po -> avidemux_2.5.6.tar.gz/po/it.po Changed

@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: Avidemux\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-29 22:35+0100\n"
-"PO-Revision-Date: 2010-10-01 15:48+0100\n"
+"POT-Creation-Date: 2011-07-10 18:48+0100\n"
+"PO-Revision-Date: 2011-07-15 11:17+0100\n"
 "Last-Translator: Matteo 'Maff' Angelino <matteo.maff at gmail dot com>\n"
 "Language-Team: Avidemux Italian Translation\n"
 "MIME-Version: 1.0\n"
@@ -160,14 +160,14 @@
 #: avidemux/ADM_userInterfaces/ADM_commonUI/DIA_ocr.cpp:227
 #: avidemux/ADM_userInterfaces/ADM_commonUI/DIA_ocr.cpp:234
 #: avidemux/ADM_userInterfaces/ADM_commonUI/DIA_ocr.cpp:243
-#: avidemux/gtk_gui.cpp:947
-#: avidemux/gtk_gui.cpp:1557
-#: avidemux/gtk_gui.cpp:2691
+#: avidemux/gtk_gui.cpp:937
+#: avidemux/gtk_gui.cpp:1569
+#: avidemux/gtk_gui.cpp:2703
 msgid "File error"
 msgstr "Errore file"
 
 #: avidemux/ADM_coreUI/src/DIA_fileSel.cpp:127
-#: avidemux/gtk_gui.cpp:944
+#: avidemux/gtk_gui.cpp:934
 #, c-format
 msgid "Cannot open \"%s\"."
 msgstr "Impossibile aprire \"%s\"."
@@ -368,7 +368,7 @@
 
 #: avidemux/ADM_filter/filter_declaration.cpp:51
 #: avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_threshold.cpp:395
-#: plugins/ADM_videoEncoder/ADM_vidEnc_x264/gtk/x264ConfigDialog.cpp:980
+#: plugins/ADM_videoEncoder/ADM_vidEnc_x264/gtk/x264ConfigDialog.cpp:1009
 msgid "Threshold"
 msgstr "Threshold"
 
@@ -439,7 +439,7 @@
 msgid "Size is not (s)QCIF"
 msgstr "La dimensione non è (s)QCIF"
 
-#: avidemux/ADM_inputs/ADM_mp4/ADM_mp4Analyzer.cpp:626
+#: avidemux/ADM_inputs/ADM_mp4/ADM_mp4Analyzer.cpp:634
 msgid "Problem reading SVQ3 headers"
 msgstr "Problema di lettura delle intestazioni SVQ3"
 
@@ -669,6 +669,10 @@
 msgid "%u seconds"
 msgstr "%u secondi"
 
+#: avidemux/ADM_outputs/ADM_lavformat.cpp:214
+msgid "Can't mux that video codec into MKV"
+msgstr "Impossibile inserire quel codec video in MKV"
+
 #: avidemux/ADM_outputs/ADM_lavformat.cpp:373
 msgid "Incompatible frame rate"
 msgstr "Frame rate incompatibile"
@@ -728,11 +732,11 @@
 #: avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_encoding.cpp:555
 #: avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_encoding.cpp:570
 #: avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_vobsub.cpp:206
-#: avidemux/gtk_gui.cpp:2060
-#: avidemux/gtk_gui.cpp:2159
+#: avidemux/gtk_gui.cpp:2072
+#: avidemux/gtk_gui.cpp:2171
 #: plugins/ADM_videoEncoder/ADM_vidEnc_avcodec/h263Encoder.cpp:197
 #: plugins/ADM_videoEncoder/ADM_vidEnc_avcodec/mpeg4aspEncoder.cpp:197
-#: plugins/ADM_videoEncoder/ADM_vidEnc_x264/gtk/x264ConfigDialog.cpp:1182
+#: plugins/ADM_videoEncoder/ADM_vidEnc_x264/gtk/x264ConfigDialog.cpp:1211
 #: plugins/ADM_videoFilters/colorYUV/gtk/DIA_coloryuv.cpp:357
 #: plugins/ADM_videoFilters/colorYUV/gtk/DIA_coloryuv.cpp:365
 #: plugins/ADM_videoFilters/colorYUV/gtk/DIA_coloryuv.cpp:373
@@ -849,7 +853,7 @@
 msgstr "Inizializzazione filtro fallita"
 
 #: avidemux/ADM_outputs/oplug_avi/op_saveprocess.cpp:131
-#: avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp:415
+#: avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp:418
 msgid "1st Pass"
 msgstr "1a passata"
 
@@ -867,7 +871,7 @@
 msgstr "Codifica"
 
 #: avidemux/ADM_outputs/oplug_avi/op_saveprocess.cpp:263
-#: avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp:488
+#: avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp:491
 msgid "2nd Pass"
 msgstr "2a passata"
 
@@ -889,7 +893,7 @@
 #: avidemux/ADM_outputs/oplug_dummy/oplug_dummy.cpp:195
 #: avidemux/ADM_outputs/oplug_flv/oplug_flv.cpp:311
 #: avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp:297
-#: avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp:449
+#: avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp:452
 #: avidemux/ADM_outputs/oplug_mpeg/op_mpegpass.cpp:304
 #: avidemux/ADM_outputs/oplug_mpegFF/oplug_vcdff.cpp:266
 #: avidemux/ADM_outputs/oplug_mpegFF/oplug_vcdff.cpp:444
@@ -899,14 +903,14 @@
 #: avidemux/ADM_outputs/oplug_dummy/oplug_dummy.cpp:202
 #: avidemux/ADM_outputs/oplug_flv/oplug_flv.cpp:318
 #: avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp:304
-#: avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp:456
+#: avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp:459
 msgid "KeyFrame error"
 msgstr "Errore fotogramma chiave"
 
 #: avidemux/ADM_outputs/oplug_dummy/oplug_dummy.cpp:202
 #: avidemux/ADM_outputs/oplug_flv/oplug_flv.cpp:318
 #: avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp:304
-#: avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp:456
+#: avidemux/ADM_outputs/oplug_mp4/oplug_mp4.cpp:459
 msgid ""
 "The beginning frame is not a key frame.\n"
 "Please move the A marker."
@@ -1039,8 +1043,8 @@
 
 #: avidemux/ADM_outputs/oplug_mpegFF/oplug_vcdff.cpp:326
 #: avidemux/ADM_outputs/oplug_ogm/op_ogsave.cpp:101
-#: avidemux/gtk_gui.cpp:1557
-#: avidemux/gtk_gui.cpp:2691
+#: avidemux/gtk_gui.cpp:1569
+#: avidemux/gtk_gui.cpp:2703
 #, c-format
 msgid "Cannot open \"%s\" for writing."
 msgstr "Impossibile aprire \"%s\" per la scrittura."
@@ -1069,44 +1073,44 @@
 msgid "Pass 2"
 msgstr "Passata 2"
 
-#: avidemux/ADM_script/ADM_JSFunctions.cpp:243
+#: avidemux/ADM_script/ADM_JSFunctions.cpp:244
 msgid "Select a directory"
 msgstr "Seleziona una cartella"
 
-#: avidemux/ADM_script/ADM_JSFunctions.cpp:514
+#: avidemux/ADM_script/ADM_JSFunctions.cpp:515
 msgid "Uinteger"
 msgstr "Uinteger"
 
-#: avidemux/ADM_script/ADM_JSFunctions.cpp:517
+#: avidemux/ADM_script/ADM_JSFunctions.cpp:518
 msgid "Test uinteger"
 msgstr "Prova uinteger"
 
-#: avidemux/ADM_script/ADM_JSFunctions.cpp:529
+#: avidemux/ADM_script/ADM_JSFunctions.cpp:530
 msgid "Float"
 msgstr "Float"
 
-#: avidemux/ADM_script/ADM_JSFunctions.cpp:547
+#: avidemux/ADM_script/ADM_JSFunctions.cpp:548
 msgid "Toggle"
 msgstr "Toggle"
 
-#: avidemux/ADM_script/ADM_JSFunctions.cpp:569
+#: avidemux/ADM_script/ADM_JSFunctions.cpp:570
 msgid "No Strategy"
 msgstr "Nessuna strategia"
 
-#: avidemux/ADM_script/ADM_JSFunctions.cpp:570
+#: avidemux/ADM_script/ADM_JSFunctions.cpp:571
 msgid "3:2 Pulldown"
 msgstr "3:2 Pulldown"
 
-#: avidemux/ADM_script/ADM_JSFunctions.cpp:571
+#: avidemux/ADM_script/ADM_JSFunctions.cpp:572
 msgid "Pal/Secam"
 msgstr "Pal/Secam"
 
-#: avidemux/ADM_script/ADM_JSFunctions.cpp:572
+#: avidemux/ADM_script/ADM_JSFunctions.cpp:573
 #: plugins/ADM_videoFilters/Telecide/ADM_vidDecTelecide.cpp:79
 msgid "NTSC converted from PAL"
 msgstr "NTSC convertito da PAL"
 
-#: avidemux/ADM_script/ADM_JSFunctions.cpp:574
+#: avidemux/ADM_script/ADM_JSFunctions.cpp:575
 msgid "menu"
 msgstr "menu"
 
@@ -1223,7 +1227,7 @@
 
 #: avidemux/ADM_UIs/ADM_GTK/src/FAC_threadCount.cpp:100
 #: avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_calculator.cpp:544
-#: plugins/ADM_videoEncoder/ADM_vidEnc_x264/gtk/x264ConfigDialog.cpp:859
+#: plugins/ADM_videoEncoder/ADM_vidEnc_x264/gtk/x264ConfigDialog.cpp:888
 msgid "Custom"
 msgstr "Personalizzato"
 
@@ -1836,7 +1840,7 @@
 msgstr "Output"
 
 #: avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp:324
-#: avidemux/gtk_gui.cpp:2059
+#: avidemux/gtk_gui.cpp:2071
 msgid "Video"

Changes of Revision 6