mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '9f5b77c16f4da6248b57f0601364d9c762c620c2'
* commit '9f5b77c16f4da6248b57f0601364d9c762c620c2': png: Report more details regarding unsupported pixel formats Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
bdbf14abba
|
@ -662,10 +662,10 @@ static int decode_idat_chunk(AVCodecContext *avctx, PNGDecContext *s,
|
|||
s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
|
||||
avctx->pix_fmt = AV_PIX_FMT_YA16BE;
|
||||
} else {
|
||||
av_log(avctx, AV_LOG_ERROR, "unsupported bit depth %d "
|
||||
"and color type %d\n",
|
||||
s->bit_depth, s->color_type);
|
||||
return AVERROR_INVALIDDATA;
|
||||
avpriv_report_missing_feature(avctx,
|
||||
"Bit depth %d color type %d",
|
||||
s->bit_depth, s->color_type);
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
if (s->has_trns && s->color_type != PNG_COLOR_TYPE_PALETTE) {
|
||||
|
|
Loading…
Reference in New Issue