OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5241bc2
)
Prevent double free of side_data when AVFMT_FLAG_KEEP_SIDE_DATA flag is set
author
Gavin Kinsey
<gkinsey@ad-holdings.co.uk>
Thu, 8 Sep 2011 12:01:14 +0000
(13:01 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 8 Sep 2011 21:47:23 +0000
(23:47 +0200)
libavformat/utils.c
patch
|
blob
|
history
diff --git
a/libavformat/utils.c
b/libavformat/utils.c
index
d3a0d4a
..
706c2b4
100644
(file)
--- a/
libavformat/utils.c
+++ b/
libavformat/utils.c
@@
-1146,7
+1146,10
@@
static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
if (!st->need_parsing || !st->parser) {
/* no parsing needed: we just output the packet as is */
/* raw data support */
- *pkt = st->cur_pkt; st->cur_pkt.data= NULL;
+ *pkt = st->cur_pkt;
+ st->cur_pkt.data= NULL;
+ st->cur_pkt.side_data_elems = 0;
+ st->cur_pkt.side_data = NULL;
compute_pkt_fields(s, st, NULL, pkt);
s->cur_st = NULL;
if ((s->iformat->flags & AVFMT_GENERIC_INDEX) &&