[vlc-commits] avcodec: map RL2 video

[Daniel Verkamp]

vlc | branch: master | Daniel Verkamp <daniel at drv.nu> | Thu Jun 19 23:25:13 2014 -0700| [0af153b46052c1d056d32259e75600303ed46844] | committer: Jean-Baptiste Kempf

avcodec: map RL2 video

Sample:
http://samples.mplayerhq.hu/game-formats/voyeur-rl2/A1100100.RL2

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 include/vlc_fourcc.h           |    1 +
 modules/codec/avcodec/fourcc.c |    2 +-
 src/misc/fourcc.c              |    2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 17ae183..81c77f3 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -160,6 +160,7 @@
 #define VLC_CODEC_C93             VLC_FOURCC('I','C','9','3')
 #define VLC_CODEC_BETHSOFTVID     VLC_FOURCC('B','V','I','D')
 #define VLC_CODEC_VB              VLC_FOURCC('V','B','V','1')
+#define VLC_CODEC_RL2             VLC_FOURCC('R','L','V','2')
 
 /* Planar YUV 4:1:0 Y:V:U */
 #define VLC_CODEC_YV9             VLC_FOURCC('Y','V','U','9')
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 25b0aab..1c970ff 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -168,7 +168,7 @@ static const struct
     { VLC_CODEC_INDEO4, AV_CODEC_ID_INDEO4, VIDEO_ES },
     { VLC_CODEC_INDEO5, AV_CODEC_ID_INDEO5, VIDEO_ES },
     { VLC_CODEC_MIMIC, AV_CODEC_ID_MIMIC, VIDEO_ES },
-    /* AV_CODEC_ID_RL2 */
+    { VLC_CODEC_RL2, AV_CODEC_ID_RL2, VIDEO_ES },
     { VLC_CODEC_ESCAPE124, AV_CODEC_ID_ESCAPE124, VIDEO_ES },
     { VLC_CODEC_DIRAC, AV_CODEC_ID_DIRAC, VIDEO_ES },
     /* AV_CODEC_ID_BFI */
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 7731f7b..39c0fae 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1079,6 +1079,8 @@ static const staticentry_t p_list_video[] = {
 
     B(VLC_CODEC_VB, "Beam Software VB"),
 
+    B(VLC_CODEC_RL2, "RL2 video"),
+
     B(0, "")
 };
 static const staticentry_t p_list_audio[] = {