ffmpeg | branch: master | Matt Oliver <protogo...@gmail.com> | Wed Jul 12 20:02:58 2017 +1000| [6cc677c0e828b2c40a7760013279c331a7748535] | committer: Matt Oliver
lavf/os_support: Use existing WinRT config value. Signed-off-by: Matt Oliver <protogo...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6cc677c0e828b2c40a7760013279c331a7748535 --- libavformat/os_support.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 6e245a88d8..91220e9716 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -146,18 +146,6 @@ int ff_poll(struct pollfd *fds, nfds_t numfds, int timeout); #include <windows.h> #include "libavutil/wchar_filename.h" -#ifdef WINAPI_FAMILY -#include <winapifamily.h> -// If a WINAPI_FAMILY is defined, check that the desktop API subset -// is enabled -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -#define USE_MOVEFILEEXA -#endif -#else -// If no WINAPI_FAMILY is defined, assume the full API subset -#define USE_MOVEFILEEXA -#endif - #define DEF_FS_FUNCTION(name, wfunc, afunc) \ static inline int win32_##name(const char *filename_utf8) \ { \ @@ -232,7 +220,7 @@ static inline int win32_rename(const char *src_utf8, const char *dest_utf8) fallback: /* filename may be be in CP_ACP */ -#ifdef USE_MOVEFILEEXA +#if !HAVE_WINRT ret = MoveFileExA(src_utf8, dest_utf8, MOVEFILE_REPLACE_EXISTING); if (ret) errno = EPERM; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
