summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-07 22:49:50 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-08 18:05:12 +0200
commit3628a903f40943740ff97a03a106d9a5208fae76 (patch)
tree3158814a5aaa5db43b9661a0a3d7e53635961f86 /libmpdemux/demuxer.c
parent12d3e0df9980822282f70dffad148b729dbee541 (diff)
downloadmpv-3628a903f40943740ff97a03a106d9a5208fae76.tar.bz2
mpv-3628a903f40943740ff97a03a106d9a5208fae76.tar.xz
demux: fix -correct-pts autoselection with -audiofile
Make demuxer-based -correct-pts autoselection base the decision on the video demuxer in case several are being used, such as with -audiofile.
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index db21f94734..ae81ae3e33 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -1224,7 +1224,7 @@ demuxer_t *demux_open(struct MPOpts *opts, stream_t *vs, int file_format,
opts->correct_pts = opts->user_correct_pts;
if (opts->correct_pts < 0)
opts->correct_pts =
- demux_control(res, DEMUXER_CTRL_CORRECT_PTS,
+ demux_control(vd ? vd : res, DEMUXER_CTRL_CORRECT_PTS,
NULL) == DEMUXER_CTRL_OK;
return res;
}