Merge pull request #10900 from tomoaki0705:fixPerfVideoioGstreamer

7 years ago · c0eaff3608
parent 857007372d bcce25900b
commit c0eaff3608
1 changed files with 1 additions and 1 deletions
--- a/modules/videoio/perf/perf_output.cpp
+++ b/modules/videoio/perf/perf_output.cpp
@ -28,7 +28,7 @@ PERF_TEST_P(VideoWriter_Writing, WriteFrame,
 {
  const string filename = getDataPath(get<0>(GetParam()));
  const bool isColor = get<1>(GetParam());
-  Mat image = imread(filename, 1);
+  Mat image = imread(filename, isColor ? IMREAD_COLOR : IMREAD_GRAYSCALE );
 #if defined(HAVE_MSMF) && !defined(HAVE_VFW) && !defined(HAVE_FFMPEG) // VFW has greater priority
  const string outfile = cv::tempfile(".wmv");
  const int fourcc = VideoWriter::fourcc('W', 'M', 'V', '3');