aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-11-11 09:58:01 -0300
committerJames Almer <jamrial@gmail.com>2017-11-11 09:58:01 -0300
commitbdbf14abba9d1fb99b63cdaabf4bba074a36ea2f (patch)
tree6c00b0f1bc18f228353663e244862085f1544a7c
parent1b6e52c68fd0ce24f0e5dbafe93146c7793c677b (diff)
parent9f5b77c16f4da6248b57f0601364d9c762c620c2 (diff)
downloadffmpeg-bdbf14abba9d1fb99b63cdaabf4bba074a36ea2f.tar.gz
Merge commit '9f5b77c16f4da6248b57f0601364d9c762c620c2'
* commit '9f5b77c16f4da6248b57f0601364d9c762c620c2': png: Report more details regarding unsupported pixel formats Merged-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavcodec/pngdec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 1d72f9542a..f93f200bb1 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -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) {