[FFmpeg-cvslog] vp3: fix regression with mplayer-crash.ogv
Michael Niedermayer
git at videolan.org
Mon Jan 2 17:36:34 CET 2012
ffmpeg | branch: release/0.7 | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 2 15:27:43 2012 +0100| [1218f8ed499509e67bdb03600a80bd382fb8fb50] | committer: Carl Eugen Hoyos
vp3: fix regression with mplayer-crash.ogv
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a2a12e3358c3bbdc0246ffc94973e58eba50ee30)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1218f8ed499509e67bdb03600a80bd382fb8fb50
---
libavcodec/vp3.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 3abc78b..2f07af8 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,
More information about the ffmpeg-cvslog
mailing list