← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/wma.h

  • 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.h
19
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
20
 */
21
21
 
22
 
#ifndef WMA_H
23
 
#define WMA_H
 
22
#ifndef FFMPEG_WMA_H
 
23
#define FFMPEG_WMA_H
24
24
 
25
25
#include "bitstream.h"
26
26
#include "dsputil.h"
92
92
    uint16_t *run_table[2];
93
93
    uint16_t *level_table[2];
94
94
    uint16_t *int_table[2];
95
 
    CoefVLCTable *coef_vlcs[2];
 
95
    const CoefVLCTable *coef_vlcs[2];
96
96
    /* frame info */
97
97
    int frame_len;                          ///< frame length in samples
98
98
    int frame_len_bits;                     ///< frame_len = 1 << frame_len_bits
107
107
    int block_pos;                          ///< current position in frame
108
108
    uint8_t ms_stereo;                      ///< true if mid/side stereo mode
109
109
    uint8_t channel_coded[MAX_CHANNELS];    ///< true if channel is coded
 
110
    int exponents_bsize[MAX_CHANNELS];      ///< log2 ratio frame/exp. length
110
111
    DECLARE_ALIGNED_16(float, exponents[MAX_CHANNELS][BLOCK_MAX_SIZE]);
111
112
    float max_exponent[MAX_CHANNELS];
112
113
    int16_t coefs1[MAX_CHANNELS][BLOCK_MAX_SIZE];
113
114
    DECLARE_ALIGNED_16(float, coefs[MAX_CHANNELS][BLOCK_MAX_SIZE]);
114
115
    DECLARE_ALIGNED_16(FFTSample, output[BLOCK_MAX_SIZE * 2]);
115
 
    DECLARE_ALIGNED_16(float, window[BLOCK_MAX_SIZE * 2]);
116
116
    MDCTContext mdct_ctx[BLOCK_NB_SIZES];
117
117
    float *windows[BLOCK_NB_SIZES];
118
118
    DECLARE_ALIGNED_16(FFTSample, mdct_tmp[BLOCK_MAX_SIZE]); ///< temporary storage for imdct
147
147
int ff_wma_total_gain_to_bits(int total_gain);
148
148
int ff_wma_end(AVCodecContext *avctx);
149
149
 
150
 
#endif
 
150
#endif /* FFMPEG_WMA_H */