Merge commit '2df7277711cbe3ca5415ff8e31228dcffa309211'

Browse Source

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

...

This commit is contained in:

Michael Niedermayer

2015-01-16 13:53:34 +01:00

parent a0aa3eaafc 2df7277711

commit aee51ee8b9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available