diff options
| author | wm4 <wm4@nowhere> | 2013-11-04 00:43:06 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-04 00:43:06 +0100 |
| commit | f7b2d644eff7fae2d74259ae14ec2b05b00c9b9b (patch) | |
| tree | ca5462391d6a8f7b8e254c51c88f30efea91b90f /demux/demux.h | |
| parent | 37388ebb0ef9085c841d7f94e665a5a77cfe0e92 (diff) | |
| parent | 25affdcc886ce010995804553396d81d90a321d3 (diff) | |
| download | mpv-f7b2d644eff7fae2d74259ae14ec2b05b00c9b9b.tar.bz2 mpv-f7b2d644eff7fae2d74259ae14ec2b05b00c9b9b.tar.xz | |
Merge branch 'master' into have_configure
Conflicts:
configure
Diffstat (limited to 'demux/demux.h')
| -rw-r--r-- | demux/demux.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/demux/demux.h b/demux/demux.h index 0c8f9cb3f8..1c8562eb63 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -166,8 +166,6 @@ typedef struct demuxer { const demuxer_desc_t *desc; ///< Demuxer description structure const char *filetype; // format name when not identified by demuxer (libavformat) int64_t filepos; // input stream current pos. - int64_t movi_start; - int64_t movi_end; struct stream *stream; double stream_pts; // current stream pts, if applicable (e.g. dvd) char *filename; // same as stream->url |