OSDN Git Service

lavf: handle data like subtitles in start time calculation.
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Jun 2012 17:07:25 +0000 (19:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Jun 2012 17:19:00 +0000 (19:19 +0200)
This fixes an issue with a crazy data track starting with a large
negative timestamp.

It could as well be solved in all user apps, but this is looking
attractively simpler ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c

index 88c7444..8d33f8d 100644 (file)
@@ -2045,7 +2045,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_type == AVMEDIA_TYPE_SUBTITLE) {
+            if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE || st->codec->codec_type == AVMEDIA_TYPE_DATA) {
                 if (start_time1 < start_time_text)
                     start_time_text = start_time1;
             } else