[Mplayer-cvslog] CVS: main/libmpcodecs vf_lavc.c,1.13,1.14

[Tobias Diedrich CVS]

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

Modified Files:
	vf_lavc.c 
Log Message:
constant qscale was broken due to libavcodec changes, fix taken from ve_lavc.c

Index: vf_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_lavc.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vf_lavc.c	4 Oct 2003 17:28:59 -0000	1.13
+++ vf_lavc.c	24 Oct 2003 11:34:48 -0000	1.14
@@ -179,7 +179,10 @@
     if(p_quality<32){
 	// fixed qscale
 	lavc_venc_context.flags = CODEC_FLAG_QSCALE;
-	vf->priv->pic->quality = (p_quality<1) ? 1 : p_quality;
+#if LIBAVCODEC_BUILD >= 4668
+	lavc_venc_context.global_quality =
+#endif
+	vf->priv->pic->quality = (int)(FF_QP2LAMBDA * ((p_quality<1) ? 1 : p_quality) + 0.5);
     } else {
 	// fixed bitrate (in kbits)
 	lavc_venc_context.bit_rate = 1000*p_quality;