Merge commit 'b545179fdff1ccfbbb9d422e4e9720cb6c6d9191'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jun 2013 10:15:12 +0000 (12:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jun 2013 10:15:12 +0000 (12:15 +0200)
commit6e76e6a05a5685b904dc0d1cd610d81ffe43bbc5
tree7c520597874b28e57afee76ffae5f0d1c40162e3
parenta285079bc75a6e3b9aa27910351044b79bc0c490
parentb545179fdff1ccfbbb9d422e4e9720cb6c6d9191
Merge commit 'b545179fdff1ccfbbb9d422e4e9720cb6c6d9191'

* commit 'b545179fdff1ccfbbb9d422e4e9720cb6c6d9191':
  x86: lpc: simd av_evaluate_lls

Conflicts:
libavutil/x86/lls.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/x86/lls.asm
libavutil/x86/lls_init.c