diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-27 02:26:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-27 02:27:35 +0200 |
| commit | e222cfefcdcb496e47391b53f0391e9c3cb66397 (patch) | |
| tree | 6dd7c856584528283cae7c6f9d377e53e011e514 /libswscale/arm/rgb2yuv_neon_16.S | |
| parent | e6a084641aada7a2e4672172f2ee26642800a361 (diff) | |
| parent | 4d8c28deab2488579f585406110b1be790896e59 (diff) | |
| download | ffmpeg-e222cfefcdcb496e47391b53f0391e9c3cb66397.tar.gz | |
Merge commit '4d8c28deab2488579f585406110b1be790896e59'
* commit '4d8c28deab2488579f585406110b1be790896e59':
imgutils: make systematic palette opaque.
Conflicts:
libavutil/imgutils.c
See: 4d8c28deab2488579f585406110b1be790896e59
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/arm/rgb2yuv_neon_16.S')
0 files changed, 0 insertions, 0 deletions