[FFmpeg-cvslog] lavf: handle data like subtitles in start time calculation.

Michael Niedermayer git at videolan.org
Tue Jun 12 19:20:08 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 12 19:07:25 2012 +0200| [47695b1d65de52eed7cbceeaa0985fa36d8bc264] | committer: Michael Niedermayer

lavf: handle data like subtitles in start time calculation.

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 at gmx.at>

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

 libavformat/utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 88c7444..8d33f8d 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -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



More information about the ffmpeg-cvslog mailing list