diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-11-01 18:12:53 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-11-01 18:12:53 +0000 |
| commit | ad86ea038a0b4803c7e3f1a82a293e2ee538e345 (patch) | |
| tree | 24aa3f8a8900028189d268d75854049dfa386794 /src/libffmpeg/libavcodec/xan.c | |
| parent | 72ae3e51758986775949a7ba2002a526d359389f (diff) | |
| download | xine-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/xan.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/xan.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libffmpeg/libavcodec/xan.c b/src/libffmpeg/libavcodec/xan.c index 49e207677..742bd3705 100644 --- a/src/libffmpeg/libavcodec/xan.c +++ b/src/libffmpeg/libavcodec/xan.c @@ -58,6 +58,10 @@ typedef struct XanContext { } XanContext; +#undef BE_16 +#undef LE_16 +#undef LE_32 + #define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1]) #define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) #define LE_32(x) ((((uint8_t*)(x))[3] << 24) | \ @@ -69,6 +73,8 @@ typedef struct XanContext { #define SCALEFACTOR 65536 #define CENTERSAMPLE 128 +#undef COMPUTE_Y + #define COMPUTE_Y(r, g, b) \ (unsigned char) \ ((y_r_table[r] + y_g_table[g] + y_b_table[b]) / SCALEFACTOR) |