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/msgsmdec.c | |
| parent | ac021fdc40631f77a727f076f8748f89109c785b (diff) | |
| parent | a16577d9857206089fd8bce6a342b31dbd7fb9b0 (diff) | |
| download | ffmpeg-streaming-8c87658fdc657fa0c19c9b507645b03d5295eb49.zip ffmpeg-streaming-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/msgsmdec.c')
| -rw-r--r-- | libavcodec/msgsmdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/msgsmdec.c b/libavcodec/msgsmdec.c index 90e83ae..4c4ddb4 100644 --- a/libavcodec/msgsmdec.c +++ b/libavcodec/msgsmdec.c @@ -26,13 +26,13 @@ #include "gsmdec_template.c" int ff_msgsm_decode_block(AVCodecContext *avctx, int16_t *samples, - const uint8_t *buf) + const uint8_t *buf, int mode) { int res; GetBitContext gb; init_get_bits(&gb, buf, GSM_MS_BLOCK_SIZE * 8); - res = gsm_decode_block(avctx, samples, &gb); + res = gsm_decode_block(avctx, samples, &gb, mode); if (res < 0) return res; - return gsm_decode_block(avctx, samples + GSM_FRAME_SIZE, &gb); + return gsm_decode_block(avctx, samples + GSM_FRAME_SIZE, &gb, mode); } |
