diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-20 18:20:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-20 18:31:45 +0200 |
| commit | 7c6c4cf2fb48d7469170e1fc5d9096b95e9b7e9f (patch) | |
| tree | ebcb01edc8a350bbd4315c38a98a31a1e1694f64 /libavcodec/eac3_data.h | |
| parent | 045ef52ef513973a134f95c10a33f9ccb89ec92f (diff) | |
| parent | 7b4ee3a21d7c7419b485bf7af3b2795b9c3e89ea (diff) | |
| download | ffmpeg-7c6c4cf2fb48d7469170e1fc5d9096b95e9b7e9f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Remove h264_lowres_idct_put/add functions
Remove snow/dwt test program
h264: remove some disabled code
Fix incorrect max_lowres values
matroskadec: fix integer underflow if header length < probe length.
cosmetics: indentation
eac3enc: use frame exponent strategy when applicable.
cosmetics: rename eac3dec_data.c/h to eac3_data.c/h since the tables will also be used in the E-AC-3 encoder.
dsputil: fix ff_check_alignment()
Conflicts:
libavcodec/Makefile
libavcodec/h264idct_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/eac3_data.h')
| -rw-r--r-- | libavcodec/eac3_data.h | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/libavcodec/eac3_data.h b/libavcodec/eac3_data.h new file mode 100644 index 0000000000..10a67f16d2 --- /dev/null +++ b/libavcodec/eac3_data.h @@ -0,0 +1,36 @@ +/* + * E-AC-3 tables + * Copyright (c) 2007 Bartlomiej Wolowiec <bartek.wolowiec@gmail.com> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_EAC3_DATA_H +#define AVCODEC_EAC3_DATA_H + +#include <stdint.h> + +extern const uint8_t ff_eac3_bits_vs_hebap[20]; +extern const int16_t ff_eac3_gaq_remap_1[12]; +extern const int16_t ff_eac3_gaq_remap_2_4_a[9][2]; +extern const int16_t ff_eac3_gaq_remap_2_4_b[9][2]; + +extern const int16_t (* const ff_eac3_mantissa_vq[8])[6]; +extern const uint8_t ff_eac3_frm_expstr[32][6]; +extern const float ff_eac3_spx_atten_tab[32][3]; + +#endif /* AVCODEC_EAC3_DATA_H */ |