1 --- avidemux_2.5.0/avidemux/ADM_core/src/ADM_fileio.cpp~ 2009-03-09 22:10:03.000000000 +0200
2 +++ avidemux_2.5.0/avidemux/ADM_core/src/ADM_fileio.cpp 2009-07-08 00:57:10.618959077 +0300
5 const char *ADM_GetFileName(const char *str)
9 + const char *filename;
11 + const char *filename2;
15 filename = strrchr(str, '/');
16 --- avidemux_2.5.0/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp~ 2008-09-13 19:27:58.000000000 +0300
17 +++ avidemux_2.5.0/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp 2009-07-08 00:59:27.130400587 +0300
20 uint8_t fileParser::open( const char *filename,FP_TYPE *multi )
22 - char *dot = NULL; // pointer to the last dot in filename
23 + const char *dot = NULL; // pointer to the last dot in filename
24 uint8_t decimals = 0; // number of decimals
25 char *left = NULL, *number = NULL, *right = NULL; // parts of filename (after splitting)
27 --- avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc~ 2004-01-30 21:32:00.000000000 +0200
28 +++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc 2009-07-08 01:00:15.725699935 +0300
31 int y4m_parse_ratio(y4m_ratio_t *r, const char *s)
33 - char *t = strchr(s, ':');
34 + const char *t = strchr(s, ':');
35 if (t == NULL) return Y4M_ERR_RANGE;
38 --- avidemux_2.5.0/avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp~ 2009-07-08 02:07:14.000000000 +0300
39 +++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp 2009-07-08 02:16:34.888485666 +0300
42 bool LPCMStream::Probe(IBitStream &bs )
44 - char *last_dot = strrchr( bs.StreamName(), '.' );
45 + const char *last_dot = strrchr( bs.StreamName(), '.' );
48 && strcmp( last_dot+1, "lpcm") == 0;
49 --- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_license.cpp~ 2009-12-16 13:05:49.000000000 +0200
50 +++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_license.cpp 2009-12-16 13:05:51.050534943 +0200
53 #include "Q_license.h"
54 #include "ADM_toolkitQt.h"
57 Ui_licenseWindow::Ui_licenseWindow(QWidget *parent) : QDialog(parent)
59 --- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.cpp~ 2009-12-16 12:45:16.000000000 +0200
60 +++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.cpp 2009-12-16 13:07:30.231566738 +0200
63 #include "DIA_coreToolkit.h"
64 #include "ADM_toolkitQt.h"
67 static void updateStatus(void);
68 extern bool parseECMAScript(const char *name);
69 --- avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_coreToolkit.h~ 2009-12-16 12:45:15.000000000 +0200
70 +++ avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_coreToolkit.h 2009-12-16 13:09:16.437182359 +0200
72 #ifndef ADM_COREUI_TOOLKIT__
73 #define ADM_COREUI_TOOLKIT__
80 --- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp~ 2009-12-16 12:45:16.000000000 +0200
81 +++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp 2009-12-16 13:22:04.967105226 +0200
83 #include <QtGui/QColorDialog>
86 #include "ADM_toolkitQt.h"
88 --- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h~ 2009-12-16 12:45:16.000000000 +0200
89 +++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h 2009-12-16 13:30:37.550386331 +0200
91 #ifndef ADM_Q_SLIDER_H
92 #define ADM_Q_SLIDER_H
96 class ADM_QSlider : public QSlider
99 --- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp~ 2009-12-16 12:45:16.000000000 +0200
100 +++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp 2009-12-16 13:34:13.304739869 +0200
103 #include <QtGui/QApplication>
104 #include <QtGui/QDesktopWidget>
107 void UI_setAProcessToggleStatus( uint8_t status ) {}
108 void UI_setVProcessToggleStatus( uint8_t status ) {}
109 --- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.cpp~ 2009-12-16 12:45:16.000000000 +0200
110 +++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.cpp 2009-12-16 13:34:43.494320144 +0200
113 #include <QtGui/QPainter>
114 #include <QtGui/QSlider>
117 #include "ADM_qslider.h"
119 --- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_commonUI/ADM_tray.h~ 2009-12-16 12:45:16.000000000 +0200
120 +++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_commonUI/ADM_tray.h 2009-12-16 13:35:20.340566492 +0200