diff options
| author | James Almer <jamrial@gmail.com> | 2019-03-14 16:09:11 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-03-14 16:09:11 -0300 |
| commit | 4f9a8d3fe2f9485ee08848d336ee96f15ec0e7e6 (patch) | |
| tree | 44b79e84a7fe96bb28146e00324c16a6b7f82a06 | |
| parent | b8eb0827f053230dd919bc73e25381b47b4fe1a7 (diff) | |
| parent | f1011ea28a4048ddec97794ca3e9901474fe055f (diff) | |
| download | ffmpeg-4f9a8d3fe2f9485ee08848d336ee96f15ec0e7e6.tar.gz | |
Merge commit 'f1011ea28a4048ddec97794ca3e9901474fe055f'
* commit 'f1011ea28a4048ddec97794ca3e9901474fe055f':
aarch64: vp8: Reorder the function pointer inits to match the arm original
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/aarch64/vp8dsp_init_aarch64.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/aarch64/vp8dsp_init_aarch64.c b/libavcodec/aarch64/vp8dsp_init_aarch64.c index 6cf2c65470..040c458a56 100644 --- a/libavcodec/aarch64/vp8dsp_init_aarch64.c +++ b/libavcodec/aarch64/vp8dsp_init_aarch64.c @@ -45,10 +45,10 @@ av_cold void ff_vp78dsp_init_aarch64(VP8DSPContext *dsp) dsp->put_vp8_epel_pixels_tab[0][2][2] = ff_put_vp8_epel16_h6v6_neon; dsp->put_vp8_epel_pixels_tab[1][0][0] = ff_put_vp8_pixels8_neon; - dsp->put_vp8_epel_pixels_tab[1][2][2] = ff_put_vp8_epel8_h6v6_neon; - dsp->put_vp8_epel_pixels_tab[1][2][1] = ff_put_vp8_epel8_h4v6_neon; - dsp->put_vp8_epel_pixels_tab[1][1][2] = ff_put_vp8_epel8_h6v4_neon; dsp->put_vp8_epel_pixels_tab[1][1][1] = ff_put_vp8_epel8_h4v4_neon; + dsp->put_vp8_epel_pixels_tab[1][1][2] = ff_put_vp8_epel8_h6v4_neon; + dsp->put_vp8_epel_pixels_tab[1][2][1] = ff_put_vp8_epel8_h4v6_neon; + dsp->put_vp8_epel_pixels_tab[1][2][2] = ff_put_vp8_epel8_h6v6_neon; } av_cold void ff_vp8dsp_init_aarch64(VP8DSPContext *dsp) @@ -60,8 +60,8 @@ av_cold void ff_vp8dsp_init_aarch64(VP8DSPContext *dsp) dsp->vp8_idct_dc_add = ff_vp8_idct_dc_add_neon; dsp->vp8_idct_dc_add4y = ff_vp8_idct_dc_add4y_neon; - dsp->vp8_h_loop_filter16y = ff_vp8_h_loop_filter16_neon; dsp->vp8_v_loop_filter16y = ff_vp8_v_loop_filter16_neon; + dsp->vp8_h_loop_filter16y = ff_vp8_h_loop_filter16_neon; dsp->vp8_v_loop_filter8uv = ff_vp8_v_loop_filter8uv_neon; dsp->vp8_h_loop_filter8uv = ff_vp8_h_loop_filter8uv_neon; |