Attachment #124484 for bug #183714

Lines 27-32 Link Here

(-)libavutil/avutil.h (+8 lines)
27	*/	27	*/
28		28
29		29
		30	#ifdef __cplusplus
		31	extern "C" {
		32	#endif
		33
30	#define AV_STRINGIFY(s) AV_TOSTRING(s)	34	#define AV_STRINGIFY(s) AV_TOSTRING(s)
31	#define AV_TOSTRING(s) #s	35	#define AV_TOSTRING(s) #s
32		36
Lines 126-129 Link Here
126	#define PIX_FMT_YUV422 PIX_FMT_YUYV422	130	#define PIX_FMT_YUV422 PIX_FMT_YUYV422
127	#endif	131	#endif
128		132
		133	#ifdef __cplusplus
		134	}
		135	#endif
		136
129	#endif /* AVUTIL_H */	137	#endif /* AVUTIL_H */

Lines 27-32 Link Here

(-)libpostproc/postprocess.h (+8 lines)
27	* external api for the pp stuff	27	* external api for the pp stuff
28	*/	28	*/
29		29
		30	#ifdef __cplusplus
		31	extern "C" {
		32	#endif
		33
30	#define LIBPOSTPROC_VERSION_INT ((51<<16)+(1<<8)+0)	34	#define LIBPOSTPROC_VERSION_INT ((51<<16)+(1<<8)+0)
31	#define LIBPOSTPROC_VERSION 51.1.0	35	#define LIBPOSTPROC_VERSION 51.1.0
32	#define LIBPOSTPROC_BUILD LIBPOSTPROC_VERSION_INT	36	#define LIBPOSTPROC_BUILD LIBPOSTPROC_VERSION_INT
Lines 73-76 Link Here
73		77
74	#define PP_PICT_TYPE_QP2 0x00000010 ///< MPEG2 style QScale	78	#define PP_PICT_TYPE_QP2 0x00000010 ///< MPEG2 style QScale
75		79
		80	#ifdef __cplusplus
		81	}
		82	#endif
		83
76	#endif	84	#endif

Lines 27-32 Link Here

(-)libswscale/swscale.h.orig (+8 lines)
27	* external api for the swscale stuff	27	* external api for the swscale stuff
28	*/	28	*/
29		29
		30	#ifdef __cplusplus
		31	extern "C" {
		32	#endif
		33
30	#include "avutil.h"	34	#include "avutil.h"
31		35
32	#define AV_STRINGIFY(s) AV_TOSTRING(s)	36	#define AV_STRINGIFY(s) AV_TOSTRING(s)
Lines 138-141 Link Here
138	int dstW, int dstH, int dstFormat, int flags,	142	int dstW, int dstH, int dstFormat, int flags,
139	SwsFilter srcFilter, SwsFilter dstFilter, double *param);	143	SwsFilter srcFilter, SwsFilter dstFilter, double *param);
140		144
		145	#ifdef __cplusplus
		146	}
		147	#endif
		148
141	#endif	149	#endif

Lines 27-32 Link Here

(-)libavcodec/avcodec.h.orig (+8 lines)
27	*/	27	*/
28		28
29		29
		30	#ifdef __cplusplus
		31	extern "C" {
		32	#endif
		33
30	#include "avutil.h"	34	#include "avutil.h"
31	#include <sys/types.h> /* size_t */	35	#include <sys/types.h> /* size_t */
32		36
Lines 2937-2940 Link Here
2937	#define AVERROR_NOTSUPP AVERROR(ENOSYS) /*< Operation not supported. /	2941	#define AVERROR_NOTSUPP AVERROR(ENOSYS) /*< Operation not supported. /
2938	#define AVERROR_NOENT AVERROR(ENOENT) /*< No such file or directory. /	2942	#define AVERROR_NOENT AVERROR(ENOENT) /*< No such file or directory. /
2939		2943
		2944	#ifdef __cplusplus
		2945	}
		2946	#endif
		2947
2940	#endif /* AVCODEC_H */	2948	#endif /* AVCODEC_H */

Lines 21-26 Link Here

(-)libavformat/avformat.h.orig (+8 lines)
21	#ifndef AVFORMAT_H	21	#ifndef AVFORMAT_H
22	#define AVFORMAT_H	22	#define AVFORMAT_H
23		23
		24	#ifdef __cplusplus
		25	extern "C" {
		26	#endif
		27
24	#define LIBAVFORMAT_VERSION_INT ((51<<16)+(12<<8)+1)	28	#define LIBAVFORMAT_VERSION_INT ((51<<16)+(12<<8)+1)
25	#define LIBAVFORMAT_VERSION 51.12.1	29	#define LIBAVFORMAT_VERSION 51.12.1
26	#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT	30	#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
Lines 874-878 Link Here
874		878
875	#endif /* HAVE_AV_CONFIG_H */	879	#endif /* HAVE_AV_CONFIG_H */
876		880
		881	#ifdef __cplusplus
		882	}
		883	#endif
		884
877	#endif /* AVFORMAT_H */	885	#endif /* AVFORMAT_H */
878		886

Return to bug 183714