From: <fla...@gm...> - 2007-12-14 21:30:06
|
# HG changeset patch # User Diego 'Flameeyes' Pettenò <fla...@gm...> # Date 1197657369 -3600 # Node ID 4c890079097e3d90db818d9b9aa7c86c1a35486d # Parent 8202570471b649f33af8f794691163c576a7a9e9 Remove extra #ifdef, and just include ff_dvdata.h header. diff -r 4c890079097e3d90db818d9b9aa7c86c1a35486d -r 8202570471b649f33af8f794691163c576a7a9e9 src/libffmpeg/ff_dvaudio_decoder.c --- a/src/libffmpeg/ff_dvaudio_decoder.c Fri Dec 14 19:36:09 2007 +0100 +++ b/src/libffmpeg/ff_dvaudio_decoder.c Fri Dec 14 19:35:31 2007 +0100 @@ -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 |