From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 16 Jan 2015 12:10:04 +0000 (+0100)
Subject: Merge commit '2df7277711cbe3ca5415ff8e31228dcffa309211'
X-Git-Tag: android-x86-6.0-r1~897
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=aee51ee8b9b87b16bd1ecced9d984344f8d4d4ea;p=android-x86%2Fexternal-ffmpeg.git

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>
---

aee51ee8b9b87b16bd1ecced9d984344f8d4d4ea