diff --git a/core/video_display.cpp b/core/video_display.cpp index 426272375..0971004ab 100644 --- a/core/video_display.cpp +++ b/core/video_display.cpp @@ -267,7 +267,7 @@ void VideoDisplay::OnPaint(wxPaintEvent& event) { // Draw frame dc.BeginDrawing(); - dc.DrawBitmap(GetFrame(frame_n),0,0); + if (provider) dc.DrawBitmap(GetFrame(frame_n),0,0); dc.EndDrawing(); } @@ -794,7 +794,6 @@ void VideoDisplay::DrawText( wxPoint Pos, wxString text ) { // Requests a new frame wxBitmap VideoDisplay::GetFrame(int n) { frame_n = n; - return provider->GetFrame(n); RefreshVideo(); } diff --git a/core/video_provider_avs.cpp b/core/video_provider_avs.cpp index 4d10b73c5..f96e723d1 100644 --- a/core/video_provider_avs.cpp +++ b/core/video_provider_avs.cpp @@ -200,7 +200,7 @@ PClip AvisynthVideoProvider::OpenVideo(wxString _filename, bool mpeg2dec3_priori AVSTRACE(_T("AvisynthVideoProvider::OpenVideo: Converted to RGB32")); // Directshow - if (usedDirectshow) wxMessageBox(_T("Warning! The file is being opened using Avisynth's DirectShowSource, which has unreliable seeking. Frame numbers might not match the real number. PROCEED AT YOUR OWN RISK!"),_T("DirectShowSource warning"),wxICON_EXCLAMATION); + //if (usedDirectshow) wxMessageBox(_T("Warning! The file is being opened using Avisynth's DirectShowSource, which has unreliable seeking. Frame numbers might not match the real number. PROCEED AT YOUR OWN RISK!"),_T("DirectShowSource warning"),wxICON_EXCLAMATION); // Cache AVSTRACE(_T("AvisynthVideoProvider::OpenVideo: Finished opening video, AVS mutex will be released now"));