- no longer needed (since ver. 2.4)

Changed files:
    avidemux-as_needed.patch -> 1.2
    avidemux-compile.patch -> 1.2
    avidemux-dts_internal.patch -> 1.3

diff --git a/avidemux-as_needed.patch b/avidemux-as_needed.patch
deleted file mode 100644 (file)
index eb0de3a..0000000
--- a/avidemux-as_needed.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- avidemux_2.3.0/avidemux/Makefile.am.orig   2007-01-04 14:35:01.000000000 +0000
-+++ avidemux_2.3.0/avidemux/Makefile.am        2007-01-04 14:35:08.000000000 +0000
-@@ -74,7 +74,7 @@
- ./ADM_matroska/libADM_matroska.a   \
- ./ADM_asf/libADM_asf.a   \
- ./ADM_h263/libADM_h263.a   \
--./ADM_nuv/libADM_nuv.a  ./ADM_ogm/libADM_ogm.a ./ADM_audiodevice/libADM_audiodevice.a \
-+./ADM_nuv/libADM_nuv.a  ./ADM_ogm/libADM_ogm.a ./ADM_audiodevice/libADM_audiodevice.la \
- ./ADM_xvidratectl/libADM_xvidratectl.a  \
- ./ADM_requant/libADM_requant.a \
- ./ADM_ocr/libADM_ocr.a \
---- avidemux_2.3.0/avidemux/ADM_audiodevice/Makefile.am.orig   2007-01-04 14:25:24.000000000 +0000
-+++ avidemux_2.3.0/avidemux/ADM_audiodevice/Makefile.am        2007-01-04 14:26:39.000000000 +0000
-@@ -1,14 +1,15 @@
- ####### kdevelop will overwrite this part!!! (begin)##########
--noinst_LIBRARIES = libADM_audiodevice.a
-+noinst_LTLIBRARIES = libADM_audiodevice.la
- 
- ## INCLUDES were found outside kdevelop specific part
- 
--libADM_audiodevice_a_METASOURCES = AUTO
-+libADM_audiodevice_la_METASOURCES = AUTO
- 
--libADM_audiodevice_a_SOURCES = ADM_deviceArts.cpp ADM_audiodevice.cpp \
-+libADM_audiodevice_la_SOURCES = ADM_deviceArts.cpp ADM_audiodevice.cpp \
-       ADM_deviceoss.cpp ADM_deviceALSA.cpp ADM_deviceALSA.h ADM_deviceAudioCore.cpp \
-       ADM_deviceSDL.cpp ADM_deviceWin32.cpp ADM_deviceEsd.cpp
- 
-+libADM_audiodevice_la_LIBADD = $(ARTS_LIBS)
- 
- EXTRA_DIST = ADM_audiodevice.cpp  ADM_deviceArts.cpp       \
- ADM_deviceEsd.cpp  ADM_deviceWin32.cpp  audio_out.h \

diff --git a/avidemux-compile.patch b/avidemux-compile.patch
deleted file mode 100644 (file)
index bc9c204..0000000
--- a/avidemux-compile.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- avidemux_2.3.0/avidemux/ADM_lavformat/ADM_lavformat.cpp.orig       2007-01-04 13:25:59.000000000 +0000
-+++ avidemux_2.3.0/avidemux/ADM_lavformat/ADM_lavformat.cpp    2007-01-04 13:49:36.000000000 +0000
-@@ -257,33 +257,29 @@
-       c->width = info->width;  
-       c->height = info->height; 
-       
-+      int _frame_rate, _frame_rate_base;
-       switch(_fps1000)
-       {
-               case 25000:
--                       c->time_base= (AVRational){1001,25025};
--                      //c->frame_rate = 25025;  
--                      //c->frame_rate_base = 1001;    
-+                      _frame_rate = 25025;
-+                      _frame_rate_base = 1001;
-                       break;
-               case 23976:
--/*
--                      c->frame_rate = 24000;  
--                      c->frame_rate_base = 1001;      
--                      break;
--*/
-                         if(_type==MUXER_MP4 || _type==MUXER_PSP)
-                         {
--                                 c->time_base= (AVRational){1001,24000};
-+                              _frame_rate = 24000;  
-+                              _frame_rate_base = 1001;        
-                                 break;
-                         }
-               case  29970:
--                       c->time_base= (AVRational){1001,30000};
--                      //c->frame_rate = 30000;  
--                      //c->frame_rate_base = 1001;    
-+                      _frame_rate = 30000;  
-+                      _frame_rate_base = 1001;        
-                       break;
-               default:
-                         if(_type==MUXER_MP4 || _type==MUXER_PSP)
-                         {
--                                c->time_base= (AVRational){1000,_fps1000};
-+                              _frame_rate = _fps1000;  
-+                              _frame_rate_base = 1000;        
-                                 break;
-                         }
-                         else
-@@ -292,7 +288,7 @@
-                             return 0;
-                         }
-       }
--
-+      c->time_base= (AVRational){_frame_rate_base, _frame_rate};
-                       
-       c->gop_size=15;
-       c->max_b_frames=2;

diff --git a/avidemux-dts_internal.patch b/avidemux-dts_internal.patch
deleted file mode 100644 (file)
index eaed28d..0000000
--- a/avidemux-dts_internal.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- avidemux/ADM_audiocodec/ADM_dca.cpp        2006-08-15 13:45:12.000000000 +0200
-+++ avidemux/ADM_audiocodec/ADM_dca.cpp-new    2006-09-27 14:25:20.680376840 +0200
-@@ -32,7 +32,6 @@
- extern "C"
- {
- #include "dts.h"
--#include "dts_internal.h"
- 
- }
- #include "ADM_audio/ADM_dcainfo.h"
---- configure.in.in    2006-09-21 19:51:13.000000000 +0200
-+++ configure.in.in-new        2006-09-27 14:27:00.529197512 +0200
-@@ -585,12 +585,7 @@
-     have_libdca=yes
-     AC_CHECK_HEADERS([dts.h], , have_libdca=no)
-     if test "x$have_libdca" = "xyes"; then
--      AC_CHECK_HEADERS([dts_internal.h], , have_libdca=no)
--      if test "x$have_libdca" = "xyes"; then
--            AC_CHECK_LIB( dts, dts_init, , have_libdca=no )
--      else
--      AC_MSG_WARN(dts.h is there but i also need dts_internal.h to compile libdca/libdts. Please copy dts_internal.h where dts.h is)
--      fi
-+      AC_CHECK_LIB( dts, dts_init, , have_libdca=no )
-     fi
-     if test "x$have_libdca" = "xyes"; then
-             AC_DEFINE(USE_LIBDCA, 1, "[libDCA]")