diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c index 5e4e797a9e3969f58429d6597fd0b4cbb28e1155..d766597c1d69cbfab8f6fd20e0e249ec5a0e89ee 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 fc25687dd8fd122e4fe8dc2da5ca3acf0e477c69..88eb6bae71255f689dd1750069f9f5f71638531c 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++ ) {