Merge commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 12:48:21 +0000 (13:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 12:49:53 +0000 (13:49 +0100)
commit42431a557e2df0289e725b518b0d7a3e1a4e39b3
treeabdfd5a10c54e8130e836a17a10a21ac82d205a3
parente88f392733fe6269fdb3fea2627b037ff654c4ce
parentd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821
Merge commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821'

* commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821':
  sws: GBRP9, GBRP10, and GBRP16 output support

Conflicts:
libswscale/output.c
libswscale/utils.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/output.c
libswscale/utils.c