[vlc-commits] Fix FFv1 output with FFmpeg

[Jean-Baptiste Kempf]

vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Dec 28 16:23:41 2013 +0100| [c7dcd9f7f97334856a83af55903648cebad0a684] | committer: Jean-Baptiste Kempf

Fix FFv1 output with FFmpeg

Close #8691

Of course, because we _really_ need that many RGB formats...

(cherry picked from commit 1b53b355e706ca09fc289319bc237231fd5401b0)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

Conflicts:
	modules/codec/avcodec/chroma.c

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=c7dcd9f7f97334856a83af55903648cebad0a684
---

 modules/codec/avcodec/chroma.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/codec/avcodec/chroma.c b/modules/codec/avcodec/chroma.c
index a767f56..ea1f672 100644
--- a/modules/codec/avcodec/chroma.c
+++ b/modules/codec/avcodec/chroma.c
@@ -120,6 +120,10 @@ static const struct
     VLC_RGB( VLC_CODEC_RGB32, PIX_FMT_RGB32, PIX_FMT_BGR32, 0x00ff0000, 0x0000ff00, 0x000000ff )
     VLC_RGB( VLC_CODEC_RGB32, PIX_FMT_RGB32_1, PIX_FMT_BGR32_1, 0xff000000, 0x00ff0000, 0x0000ff00 )
 
+#if (LIBAVUTIL_VERSION_MICRO >= 100)
+    VLC_RGB( VLC_CODEC_RGB32, AV_PIX_FMT_0BGR32, AV_PIX_FMT_0RGB32, 0x000000ff, 0x0000ff00, 0x00ff0000 )
+#endif
+
     {VLC_CODEC_RGBA, PIX_FMT_RGBA, 0xff000000, 0x00ff0000, 0x0000ff00},
     {VLC_CODEC_GREY, PIX_FMT_GRAY8, 0, 0, 0},