[vlc-commits] Map Canopus HQX decoder

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Mar 14 14:30:06 2015 +0100| [0b6f58c673ec74200ac204297c4c09c8ff6226e4] | committer: Jean-Baptiste Kempf

Map Canopus HQX decoder

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

 NEWS                           |    2 +-
 modules/codec/avcodec/fourcc.c |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 6d13894..8b85a6f 100644
--- a/NEWS
+++ b/NEWS
@@ -31,7 +31,7 @@ Decoder:
  * New BPG decoder based on libbpg
  * Fixed uncompressed DVD-Audio (AOB) LPCM decoding
  * Rewrite WPL playlists and add ZPL playlists support (Zune)
- * Support TDSC
+ * Support TDSC, Canopus HQX
 
 Demuxers:
  * Support HD-DVD .evo (H.264, VC-1, MPEG-2, PCM, AC-3, E-AC3, MLP, DTS)
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 8ba7952..61559ab 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -262,6 +262,10 @@ static const struct
     { VLC_CODEC_VP7 , AV_CODEC_ID_VP7, VIDEO_ES },
 #endif
 
+#if LIBAVCODEC_VERSION_CHECK( 56, 17, 0, 26, 100 )
+    { VLC_CODEC_HQX, AV_CODEC_ID_HQX, VIDEO_ES },
+#endif
+
 #if LIBAVCODEC_VERSION_CHECK( 56, 18, 0, 27, 100 )
     { VLC_CODEC_TDSC, AV_CODEC_ID_TDSC, VIDEO_ES },
 #endif