← Back to branch summary

~ubuntu-branches/ubuntu/utopic/ffmpeg-debian/utopic

« back to all changes in this revision

Viewing changes to libavcodec/vorbis.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-01-20 09:20:53 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090120092053-izz63p40hc98qfgp
Tags: 3:0.svn20090119-1ubuntu1
https://launchpad.net/bugs/318501
https://launchpad.net/bugs/253767
* merge from debian. LP: #318501
* new version fixes CVE-2008-3230, LP: #253767

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/vorbis.c
111
111
    return 0;
112
112
}
113
113
 
114
 
void ff_vorbis_ready_floor1_list(floor1_entry_t * list, int values) {
 
114
void ff_vorbis_ready_floor1_list(vorbis_floor1_entry * list, int values) {
115
115
    int i;
116
116
    list[0].sort = 0;
117
117
    list[1].sort = 1;
162
162
    }
163
163
}
164
164
 
165
 
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) {
 
165
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) {
166
166
    int lx, ly, i;
167
167
    lx = 0;
168
168
    ly = y_list[0] * multiplier;