Commit 70523657 authored by Max Kellermann's avatar Max Kellermann

renamed decoder plugin "mp4" to "mp4ff"

This plugin is based on "libmp4ff".
parent f4ff7eab
...@@ -283,7 +283,7 @@ mpd_SOURCES += decoder/faad_plugin.c ...@@ -283,7 +283,7 @@ mpd_SOURCES += decoder/faad_plugin.c
endif endif
if HAVE_MP4 if HAVE_MP4
mpd_SOURCES += decoder/mp4_plugin.c mpd_SOURCES += decoder/mp4ff_plugin.c
endif endif
if HAVE_OGG_COMMON if HAVE_OGG_COMMON
......
...@@ -411,7 +411,7 @@ mp4_tag_dup(const char *file) ...@@ -411,7 +411,7 @@ mp4_tag_dup(const char *file)
static const char *const mp4_suffixes[] = { "m4a", "mp4", NULL }; static const char *const mp4_suffixes[] = { "m4a", "mp4", NULL };
static const char *const mp4_mime_types[] = { "audio/mp4", "audio/m4a", 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", .name = "mp4",
.stream_decode = mp4_decode, .stream_decode = mp4_decode,
.tag_dup = mp4_tag_dup, .tag_dup = mp4_tag_dup,
......
...@@ -31,7 +31,7 @@ extern const struct decoder_plugin vorbis_decoder_plugin; ...@@ -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 flac_decoder_plugin;
extern const struct decoder_plugin oggflac_decoder_plugin; extern const struct decoder_plugin oggflac_decoder_plugin;
extern const struct decoder_plugin audiofilePlugin; 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 faad_decoder_plugin;
extern const struct decoder_plugin mpcPlugin; extern const struct decoder_plugin mpcPlugin;
extern const struct decoder_plugin wavpack_plugin; extern const struct decoder_plugin wavpack_plugin;
...@@ -62,7 +62,7 @@ static const struct decoder_plugin *const decoder_plugins[] = { ...@@ -62,7 +62,7 @@ static const struct decoder_plugin *const decoder_plugins[] = {
&faad_decoder_plugin, &faad_decoder_plugin,
#endif #endif
#ifdef HAVE_MP4 #ifdef HAVE_MP4
&mp4_plugin, &mp4ff_decoder_plugin,
#endif #endif
#ifdef HAVE_MPCDEC #ifdef HAVE_MPCDEC
&mpcPlugin, &mpcPlugin,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment