~ubuntu-branches/ubuntu/precise/libav/precise-updates

« back to all changes in this revision

Viewing changes to libavcodec/sbr.h

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2011-07-21 21:12:27 UTC
  • mfrom: (1.1.9 experimental)
  • Revision ID: james.westby@ubuntu.com-20110721211227-i7f0fi12n1t9vd8e
Tags: 4:0.7.1-1ubuntu1
* Merge from debian/unstable
  - don't build against libfaad, libdirac, librtmp and libopenjpeg
    (all in universe)
  - Extra conflicts on libswscale-extra-1 (can be dropped after natty release)

Show diffs side-by-side

added added

removed removed

Lines of Context:
42
42
    uint8_t bs_xover_band;
43
43
 
44
44
    /**
45
 
     * @defgroup bs_header_extra_1     Variables associated with bs_header_extra_1
 
45
     * @name Variables associated with bs_header_extra_1
46
46
     * @{
47
47
     */
48
48
    uint8_t bs_freq_scale;
58
58
 */
59
59
typedef struct {
60
60
    /**
61
 
     * @defgroup aac_bitstream     Main bitstream data variables
 
61
     * @name Main bitstream data variables
62
62
     * @{
63
63
     */
64
64
    unsigned           bs_frame_class;
74
74
    /** @} */
75
75
 
76
76
    /**
77
 
     * @defgroup state         State variables
 
77
     * @name State variables
78
78
     * @{
79
79
     */
80
80
    DECLARE_ALIGNED(16, float, synthesis_filterbank_samples)[SBR_SYNTHESIS_BUF_SIZE];
116
116
    SpectrumParameters spectrum_params;
117
117
    int                bs_amp_res_header;
118
118
    /**
119
 
     * @defgroup bs_header_extra_2     variables associated with bs_header_extra_2
 
119
     * @name Variables associated with bs_header_extra_2
120
120
     * @{
121
121
     */
122
122
    unsigned           bs_limiter_bands;