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:
46aae84
)
avcodec/mpegvideo_enc: fix memory leak
author
Timo Rothenpieler
<timo@rothenpieler.org>
Sun, 25 Sep 2016 13:41:47 +0000
(15:41 +0200)
committer
Timo Rothenpieler
<timo@rothenpieler.org>
Mon, 26 Sep 2016 16:21:00 +0000
(18:21 +0200)
When the input frames contain side data, it will accumulate endlessly in
the coded frame, as av_frame_copy_props will append any new side data.
Fixes ticket #5799.
libavcodec/mpegvideo_enc.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpegvideo_enc.c
b/libavcodec/mpegvideo_enc.c
index
87d7954
..
5cd654f
100644
(file)
--- a/
libavcodec/mpegvideo_enc.c
+++ b/
libavcodec/mpegvideo_enc.c
@@
-1735,6
+1735,7
@@
static void frame_end(MpegEncContext *s)
#if FF_API_CODED_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
+ av_frame_unref(s->avctx->coded_frame);
av_frame_copy_props(s->avctx->coded_frame, s->current_picture.f);
FF_ENABLE_DEPRECATION_WARNINGS
#endif