* modules/demux/mp4/*: added FOURCC_dvc (DV - NTSC), FOURCC_dvp (DV - PAL)

   and FOURCC_twos (PCM audio).

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 14df17311cea35dc6512e005814af221e0a1f24f..713a397f7bd5888a8924fb7e1e17c30062c8e1db 100644 (file)
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -2,7 +2,7 @@
  * libmp4.c : LibMP4 library for mp4 module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: libmp4.c,v 1.14 2003/02/07 01:22:55 fenrir Exp $
+ * $Id: libmp4.c,v 1.15 2003/02/18 23:34:14 gbazin Exp $
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -2031,6 +2031,7 @@ static struct
     { FOURCC__mp3,  MP4_ReadBox_sample_soun,    MP4_FreeBox_Common },
     { FOURCC_ms55,  MP4_ReadBox_sample_soun,    MP4_FreeBox_Common },
     { FOURCC_mp4a,  MP4_ReadBox_sample_soun,    MP4_FreeBox_Common },
+    { FOURCC_twos,  MP4_ReadBox_sample_soun,    MP4_FreeBox_Common },
 
     { FOURCC_vide,  MP4_ReadBox_sample_vide,    MP4_FreeBox_Common },
     { FOURCC_mp4v,  MP4_ReadBox_sample_vide,    MP4_FreeBox_Common },
@@ -2044,6 +2045,8 @@ static struct
     { FOURCC_mjpb,  MP4_ReadBox_sample_vide,    MP4_FreeBox_Common },
     { FOURCC_mjqt,  NULL,                       NULL }, /* found in mjpa/b */
     { FOURCC_mjht,  NULL,                       NULL },
+    { FOURCC_dvc,   MP4_ReadBox_sample_vide,    MP4_FreeBox_Common },
+    { FOURCC_dvp,   MP4_ReadBox_sample_vide,    MP4_FreeBox_Common },
 
     { FOURCC_jpeg,  MP4_ReadBox_sample_vide,    MP4_FreeBox_Common },
 

diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index d1670a14616ae5ac70db1230fc742c00d10f07f7..b79d7f8117a7450fcff30882e5b7239f8d77b6ed 100644 (file)
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -2,7 +2,7 @@
  * libmp4.h : LibMP4 library for mp4 module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: libmp4.h,v 1.5 2003/01/13 02:30:11 fenrir Exp $
+ * $Id: libmp4.h,v 1.6 2003/02/18 23:34:14 gbazin Exp $
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  * 
  * This program is free software; you can redistribute it and/or modify
@@ -105,6 +105,9 @@
 #define FOURCC_mjpb VLC_FOURCC( 'm', 'j', 'q', 't' )
 #define FOURCC_mjqt VLC_FOURCC( 'm', 'j', 'h', 't' )
 #define FOURCC_mjht VLC_FOURCC( 'm', 'j', 'p', 'b' )
+#define FOURCC_dvc  VLC_FOURCC( 'd', 'v', 'c', ' ' )
+#define FOURCC_dvp  VLC_FOURCC( 'd', 'v', 'p', ' ' )
+#define FOURCC_twos VLC_FOURCC( 't', 'w', 'o', 's' )
 
 #define FOURCC_jpeg VLC_FOURCC( 'j', 'p', 'e', 'g' )