From 55b973ab9dde41cbc9d70e2cb9cb1365ec4ad5a2 Mon Sep 17 00:00:00 2001
From: Miguel Freitas <miguelfreitas@users.sourceforge.net>
Date: Mon, 1 Jul 2002 17:56:05 +0000
Subject: enable ffmpeg's msmpeg4 v1/v2. note: i don't have any v1 streams to
 test. v2 are working fine though.

CVS patchset: 2189
CVS date: 2002/07/01 17:56:05
---
 src/xine-engine/buffer.h       |  5 +++--
 src/xine-engine/buffer_types.c | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'src/xine-engine')

diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 339f556d1..15eac4969 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: buffer.h,v 1.53 2002/06/26 15:55:49 jkeil Exp $
+ * $Id: buffer.h,v 1.54 2002/07/01 17:56:05 miguelfreitas Exp $
  *
  *
  * contents:
@@ -83,7 +83,7 @@ extern "C" {
 #define BUF_VIDEO_MPEG4		0x02010000
 #define BUF_VIDEO_CINEPAK	0x02020000
 #define BUF_VIDEO_SORENSON_V1	0x02030000
-#define BUF_VIDEO_MSMPEG4_V12	0x02040000
+#define BUF_VIDEO_MSMPEG4_V2	0x02040000
 #define BUF_VIDEO_MSMPEG4_V3	0x02050000
 #define BUF_VIDEO_MJPEG		0x02060000
 #define BUF_VIDEO_IV50		0x02070000
@@ -116,6 +116,7 @@ extern "C" {
 #define BUF_VIDEO_FLI		0x02230000
 #define BUF_VIDEO_ROQ		0x02240000
 #define BUF_VIDEO_SORENSON_V3	0x02250000
+#define BUF_VIDEO_MSMPEG4_V1	0x02260000
 
 /* audio buffer types:  (please keep in sync with buffer_types.c) */
 
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index 78cb7dba7..4812def16 100644
--- a/src/xine-engine/buffer_types.c
+++ b/src/xine-engine/buffer_types.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: buffer_types.c,v 1.26 2002/06/24 12:26:30 jcdutton Exp $
+ * $Id: buffer_types.c,v 1.27 2002/07/01 17:56:05 miguelfreitas Exp $
  *
  *
  * contents:
@@ -132,6 +132,15 @@ static video_db_t video_db[] = {
   BUF_VIDEO_SORENSON_V3,
   "Sorenson Video 3"
 },
+{
+  {
+    meFOURCC('M', 'P', '4', '1'),
+    meFOURCC('m', 'p', '4', '1'),
+    0
+  },
+  BUF_VIDEO_MSMPEG4_V1,
+  "Microsoft MPEG-4 format v1"
+},
 {
   {
     meFOURCC('M', 'P', '4', '1'),
@@ -144,8 +153,8 @@ static video_db_t video_db[] = {
     meFOURCC('m', 'p', 'g', '4'),
     0
   },
-  BUF_VIDEO_MSMPEG4_V12,
-  "Microsoft MPEG-4 format v1/v2"
+  BUF_VIDEO_MSMPEG4_V2,
+  "Microsoft MPEG-4 format v2"
 },
 {
   {
-- 
cgit v1.2.3