diff options
| -rw-r--r-- | Changelog | 1 | ||||
| -rw-r--r-- | ffmpeg.c | 7 | ||||
| -rw-r--r-- | ffplay.c | 25 | ||||
| -rw-r--r-- | libavformat/os_support.c | 3 | ||||
| -rw-r--r-- | libavformat/os_support.h | 10 | ||||
| -rw-r--r-- | libavutil/internal.h | 8 |
6 files changed, 4 insertions, 50 deletions
@@ -89,6 +89,7 @@ version <next> - codebook generator - RoQ video encoder - QTRLE encoder +- OS/2 support removed version 0.4.9-pre1: @@ -44,11 +44,6 @@ #include <termios.h> #include <sys/resource.h> #endif -#ifdef CONFIG_OS2 -#include <sys/types.h> -#include <sys/select.h> -#include <stdlib.h> -#endif #undef time //needed because HAVE_AV_CONFIG_H is defined on top #include <time.h> @@ -3110,7 +3105,7 @@ static void opt_pass(const char *pass_str) do_pass = pass; } -#if defined(__MINGW32__) || defined(CONFIG_OS2) +#if defined(__MINGW32__) static int64_t getutime(void) { return av_gettime(); @@ -35,23 +35,6 @@ #undef main /* We don't want SDL to override our main() */ #endif -#ifdef CONFIG_OS2 -#define INCL_DOS - #include <os2.h> - #include <stdio.h> - - void MorphToPM() - { - PPIB pib; - PTIB tib; - - DosGetInfoBlocks(&tib, &pib); - - // Change flag from VIO to PM: - if (pib->pib_ultype==2) pib->pib_ultype = 3; - } -#endif - #undef exit //#define DEBUG_SYNC @@ -2533,14 +2516,6 @@ int main(int argc, char **argv) /* register all codecs, demux and protocols */ av_register_all(); - #ifdef CONFIG_OS2 - MorphToPM(); // Morph the VIO application to a PM one to be able to use Win* functions - - // Make stdout and stderr unbuffered - setbuf( stdout, NULL ); - setbuf( stderr, NULL ); - #endif - parse_options(argc, argv, options); if (!input_filename) diff --git a/libavformat/os_support.c b/libavformat/os_support.c index e627367593..947679a143 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -24,9 +24,6 @@ #if defined(__MINGW32__) #include <sys/types.h> #include <sys/timeb.h> -#elif defined(CONFIG_OS2) -#include <string.h> -#include <sys/time.h> #else #include <unistd.h> #include <fcntl.h> diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 05acaa152a..13615eec9e 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -27,10 +27,8 @@ * miscellaneous OS support macros and functions. * * - socklen_t typedef (BeOS, Innotek libc) - * - usleep() (Win32, BeOS, OS/2) + * - usleep() (Win32, BeOS) * - lseek() (Win32) - * - floatf() (OS/2) - * - strcasecmp() (OS/2) * - closesocket() * - poll() (BeOS, MinGW) */ @@ -68,12 +66,6 @@ __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds); # endif #endif -#if defined(CONFIG_OS2) -#include <stdlib.h> -static inline int usleep(unsigned int t) { return _sleep2(t / 1000); } -static inline int strcasecmp(const char* s1, const char* s2) { return stricmp(s1,s2); } -#endif - /* most of the time closing a socket is just closing an fd */ #if HAVE_CLOSESOCKET != 1 #define closesocket close diff --git a/libavutil/internal.h b/libavutil/internal.h index af32f56907..ac0fcf7332 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -101,13 +101,7 @@ # define snprintf _snprintf # define vsnprintf _vsnprintf -/* __MINGW32__ end */ -#elif defined (CONFIG_OS2) -/* OS/2 EMX */ - -# include <float.h> - -#endif /* !__MINGW32__ && CONFIG_OS2 */ +#endif /* !__MINGW32__ */ #ifdef USE_FASTMEMCPY # include "libvo/fastmemcpy.h" |