aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-02 15:27:43 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2012-01-02 17:24:43 +0100
commit1218f8ed499509e67bdb03600a80bd382fb8fb50 (patch)
tree5acda726e6bac48e7660d0e3e18e7e0699611d25 /libavcodec
parent575cbbffaaa16fde167e6c7a577799da68b6937b (diff)
downloadffmpeg-1218f8ed499509e67bdb03600a80bd382fb8fb50.tar.gz
vp3: fix regression with mplayer-crash.ogv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a2a12e3358c3bbdc0246ffc94973e58eba50ee30)
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vp3.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 3abc78b85a..2f07af8c4b 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -1514,10 +1514,7 @@ static void render_slice(Vp3DecodeContext *s, int slice)
/* invert DCT and place (or add) in final output */
if (s->all_fragments[i].coding_method == MODE_INTRA) {
- int index;
- index = vp3_dequant(s, s->all_fragments + i, plane, 0, block);
- if (index > 63)
- continue;
+ vp3_dequant(s, s->all_fragments + i, plane, 0, block);
if(s->avctx->idct_algo!=FF_IDCT_VP3)
block[0] += 128<<3;
s->dsp.idct_put(
@@ -1525,10 +1522,7 @@ static void render_slice(Vp3DecodeContext *s, int slice)
stride,
block);
} else {
- int index = vp3_dequant(s, s->all_fragments + i, plane, 1, block);
- if (index > 63)
- continue;
- if (index > 0) {
+ if (vp3_dequant(s, s->all_fragments + i, plane, 1, block)) {
s->dsp.idct_add(
output_plane + first_pixel,
stride,