summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-26 02:06:58 +0200
committerwm4 <wm4@nowhere>2013-07-26 02:11:34 +0200
commit3bddc16431f8d2e22b03154465e9c62bafd328f3 (patch)
tree75711353b4124a6b9efea3e75ccb882981865112 /demux
parentfb67770ed697ed4898f9019640bb389f2f6f588e (diff)
downloadmpv-3bddc16431f8d2e22b03154465e9c62bafd328f3.tar.bz2
mpv-3bddc16431f8d2e22b03154465e9c62bafd328f3.tar.xz
options: simplify --correct-pts handling
Remove the (now unused) code for determining correct-pts mode based on the demuxer in use. Change its description in the manpage to reflect what this option does now.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux.h1
-rw-r--r--demux/demux_lavf.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/demux/demux.h b/demux/demux.h
index 85ee738137..4afd85f4a7 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -63,7 +63,6 @@ enum timestamp_type {
#define DEMUXER_CTRL_RESYNC 13
#define DEMUXER_CTRL_SWITCH_VIDEO 14
#define DEMUXER_CTRL_IDENTIFY_PROGRAM 15
-#define DEMUXER_CTRL_CORRECT_PTS 16 // int* (write 1 for ok, 0 for no)
#define SEEK_ABSOLUTE (1 << 0)
#define SEEK_FACTOR (1 << 1)
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 350fe54b66..21b1cf8624 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -531,7 +531,7 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check)
demuxer->timestamp_type = TIMESTAMP_TYPE_SORT;
} else {
int mode = lavfdopts->genptsmode;
- if (mode == 0 && opts->user_correct_pts != 0)
+ if (mode == 0 && opts->correct_pts)
mode = demuxer->stream->uncached_type == STREAMTYPE_DVD ? 2 : 1;
if (mode == 1)
avfc->flags |= AVFMT_FLAG_GENPTS;