From: Chris Tallon Date: Tue, 13 Jun 2006 23:14:02 +0000 (+0000) Subject: Keep compiler happy X-Git-Tag: r0-2-4~5 X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=73d334ca01aa478260bc258977f23656fe30fa19;p=vompclient.git Keep compiler happy --- diff --git a/demuxervdr.cc b/demuxervdr.cc index 526b300..a969954 100644 --- a/demuxervdr.cc +++ b/demuxervdr.cc @@ -282,7 +282,6 @@ ULONG DemuxerVDR::getFrameNumFromPTS(ULLONG pts) ++iter; } --iter; - if (onTarget) ret = iter->frame; pthread_mutex_unlock(&pts_map_mutex); if (!onTarget) { @@ -291,17 +290,18 @@ ULONG DemuxerVDR::getFrameNumFromPTS(ULLONG pts) } else { + ret = iter->frame; Log::getInstance()->log("Demuxer", Log::DEBUG, "FOUND FRAME NUMBER %d for %llu", ret, pts); return ret; } } - + void DemuxerVDR::PESPacketVDR::parseDetails() { // TODO: Currently, we naïvely assume that a packet contains a new frame // if and only if it contains a pts, and that no packet contains more // than one new frame - + DemuxerVDR* dx = (DemuxerVDR*)(DemuxerVDR::getInstance()); PESPacket::parseDetails(); if (dx->frameCounting && pts != PTS_INVALID &&