From 546c34ca7b14f6268e7bf9a105cee598e5b1ce88 Mon Sep 17 00:00:00 2001 From: beveloper Date: Sun, 25 Jan 2004 22:28:19 +0000 Subject: [PATCH] removed OGG family and meta format description git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6306 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/media/MediaDefs.h | 2 -- headers/os/media/MediaFormats.h | 5 ----- 2 files changed, 7 deletions(-) diff --git a/headers/os/media/MediaDefs.h b/headers/os/media/MediaDefs.h index 6277bfa7bf..814033e09a 100644 --- a/headers/os/media/MediaDefs.h +++ b/headers/os/media/MediaDefs.h @@ -599,9 +599,7 @@ typedef enum { B_WAV_FORMAT_FAMILY = 6, B_AIFF_FORMAT_FAMILY = 7, B_AVR_FORMAT_FAMILY = 8, - B_OGG_FORMAT_FAMILY = 9, B_MISC_FORMAT_FAMILY = 99999, - B_META_FORMAT_FAMILY = 100000 } media_format_family; struct media_file_format { diff --git a/headers/os/media/MediaFormats.h b/headers/os/media/MediaFormats.h index 90bb120bac..40c0bda16a 100644 --- a/headers/os/media/MediaFormats.h +++ b/headers/os/media/MediaFormats.h @@ -123,10 +123,6 @@ typedef struct { uint32 codec; } media_misc_description; -typedef struct { - char description[48]; -} media_meta_description; - typedef struct _media_format_description { #if defined(__cplusplus) _media_format_description(); @@ -146,7 +142,6 @@ typedef struct _media_format_description { media_aiff_description aiff; media_misc_description misc; media_avr_description avr; - media_meta_description meta; uint32 _reserved_[12]; } u; } media_format_description;