Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 20:23:54 +0000 (21:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 20:24:55 +0000 (21:24 +0100)
commit5d39ec2188e8244851f4e079029704677bbf4505
tree9bb438dc1e4d65df4f20bd0fce15ed3f3126c956
parentfc2de9b7cf59eda377fffcd8d6c3ab4b1fa57b22
parent21a561176e5ed44208a4438a1b0c28a91dd6f4b6
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx265: Only use one memcpy for headers

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