diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-21 03:34:46 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-21 03:34:46 +0000 |
| commit | ca6d300b39eb9a8bb31de2e33b03ecf96e2e0b60 (patch) | |
| tree | 6e7945d259b295ace8161791769bded15b55997b /src/combined/ffmpeg/ff_video_decoder.c | |
| parent | 85bd1c93b079c8b42362111efda3bbfab207d149 (diff) | |
| parent | f82784e051769a6674639aa0e5080430b4ceaf21 (diff) | |
| download | xine-lib-ca6d300b39eb9a8bb31de2e33b03ecf96e2e0b60.tar.gz xine-lib-ca6d300b39eb9a8bb31de2e33b03ecf96e2e0b60.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'src/combined/ffmpeg/ff_video_decoder.c')
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index 08c554aa0..726945acd 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -50,22 +50,6 @@ # 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) |