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)
* commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0':
  MSN Audio support

Conflicts:
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge