Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-01-17 23:36:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34 from notspiff/fix_ifdefery

Browse Source 
Fix some ifdef issues
This commit is contained in:
Christopher Snowhill 2016-07-31 14:10:43 -07:00 committed by GitHub
commit 32ca1e646f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/meta/meta.h
View File

@ -110,6 +110,7 @@ typedef struct {
VGMSTREAM * init_vgmstream_ogg_vorbis_callbacks(STREAMFILE *streamFile, const char * filename, ov_callbacks *callbacks, off_t other_header_bytes, const vgm_vorbis_info_t *vgm_inf);
VGMSTREAM * init_vgmstream_sli_ogg(STREAMFILE * streamFile);
#endif
VGMSTREAM * init_vgmstream_hca(STREAMFILE *streamFile);
@ -135,7 +136,6 @@ VGMSTREAM * init_vgmstream_akb(STREAMFILE *streamFile);
#endif
VGMSTREAM * init_vgmstream_sfl(STREAMFILE * streamFile);
#endif
VGMSTREAM * init_vgmstream_sadb(STREAMFILE *streamFile);

6
src/meta/sqex_scd.c
View File

@ -313,7 +313,11 @@ VGMSTREAM * init_vgmstream_sqex_scd(STREAMFILE *streamFile) {
vgmstream->meta_type = meta_SQEX_SCD;
/* open the file for reading */
if (vgmstream->layout_type != layout_scd_int && vgmstream->coding_type != coding_FFmpeg)
if (vgmstream->layout_type != layout_scd_int
#ifdef VGM_USE_FFMPEG
&& vgmstream->coding_type != coding_FFmpeg
#endif
)
{
int i;
STREAMFILE * file;