summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2005-05-28 02:25:45 +0000
committerMike Melanson <mike@multimedia.cx>2005-05-28 02:25:45 +0000
commit4d81a85187a2c212d11dbb0842f42ed7d5c149b4 (patch)
tree962f26b0b78656c1e9a4773f90950bc845a3c442
parent875da7c6e187d3aacaac0107deb45200286dfa7d (diff)
downloadxine-lib-4d81a85187a2c212d11dbb0842f42ed7d5c149b4.tar.gz
xine-lib-4d81a85187a2c212d11dbb0842f42ed7d5c149b4.tar.bz2
buffer type for Fraps FPS1
CVS patchset: 7568 CVS date: 2005/05/28 02:25:45
-rw-r--r--src/xine-engine/buffer.h3
-rw-r--r--src/xine-engine/buffer_types.c10
2 files changed, 11 insertions, 2 deletions
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 283d0495c..e5a3644e2 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.151 2005/05/06 04:14:55 tmmm Exp $
+ * $Id: buffer.h,v 1.152 2005/05/28 02:25:45 tmmm Exp $
*
*
* contents:
@@ -178,6 +178,7 @@ extern "C" {
#define BUF_VIDEO_WNV1 0x02550000
#define BUF_VIDEO_XL 0x02560000
#define BUF_VIDEO_RT21 0x02570000
+#define BUF_VIDEO_FPS1 0x02580000
/* 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 c4edab60b..33ee0a893 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.99 2005/05/15 09:26:36 jcdutton Exp $
+ * $Id: buffer_types.c,v 1.100 2005/05/28 02:25:46 tmmm Exp $
*
*
* contents:
@@ -720,6 +720,14 @@ static video_db_t video_db[] = {
BUF_VIDEO_RT21,
"Winnow Video"
},
+{
+ {
+ meFOURCC('F','P','S','1'),
+ 0
+ },
+ BUF_VIDEO_FPS1,
+ "Fraps FPS1"
+},
{ { 0 }, 0, "last entry" }
};