aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2009-02-28 15:15:54 +0000
committerMåns Rullgård <mans@mansr.com>2009-02-28 15:15:54 +0000
commitf166f2f4350f5d3d06719c349fcae82ee722cb4c (patch)
treee54c069f7d7de337ff60aeefda61db072a69c409
parentfe7f149ed889c428703316ce0de4c7c57405cb16 (diff)
downloadffmpeg-f166f2f4350f5d3d06719c349fcae82ee722cb4c.tar.gz
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
-rw-r--r--libavformat/utils.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 864fd9e540..9354b75886 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);