From 4b9ac6dedcbee4d059c04363fafbaad3586c1053 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sun, 12 Sep 2010 21:31:39 +0000 Subject: [PATCH] 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 --- libavutil/pixdesc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index e2bc6491da..98f5a9b1c6 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];