Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | avcodec/cljrdec: remove unneeded include | Michael Niedermayer | 2014-07-07 |
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | ||
* | Merge commit '373a6dda5422186bc057297342a9e559a564595e' | Michael Niedermayer | 2014-07-06 |
| | | | | | | | | | | | * commit '373a6dda5422186bc057297342a9e559a564595e': cljr: split decoder and encoder Conflicts: libavcodec/Makefile libavcodec/cljrdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||
* | cljr: split decoder and encoder | Nidhi Makhijani | 2014-07-06 |
Signed-off-by: Diego Biurrun <diego@biurrun.de> |