aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/decoder/faad_plugin.c (renamed from src/decoder/aac_plugin.c)4
-rw-r--r--src/decoder_list.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/decoder/aac_plugin.c b/src/decoder/faad_plugin.c
index 694075415..15fbf030e 100644
--- a/src/decoder/aac_plugin.c
+++ b/src/decoder/faad_plugin.c
@@ -460,8 +460,8 @@ static struct tag *aacTagDup(const char *file)
static const char *const aac_suffixes[] = { "aac", NULL };
static const char *const aac_mimeTypes[] = { "audio/aac", "audio/aacp", NULL };
-const struct decoder_plugin aacPlugin = {
- .name = "aac",
+const struct decoder_plugin faad_decoder_plugin = {
+ .name = "faad",
.stream_decode = aac_stream_decode,
.tag_dup = aacTagDup,
.suffixes = aac_suffixes,
diff --git a/src/decoder_list.c b/src/decoder_list.c
index b6093a9bc..d7360ce78 100644
--- a/src/decoder_list.c
+++ b/src/decoder_list.c
@@ -32,7 +32,7 @@ extern const struct decoder_plugin flac_decoder_plugin;
extern const struct decoder_plugin oggflac_decoder_plugin;
extern const struct decoder_plugin audiofilePlugin;
extern const struct decoder_plugin mp4_plugin;
-extern const struct decoder_plugin aacPlugin;
+extern const struct decoder_plugin faad_decoder_plugin;
extern const struct decoder_plugin mpcPlugin;
extern const struct decoder_plugin wavpack_plugin;
extern const struct decoder_plugin modplug_plugin;
@@ -59,7 +59,7 @@ static const struct decoder_plugin *const decoder_plugins[] = {
&audiofilePlugin,
#endif
#ifdef HAVE_FAAD
- &aacPlugin,
+ &faad_decoder_plugin,
#endif
#ifdef HAVE_MP4
&mp4_plugin,