highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '28fb80dcbf6f63eedfcfffc725a6bf0069d03fab'

Browse Source 
* commit '28fb80dcbf6f63eedfcfffc725a6bf0069d03fab':
  svq1: Check memory allocation

Conflicts:
	libavcodec/svq1enc.c

See: 2a3af77284
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-01 02:37:30 +02:00
parent abee1972ef 28fb80dcbf
commit f24b7d7616
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/svq1enc.c
View File

@@ -556,8 +556,8 @@ static av_cold int svq1_encode_init(AVCodecContext *avctx)
s->y_block_height * sizeof(int32_t)); s->y_block_height * sizeof(int32_t));
s->ssd_int8_vs_int16 = ssd_int8_vs_int16_c; s->ssd_int8_vs_int16 = ssd_int8_vs_int16_c;
if (!s->m.me.scratchpad || !s->m.me.map || !s->m.me.score_map || if (!s->m.me.temp || !s->m.me.scratchpad || !s->m.me.map ||
!s->mb_type || !s->dummy) { !s->m.me.score_map || !s->mb_type || !s->dummy) {
svq1_encode_end(avctx); svq1_encode_end(avctx);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@@ -622,8 +622,15 @@ static int svq1_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
s->frame_width / (i ? 4 : 1), s->frame_width / (i ? 4 : 1),
s->frame_height / (i ? 4 : 1), s->frame_height / (i ? 4 : 1),
pict->linesize[i], pict->linesize[i],
s->current_picture->linesize[i]) < 0) s->current_picture->linesize[i]) < 0) {
int j;
for (j = 0; j < i; j++) {
av_freep(&s->motion_val8[j]);
av_freep(&s->motion_val16[j]);
}
av_freep(&s->scratchbuf);
return -1; return -1;
}
// avpriv_align_put_bits(&s->pb); // avpriv_align_put_bits(&s->pb);
while (put_bits_count(&s->pb) & 31) while (put_bits_count(&s->pb) & 31)