Merge commit '4912b634b517c8acfc476c5d47f10be83fe7e18b'
[ffmpeg.git] / libavcodec / libgsmenc.c
2014-07-18 Michael NiedermayerMerge commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5'
2014-07-18 Nidhi Makhijanilibgsm: Split decoder and encoder