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

avcodec/svq1enc: Clear MMX state after svq1_encode_plane()

Browse Source 
svq1_encode_plane() uses SIMD and we call libc memory allocation functions after it

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-10-21 14:33:42 +02:00
parent 6969bed12c
commit 70dc6bbf1b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/svq1enc.c
View File

@ -641,15 +641,17 @@ FF_ENABLE_DEPRECATION_WARNINGS
ff_side_data_set_encoder_stats(pkt, pict->quality, NULL, 0, s->pict_type); ff_side_data_set_encoder_stats(pkt, pict->quality, NULL, 0, s->pict_type);
svq1_write_header(s, s->pict_type); svq1_write_header(s, s->pict_type);
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++) {
if (svq1_encode_plane(s, i, int ret = svq1_encode_plane(s, i,
pict->data[i], pict->data[i],
s->last_picture->data[i], s->last_picture->data[i],
s->current_picture->data[i], s->current_picture->data[i],
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]);
emms_c();
if (ret < 0) {
int j; int j;
for (j = 0; j < i; j++) { for (j = 0; j < i; j++) {
av_freep(&s->motion_val8[j]); av_freep(&s->motion_val8[j]);
@ -658,6 +660,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_freep(&s->scratchbuf); 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)