diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-12 20:49:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-12 21:01:12 +0200 |
| commit | 9765caec1b9991e676d1b91db0c04a6242b65d7a (patch) | |
| tree | dcd5a8d04e7c5a61aa12b455424fb4d0d9b2d076 /libavcodec/adpcm_data.h | |
| parent | f0c64d0d0b16162a46d7b88d09ac0801a94e59a7 (diff) | |
| parent | 826c56d16e55f3819a75d01f957dd295aa1e9f3a (diff) | |
| download | ffmpeg-9765caec1b9991e676d1b91db0c04a6242b65d7a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
adpcm: split ADPCM encoders and decoders into separate files.
doc/avconv: fix typo.
rv34: check that subsequent slices have the same type as first one.
smacker demuxer: handle possible av_realloc() failure.
lavfi: add split filter from soc.
lavfi: add showinfo filter
libxavs: add private options corresponding to deprecated global options
Conflicts:
Changelog
libavcodec/adpcm.c
libavfilter/avfilter.h
libavfilter/vf_showinfo.c
libavfilter/vf_split.c
libavformat/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm_data.h')
| -rw-r--r-- | libavcodec/adpcm_data.h | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/libavcodec/adpcm_data.h b/libavcodec/adpcm_data.h new file mode 100644 index 0000000000..2aa7df5b64 --- /dev/null +++ b/libavcodec/adpcm_data.h @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2001-2003 The ffmpeg Project + * + * 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 + */ + +/** + * @file + * ADPCM tables + */ + +#ifndef AVCODEC_ADPCM_DATA_H +#define AVCODEC_ADPCM_DATA_H + +extern const int8_t ff_adpcm_index_table[16]; +extern const int16_t ff_adpcm_step_table[89]; +extern const int16_t ff_adpcm_AdaptationTable[]; +extern const uint8_t ff_adpcm_AdaptCoeff1[]; +extern const int8_t ff_adpcm_AdaptCoeff2[]; +extern const int16_t ff_adpcm_yamaha_indexscale[]; +extern const int8_t ff_adpcm_yamaha_difflookup[]; + +#endif /* AVCODEC_ADPCM_DATA_H */ |