Michael Niedermayer 225c5cc815 Merge commit '373a6dda5422186bc057297342a9e559a564595e' ...

* commit '373a6dda5422186bc057297342a9e559a564595e':
  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

4.2 KiB

Raw Blame History

View Raw