g726dec: set channel layout at initialization instead of validating it

[ffmpeg] / libavcodec / vorbis.h

diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h
index 924ca800b2526d51623dbe1b8aee1889aab8eec6..6b72f6ad7e172f65458584116e4e526cbd82efa2 100644 (file)
--- a/libavcodec/vorbis.h
+++ b/libavcodec/vorbis.h
@@ -29,14 +29,15 @@ 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 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 *avccontext,
+                                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,