Merge pull request #12572 from alalek:ffmpeg_update_master

modules/ts/include/opencv2/ts/ts_ext.hpp

@@ -24,10 +24,13 @@ extern int testThreads;
 
 #define CV__TEST_INIT \
     CV__TEST_NAMESPACE_CHECK \
+    fflush(stdout); fflush(stderr); \
     cv::ipp::setIppStatus(0); \
     cv::theRNG().state = cvtest::param_seed; \
     cv::setNumThreads(cvtest::testThreads);
-#define CV__TEST_CLEANUP ::cvtest::checkIppStatus();
+#define CV__TEST_CLEANUP \
+    fflush(stdout); fflush(stderr); \
+    ::cvtest::checkIppStatus();
 #define CV__TEST_BODY_IMPL(name) \
     { \
        CV__TRACE_APP_FUNCTION_NAME(name); \

modules/videoio/test/test_ffmpeg.cpp

@@ -164,6 +164,8 @@ public:
                     }
                     else
                     {
+                        printf("Case: '%s' (frame size %dx%d fps=%g). FileSize=%lld bytes\n",
+                               s.c_str(), frame_s.width, frame_s.height, fps, (long long int)sz);
                         if (sz < 8192)
                         {
                             fprintf(stderr, "ERROR: File name: %s is very small (data write problems?)\n", filename.c_str());