[FFmpeg-cvslog] Merge commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 18 22:27:16 2014 +0200| [4b0fa45b842cb1a6721f4e83edd09400c35162fd] | committer: Michael Niedermayer

Merge commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5'

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

Conflicts:
	libavcodec/libgsmenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b0fa45b842cb1a6721f4e83edd09400c35162fd
---