summaryrefslogtreecommitdiff
path: root/src/combined/nsf_combined.c
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-12-12 22:39:58 +0100
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-12-12 22:39:58 +0100
commit44234828cf17a0a302975dc3f5f8b671f86a8ac2 (patch)
tree43d3917bb441eb7b85d3d6bc443162406e7958ba /src/combined/nsf_combined.c
parent6514a174a7036d285da2faae55d1e4cecb7ea310 (diff)
parent552c28241aa1e6820857f5bf8bd8bbb9ee99dd99 (diff)
downloadxine-lib-44234828cf17a0a302975dc3f5f8b671f86a8ac2.tar.gz
xine-lib-44234828cf17a0a302975dc3f5f8b671f86a8ac2.tar.bz2
Merge from 1.2 main.
Diffstat (limited to 'src/combined/nsf_combined.c')
-rw-r--r--src/combined/nsf_combined.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/combined/nsf_combined.c b/src/combined/nsf_combined.c
index 0f71a287d..085467937 100644
--- a/src/combined/nsf_combined.c
+++ b/src/combined/nsf_combined.c
@@ -36,7 +36,7 @@ static const decoder_info_t decoder_info_nsf = {
};
const plugin_info_t xine_plugin_info[] EXPORTED = {
- { PLUGIN_DEMUX, 26, "nsfdemux", XINE_VERSION_CODE, &demux_info_nsf, demux_nsf_init_plugin },
- { PLUGIN_AUDIO_DECODER, 15, "nsfdec", XINE_VERSION_CODE, &decoder_info_nsf, decoder_nsf_init_plugin },
+ { PLUGIN_DEMUX, 27, "nsfdemux", XINE_VERSION_CODE, &demux_info_nsf, demux_nsf_init_plugin },
+ { PLUGIN_AUDIO_DECODER, 16, "nsfdec", XINE_VERSION_CODE, &decoder_info_nsf, decoder_nsf_init_plugin },
{ PLUGIN_NONE, 0, NULL, 0, NULL, NULL }
};