split out some decoder context params to a shared macro

Originally committed as revision 13035 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 4 insertions, 4 deletions

diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index 28e25e7b90..f3603ce4a8 100644
--- a/libavcodec/flac.c
+++ b/libavcodec/flac.c
@@ -40,6 +40,7 @@
 #include "bitstream.h"
 #include "golomb.h"
 #include "crc.h"
+#include "flac.h"
 
 #undef NDEBUG
 #include <assert.h>
@@ -56,14 +57,13 @@ enum decorrelation_type {
 };
 
 typedef struct FLACContext {
+    FLACSTREAMINFO
+
     AVCodecContext *avctx;
     GetBitContext gb;
 
-    int min_blocksize, max_blocksize;
-    int max_framesize;
-    int samplerate, channels;
     int blocksize/*, last_blocksize*/;
-    int bps, curr_bps;
+    int curr_bps;
     enum decorrelation_type decorrelation;
 
     int32_t *decoded[MAX_CHANNELS];