diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-16 13:10:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-16 13:53:34 +0100 |
| commit | aee51ee8b9b87b16bd1ecced9d984344f8d4d4ea (patch) | |
| tree | 4ead2cbf8387db5a0433d67b531cd44c62446fbd /libavformat/aea.c | |
| parent | a0aa3eaafc79cfd15452745ad9f54207f6461899 (diff) | |
| parent | 2df7277711cbe3ca5415ff8e31228dcffa309211 (diff) | |
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>
Diffstat (limited to 'libavformat/aea.c')
0 files changed, 0 insertions, 0 deletions