ape: Support _0000 files with nblock smaller than 64

[ffmpeg] / libavcodec / binkaudio.c

diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
index ddaa613ae45b1b45c3b85a2aa988268790056f06..0b427bfb90b3cb6a8ff800aced898df2095ab549 100644 (file)
--- a/libavcodec/binkaudio.c
+++ b/libavcodec/binkaudio.c
@@ -34,9 +34,8 @@
 #include "get_bits.h"
 #include "dct.h"
 #include "rdft.h"
-#include "fmtconvert.h"
 #include "internal.h"
-#include "wma.h"
+#include "wma_freqs.h"
 #include "libavutil/intfloat.h"
 
 static float quant_table[96];
@@ -44,7 +43,7 @@ static float quant_table[96];
 #define MAX_CHANNELS 2
 #define BINK_BLOCK_MAX_SIZE (MAX_CHANNELS << 11)
 
-typedef struct {
+typedef struct BinkAudioContext {
     GetBitContext gb;
     int version_b;          ///< Bink version 'b'
     int first;