Attachment #145878 for bug #213099

Lines 28-33 Link Here

(-)avidemux_2.4.1-orig/avidemux/ADM_libraries/ADM_mplex/inputstrm.cpp (+2 lines)
28	#include "inputstrm.hpp"	28	#include "inputstrm.hpp"
29	#include "multiplexor.hpp"	29	#include "multiplexor.hpp"
30		30
		31	#include <climits>
		32
31	MuxStream::MuxStream() : init(false)	33	MuxStream::MuxStream() : init(false)
32	{	34	{
33	}	35	}

Lines 35-41 Link Here

(-)avidemux_2.4.1-orig/avidemux/ADM_libraries/ADM_mplex/multiplexor.cpp (-1 / +1 lines)
35	#include "zalphastrm.hpp"	35	#include "zalphastrm.hpp"
36	#endif	36	#endif
37	#include "multiplexor.hpp"	37	#include "multiplexor.hpp"
38		38	#include <cstring>
39		39
40	/****************	40	/****************
41	*	41	*

Lines 26-31 Link Here

(-)avidemux_2.4.1-orig/avidemux/ADM_libraries/ADM_mplex/padstrm.cpp (+1 lines)
26		26
27	#include "padstrm.hpp"	27	#include "padstrm.hpp"
28		28
		29	#include <cstring>
29		30
30		31
31	//	32	//

Lines 23-28 Link Here

(-)avidemux_2.4.1-orig/avidemux/ADM_script/DirectorySearch.h (+1 lines)
23	#include <dirent.h>	23	#include <dirent.h>
24	#endif	24	#endif
25	#include "StdFile.h"	25	#include "StdFile.h"
		26	#include <cstring>
26		27
27	// create a non file bit for unix	28	// create a non file bit for unix
28	#define _A_NONFILE 0x03	29	#define _A_NONFILE 0x03

Lines 41-46 Link Here

(-)avidemux_2.4.1-orig/avidemux/ADM_userInterfaces/ADM_GTK/ADM_toolkit_gtk/ADM_jogshuttle.cpp (+2 lines)
41	#include "config.h"	41	#include "config.h"
42		42
43	#ifdef USE_JOG	43	#ifdef USE_JOG
		44	#include <cstdlib>
		45	#include <cstring>
44	#include <string>	46	#include <string>
45	using std::string;	47	using std::string;
46	#include <iostream>	48	#include <iostream>

Lines 97-102 Link Here

(-)avidemux_2.4.1-orig/avidemux/ADM_userInterfaces/ADM_GTK/ADM_toolkit_gtk/mediactrl.h (+2 lines)
97	extern "C" {	97	extern "C" {
98	#endif	98	#endif
99		99
		100	#include <time.h>
		101
100	struct media_ctrl_device;	102	struct media_ctrl_device;
101		103
102	struct media_ctrl_key	104	struct media_ctrl_key

Lines 41-47 Link Here

(-)avidemux_2.4.1-orig/avidemux/ADM_videoFilter/ADM_guiResize.cpp (-1 / +1 lines)
41	#include <ADM_assert.h>	41	#include <ADM_assert.h>
42		42
43		43
44	static int getResizeParams(uint32_t * w, uint32_t * h, uint32_t * algo,uint32_t w,uint32_t h,uint32_t fps);	44	static int getResizeParams(uint32_t * w, uint32_t * h, uint32_t * algo, uint32_t ow, uint32_t oh, uint32_t fps);
45		45
46		46
47	extern uint8_t DIA_resize(uint32_t width,uint32_t height,uint32_t *algo,uint32_t originalw, uint32_t originalh,uint32_t fps1000);	47	extern uint8_t DIA_resize(uint32_t width,uint32_t height,uint32_t *algo,uint32_t originalw, uint32_t originalh,uint32_t fps1000);

Lines 1-4 Link Here

(-)avidemux_2.4.1-orig/avidemux/gui_action.cpp (-1 / +2 lines)
1	#include <stdio.h>	1	#include <cstdio>
		2	#include <cstring>
2	#include <vector>	3	#include <vector>
3	using std::vector;	4	using std::vector;
4	#include <utility>	5	#include <utility>

Return to bug 213099