Merge pull request #3376 from vriera:2.4

2014-11-05 11:13:03 +00:00 · 2014-11-05 11:13:03 +00:00 · 23b28a6700
commit 23b28a6700
parent a28cde9c3b 2e393ab833
1 changed files with 1 additions and 1 deletions
--- a/modules/superres/src/frame_source.cpp
+++ b/modules/superres/src/frame_source.cpp
@ -260,7 +260,7 @@ namespace

 Ptr<FrameSource> cv::superres::createFrameSource_Video_GPU(const string& fileName)
 {
-    return new VideoFrameSource(fileName);
+    return new VideoFrameSource_GPU(fileName);
 }

 #endif // HAVE_OPENCV_GPU