jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #371 from martell/master 

win-dshow: Reorder CapsMatch for gcc
master
Jim 2015-02-14 11:21:04 -08:00
parent 8ecbe91d9a f079bc9f7f
commit c0b9a11c5d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/win-dshow/win-dshow.cpp
View File

@ -578,6 +578,11 @@ static inline bool ResolutionValid(string res, int &cx, int &cy)
return ConvertRes(cx, cy, res.c_str());
}
static inline bool CapsMatch(const VideoInfo&)
{
return true;
}
template <typename ... F>
static bool CapsMatch(const VideoDevice &dev, F ... fs);
@ -587,11 +592,6 @@ static inline bool CapsMatch(const VideoInfo &info, F&& f, Fs ... fs)
return f(info) && CapsMatch(info, fs ...);
}
static inline bool CapsMatch(const VideoInfo&)
{
return true;
}
template <typename ... F>
static bool CapsMatch(const VideoDevice &dev, F ... fs)
{