summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/buffer.h4
-rw-r--r--src/xine-engine/buffer_types.c22
2 files changed, 21 insertions, 5 deletions
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index b3be8a5a3..98d1de436 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.41 2002/04/20 15:00:27 guenter Exp $
+ * $Id: buffer.h,v 1.42 2002/04/20 20:20:44 guenter Exp $
*
*
* contents:
@@ -102,6 +102,8 @@ extern "C" {
#define BUF_VIDEO_H263 0x02190000
#define BUF_VIDEO_3IVX 0x021A0000
#define BUF_VIDEO_CYUV 0x021B0000
+#define BUF_VIDEO_DIVX5 0x021C0000
+#define BUF_VIDEO_XVID 0x021D0000
/* 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 5deaf5bb6..0856d1ede 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.15 2002/04/20 15:00:27 guenter Exp $
+ * $Id: buffer_types.c,v 1.16 2002/04/20 20:20:44 guenter Exp $
*
*
* contents:
@@ -67,8 +67,6 @@ static video_db_t video_db[] = {
},
{
{
- mmioFOURCC('X', 'V', 'I', 'D'),
- mmioFOURCC('D', 'X', '5', '0'),
mmioFOURCC('D', 'I', 'V', 'X'),
mmioFOURCC('d', 'i', 'v', 'x'),
mmioFOURCC('D', 'i', 'v', 'x'),
@@ -80,7 +78,23 @@ static video_db_t video_db[] = {
0
},
BUF_VIDEO_MPEG4,
- "ISO-MPEG4/XviD/OpenDivx format"
+ "ISO-MPEG4/OpenDivx format"
+},
+{
+ {
+ mmioFOURCC('X', 'V', 'I', 'D'),
+ 0
+ },
+ BUF_VIDEO_XVID,
+ "XviD format"
+},
+{
+ {
+ mmioFOURCC('D', 'X', '5', '0'),
+ 0
+ },
+ BUF_VIDEO_DIVX5,
+ "DivX 5 format"
},
{
{