summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-17 23:47:54 +0100
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-02-19 13:39:38 +0900
commitfea1dc0cd5c7611e9600f1a42b9c7f4c72a75058 (patch)
tree6a0c58119f8a3d9f08a2f81a4d825fd5dc680426
parent8161b47e73f96ffb6ae505008a1fa0dd48e1694d (diff)
downloadmpv-fea1dc0cd5c7611e9600f1a42b9c7f4c72a75058.tar.bz2
mpv-fea1dc0cd5c7611e9600f1a42b9c7f4c72a75058.tar.xz
demux: copy priv pointer too
Weird, but helps with the case a demuxer gets handed its own instance from outside. (cherry picked from commit f9872ab26fad62766f62be112436482ef3e7e07b)
-rw-r--r--demux/demux.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/demux/demux.c b/demux/demux.c
index 3949f5de18..96e277f2c5 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -763,6 +763,7 @@ static void demux_copy(struct demuxer *dst, struct demuxer *src)
dst->ts_resets_possible = src->ts_resets_possible;
dst->rel_seeks = src->rel_seeks;
dst->start_time = src->start_time;
+ dst->priv = src->priv;
}
if (src->events & DEMUX_EVENT_STREAMS) {
// The stream structs themselves are immutable.