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;