summaryrefslogtreecommitdiffstats
path: root/stream/stream_cdda.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-08-22 18:23:33 +0200
committerwm4 <wm4@nowhere>2013-08-22 19:14:26 +0200
commitf806e268c6c3a76f65b1282219e16fcdfb80a9b5 (patch)
tree66876fbc7d96308da11a91456d91ef90223bac23 /stream/stream_cdda.c
parenta790f2133bb785e0c48a7c6cdc730c8b7e8287fb (diff)
downloadmpv-f806e268c6c3a76f65b1282219e16fcdfb80a9b5.tar.bz2
mpv-f806e268c6c3a76f65b1282219e16fcdfb80a9b5.tar.xz
stream: don't require streams to set s->pos in seek callback
Instead, set s->pos depending on the success of the seek callback.
Diffstat (limited to 'stream/stream_cdda.c')
-rw-r--r--stream/stream_cdda.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index 02ba28d54b..26ad560cae 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -213,9 +213,8 @@ static int seek(stream_t *s, int64_t newpos)
int seek_to_track = 0;
int i;
- s->pos = newpos;
- sec = s->pos / CDIO_CD_FRAMESIZE_RAW;
- if (s->pos < 0 || sec > p->end_sector) {
+ sec = newpos / CDIO_CD_FRAMESIZE_RAW;
+ if (newpos < 0 || sec > p->end_sector) {
p->sector = p->end_sector + 1;
return 0;
}