FFmpeg/libavcodec
Michael Niedermayer 4b0fa45b84 Merge commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5'
* commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5':
  libgsm: Split decoder and encoder

Conflicts:
	libavcodec/libgsmenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-18 22:28:34 +02:00
..
2014-07-16 20:55:24 +02:00
2014-07-18 00:48:34 +02:00
2014-07-16 14:27:45 +02:00
2014-07-10 17:27:56 +02:00
2014-07-12 01:09:51 +02:00
2014-07-18 13:31:19 +02:00
2014-07-12 22:33:27 +02:00
2014-07-10 15:29:54 +02:00
2014-07-16 14:38:42 +02:00