[Bf-blender-cvs] [3600b9f] gooseberry: Fix building without FFMPEG

Antony Riakiotakis noreply at git.blender.org
Tue May 19 13:16:03 CEST 2015


Commit: 3600b9f6bd7f41b2646e5dabbb1dc2e29317c936
Author: Antony Riakiotakis
Date:   Tue May 19 13:15:42 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB3600b9f6bd7f41b2646e5dabbb1dc2e29317c936

Fix building without FFMPEG

Note - seems fps for movies are only calculated with ffmpeg?

===================================================================

M	source/blender/imbuf/intern/anim_movie.c

===================================================================

diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index be0b624..aee83c3 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -1432,8 +1432,12 @@ bool IMB_anim_get_fps(struct anim *anim,
 	if (anim->frs_sec) {
 		*frs_sec = anim->frs_sec;
 		*frs_sec_base = anim->frs_sec_base;
+#ifdef WITH_FFMPEG
 		if (no_av_base)
 			*frs_sec_base /= AV_TIME_BASE;
+#else
+		(void)no_av_base;
+#endif
 		return true;
 	}
 	return false;




More information about the Bf-blender-cvs mailing list