From 2fb4e0a646eb374031106e099cfce9ffd73f1b19 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 17 Jan 2010 22:15:37 +0000 Subject: Cope with libavutil no longer defining some endian-specific macros. --- src/combined/ffmpeg/ff_video_decoder.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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 #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) -- cgit v1.2.3