Merge pull request #213 from bnnm/master

Fix ATRAC9 regression
This commit is contained in:
Christopher Snowhill 2018-04-10 15:41:32 -07:00 committed by GitHub
commit 2f93dc2a45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -198,6 +198,7 @@ static int read_fmt(int big_endian, STREAMFILE * streamFile, off_t current_chunk
fmt->block_size = (bztmp & 0x3FF) * 8 + 8; //should match fmt->block_size fmt->block_size = (bztmp & 0x3FF) * 8 + 8; //should match fmt->block_size
#elif defined(VGM_USE_FFMPEG) #elif defined(VGM_USE_FFMPEG)
fmt->coding_type = coding_FFmpeg; fmt->coding_type = coding_FFmpeg;
break;
#else #else
goto fail; goto fail;
#endif #endif
@ -210,12 +211,13 @@ static int read_fmt(int big_endian, STREAMFILE * streamFile, off_t current_chunk
read_32bitBE(current_chunk+0x2c,streamFile) == 0x4F8C836C) { read_32bitBE(current_chunk+0x2c,streamFile) == 0x4F8C836C) {
#ifdef VGM_USE_ATRAC9 #ifdef VGM_USE_ATRAC9
fmt->coding_type = coding_ATRAC9; fmt->coding_type = coding_ATRAC9;
break;
#else #else
goto fail; goto fail;
#endif #endif
} }
goto fail; goto fail; /* unknown GUID */
default: default:
goto fail; goto fail;