removed #include "cap_ffmpeg_impl_v2.hpp"

13 years ago · c65b7a9980
parent 860172c626
commit c65b7a9980
2 changed files with 2 additions and 10 deletions
--- a/modules/gpu/src/ffmpeg_video_source.cpp
+++ b/modules/gpu/src/ffmpeg_video_source.cpp
@ -45,11 +45,7 @@
 #ifdef HAVE_CUDA

 #ifdef HAVE_FFMPEG
-    #ifdef NEW_FFMPEG
-        #include "cap_ffmpeg_impl_v2.hpp"
-    #else
-        #include "cap_ffmpeg_impl.hpp"
-    #endif
+    #include "cap_ffmpeg_impl.hpp"
 #else
    #include "cap_ffmpeg_api.hpp"
 #endif
--- 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

 #ifdef HAVE_FFMPEG
-    #ifdef NEW_FFMPEG
-        #include "cap_ffmpeg_impl_v2.hpp"
-    #else
-        #include "cap_ffmpeg_impl.hpp"
-    #endif
+    #include "cap_ffmpeg_impl.hpp"
 #else
    #include "cap_ffmpeg_api.hpp"
 #endif