diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-20 13:57:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-20 13:57:10 +0100 |
| commit | cf061a9c3b861a048dd5b67ded5265c6f53805e5 (patch) | |
| tree | 7b939285a34abfe719f38e594afa105c41574014 /libavcodec/vp3dsp.c | |
| parent | b3b456b2588f67a152f3035cbc80d349898534c1 (diff) | |
| parent | aeaf268e52fc11c1f64914a319e0edddf1346d6a (diff) | |
| download | ffmpeg-cf061a9c3b861a048dd5b67ded5265c6f53805e5.tar.gz | |
Merge commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a'
* commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a':
vp3: integrate clear_blocks with idct of previous block.
mpegvideo: fix loop condition in draw_line()
dvdsubdec: parse the size from the extradata
Conflicts:
libavcodec/dvdsubdec.c
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp3dsp.c')
| -rw-r--r-- | libavcodec/vp3dsp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/vp3dsp.c b/libavcodec/vp3dsp.c index 0e0c0f58ae..6502a158e6 100644 --- a/libavcodec/vp3dsp.c +++ b/libavcodec/vp3dsp.c @@ -215,14 +215,16 @@ static av_always_inline void idct(uint8_t *dst, int stride, int16_t *input, int static void vp3_idct_put_c(uint8_t *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/){ idct(dest, line_size, block, 1); + memset(block, 0, sizeof(*block) * 64); } static void vp3_idct_add_c(uint8_t *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/){ idct(dest, line_size, block, 2); + memset(block, 0, sizeof(*block) * 64); } static void vp3_idct_dc_add_c(uint8_t *dest/*align 8*/, int line_size, - const DCTELEM *block/*align 16*/){ + DCTELEM *block/*align 16*/){ int i, dc = (block[0] + 15) >> 5; for(i = 0; i < 8; i++){ @@ -236,6 +238,7 @@ static void vp3_idct_dc_add_c(uint8_t *dest/*align 8*/, int line_size, dest[7] = av_clip_uint8(dest[7] + dc); dest += line_size; } + block[0] = 0; } static void vp3_v_loop_filter_c(uint8_t *first_pixel, int stride, |