mirror of https://github.com/odrling/Aegisub
Fixing weird shit that got broken
Originally committed to SVN as r1521.
This commit is contained in:
parent
d6b5c8fbb9
commit
388429b899
|
@ -242,6 +242,7 @@ PClip AvisynthVideoProvider::OpenVideo(wxString _filename, bool mpeg2dec3_priori
|
|||
// Some other format, such as mkv, mp4, ogm... try FFMpegSource and DirectShowSource
|
||||
else {
|
||||
// Try loading FFMpegSource
|
||||
directshowOpen:
|
||||
bool ffsource = false;
|
||||
if (env->FunctionExists("ffmpegsource")) ffsource = true;
|
||||
if (!ffsource) {
|
||||
|
@ -263,7 +264,6 @@ PClip AvisynthVideoProvider::OpenVideo(wxString _filename, bool mpeg2dec3_priori
|
|||
ffsource = true;
|
||||
decoderName = _T("FFmpegSource");
|
||||
}
|
||||
directshowOpen:
|
||||
|
||||
// DirectShowSource
|
||||
if (!ffsource) {
|
||||
|
|
|
@ -112,7 +112,7 @@ public:
|
|||
int GetWidth();
|
||||
int GetHeight();
|
||||
double GetFPS();
|
||||
wxString GetDecoderName() { return _T("FFMpeg/libavcodec")); }
|
||||
wxString GetDecoderName() { return _T("FFMpeg/libavcodec"); }
|
||||
bool IsNativelyByFrames() { return true; }
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue