diff options
| author | Alex Beregszaszi | 2007-04-20 23:45:53 +0000 |
|---|---|---|
| committer | Alex Beregszaszi | 2007-04-20 23:45:53 +0000 |
| commit | 61bc79ec9cf79dc92ac80045df69bc87d598f825 (patch) | |
| tree | db8ca79c481b4b783202053d353093050d53c40e /libavformat | |
| parent | 3154f6dbf972b27c41c64da3c4e0e776f74145d4 (diff) | |
remove possibly broken wince cruft
Originally committed as revision 8763 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/os_support.c | 12 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 7a4be8fa75..5bd9e58b68 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -21,9 +21,7 @@ */ #include "config.h" #include "avformat.h" -#if defined(CONFIG_WINCE) -/* Skip includes on WinCE. */ -#elif defined(__MINGW32__) +#if defined(__MINGW32__) #include <sys/types.h> #include <sys/timeb.h> #elif defined(CONFIG_OS2) @@ -49,9 +47,7 @@ */ int64_t av_gettime(void) { -#if defined(CONFIG_WINCE) - return timeGetTime() * INT64_C(1000); -#elif defined(__MINGW32__) +#if defined(__MINGW32__) struct timeb tb; _ftime(&tb); return ((int64_t)tb.time * INT64_C(1000) + (int64_t)tb.millitm) * INT64_C(1000); @@ -62,7 +58,7 @@ int64_t av_gettime(void) #endif } -#if !defined(CONFIG_WINCE) && !defined(HAVE_LOCALTIME_R) +#if !defined(HAVE_LOCALTIME_R) struct tm *localtime_r(const time_t *t, struct tm *tp) { struct tm *l; @@ -73,7 +69,7 @@ struct tm *localtime_r(const time_t *t, struct tm *tp) *tp = *l; return tp; } -#endif /* !defined(CONFIG_WINCE) && !defined(HAVE_LOCALTIME_R) */ +#endif /* !defined(HAVE_LOCALTIME_R) */ #if !defined(HAVE_INET_ATON) && defined(CONFIG_NETWORK) #include <stdlib.h> diff --git a/libavformat/utils.c b/libavformat/utils.c index 6267b9a729..ce05fa0b99 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2537,7 +2537,6 @@ int parse_frame_rate(int *frame_rate, int *frame_rate_base, const char *arg) return 0; } -#ifndef CONFIG_WINCE int64_t parse_date(const char *datestr, int duration) { const char *p; @@ -2645,7 +2644,6 @@ int64_t parse_date(const char *datestr, int duration) } return negative ? -t : t; } -#endif /* CONFIG_WINCE */ int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info) { |