Attachment #373984 for bug #476534

Lines 789-797 Link Here

(-)opal/trunk/plugins/video/H.264/h264-x264.cxx (-1 / +5 lines)
789	if (!InitDecoder(CODEC_ID_H264))	789	if (!InitDecoder(CODEC_ID_H264))
790	return false;	790	return false;
791		791
		792	#ifdef FF_IDCT_H264
792	m_context->idct_algo = FF_IDCT_H264;	793	m_context->idct_algo = FF_IDCT_H264;
		794	#else
		795	m_context->idct_algo = FF_IDCT_AUTO;
		796	#endif
793	m_context->flags = CODEC_FLAG_INPUT_PRESERVED \| CODEC_FLAG_EMU_EDGE;	797	m_context->flags = CODEC_FLAG_INPUT_PRESERVED \| CODEC_FLAG_EMU_EDGE;
794	m_context->flags2 = CODEC_FLAG2_SKIP_RD \|	798	m_context->flags2 =
795	#ifdef CODEC_FLAG2_DROP_FRAME_TIMECODE	799	#ifdef CODEC_FLAG2_DROP_FRAME_TIMECODE
796	CODEC_FLAG2_DROP_FRAME_TIMECODE \|	800	CODEC_FLAG2_DROP_FRAME_TIMECODE \|
797	#endif	801	#endif

Lines 179-185 Link Here

(-)opal/trunk/plugins/video/common/ffmpeg.cxx (-2 / +2 lines)
179	static_cast<FFMPEGCodec *>(ctx->opaque)->GetEncodedFrame()->RTPCallBack(data, size, numMB);	179	static_cast<FFMPEGCodec *>(ctx->opaque)->GetEncodedFrame()->RTPCallBack(data, size, numMB);
180	}	180	}
181		181
182	bool FFMPEGCodec::InitEncoder(CodecID codecId)	182	bool FFMPEGCodec::InitEncoder(AVCodecID codecId)
183	{	183	{
184	PTRACE(5, m_prefix, "Opening encoder");	184	PTRACE(5, m_prefix, "Opening encoder");
185		185
Lines 214-220 Link Here
214	}	214	}
215		215
216		216
217	bool FFMPEGCodec::InitDecoder(CodecID codecId)	217	bool FFMPEGCodec::InitDecoder(AVCodecID codecId)
218	{	218	{
219	if ((m_codec = avcodec_find_decoder(codecId)) == NULL) {	219	if ((m_codec = avcodec_find_decoder(codecId)) == NULL) {
220	PTRACE(1, m_prefix, "Codec not found for decoder");	220	PTRACE(1, m_prefix, "Codec not found for decoder");

Lines 120-127 Link Here

(-)opal/trunk/plugins/video/common/ffmpeg.h (-2 / +2 lines)
120	FFMPEGCodec(const char * prefix, EncodedFrame * fullFrame);	120	FFMPEGCodec(const char * prefix, EncodedFrame * fullFrame);
121	~FFMPEGCodec();	121	~FFMPEGCodec();
122		122
123	virtual bool InitEncoder(CodecID codecId);	123	virtual bool InitEncoder(AVCodecID codecId);
124	virtual bool InitDecoder(CodecID codecId);	124	virtual bool InitDecoder(AVCodecID codecId);
125		125
126	bool SetResolution(unsigned width, unsigned height);	126	bool SetResolution(unsigned width, unsigned height);
127	void SetEncoderOptions(	127	void SetEncoderOptions(

Return to bug 476534