virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

huffyuvdec: fix old (v1) rgba

Browse Source 
Commit deadcf5e misplaced a hunk.

Fixes ticket #3877.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Christophe Gisquet 2014-08-20 23:19:48 +00:00 committed by Michael Niedermayer
parent e298b2f5d6
commit 331b1f7d81
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/huffyuvdec.c
View File

@ -729,7 +729,7 @@ static av_always_inline void decode_bgr_1(HYuvContext *s, int count,
for (i = 0; i < count && BITS_LEFT(re, &s->gb) > 0; i++) { for (i = 0; i < count && BITS_LEFT(re, &s->gb) > 0; i++) {
unsigned int index; unsigned int index;
int code, n; int code, n, nb_bits;
UPDATE_CACHE(re, &s->gb); UPDATE_CACHE(re, &s->gb);
index = SHOW_UBITS(re, &s->gb, VLC_BITS); index = SHOW_UBITS(re, &s->gb, VLC_BITS);
@ -740,7 +740,6 @@ static av_always_inline void decode_bgr_1(HYuvContext *s, int count,
*(uint32_t *) &s->temp[0][4 * i] = s->pix_bgr_map[code]; *(uint32_t *) &s->temp[0][4 * i] = s->pix_bgr_map[code];
LAST_SKIP_BITS(re, &s->gb, n); LAST_SKIP_BITS(re, &s->gb, n);
} else { } else {
int nb_bits;
if (decorrelate) { if (decorrelate) {
VLC_INTERN(s->temp[0][4 * i + G], s->vlc[1].table, VLC_INTERN(s->temp[0][4 * i + G], s->vlc[1].table,
&s->gb, re, VLC_BITS, 3); &s->gb, re, VLC_BITS, 3);
@ -768,14 +767,14 @@ static av_always_inline void decode_bgr_1(HYuvContext *s, int count,
VLC_INTERN(s->temp[0][4 * i + R], s->vlc[2].table, VLC_INTERN(s->temp[0][4 * i + R], s->vlc[2].table,
&s->gb, re, VLC_BITS, 3); &s->gb, re, VLC_BITS, 3);
} }
if (alpha) {
UPDATE_CACHE(re, &s->gb);
index = SHOW_UBITS(re, &s->gb, VLC_BITS);
VLC_INTERN(s->temp[0][4 * i + A], s->vlc[2].table,
&s->gb, re, VLC_BITS, 3);
} else
s->temp[0][4 * i + A] = 0;
} }
if (alpha) {
UPDATE_CACHE(re, &s->gb);
index = SHOW_UBITS(re, &s->gb, VLC_BITS);
VLC_INTERN(s->temp[0][4 * i + A], s->vlc[2].table,
&s->gb, re, VLC_BITS, 3);
} else
s->temp[0][4 * i + A] = 0;
} }
CLOSE_READER(re, &s->gb); CLOSE_READER(re, &s->gb);
} }