[Mplayer-cvslog] CVS: main/libmpcodecs vd_odivx.c,1.12,1.13 vf_pp.c,1.18,1.19

[Michael Niedermayer]

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

Modified Files:
	vd_odivx.c vf_pp.c 
Log Message:
cleanup


Index: vd_odivx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_odivx.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vd_odivx.c	31 Aug 2002 13:09:23 -0000	1.12
+++ vd_odivx.c	2 Nov 2002 14:20:03 -0000	1.13
@@ -79,7 +79,7 @@
 #ifdef NEW_DECORE
 	return 9; // for divx4linux
 #else
-	return GET_PP_QUALITY_MAX;  // for opendivx
+	return PP_QUALITY_MAX;  // for opendivx
 #endif
     case VDCTRL_SET_PP_LEVEL: {
 	DEC_SET dec_set;
@@ -88,7 +88,7 @@
 	if(quality<0 || quality>9) quality=9;
 	dec_set.postproc_level=quality*10;
 #else
-	if(quality<0 || quality>GET_PP_QUALITY_MAX) quality=GET_PP_QUALITY_MAX;
+	if(quality<0 || quality>PP_QUALITY_MAX) quality=PP_QUALITY_MAX;
 	dec_set.postproc_level=getPpModeForQuality(quality);
 #endif
 	decore(0x123,DEC_OPT_SETPP,&dec_set,NULL);

Index: vf_pp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_pp.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- vf_pp.c	2 Nov 2002 13:58:02 -0000	1.18
+++ vf_pp.c	2 Nov 2002 14:20:03 -0000	1.19
@@ -22,7 +22,7 @@
 
 struct vf_priv_s {
     int pp;
-    pp_mode_t *ppMode[GET_PP_QUALITY_MAX+1];
+    pp_mode_t *ppMode[PP_QUALITY_MAX+1];
     void *context;
     mp_image_t *dmpi;
     unsigned int outfmt;
@@ -44,7 +44,7 @@
 
 static void uninit(struct vf_instance_s* vf){
     int i;
-    for(i=0; i<=GET_PP_QUALITY_MAX; i++){
+    for(i=0; i<=PP_QUALITY_MAX; i++){
         if(vf->priv->ppMode[i])
 	    pp_free_mode(vf->priv->ppMode[i]);
     }
@@ -64,7 +64,7 @@
 static int control(struct vf_instance_s* vf, int request, void* data){
     switch(request){
     case VFCTRL_QUERY_MAX_PP_LEVEL:
-	return GET_PP_QUALITY_MAX;
+	return PP_QUALITY_MAX;
     case VFCTRL_SET_PP_LEVEL:
 	vf->priv->pp= *((unsigned int*)data);
 	return CONTROL_TRUE;
@@ -164,14 +164,14 @@
 #ifdef EMU_OLD
     if(name){
 #endif
-	for(i=0; i<=GET_PP_QUALITY_MAX; i++){
+	for(i=0; i<=PP_QUALITY_MAX; i++){
             vf->priv->ppMode[i]= pp_get_mode_by_name_and_quality(name, i);
             if(vf->priv->ppMode[i]==NULL) return -1;
         }
 #ifdef EMU_OLD
     }else{
         /* hex mode for compatibility */
-        for(i=0; i<=GET_PP_QUALITY_MAX; i++){
+        for(i=0; i<=PP_QUALITY_MAX; i++){
 	    PPMode *ppMode;
 	    
 	    ppMode= (PPMode*)memalign(8, sizeof(PPMode));
@@ -191,7 +191,7 @@
     }
 #endif
     
-    vf->priv->pp=GET_PP_QUALITY_MAX; //divx_quality;
+    vf->priv->pp=PP_QUALITY_MAX; //divx_quality;
     return 1;
 }