fix a few conflicts with <windows.h>:

- prefix log-constants with LOG_
- remove already defined WAIT_TIMEOUT
- use more portable _WIN32 instead of __WIN32__
- define <stdint.h> types for MSVC

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2755 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 1 insertions, 3 deletions

diff --git a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.cpp b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.cpp
index 13aae4a6..d33af650 100644
--- a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.cpp
+++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.cpp
@@ -359,8 +359,6 @@ void* PacketQueue::getStatusInfo(AVPacket *packet) {
 }
 
 int PacketQueue::get(AVPacket *packet, bool blocking) {
-	const int WAIT_TIMEOUT = 10; // timeout in ms
-
 	{
 		Mutex::RegionLock lock(_mutex);
 		while (true) {
@@ -384,7 +382,7 @@ int PacketQueue::get(AVPacket *packet, bool blocking) {
 			} else {
 				// block until a new package arrives,
 				// but do not wait till infinity to avoid deadlocks
-				if (_condition.waitTimeout(_mutex, WAIT_TIMEOUT) == MUTEX_TIMEDOUT) {
+				if (_condition.waitTimeout(_mutex, 10) == MUTEX_TIMEDOUT) {
 					return 0;
 				}
 			}