diff options
| -rw-r--r-- | src/xine-engine/buffer.h | 10 | ||||
| -rw-r--r-- | src/xine-engine/buffer_types.c | 43 |
2 files changed, 51 insertions, 2 deletions
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index 70e626b0c..a63a24418 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.130 2004/01/13 20:44:23 jstembridge Exp $ + * $Id: buffer.h,v 1.131 2004/02/01 05:56:26 tmmm Exp $ * * * contents: @@ -157,6 +157,12 @@ extern "C" { #define BUF_VIDEO_VP4 0x02410000 #define BUF_VIDEO_VP5 0x02420000 #define BUF_VIDEO_VP6 0x02430000 +#define BUF_VIDEO_VMD 0x02440000 +#define BUF_VIDEO_MSZH 0x02450000 +#define BUF_VIDEO_ZLIB 0x02460000 +#define BUF_VIDEO_8BPS 0x02470000 +#define BUF_VIDEO_ASV1 0x02480000 +#define BUF_VIDEO_ASV2 0x02490000 /* audio buffer types: (please keep in sync with buffer_types.c) */ @@ -212,6 +218,8 @@ extern "C" { #define BUF_AUDIO_SPEEX 0x032F0000 #define BUF_AUDIO_RAWPCM 0x03300000 #define BUF_AUDIO_4X_ADPCM 0x03310000 +#define BUF_AUDIO_VMD 0x03320000 +#define BUF_AUDIO_XAN_DPCM 0x03330000 /* spu buffer types: */ diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index ba0bae5a4..07de76399 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.74 2004/01/25 18:02:23 jstembridge Exp $ + * $Id: buffer_types.c,v 1.75 2004/02/01 05:56:26 tmmm Exp $ * * * contents: @@ -586,6 +586,46 @@ static video_db_t video_db[] = { BUF_VIDEO_VP6, "On2 VP6 Codec" }, +{ + { + meFOURCC('8','B', 'P','S'), + 0 + }, + BUF_VIDEO_8BPS, + "Planar RGB" +}, +{ + { + meFOURCC('Z','L','I','B'), + 0 + }, + BUF_VIDEO_ZLIB, + "ZLIB Video" +}, +{ + { + meFOURCC('M','S','Z','H'), + 0 + }, + BUF_VIDEO_MSZH, + "MSZH Video" +}, +{ + { + meFOURCC('A','S','V','1'), + 0 + }, + BUF_VIDEO_ASV1, + "ASV v1 Video" +}, +{ + { + meFOURCC('A','S','V','2'), + 0 + }, + BUF_VIDEO_ASV2, + "ASV v2 Video" +}, { { 0 }, 0, "last entry" } }; @@ -614,6 +654,7 @@ static audio_db_t audio_db[] = { { { meFOURCC('t','w','o','s'), + meFOURCC('i','n','2','4'), 0 }, BUF_AUDIO_LPCM_BE, |