merged with master

This commit is contained in:
itsmattkc
2019-03-25 12:43:23 +11:00
83 changed files with 7823 additions and 1469 deletions
+1
View File
@@ -653,6 +653,7 @@ void Cacher::CacheVideoWorker() {
// again, an EOF isn't an "error" but will how we add frames (see below)
qCritical() << "Failed to retrieve frame from buffersink." << retrieve_code;
break;
} else if (decoded_frame->pts != AV_NOPTS_VALUE) {