Mercurial > mplayer.hg

changeset 33584:deedeb235cac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify code for printing display adapter list.
author reimar
date Sun, 19 Jun 2011 18:31:45 +0000
parents a39c61198f93
children 1f6ff1848bd3
files libvo/vo_directx.c
diffstat 1 files changed, 2 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_directx.c	Sun Jun 19 17:33:16 2011 +0000
+++ b/libvo/vo_directx.c	Sun Jun 19 18:31:45 2011 +0000
@@ -377,16 +377,9 @@
 
 static BOOL WINAPI EnumCallbackEx(GUID FAR *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, LPVOID lpContext, HMONITOR  hm)
 {
-    mp_msg(MSGT_VO, MSGL_INFO ,"<vo_directx> adapter %d: ", adapter_count);
-
     if (!lpGUID)
-    {
-        mp_msg(MSGT_VO, MSGL_INFO ,"%s", "Primary Display Adapter");
-    }
-    else
-    {
-        mp_msg(MSGT_VO, MSGL_INFO ,"%s", lpDriverDescription);
-    }
+        lpDriverDescription = "Primary Display Adapter";
+    mp_msg(MSGT_VO, MSGL_INFO ,"<vo_directx> adapter %d: %s", adapter_count, lpDriverDescription);
 
     if(adapter_count == vo_adapter_num){
         MONITORINFO mi;