aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-10-21 14:05:00 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-12-04 20:25:15 +0100
commit9128ef0302084ab5e7d87ed5fbe95846eda8d8d8 (patch)
tree8b27d3f9890bdd5742c10cab2743c3e0f9d3eeb4
parent86f5b73429d8c19bc80399548e0e9a8dc8ee7cf9 (diff)
downloadffmpeg-9128ef0302084ab5e7d87ed5fbe95846eda8d8d8.tar.gz
avcodec/mpegvideo_enc: Clear mmx state in ff_mpv_reallocate_putbitbuffer()
This function must be called from the mb or slice encoding loop and MMX state may not be clean there Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 03ec6b780cfae85b8bf0f32b2eda201063ad061b) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/mpegvideo_enc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 297ff78840..4af65a6c95 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -2912,6 +2912,8 @@ int ff_mpv_reallocate_putbitbuffer(MpegEncContext *s, size_t threshold, size_t s
return AVERROR(ENOMEM);
}
+ emms_c();
+
av_fast_padded_malloc(&new_buffer, &new_buffer_size,
s->avctx->internal->byte_buffer_size + size_increase);
if (!new_buffer)