Commit graph

2 commits

Author SHA1 Message Date
Michael Niedermayer
4b0fa45b84 Merge commit 'b4edbe9a0e'
* commit 'b4edbe9a0e':
  libgsm: Split decoder and encoder

Conflicts:
	libavcodec/libgsmenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-18 22:28:34 +02:00
Nidhi Makhijani
b4edbe9a0e libgsm: Split decoder and encoder
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-18 17:27:54 +02:00
Renamed from libavcodec/libgsm.c (Browse further)