Mercurial > libavformat.hg

changeset 772:d3cec742f7c0 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
av_find_stream_info() end check fixes 10l (wrong time base) use timestamps if duration isnt available
author michael
date Sun, 22 May 2005 08:47:09 +0000
parents 581bec6f0eb0
children a5095f5cf38a
files utils.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/utils.c	Sat May 21 10:41:52 2005 +0000
+++ b/utils.c	Sun May 22 08:47:09 2005 +0000
@@ -1797,7 +1797,7 @@
         if (pkt->duration != 0)
             st->codec_info_nb_frames++;
 
-        if(st->codec.codec_type == CODEC_TYPE_VIDEO){
+        {
             int index= pkt->stream_index;
             int64_t last= last_dts[index];
             int64_t duration= pkt->dts - last;
@@ -1811,6 +1811,8 @@
                     duration_sum[index] += duration;
                     duration_count[index]+= factor;
                 }
+                if(st->codec_info_nb_frames == 0)
+                    st->codec_info_duration += duration;
             }
             last_dts[pkt->stream_index]= pkt->dts;
         }
@@ -1835,7 +1837,7 @@
              (st->codec.codec_id == CODEC_ID_MPEG4 && !st->need_parsing))*/)
             try_decode_frame(st, pkt->data, pkt->size);
         
-        if (st->codec_info_duration >= MAX_STREAM_DURATION) {
+        if (av_rescale_q(st->codec_info_duration, st->time_base, AV_TIME_BASE_Q) >= MAX_STREAM_DURATION) {
             break;
         }
         count++;