aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-12-06 00:15:52 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-12-06 00:15:52 +0000
commitd43ed92def0220c8024ed479bb2824be17cdb061 (patch)
tree2417100ec6a56a90ea97c979831ccef749bffe8d
parentf9a35124a7b4bde1898727b52c3bc62587ff1505 (diff)
downloadffmpeg-d43ed92def0220c8024ed479bb2824be17cdb061.tar.gz
use pts based duration/bitrate guessing code for mpeg-ts
Originally committed as revision 3731 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 5b17c64b90..1f99daa42b 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1617,7 +1617,7 @@ static void av_estimate_timings(AVFormatContext *ic)
}
ic->file_size = file_size;
- if (ic->iformat == &mpegps_demux && file_size && !ic->pb.is_streamed) {
+ if ((ic->iformat == &mpegps_demux || ic->iformat == &mpegts_demux) && file_size && !ic->pb.is_streamed) {
/* get accurate estimate from the PTSes */
av_estimate_timings_from_pts(ic);
} else if (av_has_timings(ic)) {