From e9c477059d7853767ddb9b777f7916c7d65d312f Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 15 Jun 2014 16:14:30 +0200
Subject: [PATCH] avcodec/huffyuvdec: assume vlcs can be 32 instead of 31 bits
max
This should avoid a division as well
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavcodec/huffyuvdec.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c
index c069d00b4ed..ca0e363a167 100644
--- a/libavcodec/huffyuvdec.c
+++ b/libavcodec/huffyuvdec.c
@@ -618,7 +618,7 @@ static void decode_422_bitstream(HYuvContext *s, int count)
OPEN_READER(re, &s->gb);
count /= 2;
- if (count >= (get_bits_left(&s->gb)) / (31 * 4)) {
+ if (count >= (get_bits_left(&s->gb)) / (32 * 4)) {
for (i = 0; i < count && get_bits_left(&s->gb) > 0; i++) {
READ_2PIX(s->temp[0][2 * i ], s->temp[1][i], 1);
READ_2PIX(s->temp[0][2 * i + 1], s->temp[2][i], 2);
@@ -658,7 +658,7 @@ static void decode_plane_bitstream(HYuvContext *s, int count, int plane)
if (s->bps <= 8) {
OPEN_READER(re, &s->gb);
- if (count >= (get_bits_left(&s->gb)) / (31 * 2)) {
+ if (count >= (get_bits_left(&s->gb)) / (32 * 2)) {
for (i = 0; i < count && get_bits_left(&s->gb) > 0; i++) {
READ_2PIX_PLANE(s->temp[0][2 * i], s->temp[0][2 * i + 1], plane, OP8bits);
}
@@ -670,7 +670,7 @@ static void decode_plane_bitstream(HYuvContext *s, int count, int plane)
CLOSE_READER(re, &s->gb);
} else if (s->bps <= 14) {
OPEN_READER(re, &s->gb);
- if (count >= (get_bits_left(&s->gb)) / (31 * 2)) {
+ if (count >= (get_bits_left(&s->gb)) / (32 * 2)) {
for (i = 0; i < count && get_bits_left(&s->gb) > 0; i++) {
READ_2PIX_PLANE(s->temp16[0][2 * i], s->temp16[0][2 * i + 1], plane, OP14bits);
}
@@ -681,7 +681,7 @@ static void decode_plane_bitstream(HYuvContext *s, int count, int plane)
}
CLOSE_READER(re, &s->gb);
} else {
- if (count >= (get_bits_left(&s->gb)) / (31 * 2)) {
+ if (count >= (get_bits_left(&s->gb)) / (32 * 2)) {
for (i = 0; i < count && get_bits_left(&s->gb) > 0; i++) {
READ_2PIX_PLANE16(s->temp16[0][2 * i], s->temp16[0][2 * i + 1], plane);
}
@@ -699,7 +699,7 @@ static void decode_gray_bitstream(HYuvContext *s, int count)
OPEN_READER(re, &s->gb);
count/=2;
- if (count >= (get_bits_left(&s->gb)) / (31 * 2)) {
+ if (count >= (get_bits_left(&s->gb)) / (32 * 2)) {
for (i = 0; i < count && get_bits_left(&s->gb) > 0; i++) {
READ_2PIX(s->temp[0][2 * i], s->temp[0][2 * i + 1], 0);
}
--
GitLab