# HG changeset patch # User cehoyos # Date 1237766320 0 # Node ID 0ce70839c3b56a352bf67a23930ed97b5c849993 # Parent 7d77afec5881709000602b0732a416f8640c99de Change function call order in config(). This stops creating a window even if hardware decoding is certainly going to fail. diff -r 7d77afec5881 -r 0ce70839c3b5 libvo/vo_vdpau.c --- a/libvo/vo_vdpau.c Sun Mar 22 23:15:54 2009 +0000 +++ b/libvo/vo_vdpau.c Sun Mar 22 23:58:40 2009 +0000 @@ -534,6 +534,11 @@ #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 @@ 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 @@ vid_surface_num = -1; resize(); - if (IMGFMT_IS_VDPAU(image_format) && !create_vdp_decoder(2)) - return -1; - return 0; }