removed #include "cap_ffmpeg_impl_v2.hpp"

diff --git a/modules/gpu/src/ffmpeg_video_source.cpp b/modules/gpu/src/ffmpeg_video_source.cpp
index 879d10c..648bd2b 100644 (file)
--- a/modules/gpu/src/ffmpeg_video_source.cpp
+++ b/modules/gpu/src/ffmpeg_video_source.cpp
@@ -45,11 +45,7 @@
 #ifdef HAVE_CUDA\r
 \r
 #ifdef HAVE_FFMPEG\r
-    #ifdef NEW_FFMPEG\r
-        #include "cap_ffmpeg_impl_v2.hpp"\r
-    #else\r
-        #include "cap_ffmpeg_impl.hpp"\r
-    #endif\r
+    #include "cap_ffmpeg_impl.hpp"\r
 #else\r
     #include "cap_ffmpeg_api.hpp"\r
 #endif\r

diff --git a/modules/gpu/src/video_writer.cpp b/modules/gpu/src/video_writer.cpp
index c7e9898..919614e 100644 (file)
--- a/modules/gpu/src/video_writer.cpp
+++ b/modules/gpu/src/video_writer.cpp
@@ -71,11 +71,7 @@ void cv::gpu::VideoWriter_GPU::EncoderParams::save(const std::string&) const { t
 #else // !defined HAVE_CUDA || !defined WIN32\r
 \r
 #ifdef HAVE_FFMPEG\r
-    #ifdef NEW_FFMPEG\r
-        #include "cap_ffmpeg_impl_v2.hpp"\r
-    #else\r
-        #include "cap_ffmpeg_impl.hpp"\r
-    #endif\r
+    #include "cap_ffmpeg_impl.hpp"\r
 #else\r
     #include "cap_ffmpeg_api.hpp"\r
 #endif\r