diff options
-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 8ffd1a6af1..47c0e7449b 100644 --- a/apps/metadata.c +++ b/apps/metadata.c | |||
@@ -89,9 +89,6 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] = | |||
89 | /* Musepack SV7 */ | 89 | /* Musepack SV7 */ |
90 | [AFMT_MPC_SV7] = | 90 | [AFMT_MPC_SV7] = |
91 | AFMT_ENTRY("MPCv7", "mpc", NULL, get_musepack_metadata,"mpc\0"), | 91 | AFMT_ENTRY("MPCv7", "mpc", NULL, get_musepack_metadata,"mpc\0"), |
92 | /* Musepack SV8 */ | ||
93 | [AFMT_MPC_SV8] = | ||
94 | AFMT_ENTRY("MPCv8", "mpc", NULL, get_musepack_metadata,"mpc\0"), | ||
95 | /* A/52 (aka AC3) audio */ | 92 | /* A/52 (aka AC3) audio */ |
96 | [AFMT_A52] = | 93 | [AFMT_A52] = |
97 | AFMT_ENTRY("AC3", "a52", NULL, get_a52_metadata, "a52\0ac3\0"), | 94 | AFMT_ENTRY("AC3", "a52", NULL, get_a52_metadata, "a52\0ac3\0"), |
@@ -104,9 +101,6 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] = | |||
104 | /* Advanced Audio Coding in M4A container */ | 101 | /* Advanced Audio Coding in M4A container */ |
105 | [AFMT_MP4_AAC] = | 102 | [AFMT_MP4_AAC] = |
106 | AFMT_ENTRY("AAC", "aac", NULL, get_mp4_metadata, "mp4\0"), | 103 | AFMT_ENTRY("AAC", "aac", NULL, get_mp4_metadata, "mp4\0"), |
107 | /* Advanced Audio Coding High Efficiency in M4A container */ | ||
108 | [AFMT_MP4_AAC_HE] = | ||
109 | AFMT_ENTRY("AAC-HE","aac", NULL, get_mp4_metadata, "mp4\0"), | ||
110 | /* Shorten */ | 104 | /* Shorten */ |
111 | [AFMT_SHN] = | 105 | [AFMT_SHN] = |
112 | AFMT_ENTRY("SHN","shorten", NULL, get_shn_metadata, "shn\0"), | 106 | AFMT_ENTRY("SHN","shorten", NULL, get_shn_metadata, "shn\0"), |
@@ -209,6 +203,12 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] = | |||
209 | /* WMA Voice in ASF */ | 203 | /* WMA Voice in ASF */ |
210 | [AFMT_WMAVOICE] = | 204 | [AFMT_WMAVOICE] = |
211 | AFMT_ENTRY("WMAVoice","wmavoice",NULL, NULL, "wma\0wmv\0"), | 205 | AFMT_ENTRY("WMAVoice","wmavoice",NULL, NULL, "wma\0wmv\0"), |
206 | /* Musepack SV8 */ | ||
207 | [AFMT_MPC_SV8] = | ||
208 | AFMT_ENTRY("MPCv8", "mpc", NULL, get_musepack_metadata,"mpc\0"), | ||
209 | /* Advanced Audio Coding High Efficiency in M4A container */ | ||
210 | [AFMT_MP4_AAC_HE] = | ||
211 | AFMT_ENTRY("AAC-HE","aac", NULL, get_mp4_metadata, "mp4\0"), | ||
212 | #endif | 212 | #endif |
213 | }; | 213 | }; |
214 | 214 | ||
diff --git a/apps/metadata.h b/apps/metadata.h index 8c350fcca3..3831062418 100644 --- a/apps/metadata.h +++ b/apps/metadata.h | |||
@@ -47,12 +47,10 @@ enum | |||
47 | AFMT_OGG_VORBIS, /* Ogg Vorbis */ | 47 | AFMT_OGG_VORBIS, /* Ogg Vorbis */ |
48 | AFMT_FLAC, /* FLAC */ | 48 | AFMT_FLAC, /* FLAC */ |
49 | AFMT_MPC_SV7, /* Musepack SV7 */ | 49 | AFMT_MPC_SV7, /* Musepack SV7 */ |
50 | AFMT_MPC_SV8, /* Musepack SV8 */ | ||
51 | AFMT_A52, /* A/52 (aka AC3) audio */ | 50 | AFMT_A52, /* A/52 (aka AC3) audio */ |
52 | AFMT_WAVPACK, /* WavPack */ | 51 | AFMT_WAVPACK, /* WavPack */ |
53 | AFMT_MP4_ALAC, /* Apple Lossless Audio Codec */ | 52 | AFMT_MP4_ALAC, /* Apple Lossless Audio Codec */ |
54 | AFMT_MP4_AAC, /* Advanced Audio Coding (AAC) in M4A container */ | 53 | AFMT_MP4_AAC, /* Advanced Audio Coding (AAC) in M4A container */ |
55 | AFMT_MP4_AAC_HE, /* Advanced Audio Coding (AAC-HE) in M4A container */ | ||
56 | AFMT_SHN, /* Shorten */ | 54 | AFMT_SHN, /* Shorten */ |
57 | AFMT_SID, /* SID File Format */ | 55 | AFMT_SID, /* SID File Format */ |
58 | AFMT_ADX, /* ADX File Format */ | 56 | AFMT_ADX, /* ADX File Format */ |
@@ -87,6 +85,8 @@ enum | |||
87 | AFMT_WAVE64, /* Wave64 */ | 85 | AFMT_WAVE64, /* Wave64 */ |
88 | AFMT_TTA, /* True Audio */ | 86 | AFMT_TTA, /* True Audio */ |
89 | AFMT_WMAVOICE, /* WMA Voice in ASF */ | 87 | AFMT_WMAVOICE, /* WMA Voice in ASF */ |
88 | AFMT_MPC_SV8, /* Musepack SV8 */ | ||
89 | AFMT_MP4_AAC_HE, /* Advanced Audio Coding (AAC-HE) in M4A container */ | ||
90 | #endif | 90 | #endif |
91 | 91 | ||
92 | /* add new formats at any index above this line to have a sensible order - | 92 | /* add new formats at any index above this line to have a sensible order - |