diff options
author | wm4 <wm4@mplayer2.org> | 2012-04-13 17:44:29 +0200 |
---|---|---|
committer | wm4 <wm4@mplayer2.org> | 2012-04-13 17:45:27 +0200 |
commit | 47371bdb944652bb17b8b779fae102ce63dd36b7 (patch) | |
tree | 495a2b71217a4fefe1c0672fce3d7cf9fabeb2e7 /stream/cache2.c | |
parent | 4dc0e54d4fffa2b81fbf6fb9b875303638eb1c9a (diff) | |
parent | 485f439cfefd4fa8d35f406fd8694e649bd536c8 (diff) | |
download | mpv-47371bdb944652bb17b8b779fae102ce63dd36b7.tar.bz2 mpv-47371bdb944652bb17b8b779fae102ce63dd36b7.tar.xz |
Merge remote-tracking branch 'origin/master'
Conflicts:
libvo/vo_kva.c
Diffstat (limited to 'stream/cache2.c')
-rw-r--r-- | stream/cache2.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/stream/cache2.c b/stream/cache2.c index 4aed786cb6..47bc76a4f9 100644 --- a/stream/cache2.c +++ b/stream/cache2.c @@ -45,10 +45,6 @@ #if defined(__MINGW32__) #include <windows.h> static void ThreadProc( void *s ); -#elif defined(__OS2__) -#define INCL_DOS -#include <os2.h> -static void ThreadProc( void *s ); #elif defined(PTHREAD_CACHE) #include <pthread.h> static void *ThreadProc(void *s); @@ -453,8 +449,6 @@ int stream_enable_cache(stream_t *stream,int size,int min,int seek_limit){ s->stream=stream2; #if defined(__MINGW32__) stream->cache_pid = _beginthread( ThreadProc, 0, s ); -#elif defined(__OS2__) - stream->cache_pid = _beginthread( ThreadProc, NULL, 256 * 1024, s ); #else { pthread_t tid; @@ -499,7 +493,7 @@ err_out: } #if !FORKED_CACHE -#if defined(__MINGW32__) || defined(__OS2__) +#if defined(__MINGW32__) static void ThreadProc( void *s ){ cache_mainloop(s); _endthread(); |