From 676e26ab6d3335a194fab2c2ac8b91c44588bb2a Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Sat, 26 Apr 2008 14:22:43 +0000 Subject: move MP3On4DecodeContext def near the code and under ifdef Originally committed as revision 12993 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpegaudiodec.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'libavcodec') 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) */ -- cgit v1.2.3