[FFmpeg-cvslog] Merge commit 'b545179fdff1ccfbbb9d422e4e9720cb6c6d9191'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 30 12:15:12 2013 +0200| [6e76e6a05a5685b904dc0d1cd610d81ffe43bbc5] | committer: Michael Niedermayer

Merge commit 'b545179fdff1ccfbbb9d422e4e9720cb6c6d9191'

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

Conflicts:
	libavutil/x86/lls.asm

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e76e6a05a5685b904dc0d1cd610d81ffe43bbc5
---