Attachment #85889 for bug #131831

Lines 40-50 Link Here

(-)gephex-0.4.3.old/base/src/utils/structscanner.h (-3 / +3 lines)
40	{	40	{
41	IStructTokenListener& m_listener;	41	IStructTokenListener& m_listener;
42		42
43	void StructScanner::divideNameFromContent(const std::string& text,	43	void divideNameFromContent(const std::string& text,
44	std::string& name,	44	std::string& name,
45	std::string& content) const;	45	std::string& content) const;
46	void StructScanner::processName(const std::string& name) const;	46	void processName(const std::string& name) const;
47	void StructScanner::processContent(const std::string& content) const;	47	void processContent(const std::string& content) const;
48	std::string::size_type	48	std::string::size_type
49	findNextClosingBracket(const std::string& content,	49	findNextClosingBracket(const std::string& content,
50	std::string::size_type n) const;	50	std::string::size_type n) const;

Lines 43-48 Link Here

(-)gephex-0.4.3.old/contrib/ffmpeg/libavcodec/ac3.h (+2 lines)
43	int cplfleak, cplsleak;	43	int cplfleak, cplsleak;
44	} AC3BitAllocParameters;	44	} AC3BitAllocParameters;
45		45
		46	#if 0
46	extern const uint16_t ac3_freqs[3];	47	extern const uint16_t ac3_freqs[3];
47	extern const uint16_t ac3_bitratetab[19];	48	extern const uint16_t ac3_bitratetab[19];
48	extern const int16_t ac3_window[256];	49	extern const int16_t ac3_window[256];
Lines 52-57 Link Here
52	extern const uint16_t dbkneetab[4];	53	extern const uint16_t dbkneetab[4];
53	extern const uint16_t floortab[8];	54	extern const uint16_t floortab[8];
54	extern const uint16_t fgaintab[8];	55	extern const uint16_t fgaintab[8];
		56	#endif
55		57
56	void ac3_common_init(void);	58	void ac3_common_init(void);
57	void ac3_parametric_bit_allocation(AC3BitAllocParameters s, uint8_t bap,	59	void ac3_parametric_bit_allocation(AC3BitAllocParameters s, uint8_t bap,

Lines 1685-1690 Link Here

(-)gephex-0.4.3.old/contrib/ffmpeg/libavcodec/avcodec.h (+8 lines)
1685	#define FF_OPT_MAX_DEPTH 10	1685	#define FF_OPT_MAX_DEPTH 10
1686	} AVOption;	1686	} AVOption;
1687		1687
		1688	struct AVOption;
		1689	#ifdef HAVE_MMX
		1690	extern const struct AVOption avoptions_common[3 + 5];
		1691	#else
		1692	extern const struct AVOption avoptions_common[3];
		1693	#endif
		1694	extern const struct AVOption avoptions_workaround_bug[11];
		1695
1688	/**	1696	/**
1689	* Parse option(s) and sets fields in passed structure	1697	* Parse option(s) and sets fields in passed structure
1690	* @param strct structure where the parsed results will be written	1698	* @param strct structure where the parsed results will be written




#define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }
#define AVOPTION_END() AVOPTION_SUB(NULL)

struct AVOption;
#ifdef HAVE_MMX
extern const struct AVOption avoptions_common[3 + 5];
#else
extern const struct AVOption avoptions_common[3];
#endif
extern const struct AVOption avoptions_workaround_bug[11];

#endif /* HAVE_AV_CONFIG_H */

/* Suppress restrict if it was not defined in config.h.  */

Lines 672-697 Link Here

