Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2020-12-04 18:25:32 +00:00
parent 22d64ae08f 12a36b5a94
commit 6fdb7aee84
51 changed files with 2880 additions and 112 deletions
@@ -109,7 +109,7 @@ const string NAME = source.substr(0, pAt) + argv[2][0] + ".avi";   // Form the n
    @code{.cpp}
    CV_FOURCC('P','I','M,'1') // this is an MPEG1 codec from the characters to integer
    @endcode
-    If you pass for this argument minus one than a window will pop up at runtime that contains all
+    If you pass for this argument minus one then a window will pop up at runtime that contains all
    the codec installed on your system and ask you to select the one to use:

    ![](images/videoCompressSelect.png)