[SCM] libav/experimental: Move 2 defines from mpegaudiodec.c to mpegaudiodata.h to allow compilation when DEBUG is defined. Patch by Martin Lindhe: martin startwars org

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 3240941b2552ec9b6373163240bb89a4bab40c50
Author: Martin Lindhe <martin at startwars.org>
Date:   Thu Nov 8 10:53:32 2007 +0000

    Move 2 defines from mpegaudiodec.c to mpegaudiodata.h to allow compilation
    when DEBUG is defined.
    Patch by Martin Lindhe: martin startwars org
    
    Originally committed as revision 10955 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegaudiodata.h b/libavcodec/mpegaudiodata.h
index 09254cb..d513645 100644
--- a/libavcodec/mpegaudiodata.h
+++ b/libavcodec/mpegaudiodata.h
@@ -29,6 +29,9 @@
 
 #include "common.h"
 
+#define MODE_EXT_MS_STEREO 2
+#define MODE_EXT_I_STEREO  1
+
 extern const uint16_t ff_mpa_bitrate_tab[2][3][15];
 extern const uint16_t ff_mpa_freq_tab[3];
 extern const int32_t ff_mpa_enwindow[257];
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index d679b00..83ee255 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -85,9 +85,6 @@ typedef struct GranuleDef {
     int32_t sb_hybrid[SBLIMIT * 18]; /* 576 samples */
 } GranuleDef;
 
-#define MODE_EXT_MS_STEREO 2
-#define MODE_EXT_I_STEREO  1
-
 #include "mpegaudiodata.h"
 #include "mpegaudiodectab.h"
 

-- 
Libav/FFmpeg packaging