Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5' | Michael Niedermayer | 2014-07-18 |
| | | | | | | | | | | * commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5': libgsm: Split decoder and encoder Conflicts: libavcodec/libgsmenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||
* | libgsm: Split decoder and encoder | Nidhi Makhijani | 2014-07-18 |
Signed-off-by: Diego Biurrun <diego@biurrun.de> |