Germany/hunting
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Compile ffmpeg ok.

Browse Source
This commit is contained in:
Fancy code 2024-06-15 19:07:20 +08:00
parent f3824bd71b
commit cb0948f81f
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
middleware/MediaManager/src/MediaManagerImpl.cpp
View File

@ -77,12 +77,6 @@ void MediaManagerImpl::InitMediaHandles(std::map<CameraType, std::shared_ptr<VCa
continue; continue;
} }
MediaChannel channel = static_cast<MediaChannel>(i); MediaChannel channel = static_cast<MediaChannel>(i);
<<<<<<< HEAD
std::shared_ptr<VMediaHandle> media = std::make_shared<MediaHandle>(channel, camera->second);
mAllMediaChannels[channel] = media;
LogInfo("InitMediaHandles. channel = %d \n", static_cast<MediaChannel>(i));
}
=======
std::shared_ptr<MediaHandle> media = std::make_shared<MediaHandle>(channel, camera->second); std::shared_ptr<MediaHandle> media = std::make_shared<MediaHandle>(channel, camera->second);
media->Init(); media->Init();
mAllMediaChannels[channel] = media; mAllMediaChannels[channel] = media;
@ -100,5 +94,4 @@ void MediaManagerImpl::UnInitMediaHandles(void)
} }
mediaImpl->UnInit(); mediaImpl->UnInit();
} }
>>>>>>> master
} }