mirror of https://github.com/odrling/Aegisub
Remove a !defined(__APPLE__) around #include "lavc_keyframes.h", also add a c_str().
Originally committed to SVN as r2145.
This commit is contained in:
parent
5ad19a2558
commit
ffaac724e1
|
@ -63,7 +63,7 @@
|
||||||
#include "subs_grid.h"
|
#include "subs_grid.h"
|
||||||
#include "vfw_wrap.h"
|
#include "vfw_wrap.h"
|
||||||
|
|
||||||
#if !defined(__WINDOWS__) && !defined(__APPLE__)
|
#if !defined(__WINDOWS__)
|
||||||
#ifdef WITH_FFMPEG
|
#ifdef WITH_FFMPEG
|
||||||
#include "lavc_keyframes.h"
|
#include "lavc_keyframes.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -365,7 +365,7 @@ void VideoContext::SetVideo(const wxString &filename) {
|
||||||
Refresh(true,true);
|
Refresh(true,true);
|
||||||
|
|
||||||
// Show warning
|
// Show warning
|
||||||
wxString warning = provider->GetWarning();
|
wxString warning = provider->GetWarning().c_str();
|
||||||
if (!warning.IsEmpty()) wxMessageBox(warning,_T("Warning"),wxICON_WARNING | wxOK);
|
if (!warning.IsEmpty()) wxMessageBox(warning,_T("Warning"),wxICON_WARNING | wxOK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue