diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-18 14:32:40 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-18 14:32:40 +0000 |
| commit | 0a121ff250996e4d372f08b0901af6acd204bd3d (patch) | |
| tree | e83ccbfc5aa735981998a4a81853cc8e1be582f0 | |
| parent | 2e6cd812d583d95d9a34059277174f62351b64eb (diff) | |
| parent | 2fb4e0a646eb374031106e099cfce9ffd73f1b19 (diff) | |
| download | xine-lib-0a121ff250996e4d372f08b0901af6acd204bd3d.tar.gz xine-lib-0a121ff250996e4d372f08b0901af6acd204bd3d.tar.bz2 | |
Merge from 1.1.
| -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 726945acd..08c554aa0 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -50,6 +50,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) |