From 30f12ef7e8103b5591d5a116cd56d7c0e57bd32c Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Thu, 6 Mar 2008 22:34:28 +0000
Subject: [PATCH] Fixed lavc and directshow video providers.
Originally committed to SVN as r1932.
---
aegisub/video_provider_dshow.cpp | 1 -
aegisub/video_provider_dshow.h | 1 +
aegisub/video_provider_lavc.cpp | 1 -
aegisub/video_provider_lavc.h | 1 +
4 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/aegisub/video_provider_dshow.cpp b/aegisub/video_provider_dshow.cpp
index 739fe4347..c9f658525 100644
--- a/aegisub/video_provider_dshow.cpp
+++ b/aegisub/video_provider_dshow.cpp
@@ -139,7 +139,6 @@ DirectShowVideoProvider::DirectShowVideoProvider(wxString _filename, double _fps
fps = _fps;
m_registered = false;
m_hFrameReady = CreateEvent(NULL, FALSE, FALSE, NULL);
- SetCacheMax(8);
HRESULT hr = OpenVideo(_filename);
if (FAILED(hr)) throw _T("Failed opening DirectShow content.");
}
diff --git a/aegisub/video_provider_dshow.h b/aegisub/video_provider_dshow.h
index 631d9e9ee..3059ee050 100644
--- a/aegisub/video_provider_dshow.h
+++ b/aegisub/video_provider_dshow.h
@@ -114,6 +114,7 @@ public:
bool IsNativelyByFrames() { return false; }
void OverrideFrameTimeList(wxArrayInt list);
+ int GetDesiredCacheSize() { return 8; }
};
diff --git a/aegisub/video_provider_lavc.cpp b/aegisub/video_provider_lavc.cpp
index 9877cf310..c2f1a553b 100644
--- a/aegisub/video_provider_lavc.cpp
+++ b/aegisub/video_provider_lavc.cpp
@@ -73,7 +73,6 @@ LAVCVideoProvider::LAVCVideoProvider(wxString filename,double fps) {
validFrame = false;
// Load
- SetCacheMax(8);
LoadVideo(filename,fps);
}
diff --git a/aegisub/video_provider_lavc.h b/aegisub/video_provider_lavc.h
index 120e70bf3..82ff78dd9 100644
--- a/aegisub/video_provider_lavc.h
+++ b/aegisub/video_provider_lavc.h
@@ -106,6 +106,7 @@ public:
double GetFPS();
wxString GetDecoderName() { return _T("FFMpeg/libavcodec"); }
bool IsNativelyByFrames() { return true; }
+ int GetDesiredCacheSize() { return 8; }
};
--
GitLab