[xine-cvs] HG: xine-lib: Merge.

[Darren S. <li...@yo...>]

# HG changeset patch
# User Darren Salt <li...@yo...>
# Date 1264044771 0
# Node ID 9641ba301dc3c3bfd2df2515017fa723a3762f36
# Parent  cc10606fdc54b82cb0e4f6f3e5e415884f2f01f2
# Parent  2a8218841f018ab02a3bb41728344c0b7d0615a1
Merge.

diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c
--- a/src/combined/ffmpeg/ff_video_decoder.c
+++ b/src/combined/ffmpeg/ff_video_decoder.c
@@ -49,22 +49,6 @@
 #  include <postprocess.h>
 #else
 #  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)