virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
73,454 Commits 37 Branches 400 Tags 460 MiB
3c63d06d81
Commit Graph

2 Commits

Author SHA1 Message Date
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
Nidhi Makhijani
b4edbe9a0e libgsm: Split decoder and encoder 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-18 17:27:54 +02:00