[FFmpeg-devel] [PATCH] Bink file demuxer and audio decoder

[Daniel Verkamp]

On Wed, Jan 20, 2010 at 4:15 AM,  <pross at xvid.org> wrote:
[...]
> Fixes incorporated. Revised patchset enclosed.

In addition to the changes in export-wma-critical-freqs.diff, I'd
prefer something like the attached to avoid having to declare the
extern in the Bink code (instead just including wma.h).

>
> -- Peter

Thanks,
-- Daniel Verkamp
-------------- next part --------------
diff --git a/libavcodec/wma.c b/libavcodec/wma.c
index 3322d0e..6578045 100644
--- a/libavcodec/wma.c
+++ b/libavcodec/wma.c
@@ -242,7 +242,7 @@ int ff_wma_init(AVCodecContext *avctx, int flags2)
             if (s->version == 1) {
                 lpos = 0;
                 for (i = 0; i < 25; i++) {
-                    a = wma_critical_freqs[i];
+                    a = ff_wma_critical_freqs[i];
                     b = s->sample_rate;
                     pos = ((block_len * 2 * a) + (b >> 1)) / b;
                     if (pos > block_len)
@@ -277,7 +277,7 @@ int ff_wma_init(AVCodecContext *avctx, int flags2)
                     j = 0;
                     lpos = 0;
                     for (i = 0; i < 25; i++) {
-                        a = wma_critical_freqs[i];
+                        a = ff_wma_critical_freqs[i];
                         b = s->sample_rate;
                         pos = ((block_len * 2 * a) + (b << 1)) / (4 * b);
                         pos <<= 2;
diff --git a/libavcodec/wma.h b/libavcodec/wma.h
index b6c2943..a10f322 100644
--- a/libavcodec/wma.h
+++ b/libavcodec/wma.h
@@ -139,6 +139,7 @@ typedef struct WMACodecContext {
 #endif
 } WMACodecContext;
 
+extern const uint16_t ff_wma_critical_freqs[25];
 extern const uint16_t ff_wma_hgain_huffcodes[37];
 extern const uint8_t ff_wma_hgain_huffbits[37];
 extern const float ff_wma_lsp_codebook[NB_LSP_COEFS][16];
diff --git a/libavcodec/wmadata.h b/libavcodec/wmadata.h
index 0a26ea4..4b56b2f 100644
--- a/libavcodec/wmadata.h
+++ b/libavcodec/wmadata.h
@@ -30,7 +30,7 @@
 #include <stdint.h>
 #include "wma.h"
 
-static const uint16_t wma_critical_freqs[25] = {
+const uint16_t ff_wma_critical_freqs[25] = {
     100,   200,  300, 400,   510,  630,  770,    920,
     1080, 1270, 1480, 1720, 2000, 2320, 2700,   3150,
     3700, 4400, 5300, 6400, 7700, 9500, 12000, 15500,