From c2da706a36ca355509d9dc2abcffc1edc6c49fff Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 28 Jan 2014 23:00:28 +1100 Subject: Code cleanup: remove references to svn and code style --- source/blender/blenkernel/intern/tracking_detect.c | 4 ++-- source/blender/blenkernel/intern/writeffmpeg.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'source/blender/blenkernel/intern') diff --git a/source/blender/blenkernel/intern/tracking_detect.c b/source/blender/blenkernel/intern/tracking_detect.c index 65fd997ae6c..a5a8ec87721 100644 --- a/source/blender/blenkernel/intern/tracking_detect.c +++ b/source/blender/blenkernel/intern/tracking_detect.c @@ -116,8 +116,8 @@ static void detect_retrieve_libmv_features(MovieTracking *tracking, ListBase *tr /* In Libmv integer coordinate points to pixel center, in blender * it's not. Need to add 0.5px offset to center. */ - xu = (x + 0.5f) / width; - yu = (y + 0.5f) / height; + xu = (x + 0.5) / width; + yu = (y + 0.5) / height; if (layer) ok = check_point_in_layer(layer, xu, yu) != place_outside_layer; diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index 38a8d2e2a4c..541d10637d5 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -332,7 +332,8 @@ static int write_video_frame(RenderData *rd, int cfra, AVFrame *frame, ReportLis if (packet.dts != AV_NOPTS_VALUE) { packet.dts = av_rescale_q(packet.dts, c->time_base, video_stream->time_base); PRINT("Video Frame DTS: %d\n", (int)packet.dts); - } else { + } + else { PRINT("Video Frame DTS: not set\n"); } @@ -976,7 +977,8 @@ static void flush_ffmpeg(void) if (packet.dts != AV_NOPTS_VALUE) { packet.dts = av_rescale_q(packet.dts, c->time_base, video_stream->time_base); PRINT("Video Frame DTS: %d\n", (int) packet.dts); - } else { + } + else { PRINT("Video Frame DTS: not set\n"); } -- cgit v1.2.3