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

[cehoyos]

Author: cehoyos
Date: Mon Mar 23 00:58:40 2009
New Revision: 29040

Log:
Change function call order in config().
This stops creating a window even if hardware decoding is certainly
going to fail.

Modified:
   trunk/libvo/vo_vdpau.c

Modified: trunk/libvo/vo_vdpau.c
==============================================================================
--- trunk/libvo/vo_vdpau.c	Mon Mar 23 00:15:54 2009	(r29039)
+++ trunk/libvo/vo_vdpau.c	Mon Mar 23 00:58:40 2009	(r29040)
@@ -534,6 +534,11 @@ static int config(uint32_t width, uint32
 #endif
 
     image_format = format;
+    vid_width    = width;
+    vid_height   = height;
+    free_video_specific();
+    if (IMGFMT_IS_VDPAU(image_format) && !create_vdp_decoder(2))
+        return -1;
 
     int_pause = 0;
     visible_buf = 0;
@@ -579,16 +584,9 @@ static int config(uint32_t width, uint32
         vo_fs = 1;
 
     /* -----VDPAU related code here -------- */
-
-    free_video_specific();
-
     if (vdp_flip_queue == VDP_INVALID_HANDLE && win_x11_init_vdpau_flip_queue())
         return -1;
 
-    // video width and height
-    vid_width  = width;
-    vid_height = height;
-
     if (create_vdp_mixer(vdp_chroma_type))
         return -1;
 
@@ -596,9 +594,6 @@ static int config(uint32_t width, uint32
     vid_surface_num = -1;
     resize();
 
-    if (IMGFMT_IS_VDPAU(image_format) && !create_vdp_decoder(2))
-        return -1;
-
     return 0;
 }