From fa73e75f701980ab214b68e4dc5767e7ddbabb18 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jmvalin@jmvalin.ca>
Date: Wed, 30 Dec 2015 14:21:34 -0500
Subject: [PATCH] Avoids having the Opus-level "arch" be set to 0 on
 encoder/decoder reset

---
 src/opus_decoder.c | 2 +-
 src/opus_encoder.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/opus_decoder.c b/src/opus_decoder.c
index c41985e9..080bec50 100644
--- a/src/opus_decoder.c
+++ b/src/opus_decoder.c
@@ -59,6 +59,7 @@ struct OpusDecoder {
    opus_int32   Fs;          /** Sampling rate (at the API level) */
    silk_DecControlStruct DecControl;
    int          decode_gain;
+   int          arch;
 
    /* Everything beyond this point gets cleared on a reset */
 #define OPUS_DECODER_RESET_START stream_channels
@@ -75,7 +76,6 @@ struct OpusDecoder {
 #endif
 
    opus_uint32  rangeFinal;
-   int          arch;
 };
 
 
diff --git a/src/opus_encoder.c b/src/opus_encoder.c
index 9dbe4bf5..8f6c9a9f 100644
--- a/src/opus_encoder.c
+++ b/src/opus_encoder.c
@@ -81,6 +81,7 @@ struct OpusEncoder {
     int          lsb_depth;
     int          encoder_buffer;
     int          lfe;
+    int          arch;
 
 #define OPUS_ENCODER_RESET_START stream_channels
     int          stream_channels;
@@ -105,7 +106,6 @@ struct OpusEncoder {
     int          analysis_offset;
 #endif
     opus_uint32  rangeFinal;
-    int          arch;
 };
 
 /* Transition tables for the voice and music. First column is the