@@ -1511,8 +1511,10 @@ static int output_frame(PNGDecContext *s, AVFrame *f)
av_log(avctx, AV_LOG_WARNING, "unrecognized cICP transfer\n");
else
avctx->color_trc = f->color_trc = s->cicp_trc;
- avctx->color_range = f->color_range =
- s->cicp_range == 0 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG;
+ /* we don't support tv-range RGB */
+ avctx->color_range = f->color_range = AVCOL_RANGE_JPEG;
+ if (s->cicp_range == 0)
+ av_log(avctx, AV_LOG_WARNING, "unsupported tv-range cICP chunk\n");
} else if (s->iccp_data) {
AVFrameSideData *sd = av_frame_new_side_data(f, AV_FRAME_DATA_ICC_PROFILE, s->iccp_data_len);
if (!sd) {
FFmpeg doesn't support tv-range RGB pixel data, so if we see a cICP chunk that marks its RGB data as tv-range, we should print a warning instead of setting it to AVCOL_RANGE_MPEG and having things possibly mess up later down the line. Signed-off-by: Leo Izen <leo.izen@gmail.com> --- libavcodec/pngdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)