summaryrefslogtreecommitdiff
path: root/libavcodec/cljrenc.c
Commit message (Collapse)AuthorAge
* Merge commit '373a6dda5422186bc057297342a9e559a564595e'Michael Niedermayer2014-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 encoderNidhi Makhijani2014-07-06
Signed-off-by: Diego Biurrun <diego@biurrun.de>