From 987641d86676aea7b6ac314b7723f7ce337a8be0 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Fri, 6 Mar 2020 03:41:39 -0800 Subject: [PATCH] Updates for MP4 --- src/formats.c | 3 +++ src/meta/mp4.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/formats.c b/src/formats.c index 0a211911..2249a8fc 100644 --- a/src/formats.c +++ b/src/formats.c @@ -791,6 +791,9 @@ static const coding_info coding_info_list[] = { #ifdef VGM_USE_FFMPEG {coding_FFmpeg, "FFmpeg"}, #endif +#ifdef VGM_USE_FDKAAC + {coding_MP4_AAC, "MPEG-4 AAC"}, +#endif }; static const layout_info layout_info_list[] = { diff --git a/src/meta/mp4.c b/src/meta/mp4.c index 5471fe0d..c16ec2aa 100644 --- a/src/meta/mp4.c +++ b/src/meta/mp4.c @@ -98,8 +98,6 @@ VGMSTREAM * init_vgmstream_mp4_aac_offset(STREAMFILE *streamFile, uint64_t start aac_file->h_aacdecoder = aacDecoder_Open( TT_MP4_RAW, 1 ); if ( !aac_file->h_aacdecoder ) goto fail; - aacDecoder_SetParam( aac_file->h_aacdecoder, AAC_PCM_OUTPUT_CHANNELS, 2 ); - MP4GetTrackESConfiguration( aac_file->h_mp4file, aac_file->track_id, (uint8_t**)(&buffer), (uint32_t*)(&buffer_size)); ubuffer_size = buffer_size;