From ac44871c7773fb9a6b18d362cec9a4630055fc50 Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Sun, 22 Jan 2006 18:34:17 +0000 Subject: WinCE cross-compilation support patch by Gildas Bazin < gbazin **@** altern **.** org > Originally committed as revision 4881 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/os_support.c | 8 ++++++-- libavformat/utils.c | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'libavformat') diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 1e1a38f471..a99a6a50db 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -18,7 +18,7 @@ */ #include "config.h" #include "avformat.h" -#ifdef CONFIG_WIN32 +#if defined(CONFIG_WIN32) && !defined(CONFIG_WINCE) #include #include #elif defined(CONFIG_OS2) @@ -36,7 +36,9 @@ */ int64_t av_gettime(void) { -#ifdef CONFIG_WIN32 +#if defined(CONFIG_WINCE) + return timeGetTime() * int64_t_C(1000); +#elif defined(CONFIG_WIN32) struct timeb tb; _ftime(&tb); return ((int64_t)tb.time * int64_t_C(1000) + (int64_t)tb.millitm) * int64_t_C(1000); @@ -47,6 +49,7 @@ int64_t av_gettime(void) #endif } +#if !defined(CONFIG_WINCE) #if !defined(HAVE_LOCALTIME_R) struct tm *localtime_r(const time_t *t, struct tm *tp) { @@ -59,3 +62,4 @@ struct tm *localtime_r(const time_t *t, struct tm *tp) return tp; } #endif /* !defined(HAVE_LOCALTIME_R) */ +#endif /* !defined(CONFIG_WINCE) */ diff --git a/libavformat/utils.c b/libavformat/utils.c index f8ecd04595..5ed508dbce 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2739,6 +2739,7 @@ int parse_frame_rate(int *frame_rate, int *frame_rate_base, const char *arg) * S+[.m...] * @endcode */ +#ifndef CONFIG_WINCE int64_t parse_date(const char *datestr, int duration) { const char *p; @@ -2846,6 +2847,7 @@ int64_t parse_date(const char *datestr, int duration) } return negative ? -t : t; } +#endif /* CONFIG_WINCE */ /** * Attempts to find a specific tag in a URL. -- cgit v1.2.3