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)
* commit 'cc6714bb16b1f0716ba43701d47273dbe9657b8b':
  lpc: remove "decay" argument

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

Simple merge
diff --cc libavutil/lls.c
Simple merge
diff --cc libavutil/lls.h
Simple merge