virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avcodec/m101: Simplify if() condition

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-05-07 03:38:13 +02:00
parent 03fceb771c
commit cbe265ccd7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/m101.c
View File

@ -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; const uint8_t *buf_src = buf + src_y*stride + 40*block;
for (x = 0; x < 16 && x + 16*block < avctx->width; x++) { for (x = 0; x < 16 && x + 16*block < avctx->width; x++) {
int xd = x + 16*block; 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); 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); 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); 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);
} }
} }
} }