Merge pull request #3376 from vriera:2.4

23b28a67 · Vadim Pisarevsky · a28cde9c · 2e393ab8 · 23b28a67
Commit 23b28a67 authored Nov 05, 2014 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

frame_source.cpp modules/superres/src/frame_source.cpp +1 -1

No files found.
--- 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