[Mplayer-cvslog] CVS: main/libmpcodecs dec_video.c,1.140,1.141 vf_vo.c,1.13,1.14

[Alex Beregszaszi]

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

Modified Files:
	dec_video.c vf_vo.c 
Log Message:
eq reworked

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_video.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- dec_video.c	25 Jul 2002 10:27:35 -0000	1.140
+++ dec_video.c	25 Jul 2002 13:10:28 -0000	1.141
@@ -77,10 +77,11 @@
 int set_video_colors(sh_video_t *sh_video,char *item,int value)
 {
     vf_instance_t* vf=sh_video->vfilter;
-    
+
+    mp_dbg(MSGT_DECVIDEO,MSGL_V,"set video colors %s=%d \n", item, value);
     if (vf)
     {
-	int ret =  vf->control(vf, VFCTRL_SET_EQUALIZER, item, (int *)value);
+	int ret = vf->control(vf, VFCTRL_SET_EQUALIZER, item, (int *)value);
 	if (ret == CONTROL_TRUE)
 	    return(1);
     }
@@ -92,9 +93,14 @@
 int get_video_colors(sh_video_t *sh_video,char *item,int *value)
 {
     vf_instance_t* vf=sh_video->vfilter;
-    
-    if (vf->control(vf, VFCTRL_GET_EQUALIZER, item, value) == CONTROL_TRUE)
-	return 1;
+
+    mp_dbg(MSGT_DECVIDEO,MSGL_V,"get video colors %s \n", item);
+    if (vf)
+    {
+        int ret = vf->control(vf, VFCTRL_GET_EQUALIZER, item, value);
+	if (ret == CONTROL_TRUE)
+	    return(1);
+    }
     /* try software control */
     if(mpvdec) return mpvdec->control(sh_video,VDCTRL_GET_EQUALIZER, item, value);
     return 0;

Index: vf_vo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_vo.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vf_vo.c	24 Jul 2002 18:14:21 -0000	1.13
+++ vf_vo.c	25 Jul 2002 13:10:28 -0000	1.14
@@ -70,13 +70,13 @@
     case VFCTRL_GET_EQUALIZER:
     {
 	va_list ap;
-	int value;
+	int *value;
 
 	if(!vo_config_count) return CONTROL_FALSE; // vo not configured?
 	va_start(ap, data);
 	value = va_arg(ap, int);
 	va_end(ap);
-	return((video_out->control(VOCTRL_GET_EQUALIZER, data, (int *)value) == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE);
+	return((video_out->control(VOCTRL_GET_EQUALIZER, data, value) == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE);
     }
     }
     // return video_out->control(request,data);