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.h | |
| 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.h')
| -rw-r--r-- | libavcodec/vp3dsp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vp3dsp.h b/libavcodec/vp3dsp.h index a14dec1eb4..bc651997d2 100644 --- a/libavcodec/vp3dsp.h +++ b/libavcodec/vp3dsp.h @@ -25,7 +25,7 @@ typedef struct VP3DSPContext { void (*idct_put)(uint8_t *dest, int line_size, DCTELEM *block); void (*idct_add)(uint8_t *dest, int line_size, DCTELEM *block); - void (*idct_dc_add)(uint8_t *dest, int line_size, const DCTELEM *block); + void (*idct_dc_add)(uint8_t *dest, int line_size, DCTELEM *block); void (*v_loop_filter)(uint8_t *src, int stride, int *bounding_values); void (*h_loop_filter)(uint8_t *src, int stride, int *bounding_values); |