diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-02-22 20:43:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 02:13:09 +0200 |
| commit | c4353d7ee2039296b2a9ecb2907db7805c6ab1d3 (patch) | |
| tree | 81a6850bb354e13cb0f6d6011158bb3e128182d3 | |
| parent | 24bb746194153181a3ff67afd6075fb25b380887 (diff) | |
| download | ffmpeg-c4353d7ee2039296b2a9ecb2907db7805c6ab1d3.tar.gz | |
avcodec/a64multienc: use av_frame_ref instead of copying the frame
This fixes freeing the frame buffer twice on cleanup leading to a crash.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 39e4ed7c1d8d840be47f6d604704d47a59a9ae5d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/a64multienc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c index eaf7b46b55..a97c641c63 100644 --- a/libavcodec/a64multienc.c +++ b/libavcodec/a64multienc.c @@ -315,7 +315,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); |