summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/msvideo1.c
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2003-11-01 18:12:53 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2003-11-01 18:12:53 +0000
commitad86ea038a0b4803c7e3f1a82a293e2ee538e345 (patch)
tree24aa3f8a8900028189d268d75854049dfa386794 /src/libffmpeg/libavcodec/msvideo1.c
parent72ae3e51758986775949a7ba2002a526d359389f (diff)
downloadxine-lib-ad86ea038a0b4803c7e3f1a82a293e2ee538e345.tar.gz
xine-lib-ad86ea038a0b4803c7e3f1a82a293e2ee538e345.tar.bz2
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
Diffstat (limited to 'src/libffmpeg/libavcodec/msvideo1.c')
-rw-r--r--src/libffmpeg/libavcodec/msvideo1.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libffmpeg/libavcodec/msvideo1.c b/src/libffmpeg/libavcodec/msvideo1.c
index 71d8af987..6e1d0a8d4 100644
--- a/src/libffmpeg/libavcodec/msvideo1.c
+++ b/src/libffmpeg/libavcodec/msvideo1.c
@@ -38,6 +38,8 @@
#include "avcodec.h"
#include "dsputil.h"
+#undef LE_16
+
#define PALETTE_COUNT 256
#define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
#define CHECK_STREAM_PTR(n) \