Commit 1411380b authored by ods15's avatar ods15

Rename all vorbis encoder related typedefs to not use _t for POSIX compatibility

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@16076 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 674a4037
...@@ -111,7 +111,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, uint_fast32_t num) { ...@@ -111,7 +111,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, uint_fast32_t num) {
return 0; return 0;
} }
void ff_vorbis_ready_floor1_list(floor1_entry_t * list, int values) { void ff_vorbis_ready_floor1_list(vorbis_floor1_entry * list, int values) {
int i; int i;
list[0].sort = 0; list[0].sort = 0;
list[1].sort = 1; list[1].sort = 1;
...@@ -162,7 +162,7 @@ static void render_line(int x0, int y0, int x1, int y1, float * buf) { ...@@ -162,7 +162,7 @@ static void render_line(int x0, int y0, int x1, int y1, float * buf) {
} }
} }
void ff_vorbis_floor1_render_list(floor1_entry_t * list, int values, uint_fast16_t * y_list, int * flag, int multiplier, float * out, int samples) { 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) {
int lx, ly, i; int lx, ly, i;
lx = 0; lx = 0;
ly = y_list[0] * multiplier; ly = y_list[0] * multiplier;
......
...@@ -31,12 +31,12 @@ typedef struct { ...@@ -31,12 +31,12 @@ typedef struct {
uint_fast16_t sort; uint_fast16_t sort;
uint_fast16_t low; uint_fast16_t low;
uint_fast16_t high; uint_fast16_t high;
} floor1_entry_t; } vorbis_floor1_entry;
void ff_vorbis_ready_floor1_list(floor1_entry_t * list, int values); 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) 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); int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, uint_fast32_t num);
void ff_vorbis_floor1_render_list(floor1_entry_t * list, int values, uint_fast16_t * y_list, int * flag, int multiplier, float * out, int samples); 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);
#define ilog(i) av_log2(2*(i)) #define ilog(i) av_log2(2*(i))
......
...@@ -90,7 +90,7 @@ typedef struct { ...@@ -90,7 +90,7 @@ typedef struct {
int_fast16_t subclass_books[16][8]; int_fast16_t subclass_books[16][8];
uint_fast8_t multiplier; uint_fast8_t multiplier;
uint_fast16_t x_list_dim; uint_fast16_t x_list_dim;
floor1_entry_t * list; vorbis_floor1_entry * list;
} t1; } t1;
} data; } data;
} vorbis_floor; } vorbis_floor;
...@@ -511,7 +511,7 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) { ...@@ -511,7 +511,7 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) {
floor_setup->data.t1.x_list_dim+=floor_setup->data.t1.class_dimensions[floor_setup->data.t1.partition_class[j]]; floor_setup->data.t1.x_list_dim+=floor_setup->data.t1.class_dimensions[floor_setup->data.t1.partition_class[j]];
} }
floor_setup->data.t1.list=av_mallocz(floor_setup->data.t1.x_list_dim * sizeof(floor1_entry_t)); floor_setup->data.t1.list=av_mallocz(floor_setup->data.t1.x_list_dim * sizeof(vorbis_floor1_entry));
rangebits=get_bits(gb, 4); rangebits=get_bits(gb, 4);
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment