mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 22:40:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

added new version of ffmpeg binary for compilation on Mingw64/MSVC64

Browse Source
This commit is contained in:
Alexander Shishkov 2011-06-14 08:06:55 +00:00
parent 2e13a4cd52
commit bce15cb6dd
12 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
3rdparty/lib/libavcodec64.a vendored
View File

Binary file not shown.

BIN
3rdparty/lib/libavcore64.a vendored Normal file
View File

Binary file not shown.

BIN
3rdparty/lib/libavdevice64.a vendored
View File

Binary file not shown.

BIN
3rdparty/lib/libavformat64.a vendored
View File

Binary file not shown.

BIN
3rdparty/lib/libavutil64.a vendored
View File

Binary file not shown.

BIN
3rdparty/lib/libgcc64.a vendored Normal file
View File

Binary file not shown.

BIN
3rdparty/lib/libmingwex64.a vendored Normal file
View File

Binary file not shown.

BIN
3rdparty/lib/libswscale64.a vendored
View File

Binary file not shown.

BIN
3rdparty/lib/libwsock3264.a vendored Normal file
View File

Binary file not shown.

4
modules/CMakeLists.txt
View File

@ -11,9 +11,7 @@ add_subdirectory(features2d)
add_subdirectory(flann) add_subdirectory(flann)
if(MSVC OR MINGW) if(MSVC OR MINGW)
if(NOT CMAKE_CL_64) add_subdirectory(ffmpeg)
add_subdirectory(ffmpeg)
endif()
endif() endif()
if(BUILD_TESTS) if(BUILD_TESTS)

2
modules/ffmpeg/CMakeLists.txt
View File

@ -26,8 +26,10 @@ if (NOT MSVC)
if(WIN32 AND MINGW64) if(WIN32 AND MINGW64)
target_link_libraries(${the_target} ${CMAKE_SOURCE_DIR}/3rdparty/lib/libavformat64.a target_link_libraries(${the_target} ${CMAKE_SOURCE_DIR}/3rdparty/lib/libavformat64.a
${CMAKE_SOURCE_DIR}/3rdparty/lib/libavcodec64.a ${CMAKE_SOURCE_DIR}/3rdparty/lib/libavcodec64.a
${CMAKE_SOURCE_DIR}/3rdparty/lib/libavdevice64.a
${CMAKE_SOURCE_DIR}/3rdparty/lib/libavutil64.a ${CMAKE_SOURCE_DIR}/3rdparty/lib/libavutil64.a
${CMAKE_SOURCE_DIR}/3rdparty/lib/libswscale64.a ${CMAKE_SOURCE_DIR}/3rdparty/lib/libswscale64.a
${CMAKE_SOURCE_DIR}/3rdparty/lib/libavcore64.a
libws2_32.a) libws2_32.a)
else() else()
target_link_libraries(${the_target} ${CMAKE_SOURCE_DIR}/3rdparty/lib/libavformat.a target_link_libraries(${the_target} ${CMAKE_SOURCE_DIR}/3rdparty/lib/libavformat.a

13
modules/ffmpeg/ffopencv.cpp
View File

@ -531,21 +531,30 @@ That's all there is to it!
#if !defined(_MT) || defined(_DLL) #if !defined(_MT) || defined(_DLL)
extern "C" { __declspec(dllexport) unsigned int __lc_codepage = 0; } extern "C" { __declspec(dllexport) unsigned int __lc_codepage = 0; }
#endif #endif
#ifdef _M_X64
#pragma comment(lib, "libgcc64.a")
#pragma comment(lib, "libmingwex64.a")
#else
#pragma comment(lib, "libgcc_.a") #pragma comment(lib, "libgcc_.a")
#pragma comment(lib, "libmingwex_.a") #pragma comment(lib, "libmingwex_.a")
#pragma comment(lib, "libcoldname_.a") #pragma comment(lib, "libcoldname_.a")
#endif
#ifdef _M_X64 #ifdef _M_X64
#pragma comment(lib, "libavformat64.a") #pragma comment(lib, "libavformat64.a")
#pragma comment(lib, "libavcodec64.a") #pragma comment(lib, "libavcodec64.a")
#pragma comment(lib, "libavutil64.a") #pragma comment(lib, "libavutil64.a")
#pragma comment(lib, "libavcore64.a")
#pragma comment(lib, "libswscale64.a")
#pragma comment(lib, "libwsock3264.a")
#else #else
#pragma comment(lib, "libavformat.a") #pragma comment(lib, "libavformat.a")
#pragma comment(lib, "libavcodec.a") #pragma comment(lib, "libavcodec.a")
#pragma comment(lib, "libavutil.a") #pragma comment(lib, "libavutil.a")
#pragma comment(lib, "libswscale.a") #pragma comment(lib, "libswscale.a")
#endif
#pragma comment(lib, "libwsock32_.a") #pragma comment(lib, "libwsock32_.a")
#endif
#endif #endif