fix build with recent compiler

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

View File

@ -59,8 +59,8 @@ std::list< std::pair<unsigned char*,size_t> > H264_V4L2DeviceSource::splitFrames
case 5: LOG(INFO) << "IDR size:" << size;
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::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_sps.c_str(), m_sps.size()));
frameList.push_back(std::pair<unsigned char*,size_t>((unsigned char*)m_pps.c_str(), m_pps.size()));
}
break;
default: break;
@ -83,7 +83,7 @@ std::list< std::pair<unsigned char*,size_t> > H264_V4L2DeviceSource::splitFrames
delete [] sps_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);
}

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;
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;
}