2 commits

Author	SHA1	Message	Date
Michael Niedermayer	225c5cc815	Merge commit '373a6dda54' ... * commit '373a6dda54': cljr: split decoder and encoder Conflicts: libavcodec/Makefile libavcodec/cljrdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-07-06 20:00:59 +02:00
Nidhi Makhijani	373a6dda54	cljr: split decoder and encoder ... Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-07-06 09:28:20 -07:00