Merge commit '8563f9887194b07c972c3475d6b51592d77f73f7'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 2 Jan 2016 12:27:11 +0000 (13:27 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 2 Jan 2016 12:27:11 +0000 (13:27 +0100)
* commit '8563f9887194b07c972c3475d6b51592d77f73f7':
  x86: use emms after ff_int32_to_float_fmul_scalar_sse

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/x86/fmtconvert.asm

Simple merge