From f27241bd3f699db256d19ccad4c2b189577a6865 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Sat, 5 Jan 2008 00:02:06 +0000
Subject: [PATCH] Minor fixes for (old) OS X builds

Originally committed to SVN as r1664.
---
 aegisub/dialog_options.cpp | 3 +++
 aegisub/mkv_wrap.cpp       | 4 ++--
 aegisub/video_context.cpp  | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/aegisub/dialog_options.cpp b/aegisub/dialog_options.cpp
index 3d9a3c174..5e9f8416c 100644
--- a/aegisub/dialog_options.cpp
+++ b/aegisub/dialog_options.cpp
@@ -523,7 +523,10 @@ DialogOptions::DialogOptions(wxWindow *parent)
 
 		// Controls
 		wxString choices2[3] = { _("None (NOT RECOMMENDED)"), _("RAM"), _("Hard Disk") };
+#ifdef WIN32
 		wxString choices3[3] = { _T("ConvertToMono"), _T("GetLeftChannel"), _T("GetRightChannel") };
+#endif
+		
 		AddComboControl(audioAdvPage,audioAdvSizer1,_("Audio provider"),_T("Audio Provider"),AudioProviderFactory::GetFactoryList(),true,1);
 		AddComboControl(audioAdvPage,audioAdvSizer1,_("Audio player"),_T("Audio Player"),AudioPlayerFactory::GetFactoryList(),true,1);
 		AddComboControl(audioAdvPage,audioAdvSizer1,_("Cache type"),_T("Audio Cache"),wxArrayString(3,choices2),true);
diff --git a/aegisub/mkv_wrap.cpp b/aegisub/mkv_wrap.cpp
index e039c0a3a..b2267a658 100644
--- a/aegisub/mkv_wrap.cpp
+++ b/aegisub/mkv_wrap.cpp
@@ -490,8 +490,8 @@ void MatroskaWrapper::GetSubtitles(AssFile *target) {
 #define std_ftell _ftelli64
 #else
 #define std_fread fread
-#define std_fseek fseeko64
-#define std_ftell ftello64
+#define std_fseek fseeko
+#define std_ftell ftello
 #endif
 
 ///////////////
diff --git a/aegisub/video_context.cpp b/aegisub/video_context.cpp
index 51e43ebe5..10934ce7d 100644
--- a/aegisub/video_context.cpp
+++ b/aegisub/video_context.cpp
@@ -62,7 +62,7 @@
 #include "ass_style.h"
 #include "subs_grid.h"
 #include "vfw_wrap.h"
-#ifndef __WINDOWS__
+#if !defined(__WINDOWS__) && !defined(__APPLE__)
 #include "lavc_keyframes.h"
 #endif
 #include "mkv_wrap.h"
@@ -290,8 +290,10 @@ void VideoContext::SetVideo(const wxString &filename) {
 #ifdef __WINDOWS__
 				KeyFrames = VFWWrapper::GetKeyFrames(filename);
 #else
+#ifndef __APPLE__
 				LAVCKeyFrames k(filename);
 				KeyFrames = k.GetKeyFrames();
+#endif
 #endif
 				keyFramesLoaded = true;
 			}