Attachment #148190 for bug #216008

View | Details | Raw Unified | Return to bug 216008
Collapse All | Expand All

Line Link Here

(-)file_not_specified_in_diff (-58 / +66 lines)
0	-- common/video/iso-mpeg4/include/bitstrm.hpp	0	++ common/video/iso-mpeg4/include/bitstrm.hpp
Lines 45-52 Link Here
45	#ifndef _BITSTREAM_HPP_	45	#ifndef _BITSTREAM_HPP_
46	#define _BITSTREAM_HPP_	46	#define _BITSTREAM_HPP_
47	#include "inbits.h"	47	#include "inbits.h"
48	#include <istream.h>	48	#include <istream>
49	#include <ostream.h>	49	#include <ostream>
50		50
51	class CIOBitStream	51	class CIOBitStream
52	{	52	{
53	-- common/video/iso-mpeg4/include/entropy.hpp	53	++ common/video/iso-mpeg4/include/entropy.hpp
Lines 39-46 Link Here
39	#ifndef __ENTROPY_HPP_	39	#ifndef __ENTROPY_HPP_
40	#define __ENTROPY_HPP_	40	#define __ENTROPY_HPP_
41		41
42	#include <istream.h>	42	#include <istream>
43	#include <ostream.h>	43	#include <ostream>
		44
		45	using namespace std;
44		46
45	class CInBitStream;	47	class CInBitStream;
46	class COutBitStream;	48	class COutBitStream;
47	-- common/video/iso-mpeg4/include/vopseenc.hpp	49	++ common/video/iso-mpeg4/include/vopseenc.hpp
Lines 79-84 Link Here
79		79
80	#include "tm5rc.hpp"	80	#include "tm5rc.hpp"
81		81
		82	using namespace std;
		83
82	class CFwdBlockDCT;	84	class CFwdBlockDCT;
83		85
84	// HHI Schueuer: scan selection classes to support the sadct	86	// HHI Schueuer: scan selection classes to support the sadct
85	-- common/video/iso-mpeg4/src/app_encoder_encoder.cpp	87	++ common/video/iso-mpeg4/src/app_encoder_encoder.cpp
Lines 99-105 Link Here
99		99
100	#include "mode.hpp"	100	#include "mode.hpp"
101	#include "tm5rc.hpp"	101	#include "tm5rc.hpp"
102	#include "fstream.h"	102	#include "fstream"
103	#include "sesenc.hpp"	103	#include "sesenc.hpp"
104	// #include "encoder/tps_sesenc.hpp" // deleted by Sharp (98/2/12)	104	// #include "encoder/tps_sesenc.hpp" // deleted by Sharp (98/2/12)
105		105
106	-- common/video/iso-mpeg4/src/sys_encoder_errenc.cpp	106	++ common/video/iso-mpeg4/src/sys_encoder_errenc.cpp
Lines 54-60 Link Here
54	#include <stdio.h>	54	#include <stdio.h>
55	#include <math.h>	55	#include <math.h>
56	#include <stdlib.h>	56	#include <stdlib.h>
57	#include <iostream.h>	57	#include <iostream>
58		58
59	#include "typeapi.h"	59	#include "typeapi.h"
60	#include "codehead.h"	60	#include "codehead.h"
61	-- common/video/iso-mpeg4/src/sys_encoder_gmc_enc_util.cpp	61	++ common/video/iso-mpeg4/src/sys_encoder_gmc_enc_util.cpp
Lines 46-52 Link Here
46	#include <stdio.h>	46	#include <stdio.h>
47	#include <math.h>	47	#include <math.h>
48	#include <stdlib.h>	48	#include <stdlib.h>
49	#include <iostream.h>	49	#include <iostream>
50	#include <assert.h>	50	#include <assert.h>
51		51
52	#include "typeapi.h"	52	#include "typeapi.h"
53	-- common/video/iso-mpeg4/src/sys_encoder_mbenc.cpp	53	++ common/video/iso-mpeg4/src/sys_encoder_mbenc.cpp
Lines 75-81 Link Here
75		75
76	#include <stdlib.h>	76	#include <stdlib.h>
77	#include <math.h>	77	#include <math.h>
78	#include <iostream.h>	78	#include <iostream>
79	#include "typeapi.h"	79	#include "typeapi.h"
80	#include "codehead.h"	80	#include "codehead.h"
81	#include "mode.hpp"	81	#include "mode.hpp"
82	-- common/video/iso-mpeg4/src/sys_encoder_mbinterlace.cpp	82	++ common/video/iso-mpeg4/src/sys_encoder_mbinterlace.cpp
Lines 60-66 Link Here
60	#include <stdio.h>	60	#include <stdio.h>
61	#include <math.h>	61	#include <math.h>
62	#include <stdlib.h>	62	#include <stdlib.h>
63	#include <iostream.h>	63	#include <iostream>
64		64
65	#include "typeapi.h"	65	#include "typeapi.h"
66	#include "codehead.h"	66	#include "codehead.h"
67	-- common/video/iso-mpeg4/src/sys_encoder_mcenc.cpp	67	++ common/video/iso-mpeg4/src/sys_encoder_mcenc.cpp
Lines 53-59 Link Here
53	#include <stdio.h>	53	#include <stdio.h>
54	#include <math.h>	54	#include <math.h>
55	#include <stdlib.h>	55	#include <stdlib.h>
56	#include <iostream.h>	56	#include <iostream>
57		57
58	#include "typeapi.h"	58	#include "typeapi.h"
59	#include "codehead.h"	59	#include "codehead.h"
60	-- common/video/iso-mpeg4/src/sys_encoder_motest.cpp	60	++ common/video/iso-mpeg4/src/sys_encoder_motest.cpp
Lines 67-73 Link Here
67	#include <stdio.h>	67	#include <stdio.h>
68	#include <math.h>	68	#include <math.h>
69	#include <stdlib.h>	69	#include <stdlib.h>
70	#include <iostream.h>	70	#include <iostream>
71		71
72	#include "typeapi.h"	72	#include "typeapi.h"
73	#include "codehead.h"	73	#include "codehead.h"
74	-- common/video/iso-mpeg4/src/sys_encoder_mvenc.cpp	74	++ common/video/iso-mpeg4/src/sys_encoder_mvenc.cpp
Lines 44-50 Link Here
44		44
45	**************************************************************************/	45	**************************************************************************/
46	#include <stdio.h>	46	#include <stdio.h>
47	#include <fstream.h>	47	#include <fstream>
48	#include <math.h>	48	#include <math.h>
49	#include <stdlib.h>	49	#include <stdlib.h>
50		50
51	-- common/video/iso-mpeg4/src/sys_encoder_padenc.cpp	51	++ common/video/iso-mpeg4/src/sys_encoder_padenc.cpp
Lines 43-49 Link Here
43	#include <stdio.h>	43	#include <stdio.h>
44	#include <math.h>	44	#include <math.h>
45	#include <stdlib.h>	45	#include <stdlib.h>
46	#include <iostream.h>	46	#include <iostream>
47		47
48	#include "typeapi.h"	48	#include "typeapi.h"
49	#include "codehead.h"	49	#include "codehead.h"
50	-- common/video/iso-mpeg4/src/sys_encoder_sesenc.cpp	50	++ common/video/iso-mpeg4/src/sys_encoder_sesenc.cpp
Lines 83-90 Link Here
83	#include "stdlib.h"	83	#include "stdlib.h"
84	#include "stdio.h"	84	#include "stdio.h"
85	#include "math.h"	85	#include "math.h"
86	#include "fstream.h"	86	#include "fstream"
87	#include "ostream.h"	87	#include "ostream"
88		88
89	#include "typeapi.h"	89	#include "typeapi.h"
90	#include "codehead.h"	90	#include "codehead.h"
91	-- common/video/iso-mpeg4/src/sys_encoder_sptenc.cpp	91	++ common/video/iso-mpeg4/src/sys_encoder_sptenc.cpp
Lines 40-46 Link Here
40	*************************************************************************/	40	*************************************************************************/
41		41
42	#include <stdio.h>	42	#include <stdio.h>
43	#include <iostream.h>	43	#include <iostream>
44	#include <math.h>	44	#include <math.h>
45	#include <stdlib.h>	45	#include <stdlib.h>
46		46
47	-- common/video/iso-mpeg4/src/sys_encoder_tm5rc.cpp	47	++ common/video/iso-mpeg4/src/sys_encoder_tm5rc.cpp
Lines 52-58 Link Here
52		52
53	#include <stdio.h>	53	#include <stdio.h>
54	#include <stdlib.h>	54	#include <stdlib.h>
55	#include <iostream.h>	55	#include <iostream>
56	#include <math.h>	56	#include <math.h>
57	#include "header.h"	57	#include "header.h"
58	#include "typeapi.h"	58	#include "typeapi.h"
59	-- common/video/iso-mpeg4/src/sys_encoder_vopmbenc.cpp	59	++ common/video/iso-mpeg4/src/sys_encoder_vopmbenc.cpp
Lines 73-79 Link Here
73	#include <stdio.h>	73	#include <stdio.h>
74	#include <math.h>	74	#include <math.h>
75	#include <stdlib.h>	75	#include <stdlib.h>
76	#include <iostream.h>	76	#include <iostream>
77		77
78	#include "typeapi.h"	78	#include "typeapi.h"
79	#include "codehead.h"	79	#include "codehead.h"
80	-- common/video/iso-mpeg4/src/sys_error.cpp	80	++ common/video/iso-mpeg4/src/sys_error.cpp
Lines 35-41 Link Here
35	#include <stdio.h>	35	#include <stdio.h>
36	#include <math.h>	36	#include <math.h>
37	#include <stdlib.h>	37	#include <stdlib.h>
38	#include <iostream.h>	38	#include <iostream>
39		39
40	#include "typeapi.h"	40	#include "typeapi.h"
41	#include "codehead.h"	41	#include "codehead.h"
42	-- common/video/iso-mpeg4/src/sys_mode.cpp	42	++ common/video/iso-mpeg4/src/sys_mode.cpp
Lines 50-56 Link Here
50		50
51		51
52	#include <string.h>	52	#include <string.h>
53	#include <iostream.h>	53	#include <iostream>
54	#include <math.h>	54	#include <math.h>
55	#include "typeapi.h"	55	#include "typeapi.h"
56	#include "mode.hpp"	56	#include "mode.hpp"
57	-- common/video/iso-mpeg4/src/sys_tps_enhcbuf.cpp	57	++ common/video/iso-mpeg4/src/sys_tps_enhcbuf.cpp
Lines 36-42 Link Here
36	*************************************************************************/	36	*************************************************************************/
37		37
38	#include <stdio.h>	38	#include <stdio.h>
39	#include <fstream.h>	39	#include <fstream>
40	#include <stdlib.h>	40	#include <stdlib.h>
41		41
42	#include "typeapi.h"	42	#include "typeapi.h"
43	-- common/video/iso-mpeg4/src/tools_entropy_bitstrm.cpp	43	++ common/video/iso-mpeg4/src/tools_entropy_bitstrm.cpp
Lines 42-49 Link Here
42		42
43	*************************************************************************/	43	*************************************************************************/
44		44
45	#include <fstream.h>	45	#include <fstream>
46	#include <iostream.h>	46	#include <iostream>
47	#include <stdio.h>	47	#include <stdio.h>
48	#include <stdlib.h>	48	#include <stdlib.h>
49	#include "typeapi.h"	49	#include "typeapi.h"
50	-- common/video/iso-mpeg4/src/tools_entropy_huffman.cpp	50	++ common/video/iso-mpeg4/src/tools_entropy_huffman.cpp
Lines 55-61 Link Here
55	#include "bitstrm.hpp"	55	#include "bitstrm.hpp"
56		56
57	#include "vlc.hpp"	57	#include "vlc.hpp"
58	#include <iostream.h>	58	#include <iostream>
59	#ifdef __MFC_	59	#ifdef __MFC_
60	#ifdef _DEBUG	60	#ifdef _DEBUG
61	#undef THIS_FILE	61	#undef THIS_FILE
62	-- common/video/iso-mpeg4/src/tools_sadct_sadct.cpp	62	++ common/video/iso-mpeg4/src/tools_sadct_sadct.cpp
Lines 37-43 Link Here
37	#include "dct.hpp"	37	#include "dct.hpp"
38	#include <math.h>	38	#include <math.h>
39	#if defined(__DEBUG_SADCT_) && !defined(NDEBUG)	39	#if defined(__DEBUG_SADCT_) && !defined(NDEBUG)
40	#include <iostream.h>	40	#include <iostream>
41	#endif	41	#endif
42	#ifdef __MFC_	42	#ifdef __MFC_
43	#ifdef _DEBUG	43	#ifdef _DEBUG
44	-- common/video/iso-mpeg4/src/type_yuvac.cpp	44	++ common/video/iso-mpeg4/src/type_yuvac.cpp
Lines 39-47 Link Here
39		39
40	*************************************************************************/	40	*************************************************************************/
41		41
42	#include <iostream.h>	42	#include <iostream>
43	#include "typeapi.h"	43	#include "typeapi.h"
44		44
		45	using namespace std;
		46
45	#ifdef __MFC_	47	#ifdef __MFC_
46	#ifdef _DEBUG	48	#ifdef _DEBUG
47	#undef THIS_FILE	49	#undef THIS_FILE
48	-- common/video/iso-mpeg4/src/type_yuvai.cpp	50	++ common/video/iso-mpeg4/src/type_yuvai.cpp
Lines 37-43 Link Here
37	*************************************************************************/	37	*************************************************************************/
38		38
39	#include "typeapi.h"	39	#include "typeapi.h"
40	#include <iostream.h>	40	#include <iostream>
		41
		42	using namespace std;
41		43
42	#ifdef __MFC_	44	#ifdef __MFC_
43	#ifdef _DEBUG	45	#ifdef _DEBUG
44	-- common/video/iso-mpeg4/src/vtc_main_vtcenc.cpp	46	++ common/video/iso-mpeg4/src/vtc_main_vtcenc.cpp
Lines 57-63 Link Here
57	#include <math.h>	57	#include <math.h>
58	#include <assert.h>	58	#include <assert.h>
59	// begin: added by Sharp (99/2/16)	59	// begin: added by Sharp (99/2/16)
60	#include <iostream.h>	60	#include <iostream>
61	#include <sys/stat.h>	61	#include <sys/stat.h>
62	// end: added by Sharp (99/2/16)	62	// end: added by Sharp (99/2/16)
63		63
64	-- player/lib/audio/faad/Makefile.am	64	++ player/lib/audio/faad/Makefile.am
Lines 33-38 Link Here
33	transfo.h\	33	transfo.h\
34	util.h	34	util.h
35	INCLUDES = -I$(top_srcdir)/include	35	INCLUDES = -I$(top_srcdir)/include
36	AM_CFLAGS = -O2 -Werror -Wall -fexceptions -fno-strict-aliasing	36	AM_CFLAGS = -O2 -Wall -fexceptions -fno-strict-aliasing
37		37
38	EXTRA_DIST = COPYING libfaad60.dsp README	38	EXTRA_DIST = COPYING libfaad60.dsp README
39	-- server/mp4live/video_util_resize.h	39	++ server/mp4live/video_util_resize.h
Lines 90-96 Link Here
90		90
91	void CopyYuv(const uint8_t fY, const uint8_t fU, const uint8_t *fV,	91	void CopyYuv(const uint8_t fY, const uint8_t fU, const uint8_t *fV,
92	uint32_t fyStride, uint32_t fuStride, uint32_t fvStride,	92	uint32_t fyStride, uint32_t fuStride, uint32_t fvStride,
93	uint8_t tY, uint8_t tU, uint8_t *fV,	93	uint8_t tY, uint8_t tU, uint8_t *f_V,
94	uint32_t tyStride, uint32_t tvStride, uint32_t tvStride,	94	uint32_t tyStride, uint32_t tvStride, uint32_t tv_Stride,
95	uint32_t w, uint32_t h);	95	uint32_t w, uint32_t h);
96	#endif	96	#endif

Return to bug 216008