summaryrefslogtreecommitdiffstats
path: root/libmpdemux/asf_mmst_streaming.c
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-06-26 09:55:17 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-06-26 09:55:17 +0000
commitdf02e80073f447861ddf10834109c406750e4c34 (patch)
tree5241a49e5f90505cb1909cd9c6d76425d12a660a /libmpdemux/asf_mmst_streaming.c
parente69fef945b148b2b34a25f8501a8562a8b337264 (diff)
downloadmpv-df02e80073f447861ddf10834109c406750e4c34.tar.bz2
mpv-df02e80073f447861ddf10834109c406750e4c34.tar.xz
disable iconv in case setlocale is disabled - compile fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12676 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/asf_mmst_streaming.c')
-rw-r--r--libmpdemux/asf_mmst_streaming.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpdemux/asf_mmst_streaming.c b/libmpdemux/asf_mmst_streaming.c
index ec8ec2af97..7059096da0 100644
--- a/libmpdemux/asf_mmst_streaming.c
+++ b/libmpdemux/asf_mmst_streaming.c
@@ -22,6 +22,10 @@
#include <winsock2.h>
#endif
+#ifndef USE_SETLOCAL
+#undef USE_ICONV
+#endif
+
#ifdef USE_ICONV
#include <iconv.h>
#ifdef USE_LANGINFO