[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29626] trunk/blender/source/blender/imbuf /intern/anim.c: ffmpeg was computing the frame length of avis via doubles, but was

[Brecht Van Lommel]

Revision: 29626
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29626
Author:   blendix
Date:     2010-06-22 20:18:42 +0200 (Tue, 22 Jun 2010)

Log Message:
-----------
ffmpeg was computing the frame length of avis via doubles, but was
not properly ceiling them, sometimes resulting in truncation errors.

(merge from render25 branch, commit with revision 28901 by Joe)

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28901

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/anim.c

Modified: trunk/blender/source/blender/imbuf/intern/anim.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/anim.c	2010-06-22 16:46:13 UTC (rev 29625)
+++ trunk/blender/source/blender/imbuf/intern/anim.c	2010-06-22 18:18:42 UTC (rev 29626)
@@ -589,9 +589,9 @@
 	anim->duration = pFormatCtx->duration * pCodecCtx->frame_rate 
 		/ pCodecCtx->frame_rate_base / AV_TIME_BASE;
 #else
-	anim->duration = pFormatCtx->duration 
+	anim->duration = ceil(pFormatCtx->duration
 		* av_q2d(pFormatCtx->streams[videoStream]->r_frame_rate) 
-		/ AV_TIME_BASE;
+		/ AV_TIME_BASE);
 
 #endif
 	anim->params = 0;