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
(from parent 1:
fab8b88
)
avcodec/a64multienc: use av_frame_ref instead of copying the frame
author
Andreas Cadhalpun
<Andreas.Cadhalpun@googlemail.com>
Sun, 22 Feb 2015 19:43:30 +0000
(20:43 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 22 Feb 2015 23:46:00 +0000
(
00:46
+0100)
This fixes freeing the frame buffer twice on cleanup leading to a crash.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/a64multienc.c
patch
|
blob
|
history
diff --git
a/libavcodec/a64multienc.c
b/libavcodec/a64multienc.c
index
6438c27
..
dfb4414
100644
(file)
--- a/
libavcodec/a64multienc.c
+++ b/
libavcodec/a64multienc.c
@@
-317,7
+317,9
@@
static int a64multi_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
} else {
/* fill up mc_meta_charset with data until lifetime exceeds */
if (c->mc_frame_counter < c->mc_lifetime) {
- *p = *pict;
+ ret = av_frame_ref(p, pict);
+ if (ret < 0)
+ return ret;
p->pict_type = AV_PICTURE_TYPE_I;
p->key_frame = 1;
to_meta_with_crop(avctx, p, meta + 32000 * c->mc_frame_counter);