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.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/msgsmdec.h')
| -rw-r--r-- | libavcodec/msgsmdec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/msgsmdec.h b/libavcodec/msgsmdec.h index 3bfd1fd407..b2a1a627a5 100644 --- a/libavcodec/msgsmdec.h +++ b/libavcodec/msgsmdec.h @@ -25,6 +25,6 @@ #include "avcodec.h" int ff_msgsm_decode_block(AVCodecContext *avctx, int16_t *samples, - const uint8_t *buf); + const uint8_t *buf, int mode); #endif /* AVCODEC_MSGSMDEC_H */ |