* ffmpeg: added m4cc and M4CC as MPEG4 fourcc.

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 42267baa08a7e7d57c97d6673143b2b671005907..2e8702d2b2cc15c4af04ec9243fa6ba65493455b 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.47 2003/08/08 17:08:32 gbazin Exp $
+ * $Id: ffmpeg.c,v 1.48 2003/08/15 13:16:38 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -504,6 +504,8 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
         case FOURCC_DX50:
         case FOURCC_mp4v:
         case FOURCC_4:
+        case FOURCC_m4cc:
+        case FOURCC_M4CC:
         /* 3iv1 is unsupported by ffmpeg
            putting it here gives extreme distorted images
         case FOURCC_3IV1:

diff --git a/modules/codec/ffmpeg/ffmpeg.h b/modules/codec/ffmpeg/ffmpeg.h
index 833a793ccefd1e1b57361fbbf47afbc98da6a4c4..570addb9702415eabfb2c892824bcb02bd5088b9 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.22 2003/08/08 17:08:32 gbazin Exp $
+ * $Id: ffmpeg.h,v 1.23 2003/08/15 13:16:38 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  * 
@@ -88,6 +88,8 @@ int E_( GetPESData )( u8 *p_buf, int i_max, pes_packet_t *p_pes );
 #define FOURCC_DX50         VLC_FOURCC('D','X','5','0')
 #define FOURCC_mp4v         VLC_FOURCC('m','p','4','v')
 #define FOURCC_4            VLC_FOURCC( 4,  0,  0,  0 )
+#define FOURCC_m4cc         VLC_FOURCC('m','4','c','c')
+#define FOURCC_M4CC         VLC_FOURCC('M','4','C','C')
 
 /* MSMPEG4 v2 */
 #define FOURCC_MPG4         VLC_FOURCC('M','P','G','4')