[vlc-commits] avcodec: map Escape 124 video

[Daniel Verkamp]

vlc | branch: master | Daniel Verkamp <daniel at drv.nu> | Fri Jan 10 18:00:22 2014 -0700| [f4e53154aaabac7cf6fd1b0f007061a6be110888] | committer: Jean-Baptiste Kempf

avcodec: map Escape 124 video

Sample:
http://samples.mplayerhq.hu/game-formats/rpl/escape124/ESCAPE.RPL

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

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

 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 72ccd66..dd17fe7 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -143,6 +143,7 @@
 #define VLC_CODEC_LCL_MSZH        VLC_FOURCC('M','S','Z','H')
 #define VLC_CODEC_LCL_ZLIB        VLC_FOURCC('Z','L','I','B')
 #define VLC_CODEC_THP             VLC_FOURCC('T','H','P','0')
+#define VLC_CODEC_ESCAPE124       VLC_FOURCC('E','1','2','4')
 
 /* 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 82f5914..63f1c2e 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -168,7 +168,7 @@ static const struct
     { VLC_CODEC_INDEO5, AV_CODEC_ID_INDEO5, VIDEO_ES },
     { VLC_CODEC_MIMIC, AV_CODEC_ID_MIMIC, VIDEO_ES },
     /* AV_CODEC_ID_RL2 */
-    /* AV_CODEC_ID_ESCAPE124 */
+    { VLC_CODEC_ESCAPE124, AV_CODEC_ID_ESCAPE124, VIDEO_ES },
     { VLC_CODEC_DIRAC, AV_CODEC_ID_DIRAC, VIDEO_ES },
     /* AV_CODEC_ID_BFI */
     /* AV_CODEC_ID_CMV */
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 9bed057..9872100 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1012,6 +1012,8 @@ static const staticentry_t p_list_video[] = {
 
     B(VLC_CODEC_TXD, "RenderWare TXD"),
 
+    B(VLC_CODEC_ESCAPE124, "Escape 124 video"),
+
     B(0, "")
 };
 static const staticentry_t p_list_audio[] = {