diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-19 15:37:07 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-19 15:40:03 +0100 |
| commit | 8e950c9b4235bb66f3bf53608417c7cbc8148740 (patch) | |
| tree | ca635db4040eda218bd41d606aef2066fe8ada0f /libswscale/alphablend.c | |
| parent | efcba5a06acff1276ef30142ef2f881307c68248 (diff) | |
| parent | aa37d2bf4505afc106e2a23c44afc722bb204a8e (diff) | |
| download | ffmpeg-8e950c9b4235bb66f3bf53608417c7cbc8148740.tar.gz | |
Merge commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e'
* commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e':
swscale: Kill non-compiling disabled cruft
The isGray() chunk is not merged as an alternative patch actually fixing
the dead code is currently under review on the mailing-list.
The SWS_X chunk is merged, with an additional cosmetic.
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libswscale/alphablend.c')
0 files changed, 0 insertions, 0 deletions