Merge commit '373a6dda5422186bc057297342a9e559a564595e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 17:58:47 +0000 (19:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 18:00:59 +0000 (20:00 +0200)
commit225c5cc8153588d61d65ec1afc1e843425d12785
tree02f2f9de16b9b7b0c69b105dd37d893b52a4afe1
parent3a29af4efc608d63bac72bf1572aff45cab22766
parent373a6dda5422186bc057297342a9e559a564595e
Merge commit '373a6dda5422186bc057297342a9e559a564595e'

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

Conflicts:
libavcodec/Makefile
libavcodec/cljrdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/cljrdec.c
libavcodec/cljrenc.c