diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 12:37:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 12:37:20 +0100 |
| commit | 8c87658fdc657fa0c19c9b507645b03d5295eb49 (patch) | |
| tree | 3773185b8bb1de15485e5aef4784d38d47ff8d63 /libavcodec/gsmdec_data.h | |
| parent | ac021fdc40631f77a727f076f8748f89109c785b (diff) | |
| parent | a16577d9857206089fd8bce6a342b31dbd7fb9b0 (diff) | |
| download | ffmpeg-8c87658fdc657fa0c19c9b507645b03d5295eb49.tar.gz | |
Merge commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0'
* commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0':
MSN Audio support
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/gsmdec_data.h')
| -rw-r--r-- | libavcodec/gsmdec_data.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/gsmdec_data.h b/libavcodec/gsmdec_data.h index fd89ed63ee..b57194b8d1 100644 --- a/libavcodec/gsmdec_data.h +++ b/libavcodec/gsmdec_data.h @@ -40,4 +40,6 @@ typedef struct GSMContext { extern const uint16_t ff_gsm_long_term_gain_tab[4]; extern const int16_t ff_gsm_dequant_tab[64][8]; +extern const int* const ff_gsm_apcm_bits[][4]; + #endif /* AVCODEC_GSMDEC_DATA_H */ |