Merge commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 20:26:13 +0000 (22:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 20:32:13 +0000 (22:32 +0200)
commit2f5bf2f7f20f29bad8c459824eaf33f2e0e483b5
tree43caa8bdcf7a5d885b81a37755ded859ec7cad17
parent6017c98036078283ce3bf4069227fed13f3e0cc0
parentf84a1b597c29dc035b8d5529ef88c2d7ff057820
Merge commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820'

* commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820':
  swscale: support AV_PIX_FMT_YA16 as input

Conflicts:
libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/input.c
libswscale/swscale-test.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c