mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-30 16:42:13 +02:00
Merge commit '4d8c28deab2488579f585406110b1be790896e59'
* commit '4d8c28deab2488579f585406110b1be790896e59':
imgutils: make systematic palette opaque.
Conflicts:
libavutil/imgutils.c
See: 4d8c28deab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
e222cfefcd
@ -181,7 +181,7 @@ int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt)
|
||||
default:
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
pal[i] = b + (g<<8) + (r<<16) + (0xFFU<<24);
|
||||
pal[i] = b + (g << 8) + (r << 16) + (0xFFU << 24);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user