b4edbe9a0e
* commit 'b4edbe9a0e': libgsm: Split decoder and encoder Conflicts: libavcodec/libgsmenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Diego Biurrun <diego@biurrun.de>