Merge pull request #1784 from SpecLad:ffmpeg-no-png

28e0d3d7 · Roman Donchenko · OpenCV Buildbot · 376993be · 405227d5 · 28e0d3d7
Commit 28e0d3d7 authored Nov 13, 2013 by Roman Donchenko Committed by OpenCV Buildbot Nov 13, 2013
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

test_ffmpeg.cpp modules/highgui/test/test_ffmpeg.cpp +1 -1

No files found.
--- a/modules/highgui/test/test_ffmpeg.cpp
+++ b/modules/highgui/test/test_ffmpeg.cpp
@@ -154,7 +154,7 @@ public:
    {
        try
        {
-            string filename = ts->get_data_path() + "../cv/features2d/tsukuba.png";
+            string filename = ts->get_data_path() + "readwrite/ordinary.bmp";
            VideoCapture cap(filename);
            Mat img0 = imread(filename, 1);
            Mat img, img_next;