diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-17 22:15:37 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-17 22:15:37 +0000 |
| commit | 2fb4e0a646eb374031106e099cfce9ffd73f1b19 (patch) | |
| tree | 7dfca8b7ef2cbb4f60ef21389b8302c20002625d | |
| parent | e890141a04b1e79feddf17b4db460050a25f613e (diff) | |
| download | xine-lib-2fb4e0a646eb374031106e099cfce9ffd73f1b19.tar.gz xine-lib-2fb4e0a646eb374031106e099cfce9ffd73f1b19.tar.bz2 | |
Cope with libavutil no longer defining some endian-specific macros.
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index 727508847..876ac2217 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -51,6 +51,22 @@ # include <libpostproc/postprocess.h> #endif +/* As of 2010-01-17, libavutil trunk doesn't define a few useful macros. + * While we may still be able to #define things to cause them to be used, + * it's safest to assume that they'll go away. + */ +#ifndef PIX_FMT_RGB32 +# ifdef WORDS_BIGENDIAN +# define PIX_FMT_RGB32 PIX_FMT_ARGB +# define PIX_FMT_RGB555 PIX_FMT_RGB555BE +# define PIX_FMT_RGB565 PIX_FMT_RGB565BE +# else +# define PIX_FMT_RGB32 PIX_FMT_BGRA +# define PIX_FMT_RGB555 PIX_FMT_RGB555LE +# define PIX_FMT_RGB565 PIX_FMT_RGB565LE +# endif +#endif + #define VIDEOBUFSIZE (128*1024) #define SLICE_BUFFER_SIZE (1194*1024) |