Fix one min() usage

diff --git a/GNUmakefile b/GNUmakefile
index fd5c01b8da863900fa0b286238b0bec95fd2f79b..2d556938c87cfa02a10dc5350e6bfae745bd4e00 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -106,8 +106,7 @@ endif
 ifeq ($(ALL_THE_WARNINGS_OFF),1)
 CXXFLAGS_DEV = $(DEFINES) -DDEV -g -O0 -std=c++14 -Wno-deprecated $(CXXFLAGS_EXTRA) $(INCLUDES)
 else
-# -Wold-style-cast
-CXXFLAGS_DEV = $(DEFINES) -DDEV -g -O0 -Wall -Wextra -Wshadow -Werror=return-type -Wmissing-format-attribute -Wdisabled-optimization -Wmissing-declarations -Wmissing-noreturn -Winit-self -Woverloaded-virtual -Wconversion -std=c++14 $(CXXFLAGS_EXTRA) $(INCLUDES)
+CXXFLAGS_DEV = $(DEFINES) -DDEV -g -O0 -Wall -Wextra -Wshadow -Werror=return-type -Wmissing-format-attribute -Wdisabled-optimization -Wmissing-declarations -Wmissing-noreturn -Winit-self -Woverloaded-virtual -Wold-style-cast -Wconversion -std=c++14 $(CXXFLAGS_EXTRA) $(INCLUDES)
 endif
 
 CXXFLAGS_REL = $(DEFINES) -O3 -std=c++14 $(CXXFLAGS_EXTRA) $(INCLUDES)

diff --git a/videoomx.cc b/videoomx.cc
index b071026931ae972b4581da35deba87ec132dbc46..a194925373caf09cd7b6299323dbc625f6443a4b 100644 (file)
--- a/videoomx.cc
+++ b/videoomx.cc
@@ -2913,7 +2913,7 @@ void VideoOMX::PrepareMediaSample(const MediaPacketList& mplist, UINT /* samplep
        mediapackets.clear();
        std::list<MediaPacket>::const_iterator begin=mplist.begin();
        std::list<MediaPacket>::const_iterator itty=mplist.begin();
-       advance(itty,min(mplist.size(),10));
+       advance(itty,std::min(mplist.size(),10U));
        mediapackets.insert(mediapackets.begin(),begin,itty);//front
 
 }