iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Small ASA fixes 

Originally committed to SVN as r384.
This commit is contained in:
Rodrigo Braz Monteiro 2006-05-11 21:11:59 +00:00
parent 10ae56ff7f
commit 64bb2bbb76
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/subtitle_provider_asa.cpp
View File

@ -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:

2
core/video_provider_lavc.cpp
View File

@ -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);