summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/buffer.h5
-rw-r--r--src/xine-engine/buffer_types.c25
2 files changed, 27 insertions, 3 deletions
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 106c19854..f63327e23 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.31 2002/01/15 16:02:03 miguelfreitas Exp $
+ * $Id: buffer.h,v 1.32 2002/01/15 17:30:51 miguelfreitas Exp $
*
*
* contents:
@@ -100,7 +100,7 @@ extern "C" {
#define BUF_VIDEO_DV 0x02160000
#define BUF_VIDEO_REAL 0x02170000
#define BUF_VIDEO_VP31 0x02180000
-
+#define BUF_VIDEO_H263 0x02190000
/* audio buffer types: (please keep in sync with buffer_types.c) */
@@ -121,6 +121,7 @@ extern "C" {
#define BUF_AUDIO_ACELPNET 0x030d0000
#define BUF_AUDIO_AAC 0x030e0000
#define BUF_AUDIO_REAL 0x030f0000
+#define BUF_AUDIO_VIVOG723 0x03100000
/* spu buffer types: */
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index 4e1b86e60..994cacd97 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.8 2002/01/15 16:02:03 miguelfreitas Exp $
+ * $Id: buffer_types.c,v 1.9 2002/01/15 17:30:51 miguelfreitas Exp $
*
*
* contents:
@@ -198,6 +198,9 @@ static video_db_t video_db[] = {
{
mmioFOURCC('I', '2', '6', '3'),
mmioFOURCC('i', '2', '6', '3'),
+ mmioFOURCC('V', 'I', 'V', 'O'),
+ mmioFOURCC('v', 'i', 'v', 'o'),
+ mmioFOURCC('v', 'i', 'v', '1'),
0
},
BUF_VIDEO_I263,
@@ -266,6 +269,9 @@ static video_db_t video_db[] = {
mmioFOURCC('c','r','a','m'),
mmioFOURCC('C','R','A','M'),
mmioFOURCC('M','S','V','C'),
+ mmioFOURCC('m','s','v','c'),
+ mmioFOURCC('W','H','A','M'),
+ mmioFOURCC('w','h','a','m'),
0
},
BUF_VIDEO_MSVC,
@@ -292,6 +298,16 @@ static video_db_t video_db[] = {
BUF_VIDEO_VP31,
"On2 VP3.1 Codec"
},
+{
+ {
+ mmioFOURCC('H', '2', '6', '3'),
+ mmioFOURCC('h', '2', '6', '3'),
+ mmioFOURCC('U', '2', '6', '3'),
+ 0
+ },
+ BUF_VIDEO_H263,
+ "H263 format"
+},
{ { 0 }, 0, "last entry" }
};
@@ -395,6 +411,13 @@ static audio_db_t audio_db[] = {
BUF_AUDIO_ACELPNET,
"ACELP.net"
},
+{
+ {
+ 0x111, 0x112, 0
+ },
+ BUF_AUDIO_VIVOG723,
+ "Vivo G.723/Siren Audio Codec"
+},
{ { 0 }, 0, "last entry" }
};