mpegaudioenc: Remove broken integer-only quantization code path

[ffmpeg] / libavcodec / vorbis.h

diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h
index 8501e0a178db5086679b1ce6e7aa8ef1fd9d65a3..5ae20ac243d8a269d7af523e9850eede875ee705 100644 (file)
--- a/libavcodec/vorbis.h
+++ b/libavcodec/vorbis.h
@@ -27,22 +27,23 @@ 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 uint8_t ff_vorbis_encoding_channel_layout_offsets[8][8];
-extern const int64_t ff_vorbis_channel_layouts[9];
+extern const uint64_t ff_vorbis_channel_layouts[9];
 
-typedef struct {
+typedef struct vorbis_floor1_entry {
     uint16_t x;
     uint16_t sort;
     uint16_t low;
     uint16_t high;
 } vorbis_floor1_entry;
 
-void ff_vorbis_ready_floor1_list(vorbis_floor1_entry * list, int values);
+int ff_vorbis_ready_floor1_list(AVCodecContext *avctx,
+                                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 vorbis_inverse_coupling(float *mag, float *ang, int blocksize);
+void ff_vorbis_inverse_coupling(float *mag, float *ang, intptr_t blocksize);
 
 #define ilog(i) av_log2(2*(i))