aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-23 03:39:59 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-23 19:47:49 +0100
commit575d494de561049f36f9c5492e05c7d83dd78e75 (patch)
treeb34e1116f79a4965bfca7dad971fec580e3c34df /libavcodec
parentc7579ad8e84c5aa28a0540604e8983cbde7ac37b (diff)
downloadffmpeg-575d494de561049f36f9c5492e05c7d83dd78e75.tar.gz
pthreads: reset got_frames on flush.
This fixes memory corruption when seeking in broken streams. a random mpeg4 in nut file was used to debug. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/pthread.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 35f8137f03..070dbffc1f 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -731,6 +731,7 @@ static void park_frame_worker_threads(FrameThreadContext *fctx, int thread_count
pthread_cond_wait(&p->output_cond, &p->progress_mutex);
pthread_mutex_unlock(&p->progress_mutex);
}
+ p->got_frame = 0;
}
}