OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
493ad51
)
avcodec/utils: Move emms_c() before memory allocation functions in avcodec_encode_vid...
author
Michael Niedermayer
<michael@niedermayer.cc>
Fri, 21 Oct 2016 12:47:34 +0000
(14:47 +0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Sat, 22 Oct 2016 11:46:10 +0000
(13:46 +0200)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/utils.c
patch
|
blob
|
history
diff --git
a/libavcodec/utils.c
b/libavcodec/utils.c
index
7da6a66
..
7c26485
100644
(file)
--- 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;
}