DVCPRO25 and 50 in AVI...

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index a7a2b99fe86ae2bd2cabf69f4484be6a56abcc70..927ddc2af1fabbe49e5d31f7c96ecba597dfdd4c 100644 (file)
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -524,7 +524,9 @@ static int Open( vlc_object_t * p_this )
                 msg_Dbg( p_demux, "stream[%d] iavs with handler %4.4s", i, (char *)&p_strh->i_handler );
                 if( p_strh->i_handler == FOURCC_dvsd ||
                     p_strh->i_handler == FOURCC_dvhd ||
-                    p_strh->i_handler == FOURCC_dvsl )
+                    p_strh->i_handler == FOURCC_dvsl ||
+                    p_strh->i_handler == FOURCC_dv25 ||
+                    p_strh->i_handler == FOURCC_dv50 )
                 {
                     tk->p_out_muxed = stream_DemuxNew( p_demux, (char *)"rawdv", p_demux->out );
                     if( !tk->p_out_muxed )

diff --git a/modules/demux/avi/libavi.h b/modules/demux/avi/libavi.h
index b23eadad5505ea3026e20199a2789992ca1344a4..08c2c6456a0919ed70262bd3183649705a10a24b 100644 (file)
--- a/modules/demux/avi/libavi.h
+++ b/modules/demux/avi/libavi.h
@@ -370,3 +370,5 @@ void    AVI_ChunkFreeRoot( stream_t *, avi_chunk_t  *p_chk );
 #define FOURCC_dvsd         VLC_FOURCC('d','v','s','d')
 #define FOURCC_dvhd         VLC_FOURCC('d','v','h','d')
 #define FOURCC_dvsl         VLC_FOURCC('d','v','s','l')
+#define FOURCC_dv25         VLC_FOURCC('d','v','2','5')
+#define FOURCC_dv50         VLC_FOURCC('d','v','5','0')