From 9d48410f142290dfe6d4823656f2f208f4b06287 Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Fri, 2 May 2008 21:33:14 +0000
Subject: [PATCH] split out some decoder context params to a shared macro

Originally committed as revision 13035 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/flac.c |  8 ++++----
 libavcodec/flac.h | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 libavcodec/flac.h

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];
diff --git a/libavcodec/flac.h b/libavcodec/flac.h
new file mode 100644
index 0000000000..e7a8440b12
--- /dev/null
+++ b/libavcodec/flac.h
@@ -0,0 +1,42 @@
+/*
+ * FLAC (Free Lossless Audio Codec) decoder/demuxer common functions
+ * Copyright (c) 2008 Justin Ruggles
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file flac.h
+ * FLAC (Free Lossless Audio Codec) decoder/demuxer common functions
+ */
+
+#ifndef FFMPEG_FLAC_H
+#define FFMPEG_FLAC_H
+
+/**
+ * Data needed from the Streaminfo header for use by the raw FLAC demuxer
+ * and/or the FLAC decoder.
+ */
+#define FLACSTREAMINFO \
+    int min_blocksize;      /**< minimum block size, in samples          */\
+    int max_blocksize;      /**< maximum block size, in samples          */\
+    int max_framesize;      /**< maximum frame size, in bytes            */\
+    int samplerate;         /**< sample rate                             */\
+    int channels;           /**< number of channels                      */\
+    int bps;                /**< bits-per-sample                         */\
+
+#endif /* FFMPEG_FLAC_H */