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_raw.c | |
| 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_raw.c')
| -rw-r--r-- | demux/demux_raw.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/demux/demux_raw.c b/demux/demux_raw.c index 4d6e171ad4..01cf3574a0 100644 --- a/demux/demux_raw.c +++ b/demux/demux_raw.c @@ -100,9 +100,6 @@ static int demux_rawaudio_open(demuxer_t *demuxer, enum demux_check check) w->wBitsPerSample = 8 * samplesize; w->cbSize = 0; - demuxer->movi_start = demuxer->stream->start_pos; - demuxer->movi_end = demuxer->stream->end_pos; - struct priv *p = talloc_ptrtype(demuxer, p); demuxer->priv = p; *p = (struct priv) { @@ -185,9 +182,6 @@ static int demux_rawvideo_open(demuxer_t *demuxer, enum demux_check check) sh_video->disp_h = height; sh_video->i_bps = fps * imgsize; - demuxer->movi_start = demuxer->stream->start_pos; - demuxer->movi_end = demuxer->stream->end_pos; - struct priv *p = talloc_ptrtype(demuxer, p); demuxer->priv = p; *p = (struct priv) { @@ -207,7 +201,7 @@ static int raw_fill_buffer(demuxer_t *demuxer) return 0; struct demux_packet *dp = new_demux_packet(p->frame_size * p->read_frames); - dp->pos = stream_tell(demuxer->stream) - demuxer->movi_start; + dp->pos = stream_tell(demuxer->stream) - demuxer->stream->start_pos; dp->pts = (dp->pos / p->frame_size) / p->frame_rate; int len = stream_read(demuxer->stream, dp->buffer, dp->len); |