aboutsummaryrefslogtreecommitdiffstats
path: root/doc/demuxers.texi
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2013-08-04 04:17:22 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-06 02:47:38 +0200
commita7bb12a307568c0db72e6eb8d496a5651a8228df (patch)
treee1dcf0cbd20c2bae71f9a87c4099300c127bec26 /doc/demuxers.texi
parent4c15f3491f1991554ad497788dfb6ad02b552134 (diff)
downloadffmpeg-a7bb12a307568c0db72e6eb8d496a5651a8228df.tar.gz
mpegts: add fix_teletext_pts mpegts demuxer option
Changes since v1 of the patch: - enable option by default - add documentation - move up PTS override code after PES header parsing, to ensure we use the last PCR before the first packet of the teletext PES packet. The option overrides teletext packet PTS and DTS values with the timestamps calculated from the PCR of the first program which the teletext stream is part of and is not discarded. Using the same teletext PID for multiple programs is possible, therefore we need some kind of heuristics to know which program PCR we should synchronize to. Using the first non-discarded PCR pid among the programs of the teletext stream seemed like a good choice. The patch does not do PCR interpolation to estimate the PCR of the teltetext packet, it just uses the last PCR of the program, which may cause a slight error (0.1 sec) in the teletext packet pts-es. Based on a patch by Reimar Döffinger. http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-September/131610.html Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/demuxers.texi')
-rw-r--r--doc/demuxers.texi13
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 1a4d739268..e18448f779 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -257,6 +257,19 @@ ffmpeg -pattern_type glob -i "*.png" -r 10 out.mkv
@end example
@end itemize
+@section mpegts
+
+MPEG-2 transport stream demuxer.
+
+@table @option
+
+@item fix_teletext_pts
+Overrides teletext packet PTS and DTS values with the timestamps calculated
+from the PCR of the first program which the teletext stream is part of and is
+not discarded. Default value is 1, set this option to 0 if you want your
+teletext packet PTS and DTS values untouched.
+@end table
+
@section rawvideo
Raw video demuxer.