Merge commit 'c93ccf5a4cca722b39f05e9f5660b4cb75bc1740'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jun 2013 10:20:12 +0000 (12:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jun 2013 10:26:58 +0000 (12:26 +0200)
commit32a39552597a2670577edb332028d9068c8f796a
treea7484d9f35e54a4268fa47c994228613e9bff00c
parent6e76e6a05a5685b904dc0d1cd610d81ffe43bbc5
parentc93ccf5a4cca722b39f05e9f5660b4cb75bc1740
Merge commit 'c93ccf5a4cca722b39f05e9f5660b4cb75bc1740'

* commit 'c93ccf5a4cca722b39f05e9f5660b4cb75bc1740':
  lpc: use levinson for the first pass of multipass cholesky

Conflicts:
libavcodec/lpc.c

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