Merge commit 'cc6714bb16b1f0716ba43701d47273dbe9657b8b'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jun 2013 08:54:12 +0000 (10:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jun 2013 08:54:20 +0000 (10:54 +0200)
commitd3bd320e63bfbc96d78a673a01d36f25dc6316e7
tree5ad449c0b1d2da87cc09dccc38893f299b8a0d7f
parentff130d7363e0b29ab3e5b46fa3647f236c3c7ba5
parentcc6714bb16b1f0716ba43701d47273dbe9657b8b
Merge commit 'cc6714bb16b1f0716ba43701d47273dbe9657b8b'

* commit 'cc6714bb16b1f0716ba43701d47273dbe9657b8b':
  lpc: remove "decay" argument

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