diff options
Diffstat (limited to '')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/decoder/mp4ff_plugin.c (renamed from src/decoder/mp4_plugin.c) | 2 | ||||
| -rw-r--r-- | src/decoder_list.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 77781b028..4f8a7db02 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -283,7 +283,7 @@ mpd_SOURCES += decoder/faad_plugin.c endif if HAVE_MP4 -mpd_SOURCES += decoder/mp4_plugin.c +mpd_SOURCES += decoder/mp4ff_plugin.c endif if HAVE_OGG_COMMON diff --git a/src/decoder/mp4_plugin.c b/src/decoder/mp4ff_plugin.c index a85e8a710..3d5a022a0 100644 --- a/src/decoder/mp4_plugin.c +++ b/src/decoder/mp4ff_plugin.c @@ -411,7 +411,7 @@ mp4_tag_dup(const char *file) static const char *const mp4_suffixes[] = { "m4a", "mp4", NULL }; static const char *const mp4_mime_types[] = { "audio/mp4", "audio/m4a", NULL }; -const struct decoder_plugin mp4_plugin = { +const struct decoder_plugin mp4ff_decoder_plugin = { .name = "mp4", .stream_decode = mp4_decode, .tag_dup = mp4_tag_dup, diff --git a/src/decoder_list.c b/src/decoder_list.c index d7360ce78..24a572a5e 100644 --- a/src/decoder_list.c +++ b/src/decoder_list.c @@ -31,7 +31,7 @@ extern const struct decoder_plugin vorbis_decoder_plugin; 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 mp4ff_decoder_plugin; extern const struct decoder_plugin faad_decoder_plugin; extern const struct decoder_plugin mpcPlugin; extern const struct decoder_plugin wavpack_plugin; @@ -62,7 +62,7 @@ static const struct decoder_plugin *const decoder_plugins[] = { &faad_decoder_plugin, #endif #ifdef HAVE_MP4 - &mp4_plugin, + &mp4ff_decoder_plugin, #endif #ifdef HAVE_MPCDEC &mpcPlugin, |