Commit 47912024 authored by Laurent Aimar's avatar Laurent Aimar

* all: added VSSH fourcc.

parent 6bc47898
...@@ -468,6 +468,10 @@ static struct ...@@ -468,6 +468,10 @@ static struct
/* avc1: special case h264 */ /* avc1: special case h264 */
{ VLC_FOURCC('a','v','c','1'), CODEC_ID_H264, { VLC_FOURCC('a','v','c','1'), CODEC_ID_H264,
VIDEO_ES, "h264" }, VIDEO_ES, "h264" },
{ VLC_FOURCC('V','S','S','H'), CODEC_ID_H264,
VIDEO_ES, "h264" },
{ VLC_FOURCC('v','s','s','h'), CODEC_ID_H264,
VIDEO_ES, "h264" },
/* H263 and H263i */ /* H263 and H263i */
/* H263(+) is also known as Real Video 1.0 */ /* H263(+) is also known as Real Video 1.0 */
......
...@@ -117,6 +117,8 @@ static int Open( vlc_object_t *p_this ) ...@@ -117,6 +117,8 @@ static int Open( vlc_object_t *p_this )
if( p_dec->fmt_in.i_codec != VLC_FOURCC( 'h', '2', '6', '4') && if( p_dec->fmt_in.i_codec != VLC_FOURCC( 'h', '2', '6', '4') &&
p_dec->fmt_in.i_codec != VLC_FOURCC( 'H', '2', '6', '4') && p_dec->fmt_in.i_codec != VLC_FOURCC( 'H', '2', '6', '4') &&
p_dec->fmt_in.i_codec != VLC_FOURCC( 'V', 'S', 'S', 'H') &&
p_dec->fmt_in.i_codec != VLC_FOURCC( 'v', 's', 's', 'h') &&
( p_dec->fmt_in.i_codec != VLC_FOURCC( 'a', 'v', 'c', '1') || p_dec->fmt_in.i_extra < 7 ) ) ( p_dec->fmt_in.i_codec != VLC_FOURCC( 'a', 'v', 'c', '1') || p_dec->fmt_in.i_extra < 7 ) )
{ {
return VLC_EGENERIC; return VLC_EGENERIC;
......
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