diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2013-03-17 18:28:53 +1100 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2013-03-17 18:28:57 +1100 |
| commit | f86b1a33535a5009df9fbf052bc0aa0155a13615 (patch) | |
| tree | ac4e39135e1806ce12c7e1ef299ace62f24cb6e0 /src/flac/foreign_metadata.c | |
| parent | ca7a3cb8227964afe959d0fe5756ebbd995648ef (diff) | |
| download | flac-f86b1a33535a5009df9fbf052bc0aa0155a13615.tar.gz | |
Wave64 patch from Janne Hyvrinen <cse@sci.fi>.
GUID had one word incorrectly in little endian order.
Diffstat (limited to 'src/flac/foreign_metadata.c')
| -rw-r--r-- | src/flac/foreign_metadata.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/flac/foreign_metadata.c b/src/flac/foreign_metadata.c index b8e8b465..3015f1d9 100644 --- a/src/flac/foreign_metadata.c +++ b/src/flac/foreign_metadata.c @@ -333,9 +333,9 @@ static FLAC__bool read_from_wave64_(foreign_metadata_t *fm, FILE *f, const char if( fread(buffer, 1, 40, f) < 40 || /* RIFF GUID 66666972-912E-11CF-A5D6-28DB04C10000 */ - memcmp(buffer, "\x72\x69\x66\x66\x2E\x91\xCF\x11\xD6\xA5\x28\xDB\x04\xC1\x00\x00", 16) || + memcmp(buffer, "\x72\x69\x66\x66\x2E\x91\xCF\x11\xA5\xD6\x28\xDB\x04\xC1\x00\x00", 16) || /* WAVE GUID 65766177-ACF3-11D3-8CD1-00C04F8EDB8A */ - memcmp(buffer+24, "\x77\x61\x76\x65\xF3\xAC\xD3\x11\xD1\x8C\x00\xC0\x4F\x8E\xDB\x8A", 16) + memcmp(buffer+24, "\x77\x61\x76\x65\xF3\xAC\xD3\x11\x8C\xD1\x00\xC0\x4F\x8E\xDB\x8A", 16) ) { if(error) *error = "unsupported Wave64 layout (002)"; return false; @@ -364,7 +364,7 @@ static FLAC__bool read_from_wave64_(foreign_metadata_t *fm, FILE *f, const char if(size & 7) size = (size+7) & (~((FLAC__uint64)7)); /* fmt GUID 20746D66-ACF3-11D3-8CD1-00C04F8EDB8A */ - if(!memcmp(buffer, "\x66\x6D\x74\x20\xF3\xAC\xD3\x11\xD1\x8C\x00\xC0\x4F\x8E\xDB\x8A", 16)) { + if(!memcmp(buffer, "\x66\x6D\x74\x20\xF3\xAC\xD3\x11\x8C\xD1\x00\xC0\x4F\x8E\xDB\x8A", 16)) { if(fm->format_block) { if(error) *error = "invalid Wave64 file: multiple \"fmt \" chunks (005)"; return false; @@ -376,7 +376,7 @@ static FLAC__bool read_from_wave64_(foreign_metadata_t *fm, FILE *f, const char fm->format_block = fm->num_blocks; } /* data GUID 61746164-ACF3-11D3-8CD1-00C04F8EDB8A */ - else if(!memcmp(buffer, "\x64\x61\x74\x61\xF3\xAC\xD3\x11\xD1\x8C\x00\xC0\x4F\x8E\xDB\x8A", 16)) { + else if(!memcmp(buffer, "\x64\x61\x74\x61\xF3\xAC\xD3\x11\x8C\xD1\x00\xC0\x4F\x8E\xDB\x8A", 16)) { if(fm->audio_block) { if(error) *error = "invalid Wave64 file: multiple \"data\" chunks (007)"; return false; @@ -387,7 +387,7 @@ static FLAC__bool read_from_wave64_(foreign_metadata_t *fm, FILE *f, const char } fm->audio_block = fm->num_blocks; } - if(!append_block_(fm, offset, memcmp(buffer, "\x64\x61\x74\x61\xF3\xAC\xD3\x11\xD1\x8C\x00\xC0\x4F\x8E\xDB\x8A", 16)? (FLAC__uint32)size : 16+8, error)) + if(!append_block_(fm, offset, memcmp(buffer, "\x64\x61\x74\x61\xF3\xAC\xD3\x11\x8C\xD1\x00\xC0\x4F\x8E\xDB\x8A", 16)? (FLAC__uint32)size : 16+8, error)) return false; /* skip to next chunk */ if(fseeko(f, size-24, SEEK_CUR) < 0) { |