Merge branch 4.x

doc/tutorials/calib3d/interactive_calibration/interactive_calibration.markdown

@@ -180,34 +180,34 @@ Example of output XML file:
 <framesCount>21</framesCount>
 <cameraResolution>
   1280 720</cameraResolution>
-<cameraMatrix type_id="opencv-matrix">
+<camera_matrix type_id="opencv-matrix">
   <rows>3</rows>
   <cols>3</cols>
   <dt>d</dt>
   <data>
     1.2519588293098975e+03 0. 6.6684948780852471e+02 0.
-    1.2519588293098975e+03 3.6298123112613683e+02 0. 0. 1.</data></cameraMatrix>
-<cameraMatrix_std_dev type_id="opencv-matrix">
+    1.2519588293098975e+03 3.6298123112613683e+02 0. 0. 1.</data></camera_matrix>
+<camera_matrix_std_dev type_id="opencv-matrix">
   <rows>4</rows>
   <cols>1</cols>
   <dt>d</dt>
   <data>
     0. 1.2887048808572649e+01 2.8536856683866230e+00
-    2.8341737483430314e+00</data></cameraMatrix_std_dev>
-<dist_coeffs type_id="opencv-matrix">
+    2.8341737483430314e+00</data></camera_matrix_std_dev>
+<distortion_coefficients type_id="opencv-matrix">
   <rows>1</rows>
   <cols>5</cols>
   <dt>d</dt>
   <data>
     1.3569117181595716e-01 -8.2513063822554633e-01 0. 0.
-    1.6412101575010554e+00</data></dist_coeffs>
-<dist_coeffs_std_dev type_id="opencv-matrix">
+    1.6412101575010554e+00</data></distortion_coefficients>
+<distortion_coefficients_std_dev type_id="opencv-matrix">
   <rows>5</rows>
   <cols>1</cols>
   <dt>d</dt>
   <data>
     1.5570675523402111e-02 8.7229075437543435e-02 0. 0.
-    1.8382427901856876e-01</data></dist_coeffs_std_dev>
+    1.8382427901856876e-01</data></distortion_coefficients_std_dev>
 <avg_reprojection_error>4.2691743074130178e-01</avg_reprojection_error>
 </opencv_storage>
 @endcode

doc/tutorials/introduction/env_reference/env_reference.markdown

@@ -272,6 +272,7 @@ Some external dependencies can be detached into a dynamic library, which will be
 | OPENCV_FFMPEG_THREADS | num | | set FFmpeg thread count |
 | OPENCV_FFMPEG_DEBUG | bool | false | enable logging messages from FFmpeg |
 | OPENCV_FFMPEG_LOGLEVEL | num | | set FFmpeg logging level |
+| OPENCV_FFMPEG_SKIP_LOG_CALLBACK | bool | false | do not install OpenCV's FFmpeg log callback (preserve default/user callback) |
 | OPENCV_FFMPEG_DLL_DIR | dir path | | directory with FFmpeg plugin (legacy) |
 | OPENCV_FFMPEG_IS_THREAD_SAFE | bool | false | enabling this option will turn off thread safety locks in the FFmpeg backend (use only if you are sure FFmpeg is built with threading support, tested on Linux) |
 | OPENCV_FFMPEG_READ_ATTEMPTS | num | 4096 | number of failed `av_read_frame` attempts before failing read procedure |

doc/tutorials/objdetect/aruco_board_detection/aruco_board_detection.markdown

@@ -127,7 +127,7 @@ in ascending order starting on 0, so they will be 0, 1, 2, ..., 34.
 
 After creating a grid board, we probably want to print it and use it.
 There are two ways to do this:
-1. By using the script `apps/pattern_tools/generate_pattern.py `, see @subpage tutorial_camera_calibration_pattern.
+1. By using the script `apps/pattern-tools/generate_pattern.py`, see @subpage tutorial_camera_calibration_pattern.
 2. By using the function `cv::aruco::GridBoard::generateImage()`.
 
 The function `cv::aruco::GridBoard::generateImage()` is provided in cv::aruco::GridBoard class and

doc/tutorials/objdetect/charuco_detection/charuco_detection.markdown

@@ -77,7 +77,7 @@ through `board.ids`, like in the `cv::aruco::Board` parent class.
 
 Once we have our `cv::aruco::CharucoBoard` object, we can create an image to print it. There are
 two ways to do this:
-1. By using the script `apps/pattern_tools/generate_pattern.py `, see @subpage tutorial_camera_calibration_pattern.
+1. By using the script `apps/pattern-tools/generate_pattern.py`, see @subpage tutorial_camera_calibration_pattern.
 2. By using the function `cv::aruco::CharucoBoard::generateImage()`.
 
 The function `cv::aruco::CharucoBoard::generateImage()` is provided in cv::aruco::CharucoBoard class