From 64bb2bbb76dc6fe693968e3da0466665860fd040 Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Thu, 11 May 2006 21:11:59 +0000
Subject: [PATCH] Small ASA fixes

Originally committed to SVN as r384.
---
 core/subtitle_provider_asa.cpp | 12 ++++++------
 core/video_provider_lavc.cpp   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/subtitle_provider_asa.cpp b/core/subtitle_provider_asa.cpp
index 214b10f8b..16b798c3e 100644
--- a/core/subtitle_provider_asa.cpp
+++ b/core/subtitle_provider_asa.cpp
@@ -38,6 +38,12 @@
 // Headers
 #ifdef HAVE_ASA
 
+#include <wx/wxprec.h>
+#include <wx/image.h>
+#include "subtitle_provider.h"
+#include "video_provider.h"
+#include "ass_file.h"
+
 #ifdef HAVE_ASA_ASA_H
 # include <asa/asa.h>
 #else
@@ -46,12 +52,6 @@
 # endif
 #endif
 
-#include <wx/wxprec.h>
-#include <wx/image.h>
-#include "subtitle_provider.h"
-#include "video_provider.h"
-#include "ass_file.h"
-
 
 class SubtitleProviderASA : public SubtitleProvider, SubtitleProvider::Overlay {
 private:
diff --git a/core/video_provider_lavc.cpp b/core/video_provider_lavc.cpp
index 802d677e6..70ab51820 100644
--- a/core/video_provider_lavc.cpp
+++ b/core/video_provider_lavc.cpp
@@ -297,7 +297,7 @@ wxBitmap LAVCVideoProvider::AVFrameToWX(AVFrame *source, int n) {
 	memcpy(data, frameRGB->data[0], w * h * 3);
 	img.SetData(data);
 	if (overlay)
-		overlay->Render(img, n);
+		overlay->Render(img, VFR_Input.GetTimeAtFrame(n));
 
 	wxBitmap bmp(img);