4 files changed, 34 insertions, 14 deletions
diff --git a/src/libflac/Makefile.am b/src/libflac/Makefile.am
index 8358402a3..c56e4f327 100644
--- a/src/libflac/Makefile.am
+++ b/src/libflac/Makefile.am
@@ -13,3 +13,5 @@ lib_LTLIBRARIES = $(flac_module)
 xineplug_flac_la_SOURCES = demux_flac.c decoder_flac.c
 xineplug_flac_la_LIBADD = $(LIBFLAC_LIBS)
 xineplug_flac_la_LDFLAGS = -avoid-version -module -lFLAC @XINE_PLUGIN_MIN_SYMS@
+
+noinst_HEADERS = demux_flac.h
+\ No newline at end of file
diff --git a/src/libflac/decoder_flac.c b/src/libflac/decoder_flac.c
index 14ef172da..25b800abd 100644
--- a/src/libflac/decoder_flac.c
+++ b/src/libflac/decoder_flac.c
@@ -39,6 +39,8 @@
 #define LOG 1
 */
 
+#include "demux_flac.h"
+
 typedef struct {
   audio_decoder_class_t   decoder_class;
 } flac_class_t;
@@ -420,9 +422,6 @@ static decoder_info_t dec_info_audio = {
   5                    /* priority        */
 };
 
-/* from demux_flac.c */
-void *demux_flac_init_class (xine_t *xine, void *data);
-
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */  
   { PLUGIN_DEMUX, 22, "flac", XINE_VERSION_CODE, NULL, demux_flac_init_class },
diff --git a/src/libflac/demux_flac.c b/src/libflac/demux_flac.c
index 6c83715d9..652916fd8 100644
--- a/src/libflac/demux_flac.c
+++ b/src/libflac/demux_flac.c
@@ -46,6 +46,8 @@
 #define LOG 1
 */
 
+#include "demux_flac.h"
+
 /* FLAC Demuxer plugin */
 typedef struct demux_flac_s {
   demux_plugin_t        demux_plugin;
@@ -660,14 +662,3 @@ demux_flac_init_class (xine_t *xine, void *data) {
 
     return this;
 }
-
-/*
- * exported plugin catalog entry
- */
-#if 0
-plugin_info_t xine_plugin_info[] = {
-  /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_DEMUX, 22, "flac", XINE_VERSION_CODE, NULL, demux_flac_init_class },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
-#endif
diff --git a/src/libflac/demux_flac.h b/src/libflac/demux_flac.h
new file mode 100644
index 000000000..a35362812
--- /dev/null
+++ b/src/libflac/demux_flac.h
@@ -0,0 +1,28 @@
+/* 
+ * Copyright (C) 2000-2002 the xine project
+ * 
+ * This file is part of xine, a free video player.
+ * 
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ *
+ * $Id: demux_flac.h,v 1.1 2003/08/25 21:51:42 f1rmb Exp $
+ */
+
+#ifndef HAVE_DEMUX_FLAC_H
+#define HAVE_DEMUX_FLAC_H
+
+void *demux_flac_init_class (xine_t *xine, void *data);
+
+#endif