[FFmpeg-cvslog] mov: do not set avg_frame_rate in the demuxer
Justin Ruggles
git at videolan.org
Tue Jan 21 04:11:13 CET 2014
ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Thu Jan 16 15:59:05 2014 -0500| [d01e684186bc1631bc176f06b89d33c27ec0d24d] | committer: Derek Buitenhuis
mov: do not set avg_frame_rate in the demuxer
The track duration is often not reliable or is not the duration
represented by the number of frames. In those cases, avg_frame_rate
was reported incorrectly. Removing this code falls back to the
default calculation in avformat_find_stream_info().
This is a partial revert of commit c3aeaa540.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d01e684186bc1631bc176f06b89d33c27ec0d24d
---
libavformat/mov.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index b5019f5..dc5b42b 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2138,10 +2138,6 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom)
st->sample_aspect_ratio = av_d2q(((double)st->codec->height * sc->width) /
((double)st->codec->width * sc->height), INT_MAX);
}
-
- if (st->duration != AV_NOPTS_VALUE && st->duration > 0)
- av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
- sc->time_scale*st->nb_frames, st->duration, INT_MAX);
}
// done for ai5q, ai52, ai55, ai1q, ai12 and ai15.
More information about the ffmpeg-cvslog
mailing list