diff options
| author | Torbjörn Andersson | 2015-08-01 20:14:05 +0200 |
|---|---|---|
| committer | Thierry Crozat | 2018-11-04 22:33:22 +0100 |
| commit | fc7fa1de3a204c65f73a0619199421bd7cdf780a (patch) | |
| tree | 7135c6ba24b60a06006ee7d4ba596bdf171f9088 /image | |
| parent | 8b692f8d8993b977ae76a546a13e37fce7272bb2 (diff) | |
| download | scummvm-rg350-fc7fa1de3a204c65f73a0619199421bd7cdf780a.tar.gz scummvm-rg350-fc7fa1de3a204c65f73a0619199421bd7cdf780a.tar.bz2 scummvm-rg350-fc7fa1de3a204c65f73a0619199421bd7cdf780a.zip | |
VIDEO: Use liba52 to decode audio. This is still laughably broken
At the moment, this produces nothing but misery in the form of
Valgrind warnings and horrible noise.
Diffstat (limited to 'image')
| -rw-r--r-- | image/codecs/mpeg.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/image/codecs/mpeg.h b/image/codecs/mpeg.h index 82c3ad19ac..b711b680aa 100644 --- a/image/codecs/mpeg.h +++ b/image/codecs/mpeg.h @@ -25,31 +25,10 @@ #ifndef IMAGE_CODECS_MPEG_H #define IMAGE_CODECS_MPEG_H +#include "common/inttypes.h" #include "image/codecs/codec.h" #include "graphics/pixelformat.h" -#if defined(__PLAYSTATION2__) - typedef uint8 uint8_t; - typedef uint16 uint16_t; - typedef uint32 uint32_t; -#elif defined(_WIN32_WCE) - typedef signed char int8_t; - typedef signed short int16_t; - typedef unsigned char uint8_t; - typedef unsigned short uint16_t; -#elif defined(_MSC_VER) || defined (__SYMBIAN32__) - typedef signed char int8_t; - typedef signed short int16_t; - typedef unsigned char uint8_t; - typedef unsigned short uint16_t; - #if !defined(SDL_COMPILEDVERSION) || (SDL_COMPILEDVERSION < 1210) - typedef signed long int32_t; - typedef unsigned long uint32_t; - #endif -#else -# include <inttypes.h> -#endif - extern "C" { #include <mpeg2dec/mpeg2.h> } |