Merge from master

This commit is contained in:
Wilson Snyder
2018-03-10 16:51:34 -05:00
87 changed files with 927 additions and 378 deletions
+4
View File
@@ -77,6 +77,10 @@ void VlcOptions::parseOptsList(int argc, char** argv) {
else if ( onoff (sw, "-rank", flag/*ref*/) ) { m_rank = flag; }
else if ( onoff (sw, "-unlink", flag/*ref*/) ) { m_unlink = flag; }
// Parameterized switches
else if ( !strcmp (sw, "-annotate-min") && (i+1)<argc ) {
shift;
m_annotateMin = atoi(argv[i]);
}
else if ( !strcmp (sw, "-annotate") && (i+1)<argc ) {
shift;
m_annotateOut = argv[i];