generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '93f7948136fcda8ddbbc44a6c24418f11ca829b8'

Browse Source 
* commit '93f7948136fcda8ddbbc44a6c24418f11ca829b8':
  libvpx: Fix mixed use of av_malloc() and av_reallocp()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-03-09 21:15:50 +01:00
parent e71dce5769 93f7948136
commit a11440c185
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/libvpxenc.c
View File

@@ -377,7 +377,7 @@ static av_cold int vpx_init(AVCodecContext *avctx,
if (enccfg.g_pass == VPX_RC_FIRST_PASS) if (enccfg.g_pass == VPX_RC_FIRST_PASS)
enccfg.g_lag_in_frames = 0; enccfg.g_lag_in_frames = 0;
else if (enccfg.g_pass == VPX_RC_LAST_PASS) { else if (enccfg.g_pass == VPX_RC_LAST_PASS) {
int decode_size; int decode_size, ret;
if (!avctx->stats_in) { if (!avctx->stats_in) {
av_log(avctx, AV_LOG_ERROR, "No stats file for second pass\n"); av_log(avctx, AV_LOG_ERROR, "No stats file for second pass\n");
@@ -385,12 +385,12 @@ static av_cold int vpx_init(AVCodecContext *avctx,
} }
ctx->twopass_stats.sz = strlen(avctx->stats_in) * 3 / 4; ctx->twopass_stats.sz = strlen(avctx->stats_in) * 3 / 4;
ctx->twopass_stats.buf = av_malloc(ctx->twopass_stats.sz); ret = av_reallocp(&ctx->twopass_stats.buf, ctx->twopass_stats.sz);
if (!ctx->twopass_stats.buf) { if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Stat buffer alloc (%"SIZE_SPECIFIER" bytes) failed\n", "Stat buffer alloc (%"SIZE_SPECIFIER" bytes) failed\n",
ctx->twopass_stats.sz); ctx->twopass_stats.sz);
return AVERROR(ENOMEM); return ret;
} }
decode_size = av_base64_decode(ctx->twopass_stats.buf, avctx->stats_in, decode_size = av_base64_decode(ctx->twopass_stats.buf, avctx->stats_in,
ctx->twopass_stats.sz); ctx->twopass_stats.sz);