[MPlayer-cvslog] CVS: main/libmpcodecs ve_xvid4.c,1.18,1.19

[Guillaume Poirier CVS]

CVS change done by Guillaume Poirier CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv1981/libmpcodecs

Modified Files:
	ve_xvid4.c 
Log Message:
10l: fully working DXN profile support require XviD 1.1.x. Earlier version will work but will lack VBV support


Index: ve_xvid4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_xvid4.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ve_xvid4.c	13 Sep 2005 21:04:44 -0000	1.18
+++ ve_xvid4.c	18 Sep 2005 17:22:04 -0000	1.19
@@ -801,9 +801,11 @@
 	else
 		create->max_bframes = 0;
 
+#if XVID_API >= XVID_MAKE_API(4,1)
 	/* dxn: always write divx5 userdata */
 	if(selected_profile->flags & PROFILE_DXN)
 		create->global |= XVID_GLOBAL_DIVX5_USERDATA;
+#endif
 	
 	create->max_key_interval = xvidenc_max_key_interval;
 	create->frame_drop_ratio = xvidenc_frame_drop_ratio;
@@ -841,10 +843,12 @@
 
 	/* VBV */
 
+#if XVID_API >= XVID_MAKE_API(4,1)
 	pass2->vbv_size = selected_profile->max_vbv_size;
 	pass2->vbv_initial = (selected_profile->max_vbv_size*3)>>2; /* 75% */
 	pass2->vbv_maxrate = selected_profile->max_bitrate;
 	pass2->vbv_peakrate = selected_profile->vbv_peakrate*3;
+#endif
 // XXX: xvidcore currently provides a "peak bits over 3 seconds" constraint.
 // according to the latest dxn literature, a 1 second constraint is now used