Merge commit '2df7277711cbe3ca5415ff8e31228dcffa309211'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Jan 2015 12:10:04 +0000 (13:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Jan 2015 12:53:34 +0000 (13:53 +0100)
commitaee51ee8b9b87b16bd1ecced9d984344f8d4d4ea
tree4ead2cbf8387db5a0433d67b531cd44c62446fbd
parenta0aa3eaafc79cfd15452745ad9f54207f6461899
parent2df7277711cbe3ca5415ff8e31228dcffa309211
Merge commit '2df7277711cbe3ca5415ff8e31228dcffa309211'

* commit '2df7277711cbe3ca5415ff8e31228dcffa309211':
  swscale: fix gbrap to gbrap alpha scaling

Conflicts:
libswscale/input.c
tests/ref/fate/filter-pixfmts-scale

Not merged, the code works fine as is and does not work with this
change

Merged-by: Michael Niedermayer <michaelni@gmx.at>