Attachment #142087 for bug #208019





#include "audio_encoder.h"
#ifdef HAVE_FFMPEG_INSTALLED
extern "C" {
#include <ffmpeg/avcodec.h>
}
#else
extern "C" {
#include <avcodec.h>
}
#endif
#include <sdp.h>






#include "video_encoder.h"
#ifdef HAVE_FFMPEG_INSTALLED
extern "C" {
#include <ffmpeg/avcodec.h>
}
#else
extern "C" {
#include <avcodec.h>
}
#endif

class CFfmpegVideoEncoder : public CVideoEncoder {




#include "video_util_filter.h"
#ifdef HAVE_FFMPEG
#ifdef HAVE_FFMPEG_INSTALLED
extern "C" {
#include <ffmpeg/avcodec.h>
}
#else
extern "C" {
#include <avcodec.h>
}
#endif
#endif





#define __MPEG4IP_FFMPEG_H__ 1
#include "codec_plugin.h"
#ifdef HAVE_FFMPEG_INSTALLED
extern "C" {
#include <ffmpeg/avcodec.h>
}
#else
extern "C" {
#include <avcodec.h>
}
#endif

DECLARE_CONFIG(CONFIG_USE_FFMPEG_AUDIO);




#define __MPEG4IP_FFMPEG_H__ 1
#include "codec_plugin.h"
#ifdef HAVE_FFMPEG_INSTALLED
extern "C" {
#include <ffmpeg/avcodec.h>
}
#else
extern "C" {
#include <avcodec.h>
}
#endif
#include <mp4av.h>


Return to bug 208019

Lines 24-32 Link Here

(-)mpeg4ip-1.5.0.1/server/mp4live/audio_ffmpeg.h.unpatched (+4 lines)
24		24
25	#include "audio_encoder.h"	25	#include "audio_encoder.h"
26	#ifdef HAVE_FFMPEG_INSTALLED	26	#ifdef HAVE_FFMPEG_INSTALLED
		27	extern "C" {
27	#include <ffmpeg/avcodec.h>	28	#include <ffmpeg/avcodec.h>
		29	}
28	#else	30	#else
		31	extern "C" {
29	#include <avcodec.h>	32	#include <avcodec.h>
		33	}
30	#endif	34	#endif
31	#include <sdp.h>	35	#include <sdp.h>
32		36

Lines 24-32 Link Here

(-)mpeg4ip-1.5.0.1/server/mp4live/video_ffmpeg.h.unpatched (+4 lines)
24		24
25	#include "video_encoder.h"	25	#include "video_encoder.h"
26	#ifdef HAVE_FFMPEG_INSTALLED	26	#ifdef HAVE_FFMPEG_INSTALLED
		27	extern "C" {
27	#include <ffmpeg/avcodec.h>	28	#include <ffmpeg/avcodec.h>
		29	}
28	#else	30	#else
		31	extern "C" {
29	#include <avcodec.h>	32	#include <avcodec.h>
		33	}
30	#endif	34	#endif
31		35
32	class CFfmpegVideoEncoder : public CVideoEncoder {	36	class CFfmpegVideoEncoder : public CVideoEncoder {

Lines 26-34 Link Here

(-)mpeg4ip-1.5.0.1/server/mp4live/video_encoder_class.cpp.unpatched (+4 lines)
26	#include "video_util_filter.h"	26	#include "video_util_filter.h"
27	#ifdef HAVE_FFMPEG	27	#ifdef HAVE_FFMPEG
28	#ifdef HAVE_FFMPEG_INSTALLED	28	#ifdef HAVE_FFMPEG_INSTALLED
		29	extern "C" {
29	#include <ffmpeg/avcodec.h>	30	#include <ffmpeg/avcodec.h>
		31	}
30	#else	32	#else
		33	extern "C" {
31	#include <avcodec.h>	34	#include <avcodec.h>
		35	}
32	#endif	36	#endif
33	#endif	37	#endif
34		38

Lines 25-33 Link Here

(-)mpeg4ip-1.5.0.1/player/plugin/audio/ffmpeg/ffmpeg.h.unpatched (+4 lines)
25	#define __MPEG4IP_FFMPEG_H__ 1	25	#define __MPEG4IP_FFMPEG_H__ 1
26	#include "codec_plugin.h"	26	#include "codec_plugin.h"
27	#ifdef HAVE_FFMPEG_INSTALLED	27	#ifdef HAVE_FFMPEG_INSTALLED
		28	extern "C" {
28	#include <ffmpeg/avcodec.h>	29	#include <ffmpeg/avcodec.h>
		30	}
29	#else	31	#else
		32	extern "C" {
30	#include <avcodec.h>	33	#include <avcodec.h>
		34	}
31	#endif	35	#endif
32		36
33	DECLARE_CONFIG(CONFIG_USE_FFMPEG_AUDIO);	37	DECLARE_CONFIG(CONFIG_USE_FFMPEG_AUDIO);

Lines 25-33 Link Here

(-)mpeg4ip-1.5.0.1/player/plugin/video/ffmpeg/ffmpeg.h.unpatched (+4 lines)
25	#define __MPEG4IP_FFMPEG_H__ 1	25	#define __MPEG4IP_FFMPEG_H__ 1
26	#include "codec_plugin.h"	26	#include "codec_plugin.h"
27	#ifdef HAVE_FFMPEG_INSTALLED	27	#ifdef HAVE_FFMPEG_INSTALLED
		28	extern "C" {
28	#include <ffmpeg/avcodec.h>	29	#include <ffmpeg/avcodec.h>
		30	}
29	#else	31	#else
		32	extern "C" {
30	#include <avcodec.h>	33	#include <avcodec.h>
		34	}
31	#endif	35	#endif
32	#include <mp4av.h>	36	#include <mp4av.h>
33		37