X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwav_reader.c;h=e69cba7050b24ed29f6fb1f113e1cfaab1cf42a7;hb=1af8624b009faf5bc6b9b8dfa76676483da5f6cf;hp=133854b1a6cd81e85fc28ff36d2d20630788e0c5;hpb=29a8f73fafe37beb8048316cca06ac83dfd1f2e1;p=fdkaac.git diff --git a/src/wav_reader.c b/src/wav_reader.c index 133854b..e69cba7 100644 --- a/src/wav_reader.c +++ b/src/wav_reader.c @@ -18,12 +18,7 @@ #define RIFF_FOURCC(a,b,c,d) ((a)|((b)<<8)|((c)<<16)|((d)<<24)) -#define ENSURE(expr) \ - do { \ - if (!(expr)) goto FAIL;\ - } while (0) - -struct wav_reader_t { +typedef struct wav_reader_t { pcm_reader_vtbl_t *vtbl; pcm_sample_description_t sample_format; int64_t length; @@ -31,7 +26,7 @@ struct wav_reader_t { int32_t data_offset; int ignore_length; pcm_io_context_t io; -}; +} wav_reader_t; static const uint8_t WAV_GUID_PCM[] = { 1, 0, 0, 0, 0, 0, 0x10, 0, 0x80, 0, 0, 0xaa, 0, 0x38, 0x9b, 0x71