summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-04-26 14:22:43 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-04-26 14:22:43 +0000
commit676e26ab6d3335a194fab2c2ac8b91c44588bb2a (patch)
tree8c5ae99b247c70fdf8d2f1c3cf3a8e225605e83d /libavcodec
parent9f95bfe2b9c8dedf8d99637af05161cbd33d6acd (diff)
move MP3On4DecodeContext def near the code and under ifdef
Originally committed as revision 12993 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mpegaudiodec.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index bf797bdaac..016a59c9d6 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -56,16 +56,6 @@
#define HEADER_SIZE 4
-/**
- * Context for MP3On4 decoder
- */
-typedef struct MP3On4DecodeContext {
- int frames; ///< number of mp3 frames per block (number of mp3 decoder instances)
- int chan_cfg; ///< channel config number
- int syncword; ///< syncword patch
- MPADecodeContext *mp3decctx[5]; ///< MPADecodeContext for every decoder instance
-} MP3On4DecodeContext;
-
/* layer 3 "granule" */
typedef struct GranuleDef {
uint8_t scfsi;
@@ -2477,6 +2467,16 @@ static int decode_frame_adu(AVCodecContext * avctx,
#ifdef CONFIG_MP3ON4_DECODER
+/**
+ * Context for MP3On4 decoder
+ */
+typedef struct MP3On4DecodeContext {
+ int frames; ///< number of mp3 frames per block (number of mp3 decoder instances)
+ int chan_cfg; ///< channel config number
+ int syncword; ///< syncword patch
+ MPADecodeContext *mp3decctx[5]; ///< MPADecodeContext for every decoder instance
+} MP3On4DecodeContext;
+
#include "mpeg4audio.h"
/* Next 3 arrays are indexed by channel config number (passed via codecdata) */