From 9491ef5a9f82b5785e685e86599a1ca8e9f8a28a Mon Sep 17 00:00:00 2001
From: Ken Moffat <zarniwhoop@users.sourceforge.net>
Date: Fri, 26 Oct 2007 22:44:11 +0100
Subject: Linux-2.6.23 header change breaks build > > /* Special codes used
 when specifying changer slots. */ > #define CDSL_NONE              
 (INT_MAX-1) > #define CDSL_CURRENT            INT_MAX

---
 src/input/vcd/libcdio/_cdio_linux.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/input/vcd/libcdio/_cdio_linux.c b/src/input/vcd/libcdio/_cdio_linux.c
index ea70d262c..acc04a839 100644
--- a/src/input/vcd/libcdio/_cdio_linux.c
+++ b/src/input/vcd/libcdio/_cdio_linux.c
@@ -59,6 +59,7 @@ static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.4 2006/09/26 22:18:44 dgp85
 #include <unistd.h>
 #include <fcntl.h>
 #include <mntent.h>
+#include <limits.h>
 
 #include <linux/cdrom.h>
 #include <scsi/scsi.h>
-- 
cgit v1.2.3


From 48e72068e1db9f7f3dd63d0a9d626f47f267aa14 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sun, 28 Oct 2007 21:45:34 +0000
Subject: Add another identifier (0x10 0x00 0x00 0x02) for MPEG video. Seen in
 an AVI in the wild; apparently generated by mencoder.

---
 src/xine-engine/buffer_types.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index 619a34c4c..a15cb69d8 100644
--- a/src/xine-engine/buffer_types.c
+++ b/src/xine-engine/buffer_types.c
@@ -67,6 +67,7 @@ static const video_db_t video_db[] = {
     meFOURCC('P', 'I', 'M', '1'),
     meFOURCC('m', 'p', 'g', '2'),
     meFOURCC('m', 'p', 'g', '1'),
+    meFOURCC(0x02, 0, 0, 0x10),
     0
   },
   BUF_VIDEO_MPEG,
-- 
cgit v1.2.3