[vlc-commits] Map G2M3 and G2M2

[Jean-Baptiste Kempf]

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

Map G2M3 and G2M2

Close #2327

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

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

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

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index c6875d0..f88a75f 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -266,6 +266,10 @@ static const struct
     { VLC_CODEC_VP7 , AV_CODEC_ID_VP7, 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 */