diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-26 19:27:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-26 19:27:32 +0100 |
| commit | 7b3ca7ae8b514bca290f97e996c5f189e60a7a74 (patch) | |
| tree | f9cb1f7923dfacad165bcbf4db4a980c68702999 /libavcodec/mpegvideo.c | |
| parent | 4c587b4f3003a1908856e96c6ed4643da9a6e21f (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/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index fdec4c629c..2e37ef1c1b 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -435,7 +435,6 @@ fail: void ff_mpeg_unref_picture(MpegEncContext *s, Picture *pic) { int off = offsetof(Picture, mb_mean) + sizeof(pic->mb_mean); - pic->period_since_free = 0; pic->tf.f = &pic->f; /* WM Image / Screen codecs allocate internal buffers with different @@ -701,7 +700,6 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, if (s1->picture[i].f.data[0] && (ret = ff_mpeg_ref_picture(s, &s->picture[i], &s1->picture[i])) < 0) return ret; - s->picture[i].period_since_free ++; } #define UPDATE_PICTURE(pic)\ @@ -1400,10 +1398,6 @@ void ff_release_unused_pictures(MpegEncContext*s, int remove_current) static inline int pic_is_unused(MpegEncContext *s, Picture *pic) { - if ( (s->avctx->active_thread_type & FF_THREAD_FRAME) - && pic->f.qscale_table //check if the frame has anything allocated - && pic->period_since_free < s->avctx->thread_count) - return 0; if (pic == s->last_picture_ptr) return 0; if (pic->f.data[0] == NULL) |