* added VP31 fourcc's.

* disabled the vp31 and iv31 iv32. In it's current state it is too ugly too
  actually use it. It would generate too many bugreports.

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 5e83239999eef6c35f9f72bc14ed80d760a2f437..455cc916ee05f97fd465550f945e897e38fd536e 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.36 2003/05/09 23:23:45 fenrir Exp $
+ * $Id: ffmpeg.c,v 1.37 2003/05/10 11:05:52 hartman Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -616,7 +616,8 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
             break;
 
 #if LIBAVCODEC_BUILD >= 4663
-        case FOURCC_IV31:
+        /* Quality of both decoders is not good enough yet
+       case FOURCC_IV31:
         case FOURCC_iv31:
         case FOURCC_IV32:
         case FOURCC_iv32:
@@ -624,6 +625,12 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
             i_codec  = CODEC_ID_INDEO3;
             psz_name = "Indeo v3";
             break;
+       case FOURCC_vp31:
+       case FOURCC_VP31:
+           i_cat    = VIDEO_ES;
+           i_codec  = CODEC_ID_VP3;
+           psz_name = "On2's VP3 Video";
+           break; */
 #endif
         default:
             i_cat = UNKNOWN_ES;

diff --git a/modules/codec/ffmpeg/ffmpeg.h b/modules/codec/ffmpeg/ffmpeg.h
index c4b7799a418ac5bd1418d4dcd7ad43b70db95955..3a0f329189ea043e72a1544747f38531f068d795 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.18 2003/05/09 23:23:45 fenrir Exp $
+ * $Id: ffmpeg.h,v 1.19 2003/05/10 11:05:52 hartman Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  * 
@@ -165,11 +165,16 @@ int E_( GetPESData )( u8 *p_buf, int i_max, pes_packet_t *p_pes );
 #define FOURCC_dvc          VLC_FOURCC('d','v','c',' ')
 #define FOURCC_dvp          VLC_FOURCC('d','v','p',' ')
 
+/* Indeo Video Codecs */
 #define FOURCC_IV31         VLC_FOURCC('I','V','3','1')
 #define FOURCC_iv31         VLC_FOURCC('i','v','3','1')
 #define FOURCC_IV32         VLC_FOURCC('I','V','3','2')
 #define FOURCC_iv32         VLC_FOURCC('i','v','3','2')
 
+/* On2 VP3 Video Codecs */
+#define FOURCC_VP31         VLC_FOURCC('V','P','3','1')
+#define FOURCC_vp31         VLC_FOURCC('v','p','3','1')
+
 /*****************************************************************************
  * Audio codec fourcc
  *****************************************************************************/

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 2d76a3561856d76bdc3db34f8ea6d29bc6b8d163..4407898e8f0532fe05bb2bdc23e32d5c795d78f5 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.26 2003/05/08 19:06:46 titer Exp $
+ * $Id: libmp4.c,v 1.27 2003/05/10 11:05:52 hartman Exp $
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -2164,6 +2164,8 @@ static struct
     { FOURCC_mjht,  NULL,                       NULL },
     { FOURCC_dvc,   MP4_ReadBox_sample_vide,    MP4_FreeBox_Common },
     { FOURCC_dvp,   MP4_ReadBox_sample_vide,    MP4_FreeBox_Common },
+    { FOURCC_VP31,  MP4_ReadBox_sample_vide,    MP4_FreeBox_Common },
+    { FOURCC_vp31,  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 f310743f587b9f8affda62ee493b818da4e825c1..44b464e6f0b691b580b4cd92f9dfd6b77cc76e51 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.12 2003/05/07 02:31:20 fenrir Exp $
+ * $Id: libmp4.h,v 1.13 2003/05/10 11:05:52 hartman Exp $
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  * 
  * This program is free software; you can redistribute it and/or modify
@@ -131,6 +131,8 @@
 #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_VP31 VLC_FOURCC( 'V', 'P', '3', '1' )
+#define FOURCC_vp31 VLC_FOURCC( 'v', 'p', '3', '1' )
 
 #define FOURCC_dvc  VLC_FOURCC( 'd', 'v', 'c', ' ' )
 #define FOURCC_dvp  VLC_FOURCC( 'd', 'v', 'p', ' ' )