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/ppc | |
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/ppc')
-rw-r--r-- | libavcodec/ppc/vp3dsp_altivec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/ppc/vp3dsp_altivec.c b/libavcodec/ppc/vp3dsp_altivec.c index ac00c933bb..b3581ab708 100644 --- a/libavcodec/ppc/vp3dsp_altivec.c +++ b/libavcodec/ppc/vp3dsp_altivec.c @@ -140,6 +140,7 @@ static void vp3_idct_put_altivec(uint8_t *dst, int stride, DCTELEM block[64]) PUT(b5) dst += stride; PUT(b6) dst += stride; PUT(b7) + memset(block, 0, sizeof(*block) * 64); } static void vp3_idct_add_altivec(uint8_t *dst, int stride, DCTELEM block[64]) @@ -171,6 +172,7 @@ static void vp3_idct_add_altivec(uint8_t *dst, int stride, DCTELEM block[64]) ADD(b5) dst += stride; ADD(b6) dst += stride; ADD(b7) + memset(block, 0, sizeof(*block) * 64); } #endif /* HAVE_ALTIVEC */ |