Attachment #189211 for bug #224384

Lines 433-439 Link Here

(-)avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp (-1 / +1 lines)
433	/**	433	/**
434	\fn decodePesHeader	434	\fn decodePesHeader
435	*/	435	*/
436	#define fail(x) {printf("[Ts Demuxer]*******"x"*****\n");return false;}	436	#define fail(x) {printf("[Ts Demuxer]*******" x "*****\n");return false;}
437	bool tsPacket::decodePesHeader(TS_PESpacket *pes)	437	bool tsPacket::decodePesHeader(TS_PESpacket *pes)
438	{	438	{
439	uint8_t *start=pes->payload+6;	439	uint8_t *start=pes->payload+6;

Lines 37-43 Link Here

(-)avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp (-1 / +1 lines)
37	{	37	{
38	const int width;	38	const int width;
39	const int height;	39	const int height;
40	const int fps;	40	const double fps;
41	const dvColorFormat color;	41	const dvColorFormat color;
42		42
43	} dvProfileClass;	43	} dvProfileClass;

Lines 43-51 Link Here

(-)avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h (-2 / +2 lines)
43	0, /* max_b_frames */ \	43	0, /* max_b_frames */ \
44	0, /* mpeg_quant */ \	44	0, /* mpeg_quant */ \
45	1, /* is_luma_elim_threshold */ \	45	1, /* is_luma_elim_threshold */ \
46	-2, /* luma_elim_threshold */ \	46	(uint32_t)-2, /* luma_elim_threshold */ \
47	1, /* is_chroma_elim_threshold */ \	47	1, /* is_chroma_elim_threshold */ \
48	-5, /* chroma_elim_threshold */ \	48	(uint32_t)-5, /* chroma_elim_threshold */ \
49	0.05, /lumi_masking / \	49	0.05, /lumi_masking / \
50	1, /* is lumi */ \	50	1, /* is lumi */ \
51	0.01, /dark_masking / \	51	0.01, /dark_masking / \

Lines 53-61 Link Here

(-)avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h (-2 / +2 lines)
53	2, /* max_b_frames */ \	53	2, /* max_b_frames */ \
54	1, /* mpeg_quant */ \	54	1, /* mpeg_quant */ \
55	1, /* is_luma_elim_threshold */ \	55	1, /* is_luma_elim_threshold */ \
56	-2, /* luma_elim_threshold */ \	56	(uint32_t)-2, /* luma_elim_threshold */ \
57	1, /* is_chroma_elim_threshold */ \	57	1, /* is_chroma_elim_threshold */ \
58	-5, /* chroma_elim_threshold */ \	58	(uint32_t)-5, /* chroma_elim_threshold */ \
59	0.05, /lumi_masking / \	59	0.05, /lumi_masking / \
60	1, /* is lumi */ \	60	1, /* is lumi */ \
61	0.01, /dark_masking / \	61	0.01, /dark_masking / \

Lines 43-51 Link Here

(-)avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h (-2 / +2 lines)
43	2, /* max_b_frames */ \	43	2, /* max_b_frames */ \
44	0, /* mpeg_quant */ \	44	0, /* mpeg_quant */ \
45	1, /* is_luma_elim_threshold */ \	45	1, /* is_luma_elim_threshold */ \
46	-2, /* luma_elim_threshold */ \	46	(uint32_t)-2, /* luma_elim_threshold */ \
47	1, /* is_chroma_elim_threshold */ \	47	1, /* is_chroma_elim_threshold */ \
48	-5, /* chroma_elim_threshold */ \	48	(uint32_t)-5, /* chroma_elim_threshold */ \
49	0.05, /lumi_masking / \	49	0.05, /lumi_masking / \
50	1, /* is lumi */ \	50	1, /* is lumi */ \
51	0.01, /dark_masking / \	51	0.01, /dark_masking / \

Lines 108-114 Link Here

(-)avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h (-1 / +1 lines)
108	1.0, /* float rate_tolerance; */ \	108	1.0, /* float rate_tolerance; */ \
109	0, /* uint32_t vbv_max_bitrate; */ \	109	0, /* uint32_t vbv_max_bitrate; */ \
110	0, /* uint32_t vbv_buffer_size; */ \	110	0, /* uint32_t vbv_buffer_size; */ \
111	0.9, /* uint32_t vbv_buffer_init; */ \	111	1, /* uint32_t vbv_buffer_init; */ \
112	1.4, /* float ip_factor; */ \	112	1.4, /* float ip_factor; */ \
113	1.3, /* float pb_factor; */ \	113	1.3, /* float pb_factor; */ \
114	1, /* uint32_t aq_mode; */ \	114	1, /* uint32_t aq_mode; */ \

Lines 38-44 Link Here

(-)avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp (-1 / +1 lines)
38	}idcToken;	38	}idcToken;
39		39
40	static const idcToken listOfIdc[]={	40	static const idcToken listOfIdc[]={
41	{-1,"Auto"},	41	{(uint32_t)-1,"Auto"},
42	{10,"1"},	42	{10,"1"},
43	{11,"1.1"},	43	{11,"1.1"},
44	{12,"1.2"},	44	{12,"1.2"},

Lines 85-91 Link Here

(-)avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h (-1 / +1 lines)
85	1.0, /* float rate_tolerance; */ \	85	1.0, /* float rate_tolerance; */ \
86	0, /* uint32_t vbv_max_bitrate; */ \	86	0, /* uint32_t vbv_max_bitrate; */ \
87	0, /* uint32_t vbv_buffer_size; */ \	87	0, /* uint32_t vbv_buffer_size; */ \
88	0.9, /* uint32_t vbv_buffer_init; */ \	88	1, /* uint32_t vbv_buffer_init; */ \
89	1.4, /* float ip_factor; */ \	89	1.4, /* float ip_factor; */ \
90	1.3, /* float pb_factor; */ \	90	1.3, /* float pb_factor; */ \
91	2, /* uint32_t aq_mode; */ \	91	2, /* uint32_t aq_mode; */ \

Lines 38-44 Link Here

(-)avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp (-1 / +1 lines)
38	}idcToken;	38	}idcToken;
39		39
40	static const idcToken listOfIdc[]={	40	static const idcToken listOfIdc[]={
41	{-1,"Auto"},	41	{(uint32_t)-1,"Auto"},
42	{10,"1"},	42	{10,"1"},
43	{20,"2"},	43	{20,"2"},
44	{21,"2.1"},	44	{21,"2.1"},

Lines 56-62 Link Here

(-)avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp (-1 / +1 lines)
56		56
57	uint32_t rdMode[5]=	57	uint32_t rdMode[5]=
58	{	58	{
59	RD_NONE,	59	(uint32_t)RD_NONE,
60	RD_DCT_ME,	60	RD_DCT_ME,
61	RD_HPEL_QPEL_16,	61	RD_HPEL_QPEL_16,
62	RD_HPEL_QPEL_8,	62	RD_HPEL_QPEL_8,

Lines 240-246 Link Here

(-)avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp (-2 / +2 lines)
240	{	240	{
241	// The chosen frame doesn't match the prediction.	241	// The chosen frame doesn't match the prediction.
242	if (predicted_metric == 0) mismatch = 0.0;	242	if (predicted_metric == 0) mismatch = 0.0;
243	else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric;	243	else mismatch = (100.0*abs((int)(predicted_metric - lowest)))/predicted_metric;
244	if (mismatch < gthresh)	244	if (mismatch < gthresh)
245	{	245	{
246	// It's close enough, so use the predicted one.	246	// It's close enough, so use the predicted one.
Lines 283-289 Link Here
283	{	283	{
284	// The chosen frame doesn't match the prediction.	284	// The chosen frame doesn't match the prediction.
285	if (predicted_metric == 0) mismatch = 0.0;	285	if (predicted_metric == 0) mismatch = 0.0;
286	else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric;	286	else mismatch = (100.0*abs((int)(predicted_metric - lowest)))/predicted_metric;
287	if ((int) mismatch <= gthresh)	287	if ((int) mismatch <= gthresh)
288	{	288	{
289	// It's close enough, so use the predicted one.	289	// It's close enough, so use the predicted one.

Return to bug 224384