mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'ae5e1f3d663a8c9a532d89e588cbc61f171c9186'
* commit 'ae5e1f3d663a8c9a532d89e588cbc61f171c9186':
tiff: Check that there is no aliasing in pixel format selection
See: e1c0cfaa41
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
9889762a9b
|
@ -658,6 +658,14 @@ static int init_image(TiffContext *s, ThreadFrame *frame)
|
||||||
int ret;
|
int ret;
|
||||||
int create_gray_palette = 0;
|
int create_gray_palette = 0;
|
||||||
|
|
||||||
|
// make sure there is no aliasing in the following switch
|
||||||
|
if (s->bpp >= 100 || s->bppcount >= 10) {
|
||||||
|
av_log(s->avctx, AV_LOG_ERROR,
|
||||||
|
"Unsupported image parameters: bpp=%d, bppcount=%d\n",
|
||||||
|
s->bpp, s->bppcount);
|
||||||
|
return AVERROR_INVALIDDATA;
|
||||||
|
}
|
||||||
|
|
||||||
switch (s->planar * 1000 + s->bpp * 10 + s->bppcount) {
|
switch (s->planar * 1000 + s->bpp * 10 + s->bppcount) {
|
||||||
case 11:
|
case 11:
|
||||||
if (!s->palette_is_set) {
|
if (!s->palette_is_set) {
|
||||||
|
|
Loading…
Reference in New Issue