[xine-cvs] HG: xine-lib: Fix xcbxv Xv port fallback (was failing to find an Xv port).

[Darren S. <li...@yo...>]

# HG changeset patch
# User Darren Salt <li...@yo...>
# Date 1230499116 0
# Node ID c46c4495e87754add6eb4e68b048f0c3f89cbcc2
# Parent  27c2bb855767c5f4149f25f04f3e90599ab8d1a4
Fix xcbxv Xv port fallback (was failing to find an Xv port).

diff -r c46c4495e87754add6eb4e68b048f0c3f89cbcc2 -r 27c2bb855767c5f4149f25f04f3e90599ab8d1a4 src/video_out/video_out_xcbxv.c
--- a/src/video_out/video_out_xcbxv.c	Sun Dec 28 21:18:36 2008 +0000
+++ b/src/video_out/video_out_xcbxv.c	Wed Sep 17 10:57:35 2008 +0100
@@ -1329,7 +1329,7 @@ static vo_driver_t *open_plugin(video_dr
   xcb_xv_list_image_formats_cookie_t list_formats_cookie;
   xcb_xv_list_image_formats_reply_t *list_formats_reply;
 
-  xcb_xv_adaptor_info_iterator_t adaptor_it;
+  xcb_xv_adaptor_info_iterator_t adaptor_it, adaptor_first;
   xcb_xv_image_format_info_iterator_t format_it;
 
   this = (xv_driver_t *) calloc(1, sizeof(xv_driver_t));
@@ -1367,7 +1367,7 @@ static vo_driver_t *open_plugin(video_dr
     return NULL;
   }
 
-  adaptor_it = xcb_xv_query_adaptors_info_iterator(query_adaptors_reply);
+  adaptor_first = xcb_xv_query_adaptors_info_iterator(query_adaptors_reply);
   xv_port = config->register_num (config, "video.device.xv_port", 0,
 				  VIDEO_DEVICE_XV_PORT_HELP,
 				  20, NULL, NULL);
@@ -1380,14 +1380,21 @@ static vo_driver_t *open_plugin(video_dr
       xprintf(class->xine, XINE_VERBOSITY_NONE,
 	      _("%s: could not open Xv port %d - autodetecting\n"),
 	      LOG_MODULE, xv_port);
+      adaptor_it = adaptor_first;
       xv_port = xv_autodetect_port (this, &adaptor_it, xv_port, prefer_type);
     } else
       xv_find_adaptor_by_port (xv_port, &adaptor_it);
   }
   if (!xv_port)
+  {
+    adaptor_it = adaptor_first;
     xv_port = xv_autodetect_port (this, &adaptor_it, 0, prefer_type);
+  }
   if (!xv_port)
+  {
+    adaptor_it = adaptor_first;
     xv_port = xv_autodetect_port (this, &adaptor_it, 0, xv_prefer_none);
+  }
 
   if (!xv_port) {
     xprintf(class->xine, XINE_VERBOSITY_LOG,