fixed opencv_ffmpeg.dll name in gpu video encoding/decoding

77717e1a · Vladislav Vinogradov · ca572396 · 77717e1a · 77717e1a
Commit 77717e1a authored May 02, 2012 by Vladislav Vinogradov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

ffmpeg_video_source.cpp modules/gpu/src/ffmpeg_video_source.cpp +1 -0

video_writer.cpp modules/gpu/src/video_writer.cpp +1 -0

No files found.
--- 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

--- 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