[MPlayer-dev-eng] [PATCH] xvid patch and VCD patch

[elcabesa]

On Thursday 03 April 2003 12:29, elcabesa wrote:
>  vcd simply doesen't compile due include error  [fixed]
> xvid doesn't comile due to another include compiel [fixed]
> xvid vhq changed as requrested by rèmy  Guyomarch
>
>
>
> _______________________________________________
> MPlayer-dev-eng mailing list
> MPlayer-dev-eng at mplayerhq.hu
> http://mplayerhq.hu/mailman/listinfo/mplayer-dev-eng

here the patch=)
-------------- next part --------------
? diff.txt
Index: libmpcodecs/ve_xvid.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_xvid.c,v
retrieving revision 1.19
diff -r1.19 ve_xvid.c
25a26
> #include <time.h>
56,58c57,59
< 	PMV_HALFPELREFINE16 | PMV_HALFPELDIAMOND8 | HALFPELREFINE16_BITS,
< 	PMV_HALFPELREFINE16 | PMV_HALFPELDIAMOND8 | PMV_ADVANCEDDIAMOND16 | HALFPELREFINE16_BITS,
< 	PMV_HALFPELREFINE16 | PMV_EXTSEARCH16 | PMV_HALFPELREFINE8 | PMV_HALFPELDIAMOND8 | PMV_USESQUARES16 | EXTSEARCH_BITS | HALFPELREFINE8_BITS | HALFPELREFINE16_BITS | CHECKPREDICTION_BITS
---
> 	PMV_HALFPELREFINE16 | PMV_HALFPELDIAMOND8 ,
> 	PMV_HALFPELREFINE16 | PMV_HALFPELDIAMOND8 | PMV_ADVANCEDDIAMOND16  ,
> 	PMV_HALFPELREFINE16 | PMV_EXTSEARCH16 | PMV_HALFPELREFINE8 | PMV_HALFPELDIAMOND8 | PMV_USESQUARES16 
71a73,82
> #ifdef XVID_API_UNSTABLE
> static int const vhq_presets[4] = {
> 	0,
> 	HALFPELREFINE16_BITS|QUARTERPELREFINE16_BITS,
> 	HALFPELREFINE16_BITS|QUARTERPELREFINE16_BITS|HALFPELREFINE8_BITS|QUARTERPELREFINE8_BITS|CHECKPREDICTION_BITS,
> 	EXTSEARCH_BITS|HALFPELREFINE16_BITS|QUARTERPELREFINE16_BITS|HALFPELREFINE8_BITS|QUARTERPELREFINE8_BITS|CHECKPREDICTION_BITS
> };
> #endif
> 
> 
145c156
<     { "vhq", &xvidenc_vhq, CONF_TYPE_FLAG, 0, 0, 1, NULL},
---
>     { "vhq", &xvidenc_vhq, CONF_TYPE_INT,  CONF_RANGE, 1, 3, NULL},
278c289
< 	fp->enc_frame.motion |= PMV_QUARTERPELREFINE16 | PMV_QUARTERPELREFINE8 |QUARTERPELREFINE16_BITS | QUARTERPELREFINE8_BITS;
---
> 	fp->enc_frame.motion |= PMV_QUARTERPELREFINE16 | PMV_QUARTERPELREFINE8 ;
280a292
>     {
281a294,295
> 	fp->enc_frame.motion |=vhq_presets[xvidenc_vhq];
>     }
472,473c486,487
<             today2 = time (NULL);
<             today = localtime (&today2);
---
>             today2=time (NULL);
>             today=localtime(&today2);
Index: libmpdemux/stream.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.h,v
retrieving revision 1.59
diff -r1.59 stream.h
253a254
> extern int vcd_track;