CDDA demux plugin build fix and enable Real 28.8 format

(currently porting native 14k4 and 28k8 decoders)

CVS patchset: 4781
CVS date: 2003/05/06 15:20:13

2 files changed, 10 insertions, 12 deletions

diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c
index 028443f35..d2ebe764c 100644
--- a/src/demuxers/demux_cdda.c
+++ b/src/demuxers/demux_cdda.c
@@ -22,7 +22,7 @@
  * linear PCM "decoder" (which in turn sends them directly to the audio
  * output target; this is a really fancy CD-playing architecture).
  *
- * $Id: demux_cdda.c,v 1.6 2003/05/06 14:02:25 tchamp Exp $
+ * $Id: demux_cdda.c,v 1.7 2003/05/06 15:20:13 esnel Exp $
  *
  */
 
@@ -282,13 +282,3 @@ void *demux_cdda_init_plugin (xine_t *xine, void *data) {
 
   return this;
 }
-
-/*
- * exported plugin catalog entry
- */
-
-plugin_info_t xine_plugin_info[] = {
-  /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_DEMUX, 21, "cdda", XINE_VERSION_CODE, NULL, demux_cdda_init_plugin },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index 0dc2f4c4e..7da091ae3 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.60 2003/05/01 21:25:15 hadess Exp $
+ * $Id: buffer_types.c,v 1.61 2003/05/06 15:20:14 esnel Exp $
  *
  *
  * contents:
@@ -842,6 +842,14 @@ static audio_db_t audio_db[] = {
   BUF_AUDIO_DV,
   "DV Audio"
 },
+{
+  {
+    meFOURCC('2', '8', '_', '8'),
+    0
+  },
+  BUF_AUDIO_28_8,
+  "Real 28.8"
+},
 { { 0 }, 0, "last entry" }
 };