(-)gephex-0.4.3.old/contrib/ffmpeg/libavcodec/i386/dsputil_mmx.c (-20 / +16 lines)
672	"punpcklwd %%mm0, %%mm1 \n\t"	672	"punpcklwd %%mm0, %%mm1 \n\t"
673	"punpckhwd %%mm4, %%mm3 \n\t"	673	"punpckhwd %%mm4, %%mm3 \n\t"
674	"punpckhwd %%mm0, %%mm6 \n\t"	674	"punpckhwd %%mm0, %%mm6 \n\t"
675	"movd %%mm5, %0 \n\t"	675	"movd %%mm5, (%0) \n\t"
676	"punpckhdq %%mm5, %%mm5 \n\t"	676	"punpckhdq %%mm5, %%mm5 \n\t"
677	"movd %%mm5, %1 \n\t"	677	"movd %%mm5, (%0,%2) \n\t"
678	"movd %%mm3, %2 \n\t"	678	"movd %%mm3, (%0,%2,2) \n\t"
679	"punpckhdq %%mm3, %%mm3 \n\t"	679	"punpckhdq %%mm3, %%mm3 \n\t"
680	"movd %%mm3, %3 \n\t"	680	"movd %%mm3, (%0,%3) \n\t"
681	"movd %%mm1, %4 \n\t"	681	"movd %%mm1, (%1) \n\t"
682	"punpckhdq %%mm1, %%mm1 \n\t"	682	"punpckhdq %%mm1, %%mm1 \n\t"
683	"movd %%mm1, %5 \n\t"	683	"movd %%mm1, (%1,%2) \n\t"
684	"movd %%mm6, %6 \n\t"	684	"movd %%mm6, (%1,%2,2) \n\t"
685	"punpckhdq %%mm6, %%mm6 \n\t"	685	"punpckhdq %%mm6, %%mm6 \n\t"
686	"movd %%mm6, %7 \n\t"	686	"movd %%mm6, (%1,%3) \n\t"
687	: "=m" ((uint32_t)(src + 0*stride)),	687	:: "r" (src),
688	"=m" ((uint32_t)(src + 1*stride)),	688	"r" (src + 4*stride),
689	"=m" ((uint32_t)(src + 2*stride)),	689	"r" ((long) stride ),
690	"=m" ((uint32_t)(src + 3*stride)),	690	"r" ((long)(3*stride))
691	"=m" ((uint32_t)(src + 4*stride)),
692	"=m" ((uint32_t)(src + 5*stride)),
693	"=m" ((uint32_t)(src + 6*stride)),
694	"=m" ((uint32_t)(src + 7*stride))
695	);	691	);
696	}	692	}
697		693

Lines 235-241 Link Here

(-)gephex-0.4.3.old/engine/src/model/model.h (-1 / +1 lines)
235	void deleteModule(utils::AutoPtr<Graph>, int moduleID);	235	void deleteModule(utils::AutoPtr<Graph>, int moduleID);
236		236
237	#ifndef NDEBUG	237	#ifndef NDEBUG
238	void Model::checkGraphSerialisation();	238	void checkGraphSerialisation();
239	#endif	239	#endif
240		240
241	};	241	};

Lines 366-372 Link Here

(-)gephex-0.4.3.old/modules/src/frbinmodule/ffmpegdriver.cpp (-1 / +1 lines)
366	return m_num_frames;	366	return m_num_frames;
367	}	367	}
368		368
369	void FFMpegDriverImpl::decode_frame(unsigned int frame_number,	369	void decode_frame(unsigned int frame_number,
370	uint_32* framebuffer,	370	uint_32* framebuffer,
371	int width, int height)	371	int width, int height)
372	{	372	{

Lines 266-272 Link Here

(-)gephex-0.4.3.old/qtgui/src/gui/graphnameview.cpp (-2 / +2 lines)
266	m_textListener->textChanged(1,newStatus.c_str());	266	m_textListener->textChanged(1,newStatus.c_str());
267	}	267	}
268		268
269	virtual void GraphItem::propertySelected(int id)	269	virtual void propertySelected(int id)
270	{	270	{
271	switch(id)	271	switch(id)
272	{	272	{
Lines 428-434 Link Here
428	m_textListener->textChanged(1,newStatus.c_str());	428	m_textListener->textChanged(1,newStatus.c_str());
429	}	429	}
430		430
431	void SnapItem::propertySelected(int id)	431	void propertySelected(int id)
432	{	432	{
433	switch(id)	433	switch(id)
434	{	434	{

Return to bug 131831

Lines 62-75 Link Here

(-)gephex-0.4.3.old/contrib/ffmpeg/libavcodec/common.h (-8 lines)
62	#define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }	62	#define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }
63	#define AVOPTION_END() AVOPTION_SUB(NULL)	63	#define AVOPTION_END() AVOPTION_SUB(NULL)
64		64
65	struct AVOption;
66	#ifdef HAVE_MMX
67	extern const struct AVOption avoptions_common[3 + 5];
68	#else
69	extern const struct AVOption avoptions_common[3];
70	#endif
71	extern const struct AVOption avoptions_workaround_bug[11];
72
73	#endif /* HAVE_AV_CONFIG_H */	65	#endif /* HAVE_AV_CONFIG_H */
74		66
75	/* Suppress restrict if it was not defined in config.h. */	67	/* Suppress restrict if it was not defined in config.h. */