added new buffer types in preparation for latest FFmpeg sync

CVS patchset: 8144
CVS date: 2006/08/02 06:19:12

2 files changed, 39 insertions, 2 deletions

diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index fa105530e..c8ce850ca 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.155 2006/03/11 08:49:40 tmattern Exp $
+ * $Id: buffer.h,v 1.156 2006/08/02 06:19:12 tmmm Exp $
  *
  *
  * contents:
@@ -181,6 +181,16 @@ extern "C" {
 #define BUF_VIDEO_RT21		0x02570000
 #define BUF_VIDEO_FPS1		0x02580000
 #define BUF_VIDEO_DUCKTM2	0x02590000
+#define BUF_VIDEO_CSCD		0x025A0000
+#define BUF_VIDEO_ALGMM		0x025B0000
+#define BUF_VIDEO_CSCD		0x025C0000
+#define BUF_VIDEO_ZMBV		0x025D0000
+#define BUF_VIDEO_AVS		0x025E0000
+#define BUF_VIDEO_SMACKER	0x025F0000
+#define BUF_VIDEO_NUV		0x02600000
+#define BUF_VIDEO_KMVC		0x02610000
+#define BUF_VIDEO_FLASHSV	0x02620000
+#define BUF_VIDEO_CAVS		0x02630000
 
 /* audio buffer types:  (please keep in sync with buffer_types.c) */
 
@@ -243,6 +253,9 @@ extern "C" {
 #define BUF_AUDIO_SHORTEN	0x03360000
 #define BUF_AUDIO_WESTWOOD_SND1	0x03370000
 #define BUF_AUDIO_WMALL		0x03380000
+#define BUF_AUDIO_TRUESPEECH	0x03390000
+#define BUF_AUDIO_TTA		0x033A0000
+#define BUF_AUDIO_SMACKER	0x033B0000
 
 /* spu buffer types:    */
 
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index eced32afd..f1d631874 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.104 2006/03/06 00:19:50 hadess Exp $
+ * $Id: buffer_types.c,v 1.105 2006/08/02 06:19:12 tmmm Exp $
  *
  *
  * contents:
@@ -739,6 +739,30 @@ static video_db_t video_db[] = {
   BUF_VIDEO_DUCKTM2,
   "Duck TrueMotion 2"
 },
+{
+  {
+    meFOURCC('C','S','C','D'),
+    0
+  },
+  BUF_VIDEO_CSCD,
+  "CamStudio"
+},
+{
+  {
+    meFOURCC('Z','M','B','V'),
+    0
+  },
+  BUF_VIDEO_ZMBV,
+  "Zip Motion Blocks Video"
+},
+{
+  {
+    meFOURCC('K','M','V','C'),
+    0
+  },
+  BUF_VIDEO_KMVC,
+  "Karl Morton's Video Codec"
+},
 { { 0 }, 0, "last entry" }
 };