- gcc 4.4 and stdint fixes

Changed files:
    gcc44.patch -> 1.1
    types.patch -> 1.1

diff --git a/gcc44.patch b/gcc44.patch
new file mode 100644 (file)
index 0000000..b70c8bb
--- /dev/null
+++ b/gcc44.patch
@@ -0,0 +1,37 @@
+--- avidemux_2.5.0/avidemux/ADM_core/src/ADM_fileio.cpp~       2009-03-09 22:10:03.000000000 +0200
++++ avidemux_2.5.0/avidemux/ADM_core/src/ADM_fileio.cpp        2009-07-08 00:57:10.618959077 +0300
+@@ -681,8 +681,10 @@
+ */
+ const char *ADM_GetFileName(const char *str)
+ {
+-      char *filename;
+-      char *filename2;
++      const char *filename;
++#ifdef __WIN32
++      const char *filename2;
++#endif
+ 
+ #ifndef __WIN32
+       filename = strrchr(str, '/');
+--- avidemux_2.5.0/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp~     2008-09-13 19:27:58.000000000 +0300
++++ avidemux_2.5.0/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp      2009-07-08 00:59:27.130400587 +0300
+@@ -71,7 +71,7 @@
+ */
+ uint8_t fileParser::open( const char *filename,FP_TYPE *multi )
+ {
+-        char *dot = NULL;                   // pointer to the last dot in filename
++        const char *dot = NULL;                   // pointer to the last dot in filename
+         uint8_t decimals = 0;               // number of decimals
+         char *left = NULL, *number = NULL, *right = NULL; // parts of filename (after splitting)
+ 
+--- avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc~   2004-01-30 21:32:00.000000000 +0200
++++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc    2009-07-08 01:00:15.725699935 +0300
+@@ -104,7 +104,7 @@
+ 
+ int y4m_parse_ratio(y4m_ratio_t *r, const char *s)
+ {
+-  char *t = strchr(s, ':');
++  const char *t = strchr(s, ':');
+   if (t == NULL) return Y4M_ERR_RANGE;
+   r->n = atoi(s);
+   r->d = atoi(t+1);

diff --git a/types.patch b/types.patch
new file mode 100644 (file)
index 0000000..14963e7
--- /dev/null
+++ b/types.patch
@@ -0,0 +1,30 @@
+--- avidemux_2.5.0/avidemux/ADM_UIs/ADM_QT4/src/T_threadCount.h~       2009-07-08 01:25:24.000000000 +0300
++++ avidemux_2.5.0/avidemux/ADM_UIs/ADM_QT4/src/T_threadCount.h        2009-07-08 01:25:27.396226444 +0300
+@@ -7,6 +7,7 @@
+ #include <QtGui/QRadioButton>
+ #include <QtGui/QSpinBox>
+ #include <QtGui/QWidget>
++#include <stdint.h>
+ 
+ namespace ADM_qt4Factory
+ {
+--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.h~    2008-10-01 03:03:46.000000000 +0300
++++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.h     2009-07-08 01:35:24.005463685 +0300
+@@ -3,6 +3,7 @@
+ 
+ #include "ui_jobs.h"
+ #include "ADM_misc.h"
++#include <stdint.h>
+ 
+ typedef enum
+ {
+--- avidemux_2.5.0/avidemux/ADM_core/include/ADM_misc.h~       2008-06-24 22:46:05.000000000 +0300
++++ avidemux_2.5.0/avidemux/ADM_core/include/ADM_misc.h        2009-07-08 01:36:44.405472138 +0300
+@@ -10,6 +10,7 @@
+ #define ADM_MISC_H
+ 
+ #include "ADM_coreConfig.h"
++#include <stdint.h>
+ 
+ 
+ typedef struct