Merge pull request #10260 from native-api:ffmpeg_load_from_package

pull/10112/head
Alexander Alekhin 7 years ago
commit 66e09bc9a4
  1. 6
      modules/videoio/src/cap_ffmpeg.cpp

@ -124,8 +124,10 @@ private:
if (m) if (m)
{ {
wchar_t path[MAX_PATH]; wchar_t path[MAX_PATH];
size_t sz = GetModuleFileNameW(m, path, sizeof(path)); const size_t path_size = sizeof(path)/sizeof(*path);
if (sz > 0 && ERROR_SUCCESS == GetLastError()) size_t sz = GetModuleFileNameW(m, path, path_size);
/* Don't handle paths longer than MAX_PATH until that becomes a real issue */
if (sz > 0 && sz < path_size)
{ {
wchar_t* s = wcsrchr(path, L'\\'); wchar_t* s = wcsrchr(path, L'\\');
if (s) if (s)

Loading…
Cancel
Save