]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
Revert "Improve frame rate guessing for streams with two fields per frame."
authormru <mru@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sat, 28 Feb 2009 15:15:54 +0000 (15:15 +0000)
committermru <mru@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sat, 28 Feb 2009 15:15:54 +0000 (15:15 +0000)
This reverts r17656, which broke many tests.  Further investigation
is necessary.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17658 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavformat/utils.c

index 864fd9e5403a0710609dfc03d6a99af943728bd2..9354b758862595bde213580c580b72cf76be235a 100644 (file)
@@ -2115,11 +2115,6 @@ int av_find_stream_info(AVFormatContext *ic)
             int64_t last= last_dts[index];
             int64_t duration= pkt->dts - last;
 
-            if (st->codec->ticks_per_frame == 2 &&
-                st->parser &&
-                st->parser->repeat_pict == 0)
-                    duration *= 2;  // two fields are needed per frame
-
             if(pkt->dts != AV_NOPTS_VALUE && last != AV_NOPTS_VALUE && duration>0){
                 double dur= duration * av_q2d(st->time_base);