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)
* qatar/master:
  libx265: Only use one memcpy for headers

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

Trivial merge