[FFmpeg-cvslog] Merge commit '373a6dda5422186bc057297342a9e559a564595e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul  6 19:58:47 2014 +0200| [225c5cc8153588d61d65ec1afc1e843425d12785] | committer: Michael Niedermayer

Merge commit '373a6dda5422186bc057297342a9e559a564595e'

* commit '373a6dda5422186bc057297342a9e559a564595e':
  cljr: split decoder and encoder

Conflicts:
	libavcodec/Makefile
	libavcodec/cljrdec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=225c5cc8153588d61d65ec1afc1e843425d12785
---