diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-03-26 14:43:46 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-03-26 14:43:46 +0000 |
| commit | a5adaebc130805962f83deccb29f47a7a2384fc8 (patch) | |
| tree | 50ce22f99ced67b6d975632574ce4b392ed820ad /src/libffmpeg/libavcodec/mpegaudio.h | |
| parent | 689bd7704fde776152e6883ce1b6022ec638304b (diff) | |
| download | xine-lib-a5adaebc130805962f83deccb29f47a7a2384fc8.tar.gz xine-lib-a5adaebc130805962f83deccb29f47a7a2384fc8.tar.bz2 | |
update ffmpeg. trying to keep local changes (see diff_to_ffmpeg_cvs.txt), let me
know if i overlooked something.
as usual, preliminary QA: tested non debug builds and several codecs including
divx3/4/5, mpeg4, xvid, msmpeg4v3, svq1, wmv7, dv (video/audio), wma
i also enabled wmv8 by default since it worked fine with the streams i have. i'm not
sure about current state of that so we might enable it only for non-x86 users in
case of trouble.
CVS patchset: 4488
CVS date: 2003/03/26 14:43:46
Diffstat (limited to 'src/libffmpeg/libavcodec/mpegaudio.h')
| -rw-r--r-- | src/libffmpeg/libavcodec/mpegaudio.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/libffmpeg/libavcodec/mpegaudio.h b/src/libffmpeg/libavcodec/mpegaudio.h index 3381dbed2..7aba13200 100644 --- a/src/libffmpeg/libavcodec/mpegaudio.h +++ b/src/libffmpeg/libavcodec/mpegaudio.h @@ -1,4 +1,7 @@ -/* mpeg audio declarations for both encoder and decoder */ +/** + * @file mpegaudio.h + * mpeg audio declarations for both encoder and decoder. + */ /* max frame size, in samples */ #define MPA_FRAME_SIZE 1152 @@ -17,11 +20,11 @@ int l2_select_table(int bitrate, int nb_channels, int freq, int lsf); -extern const UINT16 mpa_bitrate_tab[2][3][15]; -extern const UINT16 mpa_freq_tab[3]; +extern const uint16_t mpa_bitrate_tab[2][3][15]; +extern const uint16_t mpa_freq_tab[3]; extern const unsigned char *alloc_tables[5]; extern const double enwindow[512]; extern const int sblimit_table[5]; extern const int quant_steps[17]; extern const int quant_bits[17]; -extern const INT32 mpa_enwindow[257]; +extern const int32_t mpa_enwindow[257]; |