]>
Commit | Line | Data |
---|---|---|
82fb4774 AM |
1 | --- avidemux_2.4.1/avidemux/ADM_libraries/ADM_mplex/multiplexor.cpp~ 2008-01-01 18:38:25.000000000 +0100 |
2 | +++ avidemux_2.4.1/avidemux/ADM_libraries/ADM_mplex/multiplexor.cpp 2008-06-29 11:16:55.765736540 +0200 | |
3 | @@ -22,6 +22,7 @@ | |
4 | #include <config.h> | |
5 | #include <math.h> | |
6 | #include <stdlib.h> | |
7 | +#include <string.h> | |
8 | ||
9 | #include <mjpeg_types.h> | |
10 | #include <mjpeg_logging.h> | |
11 | --- avidemux_2.4.1/avidemux/ADM_libraries/ADM_mplex/inputstrm.cpp~ 2007-08-03 02:04:40.000000000 +0200 | |
12 | +++ avidemux_2.4.1/avidemux/ADM_libraries/ADM_mplex/inputstrm.cpp 2008-06-29 11:19:10.161766143 +0200 | |
13 | @@ -23,6 +23,7 @@ | |
14 | ||
15 | #include <config.h> | |
16 | #include <assert.h> | |
17 | +#include <limits.h> | |
18 | ||
19 | #include "mjpeg_types.h" | |
20 | #include "inputstrm.hpp" | |
21 | --- avidemux_2.4.1/avidemux/ADM_libraries/ADM_mplex/padstrm.cpp~ 2007-08-03 02:04:40.000000000 +0200 | |
22 | +++ avidemux_2.4.1/avidemux/ADM_libraries/ADM_mplex/padstrm.cpp 2008-06-29 11:19:49.865094597 +0200 | |
23 | @@ -23,6 +23,7 @@ | |
24 | #ifdef HAVE_CONFIG_H | |
25 | #include "config.h" | |
26 | #endif | |
27 | +#include <string.h> | |
28 | ||
29 | #include "padstrm.hpp" | |
30 | ||
31 | --- avidemux_2.4.1/avidemux/ADM_videoFilter/ADM_guiResize.cpp~ 2007-09-25 21:01:54.000000000 +0200 | |
32 | +++ avidemux_2.4.1/avidemux/ADM_videoFilter/ADM_guiResize.cpp 2008-06-29 11:21:10.131913319 +0200 | |
33 | @@ -41,7 +41,7 @@ | |
34 | #include <ADM_assert.h> | |
35 | ||
36 | ||
37 | -static int getResizeParams(uint32_t * w, uint32_t * h, uint32_t * algo,uint32_t w,uint32_t h,uint32_t fps); | |
38 | +static int getResizeParams(uint32_t * w, uint32_t * h, uint32_t * algo,uint32_t w2,uint32_t h2,uint32_t fps); | |
39 | ||
40 | ||
41 | extern uint8_t DIA_resize(uint32_t *width,uint32_t *height,uint32_t *algo,uint32_t originalw, uint32_t originalh,uint32_t fps1000); | |
42 | --- avidemux_2.4.1/avidemux/ADM_script/DirectorySearch.h~ 2007-06-09 16:38:45.000000000 +0200 | |
43 | +++ avidemux_2.4.1/avidemux/ADM_script/DirectorySearch.h 2008-06-29 11:24:26.278608518 +0200 | |
44 | @@ -22,6 +22,7 @@ | |
45 | #include <sys/stat.h> | |
46 | #include <dirent.h> | |
47 | #endif | |
48 | +#include <string.h> | |
49 | #include "StdFile.h" | |
50 | ||
51 | // create a non file bit for unix | |
52 | --- avidemux_2.4.1/avidemux/gui_action.cpp~ 2007-10-22 17:35:19.000000000 +0200 | |
53 | +++ avidemux_2.4.1/avidemux/gui_action.cpp 2008-06-29 11:25:49.725058609 +0200 | |
54 | @@ -1,4 +1,5 @@ | |
55 | #include <stdio.h> | |
56 | +#include <string.h> | |
57 | #include <vector> | |
58 | using std::vector; | |
59 | #include <utility> |