Commit 8ede3d79 authored by Rémi Duraffort's avatar Rémi Duraffort

Compile fix for packaged ffmpeg on debian etch.

Signed-off-by: default avatarRémi Duraffort <ivoire@via.ecp.fr>
parent 5568a82a
...@@ -498,7 +498,9 @@ static struct ...@@ -498,7 +498,9 @@ static struct
{ VLC_FOURCC('R','V','1','6'), PIX_FMT_BGR565 }, { VLC_FOURCC('R','V','1','6'), PIX_FMT_BGR565 },
{ VLC_FOURCC('R','V','2','4'), PIX_FMT_BGR24 }, { VLC_FOURCC('R','V','2','4'), PIX_FMT_BGR24 },
#else #else
#if defined(PIX_FMT_RGB8)
{ VLC_FOURCC('R','G','B','8'), 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','5'), PIX_FMT_RGB555 },
{ VLC_FOURCC('R','V','1','6'), PIX_FMT_RGB565 }, { VLC_FOURCC('R','V','1','6'), PIX_FMT_RGB565 },
{ VLC_FOURCC('R','V','2','4'), PIX_FMT_RGB24 }, { VLC_FOURCC('R','V','2','4'), PIX_FMT_RGB24 },
......
...@@ -134,8 +134,10 @@ static uint32_t ffmpeg_PixFmtToChroma( int i_ff_chroma ) ...@@ -134,8 +134,10 @@ static uint32_t ffmpeg_PixFmtToChroma( int i_ff_chroma )
case PIX_FMT_BGR24: case PIX_FMT_BGR24:
return VLC_FOURCC('R','V','2','4'); return VLC_FOURCC('R','V','2','4');
#else #else
#if defined(PIX_FMT_RGB8)
case PIX_FMT_RGB8: case PIX_FMT_RGB8:
return VLC_FOURCC('R','G','B','8'); return VLC_FOURCC('R','G','B','8');
#endif
case PIX_FMT_RGB555: case PIX_FMT_RGB555:
return VLC_FOURCC('R','V','1','5'); return VLC_FOURCC('R','V','1','5');
case PIX_FMT_RGB565: case PIX_FMT_RGB565:
...@@ -852,10 +854,16 @@ static void ffmpeg_CopyPicture( decoder_t *p_dec, ...@@ -852,10 +854,16 @@ static void ffmpeg_CopyPicture( decoder_t *p_dec,
case PIX_FMT_YUV411P: case PIX_FMT_YUV411P:
case PIX_FMT_RGB32: case PIX_FMT_RGB32:
case PIX_FMT_RGB24: case PIX_FMT_RGB24:
#if defined(PIX_FMT_RGB8)
case PIX_FMT_RGB8: case PIX_FMT_RGB8:
#endif
#if defined(PIX_FMT_BRG32)
case PIX_FMT_BGR32: case PIX_FMT_BGR32:
#endif
case PIX_FMT_BGR24: case PIX_FMT_BGR24:
#if defined(PIX_FMT_BGR8)
case PIX_FMT_BGR8: case PIX_FMT_BGR8:
#endif
case PIX_FMT_PAL8: case PIX_FMT_PAL8:
for( i = 0; i < p_pic->i_planes; i++ ) for( i = 0; i < p_pic->i_planes; i++ )
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment