har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/decode: always free private_ref

Browse Source 
There is no reason to keep this intact when decoding failed, specially
as private_ref is supposed to always be NULL when a frame is returned to
the user.
This commit is contained in:
Timo Rothenpieler 2017-11-11 12:59:44 +01:00
parent 6a4d1c9063
commit 8dd73f68a6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/decode.c
View File

@ -613,7 +613,6 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame)
if (ret == AVERROR_EOF) if (ret == AVERROR_EOF)
avci->draining_done = 1; avci->draining_done = 1;
/* free the per-frame decode data */
if (!ret) { if (!ret) {
/* the only case where decode data is not set should be decoders /* the only case where decode data is not set should be decoders
* that do not call ff_get_buffer() */ * that do not call ff_get_buffer() */
@ -631,10 +630,11 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame)
} }
} }
} }
av_buffer_unref(&frame->private_ref);
} }
/* free the per-frame decode data */
av_buffer_unref(&frame->private_ref);
return ret; return ret;
} }