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/gsm.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/gsm.h')
| -rw-r--r-- | libavcodec/gsm.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/libavcodec/gsm.h b/libavcodec/gsm.h index e56f4cd0b4..53d65c4dc7 100644 --- a/libavcodec/gsm.h +++ b/libavcodec/gsm.h @@ -22,10 +22,24 @@ #define AVCODEC_GSM_H /* bytes per block */ -#define GSM_BLOCK_SIZE 33 -#define GSM_MS_BLOCK_SIZE 65 +#define GSM_BLOCK_SIZE 33 +#define GSM_MS_BLOCK_SIZE 65 +#define MSN_MIN_BLOCK_SIZE 41 /* samples per block */ #define GSM_FRAME_SIZE 160 +enum GSMModes { + GSM_13000 = 0, + MSN_12400, + MSN_11800, + MSN_11200, + MSN_10600, + MSN_10000, + MSN_9400, + MSN_8800, + MSN_8200, + NUM_GSM_MODES +}; + #endif /* AVCODEC_GSM_H */ |