1 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h
index de150f9940..927312ded4 100644
--- a/libavcodec/vorbis.h
+++ b/libavcodec/vorbis.h
@@ -89,8 +89,7 @@ typedef struct vorbis_context_s {
     GetBitContext gb;
     DSPContext dsp;
 
-    MDCTContext mdct0;
-    MDCTContext mdct1;
+    MDCTContext mdct[2];
     uint_fast8_t first_frame;
     uint_fast32_t version;
     uint_fast8_t audio_channels;
@@ -98,10 +97,8 @@ typedef struct vorbis_context_s {
     uint_fast32_t bitrate_maximum;
     uint_fast32_t bitrate_nominal;
     uint_fast32_t bitrate_minimum;
-    uint_fast32_t blocksize_0;
-    uint_fast32_t blocksize_1;
-    const float * swin;
-    const float * lwin;
+    uint_fast32_t blocksize[2];
+    const float * win[2];
     uint_fast16_t codebook_count;
     vorbis_codebook *codebooks;
     uint_fast8_t floor_count;