Commit 6c9c2ae6 authored by Paul B Mahol's avatar Paul B Mahol Committed by Jean-Baptiste Kempf

add Apple Pixlet decoder

Signed-off-by: default avatarPaul B Mahol <onemda@gmail.com>
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent babd896d
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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[] = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment