From f2b5952159d94a8adb5b8d3ddb5aabd5dc3462e8 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Fri, 18 Nov 2011 00:36:31 +0000
Subject: [PATCH] fix double-lock

---
 panda/src/movies/ffmpegVideoCursor.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panda/src/movies/ffmpegVideoCursor.cxx b/panda/src/movies/ffmpegVideoCursor.cxx
index cf634c99ae..8b065a80ff 100644
--- a/panda/src/movies/ffmpegVideoCursor.cxx
+++ b/panda/src/movies/ffmpegVideoCursor.cxx
@@ -653,7 +653,6 @@ st_thread_main(void *self) {
 ////////////////////////////////////////////////////////////////////
 void FfmpegVideoCursor::
 thread_main() {
-  MutexHolder holder(_lock);
   if (ffmpeg_cat.is_spam()) {
     ffmpeg_cat.spam()
       << "ffmpeg thread for " << _filename.get_basename() << " starting.\n";
@@ -669,6 +668,7 @@ thread_main() {
   
   // Now repeatedly wait for something interesting to do, until we're told
   // to shut down.
+  MutexHolder holder(_lock);
   while (_thread_status != TS_shutdown) {
     nassertv(_thread_status != TS_stopped);
     _action_cvar.wait();