From 52e5b0620e7579faa998e53e3e3e00f0449d2387 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Thu, 21 Jan 2010 03:00:41 +0000
Subject: Undo libavutil workaround (fixed upstream).

---
 src/combined/ffmpeg/ff_video_decoder.c | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'src')

diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c
index 876ac2217..727508847 100644
--- a/src/combined/ffmpeg/ff_video_decoder.c
+++ b/src/combined/ffmpeg/ff_video_decoder.c
@@ -51,22 +51,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)
 
-- 
cgit v1.2.3