style cleanup: multi-line if statements.

2 files changed, 23 insertions, 19 deletions

diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index 01a9a0a7303..0c8f932db6a 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -636,8 +636,9 @@ static void ffmpeg_postprocess(struct anim * anim)
 
 	/* This means the data wasnt read properly, 
 	 * this check stops crashing */
-	if (input->data[0]==0 && input->data[1]==0 
-	    && input->data[2]==0 && input->data[3]==0) {
+	if (input->data[0]==0 && input->data[1]==0 &&
+	    input->data[2]==0 && input->data[3]==0)
+	{
 		fprintf(stderr, "ffmpeg_fetchibuf: "
 			"data not read properly...\n");
 		return;
@@ -945,10 +946,11 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position,
 		return anim->last_frame;
 	}
 	 
-	if (position > anim->curposition + 1 
-	    && anim->preseek 
-	    && !tc_index
-	    && position - (anim->curposition + 1) < anim->preseek) {
+	if (position > anim->curposition + 1 &&
+	    anim->preseek &&
+	    !tc_index &&
+	    position - (anim->curposition + 1) < anim->preseek)
+	{
 		av_log(anim->pFormatCtx, AV_LOG_DEBUG, 
 		       "FETCH: within preseek interval (no index)\n");
 
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c
index 1d629876727..85a2fd3dd91 100644
--- a/source/blender/imbuf/intern/util.c
+++ b/source/blender/imbuf/intern/util.c
@@ -372,24 +372,26 @@ int IMB_isanim(const char *filename)
 	
 	if (U.uiflag & USER_FILTERFILEEXTS) {
 		if (G.have_quicktime) {
-			if (		BLI_testextensie(filename, ".avi")
-				||	BLI_testextensie(filename, ".flc")
-				||	BLI_testextensie(filename, ".dv")
-				||	BLI_testextensie(filename, ".r3d")
-				||	BLI_testextensie(filename, ".mov")
-				||	BLI_testextensie(filename, ".movie")
-				||	BLI_testextensie(filename, ".mv")) {
+			if (BLI_testextensie(filename, ".avi")   ||
+			    BLI_testextensie(filename, ".flc")   ||
+			    BLI_testextensie(filename, ".dv")    ||
+			    BLI_testextensie(filename, ".r3d")   ||
+			    BLI_testextensie(filename, ".mov")   ||
+			    BLI_testextensie(filename, ".movie") ||
+			    BLI_testextensie(filename, ".mv"))
+			{
 				type = imb_get_anim_type(filename);
 			}
 			else {
 				return(FALSE);			
 			}
 		}
-		else { // no quicktime
-			if (		BLI_testextensie(filename, ".avi")
-				||	BLI_testextensie(filename, ".dv")
-				||	BLI_testextensie(filename, ".r3d")
-				||	BLI_testextensie(filename, ".mv")) {
+		else { /* no quicktime */
+			if (BLI_testextensie(filename, ".avi") ||
+			    BLI_testextensie(filename, ".dv")  ||
+			    BLI_testextensie(filename, ".r3d") ||
+			    BLI_testextensie(filename, ".mv"))
+			{
 				type = imb_get_anim_type(filename);
 			}
 			else {
@@ -397,7 +399,7 @@ int IMB_isanim(const char *filename)
 			}
 		}
 	}
-	else { // no FILTERFILEEXTS
+	else { /* no FILTERFILEEXTS */
 		type = imb_get_anim_type(filename);
 	}