diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-10-20 22:14:22 +0200 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-11-27 00:46:33 +0100 |
| commit | 51ff17d6b993fed3eaeddf7e718391f905eec047 (patch) | |
| tree | c7b69a6c55990df6f098ab14e8e64ce7ea377bf5 | |
| parent | e14da0578c85721ac6f59ddcd9fb4c778bfc5d09 (diff) | |
| download | ffmpeg-51ff17d6b993fed3eaeddf7e718391f905eec047.tar.gz | |
cavsdec: unref frame before referencing again
This fixes asserts (from commit 13aae8) in av_frame_ref and
av_frame_move_ref.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit 1966ea012fd72abc8003e95dc3c8ad9e9f197913)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| -rw-r--r-- | libavcodec/cavsdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 8f5d58d10e..d267faa6a1 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -1218,6 +1218,8 @@ static int cavs_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, h->got_keyframe = 1; } case PIC_PB_START_CODE: + if (*got_frame) + av_frame_unref(data); *got_frame = 0; if (!h->got_keyframe) break; |