Archives/v4l2rtspserver
2
0
Fork 0
mirror of https://github.com/mpromonet/v4l2rtspserver synced 2024-11-19 15:25:34 +00:00
Code Issues Projects Releases Wiki Activity

fix build with recent compiler

Browse Source
This commit is contained in:
mpromonet 2016-06-12 12:45:18 +00:00
parent 2243e62fc6
commit 74703ebaee
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/H264_V4l2DeviceSource.cpp
View File

@ -59,8 +59,8 @@ std::list< std::pair<unsigned char*,size_t> > H264_V4L2DeviceSource::splitFrames
case 5: LOG(INFO) << "IDR size:" << size; case 5: LOG(INFO) << "IDR size:" << size;
if (m_repeatConfig && !m_sps.empty() && !m_pps.empty()) if (m_repeatConfig && !m_sps.empty() && !m_pps.empty())
{ {
frameList.push_back(std::make_pair<unsigned char*,size_t>((unsigned char*)m_sps.c_str(), m_sps.size())); frameList.push_back(std::pair<unsigned char*,size_t>((unsigned char*)m_sps.c_str(), m_sps.size()));
frameList.push_back(std::make_pair<unsigned char*,size_t>((unsigned char*)m_pps.c_str(), m_pps.size())); frameList.push_back(std::pair<unsigned char*,size_t>((unsigned char*)m_pps.c_str(), m_pps.size()));
} }
break; break;
default: break; default: break;
@ -83,7 +83,7 @@ std::list< std::pair<unsigned char*,size_t> > H264_V4L2DeviceSource::splitFrames
delete [] sps_base64; delete [] sps_base64;
delete [] pps_base64; delete [] pps_base64;
} }
frameList.push_back(std::make_pair<unsigned char*,size_t>(buffer, size)); frameList.push_back(std::pair<unsigned char*,size_t>(buffer, size));
buffer = this->extractFrame(&buffer[size], bufSize, size); buffer = this->extractFrame(&buffer[size], bufSize, size);
} }

2
src/V4l2DeviceSource.cpp
View File

@ -268,7 +268,7 @@ std::list< std::pair<unsigned char*,size_t> > V4L2DeviceSource::splitFrames(unsi
std::list< std::pair<unsigned char*,size_t> > frameList; std::list< std::pair<unsigned char*,size_t> > frameList;
if (frame != NULL) if (frame != NULL)
{ {
frameList.push_back(std::make_pair<unsigned char*,size_t>(frame, frameSize)); frameList.push_back(std::pair<unsigned char*,size_t>(frame, frameSize));
} }
return frameList; return frameList;
} }