May 2015 - ffmpeg-cvslog - lists.ffmpeg.org

Merge commit '7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8'
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Jun 1 01:44:44 2015 +0200| [10531d48a0f91aea57eac7e1c6cf5857e601826e] | committer: Michael Niedermayer Merge commit '7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8' * commit '7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8': eatgv: Check memory allocation Conflicts: libavcodec/eatgv.c See: a5615b82eb116e9fd0f71f2b03c333cc31ab706a Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=10531d48a0f91aea5… ---

1 0

Merge commit 'e524f37356156893cae50fc46451bd4a6198703d'
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Jun 1 01:41:02 2015 +0200| [7110b024a90097312794b55d1145724e10589c59] | committer: Michael Niedermayer Merge commit 'e524f37356156893cae50fc46451bd4a6198703d' * commit 'e524f37356156893cae50fc46451bd4a6198703d': asv: Check memory allocation Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7110b024a90097312… ---

1 0

Merge commit '69277069dd225f5ae02f0215e877a06522d834d3'
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Jun 1 01:42:13 2015 +0200| [3a8b16f78e8bf35328f9d70506c1205bb258792c] | committer: Michael Niedermayer Merge commit '69277069dd225f5ae02f0215e877a06522d834d3' * commit '69277069dd225f5ae02f0215e877a06522d834d3': dct: Check memory allocation Conflicts: libavcodec/dct.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3a8b16f78e8bf3532… ---

1 0

eatgv: Check memory allocation
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Sun May 31 14:53:51 2015 +0200| [7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8] | committer: Luca Barbato eatgv: Check memory allocation > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7fccc96dc3c0bb2fa… --- libavcodec/eatgv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c index c400b56..a77c4c3 100644 --- a/libavcodec/eatgv.c +++ b/libavcodec/eatgv.c @@ -173,7 +173,9 @@ static int tgv_decode_inter(TgvContext *s, AVFrame *frame, /* allocate codebook buffers as necessary */ if (num_mvs > s->num_mvs) { - s->mv_codebook = av_realloc(s->mv_codebook, num_mvs*2*sizeof(int)); + int err = av_reallocp(&s->mv_codebook, num_mvs * 2 * sizeof(int)); + if (err < 0) + return err; s->num_mvs = num_mvs; }

1 0

dct: Check memory allocation
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Sun May 31 14:53:31 2015 +0200| [69277069dd225f5ae02f0215e877a06522d834d3] | committer: Luca Barbato dct: Check memory allocation > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69277069dd225f5ae… --- libavcodec/dct.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/dct.c b/libavcodec/dct.c index 4dbbff8..180477e 100644 --- a/libavcodec/dct.c +++ b/libavcodec/dct.c @@ -191,6 +191,8 @@ av_cold int ff_dct_init(DCTContext *s, int nbits, enum DCTTransformType inverse) s->costab = ff_cos_tabs[nbits + 2]; s->csc2 = av_malloc(n / 2 * sizeof(FFTSample)); + if (!s->csc2) + return AVERROR(ENOMEM); if (ff_rdft_init(&s->rdft, nbits, inverse == DCT_III) < 0) { av_free(s->csc2);

1 0

asv: Check memory allocation
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Sun May 31 14:50:21 2015 +0200| [e524f37356156893cae50fc46451bd4a6198703d] | committer: Luca Barbato asv: Check memory allocation > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e524f37356156893c… --- libavcodec/asvenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index f8c52af..0879615 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -299,6 +299,8 @@ static av_cold int encode_init(AVCodecContext *avctx) avctx->global_quality / 2) / avctx->global_quality; avctx->extradata = av_mallocz(8); + if (!avctx->extradata) + return AVERROR(ENOMEM); avctx->extradata_size = 8; ((uint32_t *) avctx->extradata)[0] = av_le2ne32(a->inv_qscale); ((uint32_t *) avctx->extradata)[1] = av_le2ne32(AV_RL32("ASUS"));

1 0

avcodec/aacpsy: Clear the correct pointer
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Jun 1 01:32:24 2015 +0200| [e7a65142b972fc1f7fd020d89c8f82dc3cfbc553] | committer: Michael Niedermayer avcodec/aacpsy: Clear the correct pointer Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e7a65142b972fc1f7… --- libavcodec/aacpsy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index 0d05937..3a66159 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -358,7 +358,7 @@ static av_cold int psy_3gpp_init(FFPsyContext *ctx) { pctx->ch = av_mallocz_array(ctx->avctx->channels, sizeof(AacPsyChannel)); if (!pctx->ch) { - av_freep(&pctx); + av_freep(&ctx->model_priv_data); return AVERROR(ENOMEM); }

1 0

Merge commit '074a1b37325bf6d1483fc23ebf1255e78d998339'
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Jun 1 01:32:12 2015 +0200| [63fdedc79470de309693d7ce7fe75cfcf0a268d8] | committer: Michael Niedermayer Merge commit '074a1b37325bf6d1483fc23ebf1255e78d998339' * commit '074a1b37325bf6d1483fc23ebf1255e78d998339': aacpsy: Check memory allocation Conflicts: libavcodec/aacpsy.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=63fdedc79470de309… ---

1 0

Merge commit '149fa0b7ac180fe1df48a2e379c560813555bf57'
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Jun 1 01:30:01 2015 +0200| [0f69f02eb746124536a81effe9000a4dc876c7d8] | committer: Michael Niedermayer Merge commit '149fa0b7ac180fe1df48a2e379c560813555bf57' * commit '149fa0b7ac180fe1df48a2e379c560813555bf57': mpegvideo: Move MotionEstContext and function declarations to a separate header Conflicts: libavcodec/mpegvideo.h Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f69f02eb74612453… ---

1 0

aacpsy: Check memory allocation
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Sun May 31 14:45:54 2015 +0200| [074a1b37325bf6d1483fc23ebf1255e78d998339] | committer: Luca Barbato aacpsy: Check memory allocation > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=074a1b37325bf6d14… --- libavcodec/aacpsy.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index ac58968..6cfe3e3 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -298,6 +298,8 @@ static av_cold int psy_3gpp_init(FFPsyContext *ctx) { const float num_bark = calc_bark((float)bandwidth); ctx->model_priv_data = av_mallocz(sizeof(AacPsyContext)); + if (!ctx->model_priv_data) + return AVERROR(ENOMEM); pctx = (AacPsyContext*) ctx->model_priv_data; pctx->chan_bitrate = chan_bitrate; @@ -349,6 +351,10 @@ static av_cold int psy_3gpp_init(FFPsyContext *ctx) { } pctx->ch = av_mallocz(sizeof(AacPsyChannel) * ctx->avctx->channels); + if (!pctx->ch) { + av_freep(&pctx); + return AVERROR(ENOMEM); + } lame_window_init(pctx, ctx->avctx);

1 0