RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/pngdec: fix av_bprint_finalize() usage.

This commit is contained in:
Nicolas George 2017-11-09 09:21:05 +01:00
parent fc9dcfe7d5
commit dfa859b85a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/pngdec.c
View File

@ -524,9 +524,9 @@ static int decode_text_chunk(PNGDecContext *s, uint32_t length, int compressed,
if ((ret = decode_zbuf(&bp, data, data_end)) < 0) if ((ret = decode_zbuf(&bp, data, data_end)) < 0)
return ret; return ret;
text_len = bp.len; text_len = bp.len;
av_bprint_finalize(&bp, (char **)&text); ret = av_bprint_finalize(&bp, (char **)&text);
if (!text) if (ret < 0)
return AVERROR(ENOMEM); return ret;
} else { } else {
text = (uint8_t *)data; text = (uint8_t *)data;
text_len = data_end - text; text_len = data_end - text;
@ -862,9 +862,9 @@ static int decode_iccp_chunk(PNGDecContext *s, int length, AVFrame *f)
if ((ret = decode_zbuf(&bp, s->gb.buffer, s->gb.buffer + length)) < 0) if ((ret = decode_zbuf(&bp, s->gb.buffer, s->gb.buffer + length)) < 0)
return ret; return ret;
av_bprint_finalize(&bp, (char **)&data); ret = av_bprint_finalize(&bp, (char **)&data);
if (!data) if (ret < 0)
return AVERROR(ENOMEM); return ret;
sd = av_frame_new_side_data(f, AV_FRAME_DATA_ICC_PROFILE, bp.len); sd = av_frame_new_side_data(f, AV_FRAME_DATA_ICC_PROFILE, bp.len);
if (!sd) { if (!sd) {
@ -1317,9 +1317,9 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s,
av_bprint_init(&bp, 0, -1); av_bprint_init(&bp, 0, -1);
av_bprintf(&bp, "%i/%i", num, 100000); av_bprintf(&bp, "%i/%i", num, 100000);
av_bprint_finalize(&bp, &gamma_str); ret = av_bprint_finalize(&bp, &gamma_str);
if (!gamma_str) if (ret < 0)
return AVERROR(ENOMEM); return ret;
av_dict_set(&p->metadata, "gamma", gamma_str, AV_DICT_DONT_STRDUP_VAL); av_dict_set(&p->metadata, "gamma", gamma_str, AV_DICT_DONT_STRDUP_VAL);