Revert "Merge pull request #836 from jet47:gpu-modules"

This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.

samples/gpu/video_reader.cpp

@@ -1,19 +1,14 @@
 #include <iostream>
-
-#include "opencv2/opencv_modules.hpp"
-
-#if defined(HAVE_OPENCV_GPUCODEC)
-
 #include <string>
 #include <vector>
 #include <algorithm>
 #include <numeric>
 
-#include <opencv2/core.hpp>
+#include <opencv2/core/core.hpp>
 #include <opencv2/core/opengl.hpp>
-#include <opencv2/gpucodec.hpp>
-#include <opencv2/highgui.hpp>
-#include <opencv2/contrib.hpp>
+#include <opencv2/gpu/gpu.hpp>
+#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/contrib/contrib.hpp>
 
 int main(int argc, const char* argv[])
 {
@@ -74,13 +69,3 @@ int main(int argc, const char* argv[])
 
     return 0;
 }
-
-#else
-
-int main()
-{
-    std::cout << "OpenCV was built without GPU Video decoding support\n" << std::endl;
-    return 0;
-}
-
-#endif