summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-03-03 15:28:26 +0100
committerwm4 <wm4@nowhere>2015-03-03 15:28:26 +0100
commit1ba24d25853c0bb42526344345dc1c20741af338 (patch)
tree49b419aff978fc45a0b258af2373175477030a35
parentb3401e8972399ecccff6c639cb845939ee6a8efc (diff)
downloadmpv-1ba24d25853c0bb42526344345dc1c20741af338.tar.bz2
mpv-1ba24d25853c0bb42526344345dc1c20741af338.tar.xz
stream_cdda: fix parameter passing
All cdda options (except --cdrom-drive) were ignored, because the priv struct (with the options set) was just replaced. Oops.
-rw-r--r--stream/stream_cdda.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index 13ec14644b..8bb940032c 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -227,7 +227,6 @@ static void close_cdda(stream_t *s)
cdda_priv *p = (cdda_priv *)s->priv;
paranoia_free(p->cdp);
cdda_close(p->cd);
- free(p);
}
static int get_track_by_sector(cdda_priv *p, unsigned int sector)
@@ -313,7 +312,6 @@ static int open_cdda(stream_t *st)
return STREAM_ERROR;
}
- priv = calloc(1,sizeof(cdda_priv));
priv->cd = cdd;
if (p->toc_bias)