diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-10-31 10:19:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-11-04 20:26:49 +0100 |
| commit | 2f04b78b95464c46468c1d8c252f2360ffe7c183 (patch) | |
| tree | 78e0bf578058dea8e20d6ddab03b2fc1871d0526 | |
| parent | fd05e20650a50f3cd2b660367d0e73cb8fef9a07 (diff) | |
| download | ffmpeg-2f04b78b95464c46468c1d8c252f2360ffe7c183.tar.gz | |
avcodec/prosumer: Simplify bit juggling of the c variable in decompress()
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 66425add270cd262a22c0fdaf6aad09a0db6f8c0)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/prosumer.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/prosumer.c b/libavcodec/prosumer.c index 3125636cf1..505de71980 100644 --- a/libavcodec/prosumer.c +++ b/libavcodec/prosumer.c @@ -69,15 +69,13 @@ static int decompress(GetByteContext *gb, int size, PutByteContext *pb, const ui } c = b >> 16; if (c & 0xFF00u) { - c = (((c >> 8) & 0xFFu) | (c & 0xFF00)) & 0xF00F; fill = lut[2 * idx + 1]; - if ((c & 0xFF00u) == 0x1000) { + if ((c & 0xF000u) == 0x1000) { bytestream2_put_le16(pb, fill); - c &= 0xFFFF00FFu; } else { bytestream2_put_le32(pb, fill); - c &= 0xFFFF00FFu; } + c = (c >> 8) & 0x0Fu; } while (c) { a <<= 4; |