diff flac.c @ 6728:56c5bbd0996f libavcodec

split out some decoder context params to a shared macro
author jbr
date Fri, 02 May 2008 21:33:14 +0000
parents 706dd1afb389
children 071888974d8a
line wrap: on
line diff
--- a/flac.c	Fri May 02 21:30:32 2008 +0000
+++ b/flac.c	Fri May 02 21:33:14 2008 +0000
@@ -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 @@
 };
 
 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];