summaryrefslogtreecommitdiff
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-26 19:27:32 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-26 19:27:32 +0100
commit7b3ca7ae8b514bca290f97e996c5f189e60a7a74 (patch)
treef9cb1f7923dfacad165bcbf4db4a980c68702999 /libavcodec/h264.c
parent4c587b4f3003a1908856e96c6ed4643da9a6e21f (diff)
mpegvideo/h264: drop period_since_free
This should not be needed anymore Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 51f34c5f1c..8a8653eba1 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -196,7 +196,6 @@ static void unref_picture(H264Context *h, Picture *pic)
if (!pic->f.data[0])
return;
- pic->period_since_free = 0;
ff_thread_release_buffer(h->avctx, &pic->tf);
av_buffer_unref(&pic->hwaccel_priv_buf);
@@ -276,7 +275,6 @@ static int ref_picture(H264Context *h, Picture *dst, Picture *src)
dst->needs_realloc = src->needs_realloc;
dst->reference = src->reference;
dst->sync = src->sync;
- dst->period_since_free = src->period_since_free;
return 0;
fail:
@@ -395,10 +393,6 @@ fail:
static inline int pic_is_unused(H264Context *h, Picture *pic)
{
- if ( (h->avctx->active_thread_type & FF_THREAD_FRAME)
- && pic->f.qscale_table //check if the frame has anything allocated
- && pic->period_since_free < h->avctx->thread_count)
- return 0;
if (pic->f.data[0] == NULL)
return 1;
if (pic->needs_realloc && !(pic->reference & DELAYED_PIC_REF))
@@ -1727,7 +1721,6 @@ static int decode_update_thread_context(AVCodecContext *dst,
h->low_delay = h1->low_delay;
for (i = 0; h->DPB && i < MAX_PICTURE_COUNT; i++) {
- h->DPB[i].period_since_free ++;
unref_picture(h, &h->DPB[i]);
if (h1->DPB[i].f.data[0] &&
(ret = ref_picture(h, &h->DPB[i], &h1->DPB[i])) < 0)