[vlc-devel] [PATCH 4/4] demux:adaptive: no need to keep the length
Steve Lhomme
robux4 at ycbcr.xyz
Mon Jan 8 08:37:19 CET 2018
---
modules/demux/adaptive/plumbing/Demuxer.cpp | 3 +--
modules/demux/adaptive/plumbing/Demuxer.hpp | 3 ---
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/modules/demux/adaptive/plumbing/Demuxer.cpp b/modules/demux/adaptive/plumbing/Demuxer.cpp
index 5eca5df527..b1568ac751 100644
--- a/modules/demux/adaptive/plumbing/Demuxer.cpp
+++ b/modules/demux/adaptive/plumbing/Demuxer.cpp
@@ -152,7 +152,6 @@ int Demuxer::demux(mtime_t)
SlaveDemuxer::SlaveDemuxer(demux_t *p_realdemux, const std::string &name, es_out_t *out, AbstractSourceStream *source)
: Demuxer(p_realdemux, name, out, source)
{
- length = VLC_TS_INVALID;
b_reinitsonseek = false;
b_startsfromzero = false;
}
@@ -166,7 +165,7 @@ bool SlaveDemuxer::create()
{
if(Demuxer::create())
{
- length = VLC_TS_INVALID;
+ mtime_t length = VLC_TS_INVALID;
if(demux_Control(p_demux, DEMUX_GET_LENGTH, &length) != VLC_SUCCESS)
b_eof = true;
return true;
diff --git a/modules/demux/adaptive/plumbing/Demuxer.hpp b/modules/demux/adaptive/plumbing/Demuxer.hpp
index 3e9b8b9182..4a962f3855 100644
--- a/modules/demux/adaptive/plumbing/Demuxer.hpp
+++ b/modules/demux/adaptive/plumbing/Demuxer.hpp
@@ -76,9 +76,6 @@ namespace adaptive
virtual ~SlaveDemuxer();
virtual bool create(); /* reimpl */
virtual int demux(mtime_t); /* reimpl */
-
- private:
- mtime_t length;
};
}
--
2.14.2
More information about the vlc-devel
mailing list