* Added fourcc 'MSS1' which is equivalent to 'WMV2'

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 0a5bc6c05f5dd76682eed194a8315f27829045bc..40ca1cc5591dd049f03beaa9075526453019910f 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -2,7 +2,7 @@
  * ffmpeg.c: video decoder using ffmpeg library
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ffmpeg.c,v 1.27 2003/03/13 16:09:20 hartman Exp $
+ * $Id: ffmpeg.c,v 1.28 2003/03/24 13:50:55 hartman Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -497,6 +497,7 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
             psz_name ="Windows Media Video 1";
             break;
         case FOURCC_WMV2:
+        case FOURCC_MSS1:
             i_cat = VIDEO_ES;
             i_codec = CODEC_ID_WMV2;
             psz_name ="Windows Media Video 2";

diff --git a/modules/codec/ffmpeg/ffmpeg.h b/modules/codec/ffmpeg/ffmpeg.h
index e1645dbc554510a71a66dbeaad1199cb053fdcb1..76d87b5ed859775c87d80d465aad9f7589422d5f 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.h
+++ b/modules/codec/ffmpeg/ffmpeg.h
@@ -2,7 +2,7 @@
  * ffmpeg_vdec.h: video decoder using ffmpeg library
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: ffmpeg.h,v 1.14 2003/03/13 16:09:20 hartman Exp $
+ * $Id: ffmpeg.h,v 1.15 2003/03/24 13:50:55 hartman Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  * 
@@ -149,6 +149,7 @@ int E_( GetPESData )( u8 *p_buf, int i_max, pes_packet_t *p_pes );
 /* wmv */
 #define FOURCC_WMV1         VLC_FOURCC('W','M','V','1')
 #define FOURCC_WMV2         VLC_FOURCC('W','M','V','2')
+#define FOURCC_MSS1         VLC_FOURCC('M','S','S','1')
 
 #define FOURCC_dvsl         VLC_FOURCC('d','v','s','l')
 #define FOURCC_dvsd         VLC_FOURCC('d','v','s','d')

diff --git a/modules/codec/ffmpeg/video.c b/modules/codec/ffmpeg/video.c
index 64530f062ef32ca9fb43ffbae4ba7bdbbecababb..952ba11a549046d31633c2b4f4c3389c55fef428 100644 (file)
--- a/modules/codec/ffmpeg/video.c
+++ b/modules/codec/ffmpeg/video.c
@@ -2,7 +2,7 @@
  * video.c: video decoder using ffmpeg library
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: video.c,v 1.18 2003/03/15 18:44:31 fenrir Exp $
+ * $Id: video.c,v 1.19 2003/03/24 13:50:55 hartman Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -280,6 +280,7 @@ int E_( InitThread_Video )( vdec_thread_t *p_vdec )
                     p_vdec->p_fifo->i_fourcc == FOURCC_M4S2 ||
                     p_vdec->p_fifo->i_fourcc == FOURCC_m4s2 ||
                     p_vdec->p_fifo->i_fourcc == FOURCC_WMV2 ||
+                    p_vdec->p_fifo->i_fourcc == FOURCC_MSS1 ||
                     p_vdec->p_fifo->i_fourcc == FOURCC_MJPG ||
                     p_vdec->p_fifo->i_fourcc == FOURCC_mjpg ||
                     p_vdec->p_fifo->i_fourcc == FOURCC_mjpa ||