From b18243fc04d1f9c124ed69ac2320ae4fdddc98f7 Mon Sep 17 00:00:00 2001 From: Francois Cartegnie Date: Fri, 16 Apr 2021 16:47:37 +0200 Subject: [PATCH] demux: adaptive: remove left indirect returns since lock removal --- modules/demux/adaptive/plumbing/CommandsQueue.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/modules/demux/adaptive/plumbing/CommandsQueue.cpp b/modules/demux/adaptive/plumbing/CommandsQueue.cpp index 0b8dbe1488..17720454a8 100644 --- a/modules/demux/adaptive/plumbing/CommandsQueue.cpp +++ b/modules/demux/adaptive/plumbing/CommandsQueue.cpp @@ -427,8 +427,7 @@ void CommandsQueue::Abort( bool b_reset ) bool CommandsQueue::isEmpty() const { - bool b_empty = commands.empty() && incoming.empty(); - return b_empty; + return commands.empty() && incoming.empty(); } void CommandsQueue::setDrop( bool b ) @@ -443,8 +442,7 @@ void CommandsQueue::setDraining() bool CommandsQueue::isDraining() const { - bool b = b_draining; - return b; + return b_draining; } void CommandsQueue::setEOF( bool b ) @@ -458,8 +456,7 @@ void CommandsQueue::setEOF( bool b ) bool CommandsQueue::isEOF() const { - bool b = b_eof; - return b; + return b_eof; } vlc_tick_t CommandsQueue::getDemuxedAmount(vlc_tick_t from) const @@ -474,9 +471,7 @@ vlc_tick_t CommandsQueue::getDemuxedAmount(vlc_tick_t from) const vlc_tick_t CommandsQueue::getBufferingLevel() const { - vlc_tick_t i_buffer; - i_buffer = bufferinglevel; - return i_buffer; + return bufferinglevel; } vlc_tick_t CommandsQueue::getFirstDTS() const @@ -504,6 +499,5 @@ void CommandsQueue::LockedSetDraining() vlc_tick_t CommandsQueue::getPCR() const { - vlc_tick_t i_pcr = pcr; - return i_pcr; + return pcr; } -- 2.11.4.GIT