summaryrefslogtreecommitdiff
path: root/src/combined/nsf_combined.c
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-06-09 18:21:04 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-06-09 18:21:04 +0200
commitf36b9d822626dbbaf585e70cfa7ea60aa6d194af (patch)
tree220b7a7d185f262dc793c14c92a77ea615950d86 /src/combined/nsf_combined.c
parentb6055c5fe61d918259d1c253aa32fa97dd3e5163 (diff)
parentd5d3776bf7e2733d382c5811b317bcdb7c2c9e88 (diff)
downloadxine-lib-f36b9d822626dbbaf585e70cfa7ea60aa6d194af.tar.gz
xine-lib-f36b9d822626dbbaf585e70cfa7ea60aa6d194af.tar.bz2
Merge with 1.2 branch.
Diffstat (limited to 'src/combined/nsf_combined.c')
-rw-r--r--src/combined/nsf_combined.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/combined/nsf_combined.c b/src/combined/nsf_combined.c
index 855b8d2a5..474064213 100644
--- a/src/combined/nsf_combined.c
+++ b/src/combined/nsf_combined.c
@@ -21,9 +21,7 @@
*/
#include "xine_internal.h"
-
-void *decoder_nsf_init_plugin (xine_t *xine, void *data);
-void *demux_nsf_init_plugin (xine_t *xine, void *data);
+#include "nsf_combined.h"
static const demuxer_info_t demux_info_nsf = {
10 /* priority */