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

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