[FFmpeg-soc] [soc]: r3786 - in dirac/libavcodec: dirac.c diracdec.c

[conrad]

Author: conrad
Date: Mon Nov 10 04:11:45 2008
New Revision: 3786

Log:
Cosmetics: remove useless paranthesises and line breaks


Modified:
   dirac/libavcodec/dirac.c
   dirac/libavcodec/diracdec.c

Modified: dirac/libavcodec/dirac.c
==============================================================================
--- dirac/libavcodec/dirac.c	(original)
+++ dirac/libavcodec/dirac.c	Mon Nov 10 04:11:45 2008
@@ -925,8 +925,7 @@ int dirac_motion_compensation(DiracConte
     hbits      = av_log2(s->xoffset) + 2;
     vbits      = av_log2(s->yoffset) + 2;
 
-    s->total_wt_bits = hbits + vbits
-                       + s->decoding.picture_weight_precision;
+    s->total_wt_bits = hbits + vbits + s->decoding.picture_weight_precision;
 
     s->refwidth = (s->width + 2 * s->xblen) << 1;
     s->refheight = (s->height + 2 * s->yblen) << 1;

Modified: dirac/libavcodec/diracdec.c
==============================================================================
--- dirac/libavcodec/diracdec.c	(original)
+++ dirac/libavcodec/diracdec.c	Mon Nov 10 04:11:45 2008
@@ -463,14 +463,10 @@ static int dirac_unpack_prediction_param
 
     /* Setup the blen and bsep parameters for the chroma
        component.  */
-    s->decoding.chroma_xblen = (s->decoding.luma_xblen
-                                      >> s->chroma_hshift);
-    s->decoding.chroma_yblen = (s->decoding.luma_yblen
-                                      >> s->chroma_vshift);
-    s->decoding.chroma_xbsep = (s->decoding.luma_xbsep
-                                      >> s->chroma_hshift);
-    s->decoding.chroma_ybsep = (s->decoding.luma_ybsep
-                                      >> s->chroma_vshift);
+    s->decoding.chroma_xblen = s->decoding.luma_xblen >> s->chroma_hshift;
+    s->decoding.chroma_yblen = s->decoding.luma_yblen >> s->chroma_vshift;
+    s->decoding.chroma_xbsep = s->decoding.luma_xbsep >> s->chroma_hshift;
+    s->decoding.chroma_ybsep = s->decoding.luma_ybsep >> s->chroma_vshift;
 
     /* Read motion vector precision.  */
     s->decoding.mv_precision = svq3_get_ue_golomb(gb);
@@ -694,8 +690,7 @@ static int dirac_unpack_prediction_data(
     for (y = 0; y < s->sbheight; y++)
         for (x = 0; x < s->sbwidth; x++) {
             int res = dirac_arith_read_uint(&s->arith, &ff_dirac_context_set_split);
-            s->sbsplit[y * s->sbwidth + x] = (res +
-                                              split_prediction(s, x, y));
+            s->sbsplit[y * s->sbwidth + x] = res + split_prediction(s, x, y);
             s->sbsplit[y * s->sbwidth + x] %= 3;
         }
     dirac_arith_flush(&s->arith);
@@ -840,8 +835,7 @@ START_TIMER
         return -1;
     }
 
-    coeffs = av_malloc(s->padded_luma_width
-                       * s->padded_luma_height
+    coeffs = av_malloc(s->padded_luma_width * s->padded_luma_height
                        * sizeof(int16_t));
     if (! coeffs) {
         av_log(s->avctx, AV_LOG_ERROR, "av_malloc() failed\n");