[MPlayer-cvslog] r36467 - trunk/libvo/vo_vdpau.c

[reimar]

Author: reimar
Date: Tue Oct 15 20:58:55 2013
New Revision: 36467

Log:
vo_vdpau: Initialize variables before, not after setup code.

Fixes possible crashes when playing multiple videos without
-fixed-vo.

Modified:
   trunk/libvo/vo_vdpau.c

Modified: trunk/libvo/vo_vdpau.c
==============================================================================
--- trunk/libvo/vo_vdpau.c	Tue Oct 15 20:44:09 2013	(r36466)
+++ trunk/libvo/vo_vdpau.c	Tue Oct 15 20:58:55 2013	(r36467)
@@ -1290,9 +1290,6 @@ static int preinit(const char *arg)
         colorspace = 1;
     }
 
-    if (!vo_init() || win_x11_init_vdpau_procs())
-        return -1;
-
     // full grayscale palette.
     for (i = 0; i < PALETTE_SIZE; ++i)
         palette[i] = (i << 16) | (i << 8) | i;
@@ -1309,6 +1306,9 @@ static int preinit(const char *arg)
     procamp.saturation = 1.0;
     procamp.hue        = 0.0;
 
+    if (!vo_init() || win_x11_init_vdpau_procs())
+        return -1;
+
     return 0;
 }