add casts to silence gcc warnings

[ffmpeg] / libavcodec / vorbis.h

diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h
index 5cdcb652af4a2f6cdbcbc31c0a367917772461ee..dc99acc2c5460291864b078b27a2c3e728423afc 100644 (file)
--- a/libavcodec/vorbis.h
+++ b/libavcodec/vorbis.h
@@ -1,34 +1,43 @@
 /*
  * copyright (c) 2006 Oded Shimon <ods15@ods15.dyndns.org>
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef VORBIS_H
-#define VORBIS_H
+#ifndef AVCODEC_VORBIS_H
+#define AVCODEC_VORBIS_H
+
+#include "avcodec.h"
 
 extern const float ff_vorbis_floor1_inverse_db_table[256];
-extern const float * ff_vorbis_vwin[8];
+extern const float * const ff_vorbis_vwin[8];
 
 typedef struct {
     uint_fast16_t x;
     uint_fast16_t sort;
     uint_fast16_t low;
     uint_fast16_t high;
-} floor1_entry_t;
+} vorbis_floor1_entry;
+
+void ff_vorbis_ready_floor1_list(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, uint_fast32_t num);
+void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values, uint_fast16_t * y_list, int * flag, int multiplier, float * out, int samples);
 
-void ff_vorbis_ready_floor1_list(floor1_entry_t * list, int values);
+#define ilog(i) av_log2(2*(i))
 
-#endif
+#endif /* AVCODEC_VORBIS_H */