Added 'CDVC' fourcc (another one for DV video)

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index d0e048ec7f7f0f5edd48b930c0063f10a0116a48..9c41c8abfdb07094988a8fb1764b1ec8ecfc71f2 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.45 2003/07/10 01:33:41 fenrir Exp $
+ * $Id: ffmpeg.c,v 1.46 2003/07/18 19:26:22 titer Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -564,6 +564,7 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
         case FOURCC_dvhd:
         case FOURCC_dvc:
         case FOURCC_dvp:
+        case FOURCC_CDVC:
             i_cat = VIDEO_ES;
             i_codec = CODEC_ID_DVVIDEO;
             psz_name = "DV video";

diff --git a/modules/codec/ffmpeg/ffmpeg.h b/modules/codec/ffmpeg/ffmpeg.h
index 609f129bd9da61f1a57a36d94addabb051097b5d..8145964a46279e8ae760c697ed95c87549bc3d5e 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.20 2003/05/21 19:55:25 hartman Exp $
+ * $Id: ffmpeg.h,v 1.21 2003/07/18 19:26:22 titer Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  * 
@@ -158,12 +158,14 @@ int E_( GetPESData )( u8 *p_buf, int i_max, pes_packet_t *p_pes );
 #define FOURCC_WMV2         VLC_FOURCC('W','M','V','2')
 #define FOURCC_MSS1         VLC_FOURCC('M','S','S','1')
 
+/* DV */
 #define FOURCC_dvsl         VLC_FOURCC('d','v','s','l')
 #define FOURCC_dvsd         VLC_FOURCC('d','v','s','d')
 #define FOURCC_DVSD         VLC_FOURCC('D','V','S','D')
 #define FOURCC_dvhd         VLC_FOURCC('d','v','h','d')
 #define FOURCC_dvc          VLC_FOURCC('d','v','c',' ')
 #define FOURCC_dvp          VLC_FOURCC('d','v','p',' ')
+#define FOURCC_CDVC         VLC_FOURCC('C','D','V','C')
 
 /* Indeo Video Codecs */
 #define FOURCC_IV31         VLC_FOURCC('I','V','3','1')