diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:21:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:21:54 +0100 |
| commit | cbabbe8220b34d245b6128639e34b9cc146c3556 (patch) | |
| tree | 0934816f96869edbf65cd8df6106322d94cc8b7a /libavcodec | |
| parent | 80122a3af3712e9d62d8f09c2386d620b1402a79 (diff) | |
| parent | 5b933be089ab2657eb754ebf5b804ae43badf13d (diff) | |
| download | ffmpeg-cbabbe8220b34d245b6128639e34b9cc146c3556.tar.gz | |
Merge commit '5b933be089ab2657eb754ebf5b804ae43badf13d' into release/2.2
* commit '5b933be089ab2657eb754ebf5b804ae43badf13d':
arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 *); |