Merge declaration and assignment.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@15494 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c
index 5f492908645240559c92f797a11fface5109ea50..8be9696326351fca0a80b593be5b12162911dcaa 100644 (file)
--- a/libavcodec/indeo3.c
+++ b/libavcodec/indeo3.c
@@ -98,19 +98,15 @@ static av_cold int build_modpred(Indeo3DecodeContext *s)
 
 static av_cold int iv_alloc_frames(Indeo3DecodeContext *s)
 {
-    int luma_width, luma_height, luma_pixels, chroma_width, chroma_height,
-        chroma_pixels, i;
-    unsigned int bufsize;
-
-    luma_width   = (s->width  + 3) & (~3);
-    luma_height  = (s->height + 3) & (~3);
-    chroma_width  = ((luma_width >> 2) + 3) & (~3);
-    chroma_height = ((luma_height>> 2) + 3) & (~3);
-    luma_pixels = luma_width * luma_height;
-    chroma_pixels = chroma_width * chroma_height;
-
-    bufsize = luma_pixels * 2 + luma_width * 3 +
-        (chroma_pixels + chroma_width) * 4;
+    int luma_width    = (s->width           + 3) & ~3,
+        luma_height   = (s->height          + 3) & ~3,
+        chroma_width  = ((luma_width  >> 2) + 3) & ~3,
+        chroma_height = ((luma_height >> 2) + 3) & ~3,
+        luma_pixels   = luma_width   * luma_height,
+        chroma_pixels = chroma_width * chroma_height,
+        i;
+    unsigned int bufsize = luma_pixels * 2 + luma_width * 3 +
+                          (chroma_pixels   + chroma_width) * 4;
 
     if(!(s->buf = av_malloc(bufsize)))
         return AVERROR(ENOMEM);