[FFmpeg-cvslog] r26310 - trunk/libavformat/mov.c

bcoudurier subversion
Tue Jan 11 20:58:00 CET 2011


Author: bcoudurier
Date: Tue Jan 11 20:58:00 2011
New Revision: 26310

Log:
In mov demuxer, set r_frame_rate for cfr files

Modified:
   trunk/libavformat/mov.c

Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c	Tue Jan 11 15:08:45 2011	(r26309)
+++ trunk/libavformat/mov.c	Tue Jan 11 20:58:00 2011	(r26310)
@@ -1788,6 +1788,10 @@ static int mov_read_trak(MOVContext *c, 
 
         av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
                   sc->time_scale*st->nb_frames, st->duration, INT_MAX);
+
+        if (sc->stts_count == 1 || (sc->stts_count == 2 && sc->stts_data[1].count == 1))
+            av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den,
+                      sc->time_scale, sc->stts_data[0].duration, INT_MAX);
     }
 
     switch (st->codec->codec_id) {



More information about the ffmpeg-cvslog mailing list