From 70e310f9da6db51dcebee647540b822bb76ba183 Mon Sep 17 00:00:00 2001 From: Chris Tallon Date: Mon, 15 Nov 2021 17:45:16 +0000 Subject: [PATCH] Fix one min() usage --- GNUmakefile | 3 +-- videoomx.cc | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index fd5c01b..2d55693 100644 --- 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 b071026..a194925 100644 --- a/videoomx.cc +++ b/videoomx.cc @@ -2913,7 +2913,7 @@ void VideoOMX::PrepareMediaSample(const MediaPacketList& mplist, UINT /* samplep mediapackets.clear(); std::list::const_iterator begin=mplist.begin(); std::list::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 } -- 2.39.5