Merge commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Nov 2013 11:37:20 +0000 (12:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Nov 2013 11:37:20 +0000 (12:37 +0100)
commit8c87658fdc657fa0c19c9b507645b03d5295eb49
tree3773185b8bb1de15485e5aef4784d38d47ff8d63
parentac021fdc40631f77a727f076f8748f89109c785b
parenta16577d9857206089fd8bce6a342b31dbd7fb9b0
Merge commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0'

* commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0':
  MSN Audio support

Conflicts:
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/gsm.h
libavcodec/gsm_parser.c
libavcodec/gsmdec.c
libavcodec/gsmdec_data.c
libavcodec/gsmdec_data.h
libavcodec/gsmdec_template.c
libavcodec/msgsmdec.c
libavcodec/msgsmdec.h