[FFmpeg-cvslog] threads: restore has_b_frames in frame_thread_free

Janne Grunau git at videolan.org
Thu Oct 27 01:46:40 CEST 2011


ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Wed Oct 26 15:28:29 2011 +0200| [d6174bfe5f7f9b4f9dbb580080e55e71705689f7] | committer: Janne Grunau

threads: restore has_b_frames in frame_thread_free

Otherwise the delay expressed in has_b_frames increases with every
avcodec_close/avcodec_open.
Fixes fate-ea-dct with more than 1 thread.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d6174bfe5f7f9b4f9dbb580080e55e71705689f7
---

 libavcodec/pthread.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index d5129dc..7557e68 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -681,6 +681,7 @@ static void frame_thread_free(AVCodecContext *avctx, int thread_count)
     av_freep(&fctx->threads);
     pthread_mutex_destroy(&fctx->buffer_mutex);
     av_freep(&avctx->thread_opaque);
+    avctx->has_b_frames -= avctx->thread_count - 1;
 }
 
 static int frame_thread_init(AVCodecContext *avctx)



More information about the ffmpeg-cvslog mailing list