[FFmpeg-cvslog] avcodec/m101: Simplify if() condition
Michael Niedermayer
git at videolan.org
Sat May 7 05:12:23 CEST 2016
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat May 7 03:38:13 2016 +0200| [cbe265ccd714d4be7aee8d48afe0716ddfb0b50d] | committer: Michael Niedermayer
avcodec/m101: Simplify if() condition
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cbe265ccd714d4be7aee8d48afe0716ddfb0b50d
---
libavcodec/m101.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/m101.c b/libavcodec/m101.c
index 93b2417..2b9b8b8 100644
--- a/libavcodec/m101.c
+++ b/libavcodec/m101.c
@@ -88,12 +88,12 @@ static int m101_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
const uint8_t *buf_src = buf + src_y*stride + 40*block;
for (x = 0; x < 16 && x + 16*block < avctx->width; x++) {
int xd = x + 16*block;
- if (!(x&1)) {
+ if (x&1) {
+ luma [xd] = (4*buf_src[2*x + 0]) + ((buf_src[32 + (x>>1)]>>4)&3);
+ } else {
luma [xd] = (4*buf_src[2*x + 0]) + (buf_src[32 + (x>>1)] &3);
cb[xd>>1] = (4*buf_src[2*x + 1]) + ((buf_src[32 + (x>>1)]>>2)&3);
cr[xd>>1] = (4*buf_src[2*x + 3]) + (buf_src[32 + (x>>1)]>>6);
- } else {
- luma [xd] = (4*buf_src[2*x + 0]) + ((buf_src[32 + (x>>1)]>>4)&3);
}
}
}
More information about the ffmpeg-cvslog
mailing list