[MPlayer-cvslog] r37786 - trunk/sub/subreader.c

[reimar]

Author: reimar
Date: Sun Feb 21 13:08:36 2016
New Revision: 37786

Log:
subreader: Fix -subcp without enca.

Modified:
   trunk/sub/subreader.c

Modified: trunk/sub/subreader.c
==============================================================================
--- trunk/sub/subreader.c	Sun Feb 21 02:01:08 2016	(r37785)
+++ trunk/sub/subreader.c	Sun Feb 21 13:08:36 2016	(r37786)
@@ -1224,8 +1224,12 @@ void	subcp_open (stream_t *st)
 		    if (st)
 		      mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: enca failed, stream must be seekable.\n");
 		  }
-		}
+		  if (!enca_sub_cp) return;
+		} else
 #endif
+		{
+		  enca_sub_cp = sub_cp;
+		}
 		if ((icdsc = iconv_open (tocp, enca_sub_cp)) != (iconv_t)(-1)){
 			mp_msg(MSGT_SUBREADER,MSGL_V,"SUB: opened iconv descriptor.\n");
 			sub_utf8 = 2;