Merge commit '25cb0c1a1e66edacc1667acf6818f524c0997f10'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Oct 2013 08:27:20 +0000 (10:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Oct 2013 08:27:30 +0000 (10:27 +0200)
commitc1488fab3dd402d6d26b2b9124ab448715a8f01f
tree1078413947569e0b50703b94a0304d78002d8166
parentba9c557b92c40ba97753354299780aa6ed646ff1
parent25cb0c1a1e66edacc1667acf6818f524c0997f10
Merge commit '25cb0c1a1e66edacc1667acf6818f524c0997f10'

* commit '25cb0c1a1e66edacc1667acf6818f524c0997f10':
  x86inc: activate REP_RET automatically

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