vlc | branch: master | Steinar H. Gunderson <[email protected]> | Fri Jan 13 20:01:21 2017 +0100| [d8a68c2b9c5c456447c35694d32deec878ce4959] | committer: Jean-Baptiste Kempf
Add SpeedHQ FourCCs This is not in libav yet, just in ffmpeg. Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d8a68c2b9c5c456447c35694d32deec878ce4959 --- NEWS | 2 +- include/vlc_fourcc.h | 1 + modules/codec/avcodec/fourcc.c | 3 +++ src/misc/fourcc_list.h | 10 ++++++++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 350098f..9894065 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 codecs + * Support TDSC, Canopus HQX, Cineform, SpeedHQ 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 a9d5ce9..09c22cb 100644 --- a/include/vlc_fourcc.h +++ b/include/vlc_fourcc.h @@ -181,6 +181,7 @@ #define VLC_CODEC_HAP VLC_FOURCC('H','A','P','1') #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') /*********** * Chromas diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c index 1e97185..dd7a366 100644 --- a/modules/codec/avcodec/fourcc.c +++ b/modules/codec/avcodec/fourcc.c @@ -279,6 +279,9 @@ static const struct /* ffmpeg only: AV_CODEC_ID_SNOW */ /* 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 diff --git a/src/misc/fourcc_list.h b/src/misc/fourcc_list.h index c54f923..d2fc683 100644 --- a/src/misc/fourcc_list.h +++ b/src/misc/fourcc_list.h @@ -1097,6 +1097,16 @@ static const staticentry_t p_list_video[] = { B(VLC_CODEC_HNM4_VIDEO, "Cryo Interactive Entertainment HNM4"), 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[] = { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
