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)
commit2214207d048187b85cd3af3e54b064f87728aa07
tree5a55912dc1c4b980255e3a122bfc18f65d8503ed
parent0eefc758e23ec46465179847c2a20dca531d7b37
parent8563f9887194b07c972c3475d6b51592d77f73f7
Merge commit '8563f9887194b07c972c3475d6b51592d77f73f7'

* commit '8563f9887194b07c972c3475d6b51592d77f73f7':
  x86: use emms after ff_int32_to_float_fmul_scalar_sse

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