potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge pull request #9130 from alalek:android_define

Browse Source
This commit is contained in:
Alexander Alekhin
2017-07-14 17:17:24 +00:00
parent e5fbb4f5d2 a4a47b538c
commit 5a54acef4e
25 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/src/cap_ffmpeg_impl.hpp
+1 -1
View File
@@ -635,7 +635,7 @@ struct ImplMutex::Impl
int refcount;
};
#elif defined __linux__ && !defined ANDROID
#elif defined __linux__ && !defined __ANDROID__
struct ImplMutex::Impl
{