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

2013-11-13 15:52:42 +04:00
parent 376993be4c 405227d531
commit 28e0d3d771
1 changed files with 1 additions and 1 deletions
--- 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;