diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-16 07:11:12 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 13:41:05 +0300 |
| commit | 9b06b5ed85ec28097428e7fe35631ce3a04685b5 (patch) | |
| tree | 8fbb0ad6eecb1f337e153d5c6eb7fa2378b805f4 /libmpdemux/demuxer.c | |
| parent | 0d59f81e546946648dfca93da6b74479d31369bc (diff) | |
| download | mpv-9b06b5ed85ec28097428e7fe35631ce3a04685b5.tar.bz2 mpv-9b06b5ed85ec28097428e7fe35631ce3a04685b5.tar.xz | |
Move correct_pts to options struct
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index c11c8a035a..377b34fd08 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -738,9 +738,6 @@ int get_demuxer_type_from_name(char *demuxer_name, int *force) int extension_parsing = 1; // 0=off 1=mixed (used only for unstable formats) -int correct_pts = 0; -int user_correct_pts = -1; - /* NOTE : Several demuxers may be opened at the same time so demuxers should NEVER rely on an external var to enable them @@ -1045,9 +1042,9 @@ demuxer_t *demux_open(struct MPOpts *opts, stream_t *vs, int file_format, else res = vd; - correct_pts = user_correct_pts; - if (correct_pts < 0) - correct_pts = + opts->correct_pts = opts->user_correct_pts; + if (opts->correct_pts < 0) + opts->correct_pts = demux_control(res, DEMUXER_CTRL_CORRECT_PTS, NULL) == DEMUXER_CTRL_OK; return res; |