aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-10-21 14:05:00 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-11-26 15:12:25 +0100
commit8328c07fb13b06c2b737785b109e7808cbbe2930 (patch)
treee0c18d42535abf898dec9beb8180e6e88731ff7b /libavcodec
parent865e3f5553e9f28fd343f5cadc7d520d91b17d64 (diff)
downloadffmpeg-8328c07fb13b06c2b737785b109e7808cbbe2930.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>
Diffstat (limited to 'libavcodec')
-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 ceed17eafd..263bf138e3 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -2788,6 +2788,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)