From: Måns Rullgård <mans@mansr.com>
Date: Sat, 28 Feb 2009 15:15:54 +0000 (+0000)
Subject: Revert "Improve frame rate guessing for streams with two fields per frame."
X-Git-Tag: v0.5~77
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f166f2f4350f5d3d06719c349fcae82ee722cb4c;p=coroid%2Flibav_saccubus.git

Revert "Improve frame rate guessing for streams with two fields per frame."

This reverts r17656, which broke many tests.  Further investigation
is necessary.

Originally committed as revision 17658 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 864fd9e54..9354b7588 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -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);