[Ffmpeg-cvslog] r8763 - in trunk: configure libavformat/os_support.c libavformat/utils.c libavutil/internal.h

[alex]

Author: alex
Date: Sat Apr 21 01:45:53 2007
New Revision: 8763

Modified:
   trunk/configure
   trunk/libavformat/os_support.c
   trunk/libavformat/utils.c
   trunk/libavutil/internal.h

Log:
remove possibly broken wince cruft

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sat Apr 21 01:45:53 2007
@@ -62,7 +62,6 @@ show_help(){
   echo "  --shlibdir=DIR           install shared libs in DIR [PREFIX/lib]"
   echo "  --incdir=DIR             install includes in DIR [PREFIX/include/ffmpeg]"
   echo "  --mandir=DIR             install man page in DIR [PREFIX/man]"
-  echo "  --enable-mingwce         enable MinGW native/cross WinCE compile"
   echo "  --enable-static          build static libraries [default=yes]"
   echo "  --disable-static         do not build static libraries [default=no]"
   echo "  --enable-shared          build shared libraries [default=no]"
@@ -597,7 +596,6 @@ CONFIG_LIST='
     vhook
     v4l
     v4l2
-    wince
     x11grab
     x264
     xvid
@@ -779,7 +777,6 @@ bigendian="no"
 targetos=$(tolower $(uname -s))
 beos_netserver="no"
 os2="no"
-wince="no"
 
 # non-library system interfaces
 audio_beos="default"
@@ -937,8 +934,6 @@ for opt do
   ;;
   --cpu=*) cpu="$optval"
   ;;
-  --enable-mingwce) wince="yes"
-  ;;
   --disable-opts) optimize="no"
   ;;
   --enable-small) optimize="small"
@@ -1139,9 +1134,6 @@ EOF
     dv1394="no"
     ffserver="no"
     network="no"
-    if enabled wince; then
-        protocols="no"
-    fi
     SLIBPREF=""
     SLIBSUF=".dll"
     EXESUF=".exe"

Modified: trunk/libavformat/os_support.c
==============================================================================
--- trunk/libavformat/os_support.c	(original)
+++ trunk/libavformat/os_support.c	Sat Apr 21 01:45:53 2007
@@ -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, 
     *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>

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	(original)
+++ trunk/libavformat/utils.c	Sat Apr 21 01:45:53 2007
@@ -2537,7 +2537,6 @@ int parse_frame_rate(int *frame_rate, in
         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, 
     }
     return negative ? -t : t;
 }
-#endif /* CONFIG_WINCE */
 
 int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info)
 {

Modified: trunk/libavutil/internal.h
==============================================================================
--- trunk/libavutil/internal.h	(original)
+++ trunk/libavutil/internal.h	Sat Apr 21 01:45:53 2007
@@ -106,11 +106,6 @@
 #    define snprintf _snprintf
 #    define vsnprintf _vsnprintf
 
-#    ifdef CONFIG_WINCE
-#        define perror(a)
-#        define abort()
-#    endif
-
 /* __MINGW32__ end */
 #elif defined (CONFIG_OS2)
 /* OS/2 EMX */