diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-14 19:36:09 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-14 19:36:09 +0100 |
| commit | 45170a8eaccd00d203cfc7bbf1affa5913447645 (patch) | |
| tree | 741e682a3ce1f75ff564744e85322996bf547fc8 /src | |
| parent | 8a5a61a6e90e2c52c87381604df8292749a9663a (diff) | |
| download | xine-lib-45170a8eaccd00d203cfc7bbf1affa5913447645.tar.gz xine-lib-45170a8eaccd00d203cfc7bbf1affa5913447645.tar.bz2 | |
Remove extra #ifdef, and just include ff_dvdata.h header.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libffmpeg/ff_dvaudio_decoder.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/libffmpeg/ff_dvaudio_decoder.c b/src/libffmpeg/ff_dvaudio_decoder.c index 482ae396e..f08185f6f 100644 --- a/src/libffmpeg/ff_dvaudio_decoder.c +++ b/src/libffmpeg/ff_dvaudio_decoder.c @@ -40,26 +40,7 @@ #include "buffer.h" #include "xineutils.h" -#ifdef _MSC_VER -/* ffmpeg has own definitions of those types */ -# undef int8_t -# undef uint8_t -# undef int16_t -# undef uint16_t -# undef int32_t -# undef uint32_t -# undef int64_t -# undef uint64_t -#endif - -#include <avcodec.h> -#include <dvdata.h> /* This is not installed by FFmpeg, its usage has to be cleared up */ - -#ifdef _MSC_VER -# undef malloc -# undef free -# undef realloc -#endif +#include "ff_dvdata.h" /* This is not installed by FFmpeg, its usage has to be cleared up */ #define AUDIOBUFSIZE 128*1024 #define MAXFRAMESIZE 131072 |