From c65b7a99801bf692cb4700f4af3492a495547e2c Mon Sep 17 00:00:00 2001
From: Vladislav Vinogradov <no@email>
Date: Thu, 3 May 2012 08:34:14 +0000
Subject: [PATCH] removed #include "cap_ffmpeg_impl_v2.hpp"

---
 modules/gpu/src/ffmpeg_video_source.cpp | 6 +-----
 modules/gpu/src/video_writer.cpp        | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/modules/gpu/src/ffmpeg_video_source.cpp b/modules/gpu/src/ffmpeg_video_source.cpp
index 879d10c016..648bd2b282 100644
--- 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
diff --git a/modules/gpu/src/video_writer.cpp b/modules/gpu/src/video_writer.cpp
index c7e989848e..919614eae5 100644
--- 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