diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-21 14:47:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-22 13:46:10 +0200 |
| commit | 966c5c7bb8bad6fef3efce935b943d05ccea0eaa (patch) | |
| tree | 566d23b8d8e8db7f76da11d19bcb5e0780bfdea4 /libavcodec | |
| parent | 493ad519ddee260200f7a00a2e5ed8cbd28b7f67 (diff) | |
| download | ffmpeg-966c5c7bb8bad6fef3efce935b943d05ccea0eaa.tar.gz | |
avcodec/utils: Move emms_c() before memory allocation functions in avcodec_encode_video2()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 7da6a66d9b..7c26485686 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; } |