# HG changeset patch
# User stefano
# Date 1284327099 0
# Node ID 83021885b234e0580f562c74c913eaa75ce773df
# Parent  c915dc284b9a971163564d7aab85246eea9e6ad9
Cosmetics: use x ? y : z construct and merge intialization and
definition for the val variable in av_read_image_line(). Simplify.

diff -r c915dc284b9a -r 83021885b234 pixdesc.c
--- a/pixdesc.c	Thu Sep 09 19:40:59 2010 +0000
+++ b/pixdesc.c	Sun Sep 12 21:31:39 2010 +0000
@@ -55,9 +55,7 @@
         const uint8_t *p = data[plane]+ y*linesize[plane] + x*step + comp.offset_plus1-1;
 
         while(w--){
-            int val;
-            if(flags & PIX_FMT_BE) val= AV_RB16(p);
-            else                   val= AV_RL16(p);
+            int val = flags & PIX_FMT_BE ? AV_RB16(p) : AV_RL16(p);
             val = (val>>shift) & mask;
             if(read_pal_component)
                 val= data[1][4*val + c];