From 94572fede5d220649f5ccb5915ee3ae8ed929487 Mon Sep 17 00:00:00 2001
From: bnnm <bananaman255@gmail.com>
Date: Fri, 30 Mar 2018 21:37:11 +0200
Subject: [PATCH] Use meta_MP4 for MP4 FFmpeg too, so no need to ifdef

---
 src/formats.c   | 4 +---
 src/meta/mp4.c  | 2 +-
 src/vgmstream.h | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/formats.c b/src/formats.c
index ecc09cd9..eda215ae 100644
--- a/src/formats.c
+++ b/src/formats.c
@@ -980,10 +980,8 @@ static const meta_info meta_info_list[] = {
         {meta_EA_WVE_AU00,          "Electronic Arts WVE (au00) header"},
         {meta_EA_WVE_AD10,          "Electronic Arts WVE (Ad10) header"},
         {meta_STHD,                 "Dream Factory STHD header"},
+        {meta_MP4,                  "MP4/AAC header"},
 
-#ifdef VGM_USE_MP4V2
-        {meta_MP4,                  "AAC header"},
-#endif
 #ifdef VGM_USE_FFMPEG
         {meta_FFmpeg,               "FFmpeg supported file format"},
 #endif
diff --git a/src/meta/mp4.c b/src/meta/mp4.c
index b232319a..ac53aa53 100644
--- a/src/meta/mp4.c
+++ b/src/meta/mp4.c
@@ -240,7 +240,7 @@ VGMSTREAM * init_vgmstream_mp4_aac_ffmpeg(STREAMFILE *streamFile) {
     vgmstream->codec_data = ffmpeg_data;
     vgmstream->coding_type = coding_FFmpeg;
     vgmstream->layout_type = layout_none;
-    vgmstream->meta_type = meta_FFmpeg;
+    vgmstream->meta_type = meta_MP4;
 
     vgmstream->num_samples = ffmpeg_data->totalSamples;
     vgmstream->sample_rate = ffmpeg_data->sampleRate;
diff --git a/src/vgmstream.h b/src/vgmstream.h
index e42f9107..4bc802ed 100644
--- a/src/vgmstream.h
+++ b/src/vgmstream.h
@@ -665,10 +665,8 @@ typedef enum {
     meta_EA_WVE_AU00,       /* Electronic Arts PS movies [Future Cop - L.A.P.D. (PS), Supercross 2000 (PS)] */
     meta_EA_WVE_AD10,       /* Electronic Arts PS movies [Wing Commander 3/4 (PS)] */
     meta_STHD,              /* STHD .stx [Kakuto Chojin (Xbox)] */
+    meta_MP4,               /* MP4/AAC */
 
-#ifdef VGM_USE_MP4V2
-    meta_MP4,               /* AAC (iOS) */
-#endif
 #ifdef VGM_USE_FFMPEG
     meta_FFmpeg,
 #endif