OSDN Git Service

Updated version info.
authorlordmulder <mulder2@gmx.de>
Wed, 28 Nov 2012 22:36:00 +0000 (23:36 +0100)
committerlordmulder <mulder2@gmx.de>
Wed, 28 Nov 2012 22:36:00 +0000 (23:36 +0100)
src/thread_encode.cpp
src/version.h

index 14b99d8..e04a90f 100644 (file)
@@ -371,7 +371,7 @@ bool EncodeThread::runEncodingPass(bool x264_x64, bool x264_10bit, bool avs2yuv_
                                Q_PID pid[2] = {processEncode.pid(), processAvisynth.pid()};
                                if(pid[0]) { ok[0] = (SuspendThread(pid[0]->hThread) != (DWORD)(-1)); }
                                if(pid[1]) { ok[1] = (SuspendThread(pid[1]->hThread) != (DWORD)(-1)); }
-                               while(m_pause) m_semaphorePaused.acquire();
+                               while(m_pause) m_semaphorePaused.tryAcquire(1, 5000);
                                while(m_semaphorePaused.tryAcquire(1, 0));
                                if(pid[0]) { if(ok[0]) ResumeThread(pid[0]->hThread); }
                                if(pid[1]) { if(ok[1]) ResumeThread(pid[1]->hThread); }
index e01fcd3..c091bc2 100644 (file)
 
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 0
-#define VER_X264_PATCH 6
-#define VER_X264_BUILD 369
+#define VER_X264_PATCH 7
+#define VER_X264_BUILD 376
 
-#define VER_X264_MINIMUM_REV 2209
-#define VER_X264_CURRENT_API 128
+#define VER_X264_MINIMUM_REV 2223
+#define VER_X264_CURRENT_API 129
 #define VER_X264_AVS2YUV_VER 242
 
 #define VER_X264_PRE_RELEASE (0)