[vlc-commits] Add Hap fourcc

[Vittorio Giovara]

vlc | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Wed Feb  3 16:14:46 2016 +0100| [aa3b515601206e781e54716c30428ac0549312ec] | committer: Jean-Baptiste Kempf

Add Hap fourcc

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

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

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

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index bb29e6b..2836097 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -175,6 +175,7 @@
 #define VLC_CODEC_TDSC            VLC_FOURCC('T','D','S','C')
 #define VLC_CODEC_HQX             VLC_FOURCC('C','H','Q','X')
 #define VLC_CODEC_HQ_HQA          VLC_FOURCC('C','U','V','C')
+#define VLC_CODEC_HAP             VLC_FOURCC('H','A','P','1')
 
 /***********
  * Chromas
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index edf66c5..67482d4 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -266,7 +266,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
-    /* AV_CODEC_ID_HAP */
+
+#if LIBAVCODEC_VERSION_CHECK( 57, 9, 0, 13, 100 )
+    { VLC_CODEC_HAP, AV_CODEC_ID_HAP, VIDEO_ES },
+#endif
     /* AV_CODEC_ID_DDS */
 #if LIBAVCODEC_VERSION_CHECK( 56, 31, 0, 46, 100 )
     { VLC_CODEC_G2M2, AV_CODEC_ID_G2M, VIDEO_ES },
diff --git a/src/misc/fourcc_list.h b/src/misc/fourcc_list.h
index 4789f88..a48de54 100644
--- a/src/misc/fourcc_list.h
+++ b/src/misc/fourcc_list.h
@@ -711,6 +711,11 @@ static const staticentry_t p_list_video[] = {
 
     B(VLC_CODEC_HQ_HQA, "Canopus HQ"),
 
+    B(VLC_CODEC_HAP, "Vidvox Hap"),
+        A("Hap1"),
+        E("Hap5", "Vidvox Hap Alpha"),
+        E("HapY", "Vidvox Hap Q"),
+
     /* */
     B(VLC_CODEC_YV12, "Planar 4:2:0 YVU"),
         A("YV12"),