* all: added VSSH fourcc.

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 16af8ece216d93028d15391840edfb350a1225f7..4b6fede45d63c414ff3f755328d9074504d4f193 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -468,6 +468,10 @@ static struct
     /* avc1: special case h264 */
     { VLC_FOURCC('a','v','c','1'), CODEC_ID_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(+) is also known as Real Video 1.0 */

diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c
index dfffbc7cfe749f77a3487458aa5b4e275397da83..fa4daf40dfb35ea43d584d63321f00d7156c9f5b 100644 (file)
--- a/modules/packetizer/h264.c
+++ b/modules/packetizer/h264.c
@@ -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') &&
         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 ) )
     {
         return VLC_EGENERIC;