62 lines
2.3 KiB
Diff
62 lines
2.3 KiB
Diff
From db0f7f7394e1f994ed38db043f78ed0f10bde0da Mon Sep 17 00:00:00 2001
|
|
From: Michael Niedermayer <michaelni@gmx.at>
|
|
Date: Tue, 29 Jan 2013 19:22:33 +0100
|
|
Subject: [PATCH] huffyuvdec: Skip len==0 cases
|
|
|
|
Upstream-Status: Backport
|
|
|
|
Commit db0f7f7394e1f994ed38db043f78ed0f10bde0da release/1.0
|
|
|
|
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>
|
|
---
|
|
libavcodec/huffyuv.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
|
|
index 993e524..72ed351 100644
|
|
--- a/gst-libs/ext/libav/libavcodec/huffyuv.c
|
|
+++ b/gst-libs/ext/libav/libavcodec/huffyuv.c
|
|
@@ -281,11 +281,11 @@ static void generate_joint_tables(HYuvCo
|
|
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;
|
|
len[i] = len0 + len1;
|
|
bits[i] = (s->bits[0][y] << len1) + s->bits[p][u];
|
|
@@ -308,17 +308,17 @@ static void generate_joint_tables(HYuvCo
|
|
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;
|
|
len[i] = len0 + len1 + len2;
|
|
bits[i] = (code << len2) + s->bits[2][r&255];
|
|
--
|
|
1.8.5.2.233.g932f7e4
|
|
|