[FFmpeg-cvslog] lavf/utils: ignore subtitle timestamps in timings calculation

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 30 17:01:51 2011 +0200| [78972a69e3a2ee940ab600f02bf09e615305ae0d] | committer: Michael Niedermayer

lavf/utils: ignore subtitle timestamps in timings calculation

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=78972a69e3a2ee940ab600f02bf09e615305ae0d
---

 libavformat/utils.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 7c80959..bb926d5 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1898,7 +1898,7 @@ static void update_stream_timings(AVFormatContext *ic)
         st = ic->streams[i];
         if (st->start_time != AV_NOPTS_VALUE && st->time_base.den) {
             start_time1= av_rescale_q(st->start_time, st->time_base, AV_TIME_BASE_Q);
-            if (st->codec->codec_id == CODEC_ID_DVB_TELETEXT) {
+            if (st->codec->codec_id == CODEC_ID_DVB_TELETEXT || st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
                 if (start_time1 < start_time_text)
                     start_time_text = start_time1;
             } else