Commit d8a68c2b authored by Steinar H. Gunderson's avatar Steinar H. Gunderson Committed by Jean-Baptiste Kempf

Add SpeedHQ FourCCs

This is not in libav yet, just in ffmpeg.
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 0beabcc7
...@@ -72,7 +72,7 @@ Decoder: ...@@ -72,7 +72,7 @@ Decoder:
* New BPG decoder based on libbpg * New BPG decoder based on libbpg
* Fixed uncompressed DVD-Audio (AOB) LPCM decoding * Fixed uncompressed DVD-Audio (AOB) LPCM decoding
* Rewrite WPL playlists and add ZPL playlists support (Zune) * Rewrite WPL playlists and add ZPL playlists support (Zune)
* Support TDSC, Canopus HQX codecs * Support TDSC, Canopus HQX, Cineform, SpeedHQ codecs
* TTML subtitles support, including EBU-TT-D variant * TTML subtitles support, including EBU-TT-D variant
* Support 9-bit and 10-bit GBR planar formats * Support 9-bit and 10-bit GBR planar formats
* New hardware accelerated decoder for OS X and and iOS based on Video Toolbox * New hardware accelerated decoder for OS X and and iOS based on Video Toolbox
......
...@@ -181,6 +181,7 @@ ...@@ -181,6 +181,7 @@
#define VLC_CODEC_HAP VLC_FOURCC('H','A','P','1') #define VLC_CODEC_HAP VLC_FOURCC('H','A','P','1')
#define VLC_CODEC_DXV VLC_FOURCC('D','X','D','3') #define VLC_CODEC_DXV VLC_FOURCC('D','X','D','3')
#define VLC_CODEC_CINEFORM VLC_FOURCC('C','F','H','D') #define VLC_CODEC_CINEFORM VLC_FOURCC('C','F','H','D')
#define VLC_CODEC_SPEEDHQ VLC_FOURCC('S','H','Q','2')
/*********** /***********
* Chromas * Chromas
......
...@@ -279,6 +279,9 @@ static const struct ...@@ -279,6 +279,9 @@ static const struct
/* ffmpeg only: AV_CODEC_ID_SNOW */ /* ffmpeg only: AV_CODEC_ID_SNOW */
/* ffmpeg only: AV_CODEC_ID_SMVJPEG */ /* ffmpeg only: AV_CODEC_ID_SMVJPEG */
#if LIBAVCODEC_VERSION_CHECK( 57, 71, 101, 999, 999 )
{ VLC_CODEC_SPEEDHQ, AV_CODEC_ID_SPEEDHQ, VIDEO_ES },
#endif
/* /*
* Audio Codecs * Audio Codecs
......
...@@ -1097,6 +1097,16 @@ static const staticentry_t p_list_video[] = { ...@@ -1097,6 +1097,16 @@ static const staticentry_t p_list_video[] = {
B(VLC_CODEC_HNM4_VIDEO, "Cryo Interactive Entertainment HNM4"), B(VLC_CODEC_HNM4_VIDEO, "Cryo Interactive Entertainment HNM4"),
B(VLC_CODEC_CINEFORM, "CineForm" ), B(VLC_CODEC_CINEFORM, "CineForm" ),
B(VLC_CODEC_SPEEDHQ, "NewTek SpeedHQ" ),
A("SHQ0"),
A("SHQ1"),
A("SHQ2"),
A("SHQ3"),
A("SHQ4"),
A("SHQ5"),
A("SHQ7"),
A("SHQ9"),
}; };
static const staticentry_t p_list_audio[] = { 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