From 4660143a2c009031ae7e812bcb966ea784a8881c Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Sun, 12 Sep 2010 22:00:45 +0000
Subject: [PATCH] Apply minor simplification in av_read_image_line().
Originally committed as revision 25112 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavutil/pixdesc.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index b3885e510da..54f1d7444fa 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -53,12 +53,11 @@ void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesiz
}
} else {
const uint8_t *p = data[plane]+ y*linesize[plane] + x*step + comp.offset_plus1-1;
- int is_8bit = 0;
+ int is_8bit = shift + depth <= 8;
- if (shift + depth <= 8) {
+ if (is_8bit)
p += !!(flags & PIX_FMT_BE);
- is_8bit = 1;
- }
+
while(w--){
int val = is_8bit ? *p :
flags & PIX_FMT_BE ? AV_RB16(p) : AV_RL16(p);
--
GitLab