Make XMA support dependent on FFmpeg inclusion, for now.

This commit is contained in:
Christopher Snowhill 2016-12-18 11:41:26 -08:00
parent 0ff86bd75a
commit ad85fc8bc3
3 changed files with 7 additions and 1 deletions

View File

@ -662,6 +662,8 @@ VGMSTREAM * init_vgmstream_btsnd(STREAMFILE* streamFile);
VGMSTREAM * init_vgmstream_ps2_svag_snk(STREAMFILE* streamFile);
#ifdef VGM_USE_FFMPEG
VGMSTREAM * init_vgmstream_xma(STREAMFILE* streamFile);
#endif
#endif

View File

@ -1,6 +1,8 @@
#include "meta.h"
#include "../util.h"
#ifdef VGM_USE_FFMPEG
#define ADJUST_SAMPLE_RATE 0
#define XMA_BYTES_PER_PACKET 2048
#define XMA_SAMPLES_PER_FRAME 512
@ -394,3 +396,5 @@ static int32_t get_xma_sample_rate(int32_t general_rate) {
return xma_rate;
}
#endif
#endif

View File

@ -338,8 +338,8 @@ VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = {
init_vgmstream_g1l,
init_vgmstream_hca,
init_vgmstream_ps2_svag_snk,
init_vgmstream_xma,
#ifdef VGM_USE_FFMPEG
init_vgmstream_xma,
init_vgmstream_mp4_aac_ffmpeg,
init_vgmstream_ffmpeg,
#endif