summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-07-06 19:05:59 +0200
committerwm4 <wm4@nowhere>2014-07-06 19:05:59 +0200
commitacd60736ef62c7ea681d69c0c7b26142509aa1cb (patch)
tree98288002d978dd5f64dbd0f8603e42ec120f9511 /demux
parenta90b5cfddf88f73b0b46318e817b00aa6658371d (diff)
downloadmpv-acd60736ef62c7ea681d69c0c7b26142509aa1cb.tar.bz2
mpv-acd60736ef62c7ea681d69c0c7b26142509aa1cb.tar.xz
Remove stream_pts stuff
This was used by DVD/BD, but its usage was removed with one of the previous commits.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux.c3
-rw-r--r--demux/demux.h1
-rw-r--r--demux/packet.c2
-rw-r--r--demux/packet.h1
4 files changed, 0 insertions, 7 deletions
diff --git a/demux/demux.c b/demux/demux.c
index 7938cbdcec..08c7e24a30 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -288,8 +288,6 @@ struct demux_packet *demux_read_packet(struct sh_stream *sh)
ds->bytes -= pkt->len;
ds->packs--;
- if (pkt->stream_pts != MP_NOPTS_VALUE)
- sh->demuxer->stream_pts = pkt->stream_pts;
if (pkt && pkt->pos >= 0)
sh->demuxer->filepos = pkt->pos;
@@ -454,7 +452,6 @@ static struct demuxer *open_given_type(struct mpv_global *global,
.desc = desc,
.type = desc->type,
.stream = stream,
- .stream_pts = MP_NOPTS_VALUE,
.seekable = stream->seekable,
.accurate_seek = true,
.filepos = -1,
diff --git a/demux/demux.h b/demux/demux.h
index c59af6a2fa..133e9ddd7a 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -173,7 +173,6 @@ typedef struct demuxer {
const char *filetype; // format name when not identified by demuxer (libavformat)
int64_t filepos; // input stream current pos.
struct stream *stream;
- double stream_pts; // current stream pts, if applicable (e.g. dvd)
char *filename; // same as stream->url
enum demuxer_type type;
int seekable; // flag
diff --git a/demux/packet.c b/demux/packet.c
index 82de1a6996..77ea78f7cc 100644
--- a/demux/packet.c
+++ b/demux/packet.c
@@ -46,7 +46,6 @@ static struct demux_packet *create_packet(size_t len)
.pts = MP_NOPTS_VALUE,
.dts = MP_NOPTS_VALUE,
.duration = -1,
- .stream_pts = MP_NOPTS_VALUE,
.pos = -1,
.stream = -1,
};
@@ -119,6 +118,5 @@ struct demux_packet *demux_copy_packet(struct demux_packet *dp)
new->pts = dp->pts;
new->dts = dp->dts;
new->duration = dp->duration;
- new->stream_pts = dp->stream_pts;
return new;
}
diff --git a/demux/packet.h b/demux/packet.h
index e6cfafb5ee..21c0a6dc8f 100644
--- a/demux/packet.h
+++ b/demux/packet.h
@@ -29,7 +29,6 @@ typedef struct demux_packet {
double pts;
double dts;
double duration;
- double stream_pts;
int64_t pos; // position in source file byte stream
unsigned char *buffer;
bool keyframe;