summaryrefslogtreecommitdiffstats
path: root/tremor/os_types.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2011-02-01 21:15:16 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-02-01 21:28:03 +0200
commit6122d83981b85997e1fc1e3962c7aca3c3ab6714 (patch)
tree8628c1312f3b30c9f76649b3b6df00484826a33d /tremor/os_types.h
parent7cd7416c7316ce28cfa663b1f1d578b9c768a6ba (diff)
downloadmpv-6122d83981b85997e1fc1e3962c7aca3c3ab6714.tar.bz2
mpv-6122d83981b85997e1fc1e3962c7aca3c3ab6714.tar.xz
tremor: drop internal tremor library
Drop internal copy of the tremor library. Note that the internal ogg demuxer (which is still sometimes useful to work around libavformat ogg demuxer problems, though it's itself quite buggy) now cannot be compiled without either external libvorbis or libvorbisidec (tremor).
Diffstat (limited to 'tremor/os_types.h')
-rw-r--r--tremor/os_types.h99
1 files changed, 0 insertions, 99 deletions
diff --git a/tremor/os_types.h b/tremor/os_types.h
deleted file mode 100644
index 0a868c72b3..0000000000
--- a/tremor/os_types.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/********************************************************************
- * *
- * THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
- * *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
- * *
- * THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
- * BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
- * *
- ********************************************************************
-
- function: #ifdef jail to whip a few platforms into the UNIX ideal.
-
- ********************************************************************/
-#ifndef _OS_TYPES_H
-#define _OS_TYPES_H
-
-#ifdef _LOW_ACCURACY_
-# define X(n) (((((n)>>22)+1)>>1) - ((((n)>>22)+1)>>9))
-# define LOOKUP_T const unsigned char
-#else
-# define X(n) (n)
-# define LOOKUP_T const ogg_int32_t
-#endif
-
-/* make it easy on the folks that want to compile the libs with a
- different malloc than stdlib */
-#define _ogg_malloc malloc
-#define _ogg_calloc calloc
-#define _ogg_realloc realloc
-#define _ogg_free free
-
-#include <inttypes.h>
-typedef int64_t ogg_int64_t;
-typedef int32_t ogg_int32_t;
-typedef int16_t ogg_int16_t;
-typedef uint32_t ogg_uint32_t;
-typedef uint16_t ogg_uint16_t;
-
-#if 0
-
-#ifdef _WIN32
-
-# ifndef __GNUC__
- /* MSVC/Borland */
- typedef __int64 ogg_int64_t;
- typedef __int32 ogg_int32_t;
- typedef unsigned __int32 ogg_uint32_t;
- typedef __int16 ogg_int16_t;
-# else
- /* Cygwin */
- #include <_G_config.h>
- typedef _G_int64_t ogg_int64_t;
- typedef _G_int32_t ogg_int32_t;
- typedef _G_uint32_t ogg_uint32_t;
- typedef _G_int16_t ogg_int16_t;
-# endif
-
-#elif defined(__MACOS__)
-
-# include <sys/types.h>
- typedef SInt16 ogg_int16_t;
- typedef SInt32 ogg_int32_t;
- typedef UInt32 ogg_uint32_t;
- typedef SInt64 ogg_int64_t;
-
-#elif defined(__MACOSX__) /* MacOS X Framework build */
-
-# include <sys/types.h>
- typedef int16_t ogg_int16_t;
- typedef int32_t ogg_int32_t;
- typedef u_int32_t ogg_uint32_t;
- typedef int64_t ogg_int64_t;
-
-#elif defined(__BEOS__)
-
- /* Be */
-# include <inttypes.h>
-
-#elif defined (__EMX__)
-
- /* OS/2 GCC */
- typedef short ogg_int16_t;
- typedef int ogg_int32_t;
- typedef unsigned int ogg_uint32_t;
- typedef long long ogg_int64_t;
-
-#else
-
-# include <sys/types.h>
-# include "config_types.h"
-
-#endif
-
-#endif /* 0 */
-
-#endif /* _OS_TYPES_H */