diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2014-01-16 15:59:05 -0500 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2014-01-20 19:15:36 +0000 |
| commit | d01e684186bc1631bc176f06b89d33c27ec0d24d (patch) | |
| tree | daf89b15f45d885f64ac02ce7b500c6d6edd5c24 /libavformat/mov.c | |
| parent | 93c553c71ef48550ff7c2aa7b5712a7e01f1999f (diff) | |
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@gmail.com>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index b5019f5863..dc5b42b2d3 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. |