From: Benoit Fouet <benoit.fouet@free.fr>
Date: Wed, 1 Oct 2008 08:27:37 +0000 (+0000)
Subject: Merge declaration and assignment.
X-Git-Tag: v0.5~2331
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=963203361c1beefeaec69fa29be90ebc942f4c78;p=platform%2Fupstream%2Flibav.git

Merge declaration and assignment.

Originally committed as revision 15494 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c
index 5f49290..8be9696 100644
--- 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);