4 files changed, 11 insertions, 14 deletions
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index 1ae2a2761..3dda77ead 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -11,8 +11,6 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c monitor.c \
 	audio_decoder.c video_out.c
 libxine_la_DEPENDENCIES = libsdeps
 libxine_la_LIBADD = \
-##	$(top_srcdir)/src/libmpeg2/libmpeg2.la   \
-	$(top_srcdir)/src/libac3/libac3.la       \
 	$(top_srcdir)/src/libmpg123/libmpg123.la \
 ##	$(top_srcdir)/src/libspudec/libspudec.la \
 	$(THREAD_LIBS)                           \
@@ -47,8 +45,6 @@ debug:
 
 
 libsdeps:
-##	@cd $(top_builddir)/src/libmpeg2  &&  $(MAKE) libmpeg2.la
-	@cd $(top_builddir)/src/libac3    && $(MAKE) libac3.la
 	@cd $(top_builddir)/src/libmpg123 && $(MAKE) libmpg123.la
 ##	@cd $(top_builddir)/src/libspudec && $(MAKE) libspudec.la
 
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index 015560844..cac4f56dd 100644
--- a/src/xine-engine/audio_decoder.c
+++ b/src/xine-engine/audio_decoder.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: audio_decoder.c,v 1.5 2001/04/27 10:42:38 f1rmb Exp $
+ * $Id: audio_decoder.c,v 1.6 2001/04/29 14:32:11 guenter Exp $
  *
  *
  * functions that implement audio decoding
@@ -76,7 +76,7 @@ void *audio_decoder_loop (void *this_gen) {
 
 	  }
 	
-	  decoder->decode_data (this->metronom, decoder, buf);
+	  decoder->decode_data (decoder, buf);
 	}
 
 	break;
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index 98b84e0ee..e5a886a44 100644
--- a/src/xine-engine/video_decoder.c
+++ b/src/xine-engine/video_decoder.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: video_decoder.c,v 1.8 2001/04/27 10:42:38 f1rmb Exp $
+ * $Id: video_decoder.c,v 1.9 2001/04/29 14:32:11 guenter Exp $
  *
  */
 
@@ -69,8 +69,7 @@ void *video_decoder_loop (void *this_gen) {
 
 	}
 	
-	decoder->decode_data (this->metronom,
-			      this->cur_video_decoder_plugin, buf);
+	decoder->decode_data (this->cur_video_decoder_plugin, buf);
       }
 
       break;
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h
index ac706d397..7bbf797c1 100644
--- a/src/xine-engine/xine_internal.h
+++ b/src/xine-engine/xine_internal.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: xine_internal.h,v 1.14 2001/04/29 01:09:23 guenter Exp $
+ * $Id: xine_internal.h,v 1.15 2001/04/29 14:32:11 guenter Exp $
  *
  */
 
@@ -56,8 +56,7 @@ struct video_decoder_s {
 
   void (*init) (video_decoder_t *this, vo_instance_t *video_out);
 
-  void (*decode_data) (metronom_t *metronom,
-		       video_decoder_t *this, buf_element_t *buf);
+  void (*decode_data) (video_decoder_t *this, buf_element_t *buf);
 
   void (*release_img_buffers) (video_decoder_t *this);
 
@@ -69,6 +68,10 @@ struct video_decoder_s {
 
 /*
  * generic xine audio decoder plugin interface
+ *
+ * for a dynamic plugin make sure you provide this function call:
+ * audio_decoder_t *init_audio_decoder_plugin (int iface_version,  
+ *                                             config_values_t *cfg);
  */
 
 typedef struct audio_decoder_s audio_decoder_t;
@@ -81,8 +84,7 @@ struct audio_decoder_s {
 
   void (*init) (audio_decoder_t *this, ao_functions_t *audio_out);
 
-  void (*decode_data) (metronom_t *metronom,
-		       audio_decoder_t *this, buf_element_t *buf);
+  void (*decode_data) (audio_decoder_t *this, buf_element_t *buf);
 
   void (*close) (audio_decoder_t *this);