justdan96
/
tsMuxer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflict between std::max and windows.h max

master
jcdr428 2019-12-06 17:37:44 +02:00 committed by GitHub
parent b79ef4c3e4
commit 002a52ab89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tsMuxer/h264StreamReader.cpp
View File

@ -1207,7 +1207,7 @@ int H264StreamReader::detectPrimaryPicType(SliceUnit& firstSlice, uint8_t* buff)
m_nextFrameFound = false;
m_nextFrameIdr = false;
m_pict_type = -1;
m_pict_type = std::max(m_pict_type, sliceTypeToPictType(firstSlice.slice_type));
m_pict_type = (std::max)(m_pict_type, sliceTypeToPictType(firstSlice.slice_type));
//if (firstSlice.orig_slice_type >= 5) // all other slice at this picture must be same type
// return 0; // OK