[Mplayer-cvslog] CVS: main/libmpcodecs vf_lavc.c,1.10,1.11

[Michael Niedermayer CVS]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv23094

Modified Files:
	vf_lavc.c 
Log Message:
1000l


Index: vf_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_lavc.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vf_lavc.c	9 Dec 2002 12:36:04 -0000	1.10
+++ vf_lavc.c	13 Mar 2003 09:24:03 -0000	1.11
@@ -62,12 +62,22 @@
 	switch(height){
 	case 240:
 	case 480:
+#if LIBAVCODEC_BUILD >= 4662
+	    lavc_venc_context.frame_rate     = 30000;
+	    lavc_venc_context.frame_rate_base= 1001;
+#else
 	    lavc_venc_context.frame_rate=29.97*FRAME_RATE_BASE; // NTSC
+#endif
 	    break;
 	case 576:
 	case 288:
 	default:
+#if LIBAVCODEC_BUILD >= 4662
+	    lavc_venc_context.frame_rate     = 25;
+	    lavc_venc_context.frame_rate_base= 1;
+#else
 	    lavc_venc_context.frame_rate=25*FRAME_RATE_BASE; // PAL
+#endif
 	    break;
 //	    lavc_venc_context.frame_rate=vo_fps*FRAME_RATE_BASE; // same as src
 	}
@@ -174,8 +184,12 @@
 	// fixed bitrate (in kbits)
 	lavc_venc_context.bit_rate = 1000*p_quality;
     }
-    lavc_venc_context.frame_rate = (p_fps<1.0) ? 0 : (p_fps * FRAME_RATE_BASE);
-    lavc_venc_context.qmin= 1;
+#if LIBAVCODEC_BUILD >= 4662
+    lavc_venc_context.frame_rate_base = 1000*1001;
+    lavc_venc_context.frame_rate      = (p_fps<1.0) ? 0 : (p_fps * lavc_venc_context.frame_rate_base);
+#else
+    lavc_venc_context.frame_rate      = (p_fps<1.0) ? 0 : (p_fps * FRAME_RATE_BASE);
+#endif
     lavc_venc_context.gop_size = 0; // I-only
 
     return 1;