diff mbox

[FFmpeg-devel] avcodec/mips: fix conflicting types error of ff_vc1_h_s_overlap_mmi.

Message ID 1531379774-32086-1-git-send-email-yinshiyou-hf@loongson.cn
State Accepted
Commit c0b42987a272caedc10d87bcd5d3a5c434cf40ef
Headers show

Commit Message

殷时友 July 12, 2018, 7:16 a.m. UTC
In commit 975a1a8,function ff_vc1_h_s_overlap_mmi was refactored,
but the declaration in libavcodec/mips/vc1dsp_mips.h was unchanged.

Change-Id: I90beae683511622a0cc1130ab1660ac8669ec3ef
Signed-off-by: Shiyou Yin <yinshiyou-hf@loongson.cn>
---
 libavcodec/mips/vc1dsp_mips.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jerome Borsboom July 13, 2018, 3:31 p.m. UTC | #1
> In commit 975a1a8,function ff_vc1_h_s_overlap_mmi was refactored,
> but the declaration in libavcodec/mips/vc1dsp_mips.h was unchanged.
> 
> Change-Id: I90beae683511622a0cc1130ab1660ac8669ec3ef
> Signed-off-by: Shiyou Yin <yinshiyou-hf at loongson.cn>
> ---
>  libavcodec/mips/vc1dsp_mips.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/mips/vc1dsp_mips.h b/libavcodec/mips/vc1dsp_mips.h
> index b9b07e1..0db85fa 100644
> --- a/libavcodec/mips/vc1dsp_mips.h
> +++ b/libavcodec/mips/vc1dsp_mips.h
> @@ -169,7 +169,7 @@ void ff_vc1_inv_trans_8x8_dc_mmi(uint8_t *dest, ptrdiff_t linesize, int16_t *blo
>  void ff_vc1_v_overlap_mmi(uint8_t *src, int stride);
>  void ff_vc1_h_overlap_mmi(uint8_t *src, int stride);
>  void ff_vc1_v_s_overlap_mmi(int16_t *top, int16_t *bottom);
> -void ff_vc1_h_s_overlap_mmi(int16_t *left, int16_t *right);
> +void ff_vc1_h_s_overlap_mmi(int16_t *left, int16_t *right, int left_stride, int right_stride, int flags);
>  
>  void ff_vc1_v_loop_filter4_mmi(uint8_t *src, int stride, int pq);
>  void ff_vc1_h_loop_filter4_mmi(uint8_t *src, int stride, int pq);
> -- 
> 2.1.0

LGTM.

My bad, sorry.

Regards,
Jerome Borsboom
Michael Niedermayer July 14, 2018, 3:59 p.m. UTC | #2
On Fri, Jul 13, 2018 at 05:31:45PM +0200, Jerome Borsboom wrote:
> > In commit 975a1a8,function ff_vc1_h_s_overlap_mmi was refactored,
> > but the declaration in libavcodec/mips/vc1dsp_mips.h was unchanged.
> > 
> > Change-Id: I90beae683511622a0cc1130ab1660ac8669ec3ef
> > Signed-off-by: Shiyou Yin <yinshiyou-hf at loongson.cn>
> > ---
> >  libavcodec/mips/vc1dsp_mips.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/libavcodec/mips/vc1dsp_mips.h b/libavcodec/mips/vc1dsp_mips.h
> > index b9b07e1..0db85fa 100644
> > --- a/libavcodec/mips/vc1dsp_mips.h
> > +++ b/libavcodec/mips/vc1dsp_mips.h
> > @@ -169,7 +169,7 @@ void ff_vc1_inv_trans_8x8_dc_mmi(uint8_t *dest, ptrdiff_t linesize, int16_t *blo
> >  void ff_vc1_v_overlap_mmi(uint8_t *src, int stride);
> >  void ff_vc1_h_overlap_mmi(uint8_t *src, int stride);
> >  void ff_vc1_v_s_overlap_mmi(int16_t *top, int16_t *bottom);
> > -void ff_vc1_h_s_overlap_mmi(int16_t *left, int16_t *right);
> > +void ff_vc1_h_s_overlap_mmi(int16_t *left, int16_t *right, int left_stride, int right_stride, int flags);
> >  
> >  void ff_vc1_v_loop_filter4_mmi(uint8_t *src, int stride, int pq);
> >  void ff_vc1_h_loop_filter4_mmi(uint8_t *src, int stride, int pq);
> > -- 
> > 2.1.0
> 
> LGTM.

will apply

thx

[...]
diff mbox

Patch

diff --git a/libavcodec/mips/vc1dsp_mips.h b/libavcodec/mips/vc1dsp_mips.h
index b9b07e1..0db85fa 100644
--- a/libavcodec/mips/vc1dsp_mips.h
+++ b/libavcodec/mips/vc1dsp_mips.h
@@ -169,7 +169,7 @@  void ff_vc1_inv_trans_8x8_dc_mmi(uint8_t *dest, ptrdiff_t linesize, int16_t *blo
 void ff_vc1_v_overlap_mmi(uint8_t *src, int stride);
 void ff_vc1_h_overlap_mmi(uint8_t *src, int stride);
 void ff_vc1_v_s_overlap_mmi(int16_t *top, int16_t *bottom);
-void ff_vc1_h_s_overlap_mmi(int16_t *left, int16_t *right);
+void ff_vc1_h_s_overlap_mmi(int16_t *left, int16_t *right, int left_stride, int right_stride, int flags);
 
 void ff_vc1_v_loop_filter4_mmi(uint8_t *src, int stride, int pq);
 void ff_vc1_h_loop_filter4_mmi(uint8_t *src, int stride, int pq);