Update to 2.4.1.

A short changelog compared to 2.3:

* Input and output support for MKV and FLV containers
* Rewritten MP4/MOV/3GP reader
* Support for Nellymoser codec
* New DV video output support
* New MPEG-TS support including H.264 Elementary Stream
* OCR support for MPEG-TS subtitles
* New video bitstream unpacker (improved compatibility)
* Capability to pack video bitstreams
* New Yadif filter (ported from Avisynth)
* Video filters can be loaded as external plug-ins (sample plug-in included)
* Three interfaces now offered: command line, GTK+ and Qt4 (Qt4 is still incomplete)
* Several key dialogs have been revamped (GTK+ user interface only)
* Preview system refactored
* Priority control added for encoding and video playback (Win32 only)
* New Jog Shuttle control (GTK+ user interface only)
* Support for Jog Shuttle hardware (Linux & GTK+ only)
* New iPod and PlayStation Portable profiles
* New Glyph Editor
* Improved Bitrate Histogram
* JACK support (Linux only)
* DirectX support (Win32 only)
* New Avisynth Proxy GUI (Win32 only)
* Improved crash recovery - session settings are saved and reloaded upon
  application start
* Numerous bugs fixed

...and more, see the changelog for more info.


(xtraeme)

$NetBSD: patch-as,v 1.1 2008/02/19 09:11:43 xtraeme Exp $

--- avidemux/main.cpp.orig	2008-02-19 09:54:01.000000000 +0100
+++ avidemux/main.cpp	2008-02-19 09:54:14.000000000 +0100
@@ -53,7 +53,7 @@
 
 #ifdef USE_SDL
 extern "C" {
-	#include "SDL.h"
+	#include <SDL/SDL.h>
 }
 
 #include "ADM_userInterfaces/ADM_commonUI/GUI_sdlRender.h"

$NetBSD: patch-at,v 1.1 2008/02/19 09:11:43 xtraeme Exp $

--- avidemux/ADM_userInterfaces/ADM_commonUI/GUI_sdlRender.cpp.orig	2008-02-19 09:52:42.000000000 +0100
+++ avidemux/ADM_userInterfaces/ADM_commonUI/GUI_sdlRender.cpp	2008-02-19 09:53:06.000000000 +0100
@@ -34,8 +34,8 @@
 #undef HAVE_STDLIB_H
 #undef HAVE_STRING_H
 #undef HAVE_SYS_TYPES_H
-#include "SDL.h"
-#include "SDL_syswm.h"
+#include <SDL/SDL.h>
+#include <SDL/SDL_syswm.h>
 }
 
 #include "ADM_colorspace/colorspace.h"

$NetBSD: patch-au,v 1.1 2008/02/19 09:11:43 xtraeme Exp $

--- avidemux/ADM_osSupport/ADM_crashdump.cpp.orig	2008-02-19 09:47:11.000000000 +0100
+++ avidemux/ADM_osSupport/ADM_crashdump.cpp	2008-02-19 09:48:44.000000000 +0100
@@ -45,7 +45,7 @@
 extern char *ADM_getBaseDir(void);
 extern void A_parseECMAScript(const char *name);
 
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__NetBSD__)
 void installSigHandler() {}
 
 void ADM_backTrack(int lineno,const char *file)

$NetBSD: patch-av,v 1.1 2008/02/19 09:11:43 xtraeme Exp $

--- avidemux/ADM_osSupport/ADM_cpuCap.cpp.orig	2008-02-19 09:44:35.000000000 +0100
+++ avidemux/ADM_osSupport/ADM_cpuCap.cpp	2008-02-19 09:46:49.000000000 +0100
@@ -195,7 +195,7 @@
 {
 #if defined(ADM_WIN32)
     return pthread_num_processors_np();
-#elif !defined(__APPLE__) && !defined(ADM_BSD_FAMILY)
+#elif !defined(__APPLE__) && !defined(__NetBSD__) && !defined(ADM_BSD_FAMILY)
     unsigned int bit;
     int np;
 

$NetBSD: patch-aw,v 1.1 2008/02/19 09:11:43 xtraeme Exp $

--- avidemux/ADM_audiodevice/ADM_deviceSDL.cpp.orig	2008-02-19 09:23:10.000000000 +0100
+++ avidemux/ADM_audiodevice/ADM_deviceSDL.cpp	2008-02-19 09:23:28.000000000 +0100
@@ -23,7 +23,7 @@
 #include "fourcc.h" 
  
 #ifdef USE_SDL
-#include "SDL.h"
+#include <SDL/SDL.h>
 
 
 #include "ADM_toolkit/toolkit.hxx"

$NetBSD: patch-ax,v 1.1 2008/02/19 09:11:43 xtraeme Exp $

--- avidemux/ADM_videoFilter/ADM_vidParticle.cpp.orig	2008-02-19 09:16:00.000000000 +0100
+++ avidemux/ADM_videoFilter/ADM_vidParticle.cpp	2008-02-19 09:21:40.000000000 +0100
@@ -797,8 +797,13 @@
 
     if (my_outImage)
     {
+#ifdef __NetBSD__
+	uint32_t px = static_cast <uint32_t> (rintf (my_particle.centroidX));
+	uint32_t py = static_cast <uint32_t> (rintf (my_particle.centroidY));
+#else
         uint32_t px = static_cast <uint32_t> (nearbyintf (my_particle.centroidX));
         uint32_t py = static_cast <uint32_t> (nearbyintf (my_particle.centroidY));
+#endif
         if (validPixel (px, py))
             outPixel (px, py) = 255;
         else
@@ -1157,8 +1162,13 @@
 char & pixel_char (vector <string> & grid, int16_t xbase, int16_t ybase,
                    float cX, float cY, float dX, float dY)
 {
+#ifdef __NetBSD__
+    uint16_t x = static_cast <uint16_t> (rintf (cX + dX));
+    uint16_t y = static_cast <uint16_t> (rintf (cY + dY));
+#else
     uint16_t x = static_cast <uint16_t> (nearbyintf (cX + dX));
     uint16_t y = static_cast <uint16_t> (nearbyintf (cY + dY));
+#endif
     return grid [y - ybase][x - xbase];
 }
 
@@ -1319,8 +1329,13 @@
             ++plit;
         }
 
+#ifdef __NetBSD__
+	uint32_t px = static_cast <uint32_t> (rintf (my_particle.centroidX));
+	uint32_t py = static_cast <uint32_t> (rintf (my_particle.centroidY));
+#else
         uint32_t px = static_cast <uint32_t> (nearbyintf (my_particle.centroidX));
         uint32_t py = static_cast <uint32_t> (nearbyintf (my_particle.centroidY));
+#endif
         char & ch = grid [py - ybase][px - xbase];
         if (ch == 'x')
             ch = 'X';

$NetBSD: patch-ay,v 1.1 2008/02/19 09:11:43 xtraeme Exp $

--- avidemux/ADM_audiofilter/audiofilter_normalize.cpp.orig	2008-02-18 21:14:29.000000000 +0100
+++ avidemux/ADM_audiofilter/audiofilter_normalize.cpp	2008-02-18 21:15:32.000000000 +0100
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
+#include <sys/param.h>
 
 #include <ADM_assert.h>
 
@@ -42,7 +43,7 @@
 
 
 #ifndef ADM_WIN32
-#ifdef ADM_BSD_FAMILY
+#ifdef BSD
                 #define POW10(x) powf(10.0,x)
 #else
                 #define POW10(x)  pow10f(x)