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:
e85771f
)
avcodec: free priv_data in avcodec_copy_context()
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 13 Aug 2013 12:32:42 +0000
(14:32 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 13 Aug 2013 13:24:30 +0000
(15:24 +0200)
Fixes memleak
Fixes Ticket2216
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/options.c
patch
|
blob
|
history
diff --git
a/libavcodec/options.c
b/libavcodec/options.c
index
b68c300
..
02fb89f
100644
(file)
--- a/
libavcodec/options.c
+++ b/
libavcodec/options.c
@@
-190,6
+190,10
@@
int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
src, dest);
return AVERROR(EINVAL);
}
+
+ av_opt_free(dest);
+ av_free(dest->priv_data);
+
memcpy(dest, src, sizeof(*dest));
/* set values specific to opened codecs back to their default state */