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/vp3.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/vp3.c')
| -rw-r--r-- | libavcodec/vp3.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index ce3ffe832a..62416172de 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -138,6 +138,7 @@ typedef struct Vp3DecodeContext { DSPContext dsp; VideoDSPContext vdsp; VP3DSPContext vp3dsp; + DECLARE_ALIGNED(16, DCTELEM, block)[64]; int flipped_image; int last_slice_end; int skip_loop_filter; @@ -1458,7 +1459,7 @@ static void await_reference_row(Vp3DecodeContext *s, Vp3Fragment *fragment, int static void render_slice(Vp3DecodeContext *s, int slice) { int x, y, i, j, fragment; - LOCAL_ALIGNED_16(DCTELEM, block, [64]); + DCTELEM *block = s->block; int motion_x = 0xdeadbeef, motion_y = 0xdeadbeef; int motion_halfpel_index; uint8_t *motion_source; @@ -1571,8 +1572,6 @@ static void render_slice(Vp3DecodeContext *s, int slice) } } - s->dsp.clear_block(block); - /* invert DCT and place (or add) in final output */ if (s->all_fragments[i].coding_method == MODE_INTRA) { |