diff --git a/aegisub/lib/ffms2.lib b/aegisub/lib/ffms2.lib
index 63f6a273d..3fd2174ea 100644
Binary files a/aegisub/lib/ffms2.lib and b/aegisub/lib/ffms2.lib differ
diff --git a/aegisub/src/audio_provider_ffmpegsource.cpp b/aegisub/src/audio_provider_ffmpegsource.cpp
index 09ad21f03..91b074f38 100644
--- a/aegisub/src/audio_provider_ffmpegsource.cpp
+++ b/aegisub/src/audio_provider_ffmpegsource.cpp
@@ -95,7 +95,7 @@ void FFmpegSourceAudioProvider::LoadAudio(Aegisub::String filename) {
 		}
 
 		for (int i = 0; i < NumTracks; i++) {
-			FFTrack *FrameData = FFMS_GetTITrackIndex(Index, i, FFMSErrMsg, MsgSize);
+			FFTrack *FrameData = FFMS_GetTrackFromIndex(Index, i, FFMSErrMsg, MsgSize);
 			if (FrameData == NULL) {
 				FFMS_DestroyFFIndex(Index);
 				Index = NULL;
@@ -146,7 +146,7 @@ void FFmpegSourceAudioProvider::LoadAudio(Aegisub::String filename) {
 			throw MsgString;
 	}
 		
-	const TAudioProperties AudioInfo = *FFMS_GetTAudioProperties(AudioSource);
+	const TAudioProperties AudioInfo = *FFMS_GetAudioProperties(AudioSource);
 
 	if (AudioInfo.Float)
 		throw _T("FFmpegSource audio provider: I don't know what to do with floating point audio");
diff --git a/aegisub/src/ffmpegsource_common.cpp b/aegisub/src/ffmpegsource_common.cpp
index ad1f54ba0..4853026db 100644
--- a/aegisub/src/ffmpegsource_common.cpp
+++ b/aegisub/src/ffmpegsource_common.cpp
@@ -56,7 +56,7 @@ wxMutex FFmpegSourceProvider::CleaningInProgress;
 
 ///////////////
 // Update indexing progress
-int FFMS_CC FFmpegSourceProvider::UpdateIndexingProgress(int State, int64_t Current, int64_t Total, void *Private) {
+int FFMS_CC FFmpegSourceProvider::UpdateIndexingProgress(int64_t Current, int64_t Total, void *Private) {
 	IndexingProgressDialog *Progress = (IndexingProgressDialog *)Private;
 
 	if (Progress->IndexingCanceled)
diff --git a/aegisub/src/ffmpegsource_common.h b/aegisub/src/ffmpegsource_common.h
index abb6900ef..a2db3725f 100644
--- a/aegisub/src/ffmpegsource_common.h
+++ b/aegisub/src/ffmpegsource_common.h
@@ -59,7 +59,7 @@ public:
 	static wxMutex CleaningInProgress;
 	bool CleanCache();
 
-	static int FFMS_CC UpdateIndexingProgress(int State, int64_t Current, int64_t Total, void *Private);
+	static int FFMS_CC UpdateIndexingProgress(int64_t Current, int64_t Total, void *Private);
 	FFIndex *DoIndexing(FFIndex *Index, wxString Filename, wxString Cachename, int Trackmask, bool IgnoreDecodeErrors);
 	wxString GetCacheFilename(const wxString& filename);
 
diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp
index d5d9282ae..c91e7fb4e 100644
--- a/aegisub/src/video_provider_ffmpegsource.cpp
+++ b/aegisub/src/video_provider_ffmpegsource.cpp
@@ -149,10 +149,10 @@ void FFmpegSourceVideoProvider::LoadVideo(Aegisub::String filename, double fps)
 	}
 
 	// load video properties
-	VideoInfo = FFMS_GetTVideoProperties(VideoSource);
+	VideoInfo = FFMS_GetVideoProperties(VideoSource);
 
 	// get frame info data
-	FFTrack *FrameData = FFMS_GetVSTrackIndex(VideoSource);
+	FFTrack *FrameData = FFMS_GetTrackFromVideo(VideoSource);
 	if (FrameData == NULL)
 		throw _T("FFmpegSource video provider: failed to get frame data");
 	const TTrackTimeBase *TimeBase = FFMS_GetTimeBase(FrameData);
@@ -163,7 +163,7 @@ void FFmpegSourceVideoProvider::LoadVideo(Aegisub::String filename, double fps)
 
 	// build list of keyframes and timecodes
 	for (int CurFrameNum = 0; CurFrameNum < VideoInfo->NumFrames; CurFrameNum++) {
-		CurFrameData = FFMS_GetTFrameInfo(FrameData, CurFrameNum, FFMSErrorMessage, MessageSize);
+		CurFrameData = FFMS_GetFrameInfo(FrameData, CurFrameNum, FFMSErrorMessage, MessageSize);
 		if (CurFrameData == NULL) {
 			wxString temp(FFMSErrorMessage, wxConvUTF8);
 			ErrorMsg << _T("Couldn't get framedata for frame ") << CurFrameNum << _T(": ") << temp;