[FFmpeg-cvslog] r12993 - trunk/libavcodec/mpegaudiodec.c
bcoudurier
subversion
Sat Apr 26 16:22:44 CEST 2008
Author: bcoudurier
Date: Sat Apr 26 16:22:43 2008
New Revision: 12993
Log:
move MP3On4DecodeContext def near the code and under ifdef
Modified:
trunk/libavcodec/mpegaudiodec.c
Modified: trunk/libavcodec/mpegaudiodec.c
==============================================================================
--- trunk/libavcodec/mpegaudiodec.c (original)
+++ trunk/libavcodec/mpegaudiodec.c Sat Apr 26 16:22:43 2008
@@ -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(AVCodecConte
#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) */
More information about the ffmpeg-cvslog
mailing list