Merge commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 20:27:16 +0000 (22:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 20:28:34 +0000 (22:28 +0200)
commit4b0fa45b842cb1a6721f4e83edd09400c35162fd
treed23c8f30dc9db2e52d5b90a28995d60150071f99
parent521f5697348d96ac7c725bc2cba14d6ce4944334
parentb4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5
Merge commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5'

* commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5':
  libgsm: Split decoder and encoder

Conflicts:
libavcodec/libgsmenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/libgsmdec.c
libavcodec/libgsmenc.c