[MPlayer-cvslog] r37114 - trunk/gui/win32/widgetrender.c

ib subversion at mplayerhq.hu
Mon Mar 31 10:40:53 CEST 2014


Author: ib
Date: Mon Mar 31 10:40:53 2014
New Revision: 37114

Log:
Fix some compilation errors in Win32 GUI.

These have crept in by absent-minded copy and paste.

Patch by Stephen Sheldon, sfsheldo gmail com.

Modified:
   trunk/gui/win32/widgetrender.c

Modified: trunk/gui/win32/widgetrender.c
==============================================================================
--- trunk/gui/win32/widgetrender.c	Sat Mar 29 15:30:40 2014	(r37113)
+++ trunk/gui/win32/widgetrender.c	Mon Mar 31 10:40:53 2014	(r37114)
@@ -34,7 +34,7 @@
 #include "access_mpcontext.h"
 #include "help_mp.h"
 #include "libavutil/avstring.h"
-#include "stream/stream.h
+#include "stream/stream.h"
 
 #define MAX_LABELSIZE 250
 
@@ -258,7 +258,7 @@ static char *generatetextfromlabel(widge
 
     if(guiInfo.AudioChannels == 0) stringreplace(text, "$a", "n");
     else if(guiInfo.AudioChannels == 1) stringreplace(text, "$a", "m");
-    else if(guiInfo.AudioChannels == 2) stringreplace(text, "$a", (guiInfo.AudioPassthrough ? : "r": "t"));
+    else if(guiInfo.AudioChannels == 2) stringreplace(text, "$a", (guiInfo.AudioPassthrough ? "r" : "t"));
     else stringreplace(text, "$a", "r");
 
     if(guiInfo.StreamType == STREAMTYPE_FILE)


More information about the MPlayer-cvslog mailing list