Imported Upstream version 6.1

[platform/upstream/ffmpeg.git] / libavcodec / vorbis.h

diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h
index 69ddbd2..7190465 100644 (file)
--- a/libavcodec/vorbis.h
+++ b/libavcodec/vorbis.h
@@ -21,12 +21,7 @@
 #ifndef AVCODEC_VORBIS_H
 #define AVCODEC_VORBIS_H
 
-#include "avcodec.h"
-
-extern const float ff_vorbis_floor1_inverse_db_table[256];
-extern const float * const ff_vorbis_vwin[8];
-extern const uint8_t ff_vorbis_channel_layout_offsets[8][8];
-extern const uint64_t ff_vorbis_channel_layouts[9];
+#include <stdint.h>
 
 typedef struct vorbis_floor1_entry {
     uint16_t x;
@@ -35,14 +30,13 @@ typedef struct vorbis_floor1_entry {
     uint16_t high;
 } vorbis_floor1_entry;
 
-int ff_vorbis_ready_floor1_list(AVCodecContext *avctx,
+int ff_vorbis_ready_floor1_list(void *logctx,
                                 vorbis_floor1_entry *list, int values);
 unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n); // x^(1/n)
 int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num);
 void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values,
                                   uint16_t *y_list, int *flag,
                                   int multiplier, float * out, int samples);
-void ff_vorbis_inverse_coupling(float *mag, float *ang, intptr_t blocksize);
 
 #define ilog(i) av_log2(2*(i))