[vlc-commits] avcodec: map HNM4

Daniel Verkamp git at videolan.org
Fri Jun 20 16:41:41 CEST 2014


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

avcodec: map HNM4

Sample:
http://samples.mplayerhq.hu/game-formats/hnm/losteden-hnm4/BROCIME.HNM

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

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

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

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index b055f0f..43fb09a 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -172,6 +172,7 @@
 #define VLC_CODEC_YOP             VLC_FOURCC('Y','O','P','V')
 #define VLC_CODEC_JV              VLC_FOURCC('J','V','0','0')
 #define VLC_CODEC_DFA             VLC_FOURCC('D','F','I','A')
+#define VLC_CODEC_HNM4_VIDEO      VLC_FOURCC('H','N','M','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 c352994..57983ef 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -245,7 +245,9 @@ static const struct
     { VLC_CODEC_G2M4, AV_CODEC_ID_G2M, VIDEO_ES },
 #endif
     /* AV_CODEC_ID_WEBP */
-    /* AV_CODEC_ID_HNM4_VIDEO */
+#if LIBAVCODEC_VERSION_CHECK( 55, 8, 0, 8, 0 )
+    { VLC_CODEC_HNM4_VIDEO, AV_CODEC_ID_HNM4_VIDEO, VIDEO_ES },
+#endif
 #if LIBAVCODEC_VERSION_CHECK( 55, 24, 0, 37, 100 )
     { VLC_CODEC_HEVC, AV_CODEC_ID_HEVC, VIDEO_ES },
 #endif
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 1e0aaa0..86b6be4 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1103,6 +1103,8 @@ static const staticentry_t p_list_video[] = {
 
     B(VLC_CODEC_DFA, "Chronomaster DFA"),
 
+    B(VLC_CODEC_HNM4_VIDEO, "Cryo Interactive Entertainment HNM4"),
+
     B(0, "")
 };
 static const staticentry_t p_list_audio[] = {



More information about the vlc-commits mailing list