diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 19:22:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 19:29:05 +0100 |
| commit | a77cf47d887a01567ae4d5327cba2886ea929e43 (patch) | |
| tree | 78b4d0217c8cc9871a125eca19502f1b53adb24e | |
| parent | a7faa1d0703b7c2539122ea2140362411d7f62e0 (diff) | |
| download | ffmpeg-a77cf47d887a01567ae4d5327cba2886ea929e43.tar.gz | |
huffyuvdec: Skip len==0 cases
Fixes vlc decoding for hypothetical files that would contain such cases.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0dfc01c2bbf4b71bb56201bc4a393321e15d1b31)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5ff41ffeb4cb9ea6df49757dc859619dc3d3ab4f)
Conflicts:
libavcodec/huffyuv.c
(cherry picked from commit 9bc70fe1ae50fd2faa0b9429d47cfbda01a92ebc)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/huffyuv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index d7e0f8041a..883abac18e 100644 --- a/libavcodec/huffyuv.c +++ b/libavcodec/huffyuv.c @@ -279,11 +279,11 @@ static void generate_joint_tables(HYuvContext *s){ for(i=y=0; y<256; y++){ int len0 = s->len[0][y]; int limit = VLC_BITS - len0; - if(limit <= 0) + if(limit <= 0 || !len0) continue; for(u=0; u<256; u++){ int len1 = s->len[p][u]; - if(len1 > limit) + if (len1 > limit || !len1) continue; assert(i < (1 << VLC_BITS)); len[i] = len0 + len1; @@ -307,17 +307,17 @@ static void generate_joint_tables(HYuvContext *s){ for(i=0, g=-16; g<16; g++){ int len0 = s->len[p0][g&255]; int limit0 = VLC_BITS - len0; - if(limit0 < 2) + if (limit0 < 2 || !len0) continue; for(b=-16; b<16; b++){ int len1 = s->len[p1][b&255]; int limit1 = limit0 - len1; - if(limit1 < 1) + if (limit1 < 1 || !len1) continue; code = (s->bits[p0][g&255] << len1) + s->bits[p1][b&255]; for(r=-16; r<16; r++){ int len2 = s->len[2][r&255]; - if(len2 > limit1) + if (len2 > limit1 || !len2) continue; assert(i < (1 << VLC_BITS)); len[i] = len0 + len1 + len2; |