Merge commit 'e78e5b735fd559bc7aa3f5a01e9c8d37dc2ec6d8'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 14:09:31 +0000 (15:09 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 14:09:31 +0000 (15:09 +0100)
commitd4509495bfa21e34941e9ee94236c4e71007bf43
treeff1208224f3d3a0c05a3d89c6129f6fc1a0c24fa
parent8fee823fe8fbd7894dc38912b799066d2c210d4d
parente78e5b735fd559bc7aa3f5a01e9c8d37dc2ec6d8
Merge commit 'e78e5b735fd559bc7aa3f5a01e9c8d37dc2ec6d8'

* commit 'e78e5b735fd559bc7aa3f5a01e9c8d37dc2ec6d8':
  swscale: add P010 input support

This commit is a noop, see 2e31434d84bba17610ecc491afb5b372678fd517

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>