[FFmpeg-cvslog] avcodec/utils: Move emms_c() before memory allocation functions in avcodec_encode_video2()
Michael Niedermayer
git at videolan.org
Sat Oct 22 15:28:10 EEST 2016
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Oct 21 14:47:34 2016 +0200| [966c5c7bb8bad6fef3efce935b943d05ccea0eaa] | committer: Michael Niedermayer
avcodec/utils: Move emms_c() before memory allocation functions in avcodec_encode_video2()
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=966c5c7bb8bad6fef3efce935b943d05ccea0eaa
---
libavcodec/utils.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 7da6a66..7c26485 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1994,6 +1994,8 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
ret = avctx->codec->encode2(avctx, avpkt, frame, got_packet_ptr);
av_assert0(ret <= 0);
+ emms_c();
+
if (avpkt->data && avpkt->data == avctx->internal->byte_buffer) {
needs_realloc = 0;
if (user_pkt.data) {
@@ -2031,7 +2033,6 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
if (ret < 0 || !*got_packet_ptr)
av_packet_unref(avpkt);
- emms_c();
return ret;
}
More information about the ffmpeg-cvslog
mailing list