aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-04 22:26:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-04 22:32:13 +0200
commit2f5bf2f7f20f29bad8c459824eaf33f2e0e483b5 (patch)
tree43caa8bdcf7a5d885b81a37755ded859ec7cad17 /doc
parent6017c98036078283ce3bf4069227fed13f3e0cc0 (diff)
parentf84a1b597c29dc035b8d5529ef88c2d7ff057820 (diff)
downloadffmpeg-2f5bf2f7f20f29bad8c459824eaf33f2e0e483b5.tar.gz
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>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions