diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-21 20:46:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-22 00:42:28 +0200 |
| commit | 7c249d4fbaf4431b20a90a3c942f3370c0039d9e (patch) | |
| tree | ff9335781727dfa35d719990bde022fbed86a4ea /libavcodec/vp5.c | |
| parent | dba20b84784a7931b7eac50ced1d43e86801bde9 (diff) | |
| download | ffmpeg-7c249d4fbaf4431b20a90a3c942f3370c0039d9e.tar.gz | |
Check for huffman tree building error in vp6 decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp5.c')
| -rw-r--r-- | libavcodec/vp5.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c index 04df3e29a5..50bd868b51 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -118,7 +118,7 @@ static void vp5_parse_vector_models(VP56Context *s) model->vector_pdv[comp][node] = vp56_rac_gets_nn(c, 7); } -static void vp5_parse_coeff_models(VP56Context *s) +static int vp5_parse_coeff_models(VP56Context *s) { VP56RangeCoder *c = &s->c; VP56Model *model = s->modelp; @@ -162,6 +162,7 @@ static void vp5_parse_coeff_models(VP56Context *s) for (ctx=0; ctx<6; ctx++) for (node=0; node<5; node++) model->coeff_acct[pt][ct][cg][ctx][node] = av_clip(((model->coeff_ract[pt][ct][cg][node] * vp5_ract_lc[ct][cg][node][ctx][0] + 128) >> 8) + vp5_ract_lc[ct][cg][node][ctx][1], 1, 254); + return 0; } static void vp5_parse_coeff(VP56Context *s) |