From a1244111a790bbc4bf91b078ebcad3f415da79da Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 3 Feb 2012 08:05:11 +0100 Subject: windows support: unicode filenames Windows uses a legacy codepage for char* / runtime functions accepting char *. Using UTF-8 as the codepage with setlocale() is explicitly forbidden. Work this around by overriding the MSVCRT functions with wrapper macros, that assume UTF-8 and use "proper" API calls like _wopen etc. to deal with unicode filenames. All code that uses standard functions that take or return filenames must now include osdep/io.h. stat() can't be overridden, because MinGW-w64 itself defines "stat" as a macro. Change code to use use mp_stat() instead. This is not perfectly clean, but still somewhat sane, and much better than littering the rest of the mplayer code with MinGW specific hacks. It's also a bit fragile, but that's actually little different from the previous situation. Also, MinGW is unlikely to ever include a nice way of dealing with this. --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 80708c29bc..21191655e7 100644 --- a/Makefile +++ b/Makefile @@ -403,6 +403,7 @@ SRCS_COMMON = asxparser.c \ libmpdemux/yuv4mpeg_ratio.c \ libvo/osd.c \ osdep/numcores.c \ + osdep/io.c \ osdep/$(GETCH) \ osdep/$(TIMER) \ stream/open.c \ -- cgit v1.2.3 From 7576885677764a71fe03cec5f697f8a28f9365c8 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Thu, 19 Jan 2012 06:49:47 +0200 Subject: core: remove old EDL mode (--edl option) Remove the old EDL implementation that was activated with the --edl option. It is mostly redundant and inferior compared to the newer demux_edl support, though currently there's no support for using the same EDL files with the new implementation and the mute functionality of the old implementation is not supported. The main reason to remove the old implementation at this point is that the mute functionality would conflict with following audio volume handling changes, and working on the old code would be a wasted effort in the long run as at some point it would be removed anyway. The --edlout functionality is kept for now, even though after this commit there is no code that could directly read its output. --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 21191655e7..59cbdc4950 100644 --- a/Makefile +++ b/Makefile @@ -218,7 +218,6 @@ SRCS_COMMON = asxparser.c \ codec-cfg.c \ cpudetect.c \ defaultopts.c \ - edl.c \ fmt-conversion.c \ m_config.c \ m_option.c \ -- cgit v1.2.3