diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/metadata.c | 12 | ||||
| -rw-r--r-- | apps/metadata.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/apps/metadata.c b/apps/metadata.c index 8ffd1a6..47c0e74 100644 --- a/apps/metadata.c +++ b/apps/metadata.c @@ -89,9 +89,6 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] = /* Musepack SV7 */ [AFMT_MPC_SV7] = AFMT_ENTRY("MPCv7", "mpc", NULL, get_musepack_metadata,"mpc\0"), - /* Musepack SV8 */ - [AFMT_MPC_SV8] = - AFMT_ENTRY("MPCv8", "mpc", NULL, get_musepack_metadata,"mpc\0"), /* A/52 (aka AC3) audio */ [AFMT_A52] = AFMT_ENTRY("AC3", "a52", NULL, get_a52_metadata, "a52\0ac3\0"), @@ -104,9 +101,6 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] = /* Advanced Audio Coding in M4A container */ [AFMT_MP4_AAC] = AFMT_ENTRY("AAC", "aac", NULL, get_mp4_metadata, "mp4\0"), - /* Advanced Audio Coding High Efficiency in M4A container */ - [AFMT_MP4_AAC_HE] = - AFMT_ENTRY("AAC-HE","aac", NULL, get_mp4_metadata, "mp4\0"), /* Shorten */ [AFMT_SHN] = AFMT_ENTRY("SHN","shorten", NULL, get_shn_metadata, "shn\0"), @@ -209,6 +203,12 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] = /* WMA Voice in ASF */ [AFMT_WMAVOICE] = AFMT_ENTRY("WMAVoice","wmavoice",NULL, NULL, "wma\0wmv\0"), + /* Musepack SV8 */ + [AFMT_MPC_SV8] = + AFMT_ENTRY("MPCv8", "mpc", NULL, get_musepack_metadata,"mpc\0"), + /* Advanced Audio Coding High Efficiency in M4A container */ + [AFMT_MP4_AAC_HE] = + AFMT_ENTRY("AAC-HE","aac", NULL, get_mp4_metadata, "mp4\0"), #endif }; diff --git a/apps/metadata.h b/apps/metadata.h index 8c350fc..3831062 100644 --- a/apps/metadata.h +++ b/apps/metadata.h @@ -47,12 +47,10 @@ enum AFMT_OGG_VORBIS, /* Ogg Vorbis */ AFMT_FLAC, /* FLAC */ AFMT_MPC_SV7, /* Musepack SV7 */ - AFMT_MPC_SV8, /* Musepack SV8 */ AFMT_A52, /* A/52 (aka AC3) audio */ AFMT_WAVPACK, /* WavPack */ AFMT_MP4_ALAC, /* Apple Lossless Audio Codec */ AFMT_MP4_AAC, /* Advanced Audio Coding (AAC) in M4A container */ - AFMT_MP4_AAC_HE, /* Advanced Audio Coding (AAC-HE) in M4A container */ AFMT_SHN, /* Shorten */ AFMT_SID, /* SID File Format */ AFMT_ADX, /* ADX File Format */ @@ -87,6 +85,8 @@ enum AFMT_WAVE64, /* Wave64 */ AFMT_TTA, /* True Audio */ AFMT_WMAVOICE, /* WMA Voice in ASF */ + AFMT_MPC_SV8, /* Musepack SV8 */ + AFMT_MP4_AAC_HE, /* Advanced Audio Coding (AAC-HE) in M4A container */ #endif /* add new formats at any index above this line to have a sensible order - |