From 77717e1abcdb3975925727e2a3180a67f0b77491 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Wed, 2 May 2012 13:23:11 +0000 Subject: [PATCH] fixed opencv_ffmpeg.dll name in gpu video encoding/decoding --- modules/gpu/src/ffmpeg_video_source.cpp | 1 + modules/gpu/src/video_writer.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/gpu/src/ffmpeg_video_source.cpp b/modules/gpu/src/ffmpeg_video_source.cpp index 4d1c6a51fe..879d10c016 100644 --- a/modules/gpu/src/ffmpeg_video_source.cpp +++ b/modules/gpu/src/ffmpeg_video_source.cpp @@ -68,6 +68,7 @@ namespace { #if defined WIN32 || defined _WIN32 const char* module_name = "opencv_ffmpeg" + CVAUX_STR(CV_MAJOR_VERSION) CVAUX_STR(CV_MINOR_VERSION) CVAUX_STR(CV_SUBMINOR_VERSION) #if (defined _MSC_VER && defined _M_X64) || (defined __GNUC__ && defined __x86_64__) "_64" #endif diff --git a/modules/gpu/src/video_writer.cpp b/modules/gpu/src/video_writer.cpp index b6ed3298ad..c7e989848e 100644 --- a/modules/gpu/src/video_writer.cpp +++ b/modules/gpu/src/video_writer.cpp @@ -771,6 +771,7 @@ namespace { #if defined WIN32 || defined _WIN32 const char* module_name = "opencv_ffmpeg" + CVAUX_STR(CV_MAJOR_VERSION) CVAUX_STR(CV_MINOR_VERSION) CVAUX_STR(CV_SUBMINOR_VERSION) #if (defined _MSC_VER && defined _M_X64) || (defined __GNUC__ && defined __x86_64__) "_64" #endif