[vlc-commits] demux: adaptative: remove unused member
Francois Cartegnie
git at videolan.org
Wed Sep 23 21:15:09 CEST 2015
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Sep 23 16:08:32 2015 +0200| [f7b1888a558aef01459db6ff61ba08eb1343a5f2] | committer: Francois Cartegnie
demux: adaptative: remove unused member
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f7b1888a558aef01459db6ff61ba08eb1343a5f2
---
modules/demux/adaptative/plumbing/StreamOutput.cpp | 4 +---
modules/demux/adaptative/plumbing/StreamOutput.hpp | 1 -
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/modules/demux/adaptative/plumbing/StreamOutput.cpp b/modules/demux/adaptative/plumbing/StreamOutput.cpp
index 79ff020..6a5a37c 100644
--- a/modules/demux/adaptative/plumbing/StreamOutput.cpp
+++ b/modules/demux/adaptative/plumbing/StreamOutput.cpp
@@ -53,7 +53,6 @@ BaseStreamOutput::BaseStreamOutput(demux_t *demux, const StreamFormat &format, c
AbstractStreamOutput(demux, format)
{
this->name = name;
- seekable = true;
demuxer = NULL;
CommandsFactory *factory = new CommandsFactory();
@@ -112,8 +111,7 @@ void BaseStreamOutput::pushBlock(block_t *block, bool b)
bool BaseStreamOutput::seekAble() const
{
- bool b_canswitch = switchAllowed();
- return (demuxer && seekable && b_canswitch);
+ return (demuxer && switchAllowed());
}
void BaseStreamOutput::setPosition(mtime_t nztime)
diff --git a/modules/demux/adaptative/plumbing/StreamOutput.hpp b/modules/demux/adaptative/plumbing/StreamOutput.hpp
index f3df128..6392a92 100644
--- a/modules/demux/adaptative/plumbing/StreamOutput.hpp
+++ b/modules/demux/adaptative/plumbing/StreamOutput.hpp
@@ -99,7 +99,6 @@ namespace adaptative
protected:
FakeESOut *fakeesout; /* to intercept/proxy what is sent from demuxstream */
AbstractDemuxer *demuxer;
- bool seekable;
std::string name;
private:
More information about the vlc-commits
mailing list