diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
| commit | 13221a716588dc88c1151e0a0f8eb7cce41d461c (patch) | |
| tree | 3184184f1e984d248e2570ffa05c79589d2c9a1c /stream/asf_mmst_streaming.c | |
| parent | c4f7b9666f753b320157e6497f9114523878885f (diff) | |
| parent | bb54613ac1211c73a3614db6b7326d7cd9be39da (diff) | |
| download | mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.bz2 mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.xz | |
Merge svn changes up to r30663
Conflicts:
gui/cfg.c
libmpcodecs/vd_dmo.c
mplayer.c
Diffstat (limited to 'stream/asf_mmst_streaming.c')
| -rw-r--r-- | stream/asf_mmst_streaming.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/stream/asf_mmst_streaming.c b/stream/asf_mmst_streaming.c index a32938a871..4e7b2eb2c7 100644 --- a/stream/asf_mmst_streaming.c +++ b/stream/asf_mmst_streaming.c @@ -43,10 +43,6 @@ #include <winsock2.h> #endif -#ifndef CONFIG_SETLOCALE -#undef CONFIG_ICONV -#endif - #ifdef CONFIG_ICONV #include <iconv.h> #endif |