diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 13:02:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 13:06:31 +0100 |
| commit | fc1d7811ef4afa6387d1d0e30c06cc8c89517ca6 (patch) | |
| tree | 30a76127ce8cf07bb7694ab45727dadf4c58a556 | |
| parent | ea9399f8f7dc68f6a4d90f6fd32a2857b0c6d39a (diff) | |
| parent | 4506a854a4d846692ba71daeeff661dc214c8fa2 (diff) | |
| download | ffmpeg-fc1d7811ef4afa6387d1d0e30c06cc8c89517ca6.tar.gz | |
Merge commit '4506a854a4d846692ba71daeeff661dc214c8fa2'
* commit '4506a854a4d846692ba71daeeff661dc214c8fa2':
arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/arm/vp3dsp_init_arm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/vp3dsp_init_arm.c b/libavcodec/arm/vp3dsp_init_arm.c index 5af795bc29..c8888edc85 100644 --- a/libavcodec/arm/vp3dsp_init_arm.c +++ b/libavcodec/arm/vp3dsp_init_arm.c @@ -26,7 +26,7 @@ void ff_vp3_idct_put_neon(uint8_t *dest, int line_size, int16_t *data); void ff_vp3_idct_add_neon(uint8_t *dest, int line_size, int16_t *data); -void ff_vp3_idct_dc_add_neon(uint8_t *dest, int line_size, const int16_t *data); +void ff_vp3_idct_dc_add_neon(uint8_t *dest, int line_size, int16_t *data); void ff_vp3_v_loop_filter_neon(uint8_t *, int, int *); void ff_vp3_h_loop_filter_neon(uint8_t *, int, int *); |