Merge commit 'de8e096c7eda2bce76efd0a1c1c89d37348c2414'
authorClément Bœsch <u@pkh.me>
Tue, 21 Mar 2017 07:24:34 +0000 (08:24 +0100)
committerClément Bœsch <u@pkh.me>
Tue, 21 Mar 2017 07:24:39 +0000 (08:24 +0100)
commitfa8db3f5975e4729bde7034315e9512367c0fdd0
tree2e8d7c0ac5b1d6ad35a0374142a042b626236474
parent4b192ffdbe226461d8a07fd36d655ec13b2c7582
parentde8e096c7eda2bce76efd0a1c1c89d37348c2414
Merge commit 'de8e096c7eda2bce76efd0a1c1c89d37348c2414'

* commit 'de8e096c7eda2bce76efd0a1c1c89d37348c2414':
  swscale: Consistently order input YUV pixel formats

Merged-by: Clément Bœsch <u@pkh.me>
libswscale/input.c