From ad86ea038a0b4803c7e3f1a82a293e2ee538e345 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Sat, 1 Nov 2003 18:12:53 +0000 Subject: big ffmpeg patch * do not define CONFIG_ENCODERS any more, use a stripped down XINE_MPEG_ENCODER, which will only compile an I-frame-only MPEG1 encoder (speeds up compile time) * fix a lot of warnings in ffmpeg (a good deal of which have already been submitted to the ffmpeg project by Mike) * simplify some Makefiles CVS patchset: 5667 CVS date: 2003/11/01 18:12:53 --- src/libffmpeg/libavcodec/cinepak.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/libffmpeg/libavcodec/cinepak.c') diff --git a/src/libffmpeg/libavcodec/cinepak.c b/src/libffmpeg/libavcodec/cinepak.c index af168d07b..56c4990be 100644 --- a/src/libffmpeg/libavcodec/cinepak.c +++ b/src/libffmpeg/libavcodec/cinepak.c @@ -37,6 +37,9 @@ #define PALETTE_COUNT 256 +#undef BE_16 +#undef BE_32 + #define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1]) #define BE_32(x) ((((uint8_t*)(x))[0] << 24) | \ (((uint8_t*)(x))[1] << 16) | \ -- cgit v1.2.3