Index: src/video/FFMpegDemuxer.cpp
===================================================================
--- src/video/FFMpegDemuxer.cpp	(revision 2241)
+++ src/video/FFMpegDemuxer.cpp	(working copy)
@@ -110,7 +110,7 @@
     for (it=m_PacketLists.begin(); it != m_PacketLists.end(); ++it) {
         int CurStreamIndex = it->first;
         AVStream * pStream = m_pFormatContext->streams[CurStreamIndex];
-        avcodec_flush_buffers(pStream->codec);
+        avcodec_flush_buffers(&pStream->codec);
     }
 }
 
Index: src/video/AsyncDemuxer.h
===================================================================
--- src/video/AsyncDemuxer.h	(revision 2241)
+++ src/video/AsyncDemuxer.h	(working copy)
@@ -22,6 +22,8 @@
 #ifndef _AsyncDemuxer_H_
 #define _AsyncDemuxer_H_
 
+#include <math.h>
+
 #include "IDemuxer.h"
 #include "VideoDemuxerThread.h"
 
Index: src/video/VideoDemuxerThread.h
===================================================================
--- src/video/VideoDemuxerThread.h	(revision 2241)
+++ src/video/VideoDemuxerThread.h	(working copy)
@@ -22,6 +22,8 @@
 #ifndef _VideoDemuxerThread_H_
 #define _VideoDemuxerThread_H_
 
+#include <math.h>
+
 #include "FFMpegDemuxer.h"
 #include "PacketVideoMsg.h"
 
Index: bootstrap
===================================================================
--- bootstrap	(revision 2241)
+++ bootstrap	(working copy)
@@ -5,11 +5,11 @@
 then
     # This uses locally-installed libtoolize and automake since the apple-supplied one is buggy
     # as of OS X 10.4.7
-    ../bin/libtoolize --copy --force
-    ../bin/aclocal -I m4
+    libtoolize --copy --force
+    aclocal -I m4
     # Patch that fixes 'local relocation entries in non-writable section' linker error.
     patch < aclocal.m4.patch
-    ../bin/automake --foreign --add-missing --copy 
+    automake --foreign --add-missing --copy 
     autoconf
 else
     libtoolize --copy --force