diff mbox series

[FFmpeg-devel] avcodec/x86/vp3dsp_init: Set correct function pointer, fix crash

Message ID AS8P250MB07442AB66777A5EF09BA495A8F1A2@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
State Accepted
Commit c3ca90a92e7211aef8ad1d044518a34f6ba137d7
Headers show
Series [FFmpeg-devel] avcodec/x86/vp3dsp_init: Set correct function pointer, fix crash | expand

Commit Message

Andreas Rheinhardt April 30, 2024, 5:36 p.m. UTC
Regression since fd172185580c1ccdcfb90bbfdb59fa806fad3117;
triggered by vp4/KTkvw8dg1J8.avi in the FATE suite, but not
when running fate as this code is not used when the bitexact
flag is set.

Bisecting done by ami_stuff, patch from user Mika Fischer
in ticket #10027 (which this commit fixes).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/x86/vp3dsp_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Martin Storsjö April 30, 2024, 6:21 p.m. UTC | #1
On Tue, 30 Apr 2024, Andreas Rheinhardt wrote:

> Regression since fd172185580c1ccdcfb90bbfdb59fa806fad3117;
> triggered by vp4/KTkvw8dg1J8.avi in the FATE suite, but not
> when running fate as this code is not used when the bitexact
> flag is set.
>
> Bisecting done by ami_stuff, patch from user Mika Fischer
> in ticket #10027 (which this commit fixes).
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> libavcodec/x86/vp3dsp_init.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavcodec/x86/vp3dsp_init.c b/libavcodec/x86/vp3dsp_init.c
> index f54fa57b3e..edac1764cb 100644
> --- a/libavcodec/x86/vp3dsp_init.c
> +++ b/libavcodec/x86/vp3dsp_init.c
> @@ -53,7 +53,7 @@ av_cold void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags)
>
>         if (!(flags & AV_CODEC_FLAG_BITEXACT)) {
>             c->v_loop_filter = c->v_loop_filter_unaligned = ff_vp3_v_loop_filter_mmxext;
> -            c->h_loop_filter = c->v_loop_filter_unaligned = ff_vp3_h_loop_filter_mmxext;
> +            c->h_loop_filter = c->h_loop_filter_unaligned = ff_vp3_h_loop_filter_mmxext;
>         }
>     }
>
> -- 
> 2.40.1

LGTM

// Martin
diff mbox series

Patch

diff --git a/libavcodec/x86/vp3dsp_init.c b/libavcodec/x86/vp3dsp_init.c
index f54fa57b3e..edac1764cb 100644
--- a/libavcodec/x86/vp3dsp_init.c
+++ b/libavcodec/x86/vp3dsp_init.c
@@ -53,7 +53,7 @@  av_cold void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags)
 
         if (!(flags & AV_CODEC_FLAG_BITEXACT)) {
             c->v_loop_filter = c->v_loop_filter_unaligned = ff_vp3_v_loop_filter_mmxext;
-            c->h_loop_filter = c->v_loop_filter_unaligned = ff_vp3_h_loop_filter_mmxext;
+            c->h_loop_filter = c->h_loop_filter_unaligned = ff_vp3_h_loop_filter_mmxext;
         }
     }