[vlc-commits] Map G2M3 and G2M2

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jul  1 15:52:38 2015 +0200| [6d383e69f980e97a61aab57c98955119eb266b93] | committer: Jean-Baptiste Kempf

Map G2M3 and G2M2

Close #2327

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

 modules/codec/avcodec/fourcc.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 81cf6e4..6f124f9 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -259,7 +259,10 @@ static const struct
 #if LIBAVCODEC_VERSION_CHECK( 56, 23, 0, 35, 100 )
     { VLC_CODEC_HQ_HQA, AV_CODEC_ID_HQ_HQA, VIDEO_ES },
 #endif
-
+#if LIBAVCODEC_VERSION_CHECK( 56, 31, 0, 46, 100 )
+    { VLC_CODEC_G2M2, AV_CODEC_ID_G2M, VIDEO_ES },
+    { VLC_CODEC_G2M3, AV_CODEC_ID_G2M, VIDEO_ES },
+#endif
 
     /* ffmpeg only: AV_CODEC_ID_BRENDER_PIX */
     /* ffmpeg only: AV_CODEC_ID_Y41P */