diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-06-23 21:04:35 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-06-23 21:04:35 +0000 |
| commit | 8292ca3541e7375c0d05c40000e8359884027b74 (patch) | |
| tree | 35f327de2108eea249b9c0720bb69ca30fba2901 /src/libffmpeg/libavcodec/common.h | |
| parent | 6bd244f210873b33611713256c58d9d139e0e945 (diff) | |
| download | xine-lib-8292ca3541e7375c0d05c40000e8359884027b74.tar.gz xine-lib-8292ca3541e7375c0d05c40000e8359884027b74.tar.bz2 | |
quick ffmpeg update (enables wmv1 decoding)
thanks to the ffmpeg team for their amazing work!
CVS patchset: 2141
CVS date: 2002/06/23 21:04:35
Diffstat (limited to 'src/libffmpeg/libavcodec/common.h')
| -rw-r--r-- | src/libffmpeg/libavcodec/common.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/libffmpeg/libavcodec/common.h b/src/libffmpeg/libavcodec/common.h index 24bd367d6..0d2c560c6 100644 --- a/src/libffmpeg/libavcodec/common.h +++ b/src/libffmpeg/libavcodec/common.h @@ -111,10 +111,10 @@ typedef signed long long INT64; #endif /* !CONFIG_WIN32 */ -#include "bswap.h" - #ifdef HAVE_AV_CONFIG_H +#include "bswap.h" + #if defined(__MINGW32__) || defined(__CYGWIN__) || \ defined(__OS2__) || defined (__OpenBSD__) #define MANGLE(a) "_" #a @@ -144,8 +144,6 @@ inline void dprintf(const char* fmt,...) {} #endif /* !CONFIG_WIN32 */ -#endif /* HAVE_AV_CONFIG_H */ - #define av_abort() do { fprintf(stderr, "Abort at %s:%d\n", __FILE__, __LINE__); abort(); } while (0) /* assume b>0 */ @@ -888,13 +886,6 @@ static inline int clip(int a, int amin, int amax) return a; } -/* memory */ -void *av_malloc(int size); -void *av_mallocz(int size); -void av_free(void *ptr); -void __av_freep(void **ptr); -#define av_freep(p) __av_freep((void **)(p)) - /* math */ int ff_gcd(int a, int b); @@ -936,4 +927,6 @@ if((y)<(x)){\ #define CLAMP_TO_8BIT(d) ((d > 0xff) ? 0xff : (d < 0) ? 0 : d) -#endif +#endif /* HAVE_AV_CONFIG_H */ + +#endif /* COMMON_H */ |