Commit 4b9ac6de authored by Stefano Sabatini's avatar Stefano Sabatini
Browse files

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
parent 01058893
...@@ -55,9 +55,7 @@ void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesiz ...@@ -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; const uint8_t *p = data[plane]+ y*linesize[plane] + x*step + comp.offset_plus1-1;
while(w--){ while(w--){
int val; int val = flags & PIX_FMT_BE ? AV_RB16(p) : AV_RL16(p);
if(flags & PIX_FMT_BE) val= AV_RB16(p);
else val= AV_RL16(p);
val = (val>>shift) & mask; val = (val>>shift) & mask;
if(read_pal_component) if(read_pal_component)
val= data[1][4*val + c]; val= data[1][4*val + c];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment