Commit 676e26ab authored by Baptiste Coudurier's avatar Baptiste Coudurier

move MP3On4DecodeContext def near the code and under ifdef

Originally committed as revision 12993 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 9f95bfe2
...@@ -56,16 +56,6 @@ ...@@ -56,16 +56,6 @@
#define HEADER_SIZE 4 #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" */ /* layer 3 "granule" */
typedef struct GranuleDef { typedef struct GranuleDef {
uint8_t scfsi; uint8_t scfsi;
...@@ -2477,6 +2467,16 @@ static int decode_frame_adu(AVCodecContext * avctx, ...@@ -2477,6 +2467,16 @@ static int decode_frame_adu(AVCodecContext * avctx,
#ifdef CONFIG_MP3ON4_DECODER #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" #include "mpeg4audio.h"
/* Next 3 arrays are indexed by channel config number (passed via codecdata) */ /* Next 3 arrays are indexed by channel config number (passed via codecdata) */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment