← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/xvidcap/jaunty-proposed

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/wma.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc, Andrew Starr-Bochicchio, Lionel Le Folgoc
  • Date: 2008-12-26 00:10:06 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20081226001006-2040ls9680bd1blt
Tags: 1.1.7-0.2ubuntu1
https://launchpad.net/bugs/298547
https://launchpad.net/bugs/311412
[ Andrew Starr-Bochicchio ]
* Merge from debian-multimedia (LP: #298547), Ubuntu Changes:
 - For ffmpeg-related build-deps, fix versionized dependencies
   as the ubuntu versioning is different than debian-multimedia's.

[ Lionel Le Folgoc ]
* LP: #311412 is fixed since the 1.1.7~rc1-0.1 revision.
* debian/patches/03_ffmpeg.diff: updated to fix FTBFS due to libswscale API
  change (cherry-pick from Gentoo #234383).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libavcodec/wma.c
72
72
    int sample_rate1;
73
73
    int coef_vlc_table;
74
74
 
 
75
    if(   avctx->sample_rate<=0 || avctx->sample_rate>50000
 
76
       || avctx->channels<=0 || avctx->channels>8
 
77
       || avctx->bit_rate<=0)
 
78
        return -1;
 
79
 
75
80
    s->sample_rate = avctx->sample_rate;
76
81
    s->nb_channels = avctx->channels;
77
82
    s->bit_rate = avctx->bit_rate;
171
176
            high_freq = high_freq * 0.5;
172
177
        }
173
178
    }
174
 
    dprintf("flags1=0x%x flags2=0x%x\n", flags1, flags2);
175
 
    dprintf("version=%d channels=%d sample_rate=%d bitrate=%d block_align=%d\n",
 
179
    dprintf(s->avctx, "flags2=0x%x\n", flags2);
 
180
    dprintf(s->avctx, "version=%d channels=%d sample_rate=%d bitrate=%d block_align=%d\n",
176
181
           s->version, s->nb_channels, s->sample_rate, s->bit_rate,
177
182
           s->block_align);
178
 
    dprintf("bps=%f bps1=%f high_freq=%f bitoffset=%d\n",
 
183
    dprintf(s->avctx, "bps=%f bps1=%f high_freq=%f bitoffset=%d\n",
179
184
           bps, bps1, high_freq, s->byte_offset_bits);
180
 
    dprintf("use_noise_coding=%d use_exp_vlc=%d nb_block_sizes=%d\n",
 
185
    dprintf(s->avctx, "use_noise_coding=%d use_exp_vlc=%d nb_block_sizes=%d\n",
181
186
           s->use_noise_coding, s->use_exp_vlc, s->nb_block_sizes);
182
187
 
183
188
    /* compute the scale factor band sizes for each MDCT block size */
302
307
        window = av_malloc(sizeof(float) * n);
303
308
        alpha = M_PI / (2.0 * n);
304
309
        for(j=0;j<n;j++) {
305
 
            window[n - j - 1] = sin((j + 0.5) * alpha);
 
310
            window[j] = sin((j + 0.5) * alpha);
306
311
        }
307
312
        s->windows[i] = window;
308
313
    }
380
385
        free_vlc(&s->coef_vlc[i]);
381
386
        av_free(s->run_table[i]);
382
387
        av_free(s->level_table[i]);
 
388
        av_free(s->int_table[i]);
383
389
    }
384
390
 
385
391
    return 0;