potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-27 14:23:04 +04:00
Code Packages Releases Wiki Activity

gpucodec module for video decoding/encoding

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-04-18 10:35:54 +04:00
parent 02131ffb62
commit 1b00a3ed54
47 changed files with 2247 additions and 1866 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/superres/src/frame_source.cpp
+3 -3
View File
@@ -187,7 +187,7 @@ Ptr<FrameSource> cv::superres::createFrameSource_Camera(int deviceId)
//////////////////////////////////////////////////////
// VideoFrameSource_GPU
#ifndef HAVE_OPENCV_GPU
#ifndef HAVE_OPENCV_GPUCODEC
Ptr<FrameSource> cv::superres::createFrameSource_Video_GPU(const String& fileName)
{
@@ -196,7 +196,7 @@ Ptr<FrameSource> cv::superres::createFrameSource_Video_GPU(const String& fileNam
return Ptr<FrameSource>();
}
#else // HAVE_OPENCV_GPU
#else // HAVE_OPENCV_GPUCODEC
namespace
{
@@ -250,4 +250,4 @@ Ptr<FrameSource> cv::superres::createFrameSource_Video_GPU(const String& fileNam
return new VideoFrameSource(fileName);
}
#endif // HAVE_OPENCV_GPU
#endif // HAVE_OPENCV_GPUCODEC