Merge commit '1daea5232fc9963ba93b1b6d07a2373f87c9b392'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 10:21:47 +0000 (12:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 10:22:18 +0000 (12:22 +0200)
* commit '1daea5232fc9963ba93b1b6d07a2373f87c9b392':
  x86: Add an xmm clobbering wrapper for avcodec_encode_video2

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

Trivial merge