summaryrefslogtreecommitdiffstats
path: root/libavcodec/pthread.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-13 13:39:01 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-13 13:39:44 +0100
commit8ded1718bdf5ad0309a33a57e10b06a51139138d (patch)
treef28f6c74273806b14c3c81a757913a57be7bdb69 /libavcodec/pthread.c
parent8bcebf9e4a480de4a904b5843e9ecb74cf44bfdf (diff)
parentfce68c93554803801c32c1b20509bfa8d496b02a (diff)
downloadffmpeg-streaming-8ded1718bdf5ad0309a33a57e10b06a51139138d.zip
ffmpeg-streaming-8ded1718bdf5ad0309a33a57e10b06a51139138d.tar.gz
Merge commit 'fce68c93554803801c32c1b20509bfa8d496b02a'
* commit 'fce68c93554803801c32c1b20509bfa8d496b02a': pthread: unref the decoded but not returned frames on close. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pthread.c')
-rw-r--r--libavcodec/pthread.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 6cd0c72..d4997e9 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -779,6 +779,7 @@ static void frame_thread_free(AVCodecContext *avctx, int thread_count)
avctx->codec = NULL;
release_delayed_buffers(p);
+ av_frame_unref(&p->frame);
}
for (i = 0; i < thread_count; i++) {
OpenPOWER on IntegriCloud