Attachment #170145 for bug #240379

Lines 23-29 Link Here

(-)mjpegtools-1.8.0.old/mpeg2enc/encodertypes.h (-1 / +3 lines)
23	* 02111-1307, USA.	23	* 02111-1307, USA.
24	*	24	*
25	*/	25	*/
26		26
		27	#include <cstdlib>
		28
27	#include "config.h"	29	#include "config.h"
28		30
29		31

Lines 19-24 Link Here

(-)mjpegtools-1.8.0.old/mpeg2enc/macroblock.cc (-1 / +4 lines)
19	*	19	*
20	*/	20	*/
21		21
		22
		23	#include <limits>
		24
22	#include <stdio.h>	25	#include <stdio.h>
23		26
24	#include "macroblock.hh"	27	#include "macroblock.hh"
Lines 49-55 Link Here
49	{	52	{
50	vector<MotionEst>::iterator i;	53	vector<MotionEst>::iterator i;
51	vector<MotionEst>::iterator min_me;	54	vector<MotionEst>::iterator min_me;
52	int best_score = INT_MAX;	55	int best_score = std::numeric_limits<int>::max();
53	int cur_score;	56	int cur_score;
54		57
55	//	58	//

Lines 45-50 Link Here

(-)mjpegtools-1.8.0.old/mpeg2enc/motionest.cc (-2 / +4 lines)
45	*	45	*
46	*/	46	*/
47		47
		48	#include <limits>
		49
48	#include <config.h>	50	#include <config.h>
49	#include <stdio.h>	51	#include <stdio.h>
50	#include <stdlib.h>	52	#include <stdlib.h>
Lines 1643-1649 Link Here
1643	a basis for setting thresholds for rejecting really dud 4*4	1645	a basis for setting thresholds for rejecting really dud 4*4
1644	and 2*2 sub-sampled matches.	1646	and 2*2 sub-sampled matches.
1645	*/	1647	*/
1646	best.weight = psad_00(reffld+i0+j0*lx,ssblk->mb,lx,h,INT_MAX);	1648	best.weight = psad_00(reffld+i0+j0*lx,ssblk->mb,lx,h,std::numeric_limits<int>::max());
1647	best.x = 0;	1649	best.x = 0;
1648	best.y = 0;	1650	best.y = 0;
1649		1651
Lines 1714-1720 Link Here
1714	/* Final polish: half-pel search of best 1*1 against	1716	/* Final polish: half-pel search of best 1*1 against
1715	reconstructed image.	1717	reconstructed image.
1716	*/	1718	*/
1717	res->sad = INT_MAX;	1719	res->sad = std::numeric_limits<int>::max();
1718	x = (i0+best.x)<<1;	1720	x = (i0+best.x)<<1;
1719	y = (j0+best.y)<<1;	1721	y = (j0+best.y)<<1;
1720		1722

Lines 20-25 Link Here

(-)mjpegtools-1.8.0.old/mpeg2enc/picturereader.cc (-1 / +3 lines)
20	*/	20	*/
21		21
22		22
		23	#include <limits>
		24
23	#include "picturereader.hh"	25	#include "picturereader.hh"
24	#include <stdio.h>	26	#include <stdio.h>
25	#include <stdlib.h>	27	#include <stdlib.h>
Lines 37-43 Link Here
37	frames_read = 0;	39	frames_read = 0;
38	last_frame = -1;	40	last_frame = -1;
39	lum_mean = 0;	41	lum_mean = 0;
40	istrm_nframes = INT_MAX;	42	istrm_nframes = std::numeric_limits<int>::max();
41	}	43	}
42		44
43		45

Lines 21-26 Link Here

(-)mjpegtools-1.8.0.old/mplex/inputstrm.cpp (-1 / +3 lines)
21	*/	21	*/
22		22
23		23
		24	#include <limits>
		25
24	#include <config.h>	26	#include <config.h>
25	#include <assert.h>	27	#include <assert.h>
26		28
Lines 72-78 Link Here
72	au(0),	74	au(0),
73	muxinto( into ),	75	muxinto( into ),
74	kind(_kind),	76	kind(_kind),
75	buffer_min(INT_MAX),	77	buffer_min(std::numeric_limits<int>::max()),
76	buffer_max(1)	78	buffer_max(1)
77	{	79	{
78	}	80	}

Lines 26-31 Link Here

(-)mjpegtools-1.8.0.old/mplex/main.cpp (+1 lines)
26	*************************************************************************/	26	*************************************************************************/
27		27
28	#include <config.h>	28	#include <config.h>
		29	#include <cstring>
29	#include <stdio.h>	30	#include <stdio.h>
30	#ifdef HAVE_GETOPT_H	31	#ifdef HAVE_GETOPT_H
31	#include <getopt.h>	32	#include <getopt.h>

Lines 19-24 Link Here

(-)mjpegtools-1.8.0.old/mplex/multiplexor.cpp (+1 lines)
19	*/	19	*/
20		20
21	#define STREAM_LOGGING	21	#define STREAM_LOGGING
		22	#include <cstring>
22	#include <config.h>	23	#include <config.h>
23	#include <math.h>	24	#include <math.h>
24	#include <stdlib.h>	25	#include <stdlib.h>

Lines 20-25 Link Here

(-)mjpegtools-1.8.0.old/mplex/padstrm.cpp (+2 lines)
20	*/	20	*/
21		21
22		22
		23	#include <cstring>
		24
23	#ifdef HAVE_CONFIG_H	25	#ifdef HAVE_CONFIG_H
24	#include "config.h"	26	#include "config.h"
25	#endif	27	#endif

Return to bug 240379