Attachment #271437 for bug #365153

Lines 488-495 Link Here

(-)plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp (-1 / +3 lines)
488	printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);	488	printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
489	printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);	489	printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
490	printf("[x264] b_cabac = %d\n", x264Param->b_cabac);	490	printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
491	#if X264_BUILD > 101	491	#if X264_BUILD > 101 && X264_BUILD < 115
492	printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);	492	printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
		493	#elif X264_BUILD > 114
		494	printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
493	#endif	495	#endif
494	printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);	496	printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
495	#if X264_BUILD > 88	497	#if X264_BUILD > 88




	_param.b_cabac = cabac;
}

#if X264_BUILD > 101 && X264_BUILD < 115
unsigned int x264Options::getOpenGopMode(void)
{
	return _param.i_open_gop;

	if (openGopMode < 3)
		_param.i_open_gop = openGopMode;
}
#elif X264_BUILD > 114
unsigned int x264Options::getOpenGopMode(void)
{
        return _param.b_open_gop;
}
 
void x264Options::setOpenGopMode(unsigned int openGopMode)
{
        if (openGopMode < 3)
                _param.b_open_gop = openGopMode;
}
#endif

unsigned int x264Options::getInterlaced(void)

Return to bug 365153

Lines 417-423 Link Here

(-)plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp (-1 / +12 lines)
417	_param.b_cabac = cabac;	417	_param.b_cabac = cabac;
418	}	418	}
419		419
420	#if X264_BUILD > 101	420	#if X264_BUILD > 101 && X264_BUILD < 115
421	unsigned int x264Options::getOpenGopMode(void)	421	unsigned int x264Options::getOpenGopMode(void)
422	{	422	{
423	return _param.i_open_gop;	423	return _param.i_open_gop;
Lines 428-433 Link Here
428	if (openGopMode < 3)	428	if (openGopMode < 3)
429	_param.i_open_gop = openGopMode;	429	_param.i_open_gop = openGopMode;
430	}	430	}
		431	#elif X264_BUILD > 114
		432	unsigned int x264Options::getOpenGopMode(void)
		433	{
		434	return _param.b_open_gop;
		435	}
		436
		437	void x264Options::setOpenGopMode(unsigned int openGopMode)
		438	{
		439	if (openGopMode < 3)
		440	_param.b_open_gop = openGopMode;
		441	}
431	#endif	442	#endif
432		443
433	unsigned int x264Options::getInterlaced(void)	444	unsigned int x264Options::getInterlaced(void)