generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mov: do not set avg_frame_rate in the demuxer

Browse Source 
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>
This commit is contained in:
Justin Ruggles 2014-01-16 15:59:05 -05:00 committed by Derek Buitenhuis
parent 93c553c71e
commit d01e684186
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/mov.c
View File

@ -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.