[Bf-blender-cvs] [69e9650] master: Fix for building without ffmpeg

Campbell Barton noreply at git.blender.org
Fri Jun 12 15:02:20 CEST 2015


Commit: 69e96509a6b45977256d95834c9ab95f5f54b4bf
Author: Campbell Barton
Date:   Fri Jun 12 23:01:23 2015 +1000
Branches: master
https://developer.blender.org/rB69e96509a6b45977256d95834c9ab95f5f54b4bf

Fix for building without 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..185dadc 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -1432,8 +1432,13 @@ bool IMB_anim_get_fps(struct anim *anim,
 	if (anim->frs_sec) {
 		*frs_sec = anim->frs_sec;
 		*frs_sec_base = anim->frs_sec_base;
-		if (no_av_base)
+#ifdef WITH_FFMPEG
+		if (no_av_base) {
 			*frs_sec_base /= AV_TIME_BASE;
+		}
+#else
+		UNUSED_VARS(no_av_base);
+#endif
 		return true;
 	}
 	return false;




More information about the Bf-blender-cvs mailing list