Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-04-21 19:11:03 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-04-21 19:11:03 +0400
commitb56aabf815dd60827da81574501ea1d12ce3a38b (patch)
treec8e49d9265437377584cb28705a2dc466a7faa1e /source/blender/imbuf/intern/anim_movie.c
parent8765dfccf725770007e3b4e6b24199fe8377df71 (diff)
style cleanup: multi-line if statements.
Diffstat (limited to 'source/blender/imbuf/intern/anim_movie.c')
-rw-r--r--source/blender/imbuf/intern/anim_movie.c14
1 files changed, 8 insertions, 6 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");