Merge commit '9d4da474f5f40b019cb4cb931c8499deee586174'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Mar 2013 12:19:00 +0000 (13:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Mar 2013 12:19:00 +0000 (13:19 +0100)
commit76f8d3c8d9211daca678747e9521c7ed9e90aba9
treeeb69348de94a6b7133c440740fe33ad21dc0640d
parentfb4b1607561c167b5018641829387447cc8fb51d
parent9d4da474f5f40b019cb4cb931c8499deee586174
Merge commit '9d4da474f5f40b019cb4cb931c8499deee586174'

* commit '9d4da474f5f40b019cb4cb931c8499deee586174':
  lls: move to the private namespace

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/lpc.c
libavutil/lls.c
libavutil/lls.h
libavutil/version.h