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