summaryrefslogtreecommitdiff
path: root/libavcodec/pthread.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-20 11:50:26 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-20 11:50:33 +0100
commit084510d12ab6af7ecb516b6fbc03c99c3617d5ce (patch)
tree30e0f168d866e391b004190e8c1598ab11568159 /libavcodec/pthread.c
parent54b0bef390edc0fbee91bf731bf0a686fadc9907 (diff)
parentc71c80f53b6a63fd6360d9de5a262f9e7c85681f (diff)
Merge commit 'c71c80f53b6a63fd6360d9de5a262f9e7c85681f'
* commit 'c71c80f53b6a63fd6360d9de5a262f9e7c85681f': pthread: unref already decoded frames when flushing the decoder 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 b32d70744a..9dbaec3dc8 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -928,6 +928,7 @@ void ff_thread_flush(AVCodecContext *avctx)
PerThreadContext *p = &fctx->threads[i];
// Make sure decode flush calls with size=0 won't return old frames
p->got_frame = 0;
+ av_frame_unref(&p->frame);
release_delayed_buffers(p);
}