Ticket #37: mplayer-vf_vo-2.patch

mencoder.c

@@ -1861 +1861 @@
 }
 #endif
 
+void initial_set_video_colors() {} // no-op in mencoder

mplayer.c

@@ -1775 +1775 @@
 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============
 
 current_module="init_vo";
-    if (sh_video)
-    {
-        if (vo_gamma_gamma != 1000)
-          set_video_colors (sh_video, "gamma", vo_gamma_gamma);
-        if (vo_gamma_brightness != 1000)
-            set_video_colors(sh_video, "brightness", vo_gamma_brightness);
-        if (vo_gamma_contrast != 1000)
-            set_video_colors(sh_video, "contrast", vo_gamma_contrast);
-        if (vo_gamma_saturation != 1000)
-            set_video_colors(sh_video, "saturation", vo_gamma_saturation);
-        if (vo_gamma_hue != 1000)
-            set_video_colors(sh_video, "hue", vo_gamma_hue);
-    }
-
    if(vo_flags & 0x08 && vo_spudec)
       spudec_set_hw_spu(vo_spudec,video_out);
 
@@ -3807 +3793 @@
 
 return 1;
 }
+
+void initial_set_video_colors()
+{
+    if (sh_video)
+    {
+        if (vo_gamma_gamma != 1000)
+          set_video_colors (sh_video, "gamma", vo_gamma_gamma);
+        if (vo_gamma_brightness != 1000)
+          set_video_colors(sh_video, "brightness", vo_gamma_brightness);
+        if (vo_gamma_contrast != 1000)
+          set_video_colors(sh_video, "contrast", vo_gamma_contrast);
+        if (vo_gamma_saturation != 1000)
+          set_video_colors(sh_video, "saturation", vo_gamma_saturation);
+        if (vo_gamma_hue != 1000)
+          set_video_colors(sh_video, "hue", vo_gamma_hue);
+    }
+}

libmpcodecs/vf_vo.c

@@ -14 +14 @@
 
 #define video_out ((vo_functions_t*)(vf->priv))
 
+extern void initial_set_video_colors();
+
 static int query_format(struct vf_instance_s* vf, unsigned int fmt); /* forward declaration */
 
 static int config(struct vf_instance_s* vf,
@@ -49 +51 @@
         return 0;
 
     ++vo_config_count;
+    initial_set_video_colors();
     return 1;
 }