]> git.sesse.net Git - ffmpeg/commit
avcodec/mips: fix conflicting types error of ff_vc1_h_s_overlap_mmi.
authorShiyou Yin <yinshiyou-hf@loongson.cn>
Thu, 12 Jul 2018 07:16:14 +0000 (15:16 +0800)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 14 Jul 2018 16:02:26 +0000 (18:02 +0200)
commitc0b42987a272caedc10d87bcd5d3a5c434cf40ef
treefe471e0e1abda52fa5ed19eaeb9891bff5d1cac0
parent28ed68fa31776b43ce718a78c4d3078fd60cd7c9
avcodec/mips: fix conflicting types error of ff_vc1_h_s_overlap_mmi.

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>
Reviewed-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/mips/vc1dsp_mips.h