From: Rémi Duraffort <ivoire@via.ecp.fr>
Date: Fri, 7 Mar 2008 09:48:09 +0000 (+0100)
Subject: Compile fix for packaged ffmpeg on debian etch.
X-Git-Tag: 0.9.0-test0~2282
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8ede3d79d009e21d5ef49797c28bc0428b6373ce;p=vlc

Compile fix for packaged ffmpeg on debian etch.
Signed-off-by: Rémi Duraffort <ivoire@via.ecp.fr>
---

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 5e4e797a9e..d766597c1d 100644
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -498,7 +498,9 @@ static struct
     { VLC_FOURCC('R','V','1','6'), PIX_FMT_BGR565 },
     { VLC_FOURCC('R','V','2','4'), PIX_FMT_BGR24 },
 #else
+#if defined(PIX_FMT_RGB8)
     { VLC_FOURCC('R','G','B','8'), PIX_FMT_RGB8 },
+#endif
     { VLC_FOURCC('R','V','1','5'), PIX_FMT_RGB555 },
     { VLC_FOURCC('R','V','1','6'), PIX_FMT_RGB565 },
     { VLC_FOURCC('R','V','2','4'), PIX_FMT_RGB24 },
diff --git a/modules/codec/ffmpeg/video.c b/modules/codec/ffmpeg/video.c
index fc25687dd8..88eb6bae71 100644
--- a/modules/codec/ffmpeg/video.c
+++ b/modules/codec/ffmpeg/video.c
@@ -134,8 +134,10 @@ static uint32_t ffmpeg_PixFmtToChroma( int i_ff_chroma )
     case PIX_FMT_BGR24:
         return VLC_FOURCC('R','V','2','4');
 #else
+#if defined(PIX_FMT_RGB8)
     case PIX_FMT_RGB8:
         return VLC_FOURCC('R','G','B','8');
+#endif
     case PIX_FMT_RGB555:
         return VLC_FOURCC('R','V','1','5');
     case PIX_FMT_RGB565:
@@ -852,10 +854,16 @@ static void ffmpeg_CopyPicture( decoder_t *p_dec,
         case PIX_FMT_YUV411P:
         case PIX_FMT_RGB32:
         case PIX_FMT_RGB24:
+#if defined(PIX_FMT_RGB8)
         case PIX_FMT_RGB8:
+#endif
+#if defined(PIX_FMT_BRG32)
         case PIX_FMT_BGR32:
+#endif
         case PIX_FMT_BGR24:
+#if defined(PIX_FMT_BGR8)
         case PIX_FMT_BGR8:
+#endif
         case PIX_FMT_PAL8:
             for( i = 0; i < p_pic->i_planes; i++ )
             {