har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffv1: Error out on unsupported format

Browse Source 
Transparency is supported only by YUV and within specific bit depths.
This commit is contained in:
Jerome Martinez 2016-06-16 16:33:55 +02:00 committed by Luca Barbato
parent 105998fb5c
commit ec9f04423b
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/ffv1dec.c
View File

@ -597,6 +597,12 @@ static int read_header(FFV1Context *f)
} }
if (f->colorspace == 0) { if (f->colorspace == 0) {
if (f->transparency && f->avctx->bits_per_raw_sample > 8) {
av_log(f->avctx, AV_LOG_ERROR,
"Transparency not supported for bit depth %d\n",
f->avctx->bits_per_raw_sample);
return AVERROR(ENOSYS);
}
if (!f->transparency && !f->chroma_planes) { if (!f->transparency && !f->chroma_planes) {
if (f->avctx->bits_per_raw_sample <= 8) if (f->avctx->bits_per_raw_sample <= 8)
f->avctx->pix_fmt = AV_PIX_FMT_GRAY8; f->avctx->pix_fmt = AV_PIX_FMT_GRAY8;
@ -695,6 +701,11 @@ static int read_header(FFV1Context *f)
"chroma subsampling not supported in this colorspace\n"); "chroma subsampling not supported in this colorspace\n");
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
} }
if (f->transparency) {
av_log(f->avctx, AV_LOG_ERROR,
"Transparency not supported in this colorspace\n");
return AVERROR(ENOSYS);
}
switch (f->avctx->bits_per_raw_sample) { switch (f->avctx->bits_per_raw_sample) {
case 0: case 0:
case 8: case 8: