summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/demux.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/demux.c b/libavformat/demux.c
index 06de71cd6e..45e5f5c4c2 100644
--- a/libavformat/demux.c
+++ b/libavformat/demux.c
@@ -668,6 +668,11 @@ static void compute_frame_duration(AVFormatContext *s, int *pnum, int *pden,
if (st->r_frame_rate.num && (!pc || !codec_framerate.num)) {
*pnum = st->r_frame_rate.den;
*pden = st->r_frame_rate.num;
+ } else if ((s->iformat->flags & AVFMT_NOTIMESTAMPS) &&
+ !codec_framerate.num &&
+ st->avg_frame_rate.num && st->avg_frame_rate.den) {
+ *pnum = st->avg_frame_rate.den;
+ *pden = st->avg_frame_rate.num;
} else if (st->time_base.num * 1000LL > st->time_base.den) {
*pnum = st->time_base.num;
*pden = st->time_base.den;