[vlc-commits] add Apple Pixlet decoder

[Paul B Mahol]

vlc | branch: master | Paul B Mahol <onemda at gmail.com> | Thu Jan 19 16:06:03 2017 +0100| [6c9c2ae6ef6bde2e86babda8cd33fc062ff4cb75] | committer: Jean-Baptiste Kempf

add Apple Pixlet decoder

Signed-off-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

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

diff --git a/NEWS b/NEWS
index 9894065..a96f92e 100644
--- a/NEWS
+++ b/NEWS
@@ -72,7 +72,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, Canopus HQX, Cineform, SpeedHQ codecs
+ * Support TDSC, Canopus HQX, Cineform, SpeedHQ, Pixlet codecs
  * TTML subtitles support, including EBU-TT-D variant
  * Support 9-bit and 10-bit GBR planar formats
  * New hardware accelerated decoder for OS X and and iOS based on Video Toolbox
diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index e44dd95..08e4af7 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -182,6 +182,7 @@
 #define VLC_CODEC_DXV             VLC_FOURCC('D','X','D','3')
 #define VLC_CODEC_CINEFORM        VLC_FOURCC('C','F','H','D')
 #define VLC_CODEC_SPEEDHQ         VLC_FOURCC('S','H','Q','2')
+#define VLC_CODEC_PIXLET          VLC_FOURCC('p','x','l','t')
 
 /***********
  * Chromas
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index dd7a366..5a5c928 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -279,6 +279,10 @@ static const struct
     /* ffmpeg only: AV_CODEC_ID_SNOW */
     /* ffmpeg only: AV_CODEC_ID_SMVJPEG */
 
+#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 70, 100 )
+    { VLC_CODEC_PIXLET, AV_CODEC_ID_PIXLET, VIDEO_ES },
+#endif
+
 #if LIBAVCODEC_VERSION_CHECK( 57, 71, 101, 999, 999 )
     { VLC_CODEC_SPEEDHQ, AV_CODEC_ID_SPEEDHQ, VIDEO_ES },
 #endif
diff --git a/src/misc/fourcc_list.h b/src/misc/fourcc_list.h
index 27c212f..e83ff7d 100644
--- a/src/misc/fourcc_list.h
+++ b/src/misc/fourcc_list.h
@@ -1111,6 +1111,9 @@ static const staticentry_t p_list_video[] = {
         A("SHQ5"),
         A("SHQ7"),
         A("SHQ9"),
+
+    B(VLC_CODEC_PIXLET, "Apple Pixlet" ),
+        A("pxlt"),
 };
 
 static const staticentry_t p_list_audio[] = {