projects
/
profile
/
ivi
/
opencv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'origin/2.4' into merge-2.4
[profile/ivi/opencv.git]
/
modules
/
highgui
/
test
/
test_ffmpeg.cpp
diff --git
a/modules/highgui/test/test_ffmpeg.cpp
b/modules/highgui/test/test_ffmpeg.cpp
index
85ee0be
..
727971e
100644
(file)
--- 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;