[SCM] libav/experimental: Cosmetics: use x ? y : z construct and merge intialization and definition for the val variable in av_read_image_line(). Simplify.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 4b9ac6dedcbee4d059c04363fafbaad3586c1053
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Sun Sep 12 21:31:39 2010 +0000

    Cosmetics: use x ? y : z construct and merge intialization and
    definition for the val variable in av_read_image_line(). Simplify.
    
    Originally committed as revision 25109 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index e2bc649..98f5a9b 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -55,9 +55,7 @@ void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesiz
         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];

-- 
Libav/FFmpeg packaging