| Message ID | 1346072195-19876-1-git-send-email-martin@martin.st |
|---|---|
| State | Committed |
| Commit | b441a4517be7d399417548738ed8f2671dd0c4ae |
| Headers | show |
On Mon, Aug 27, 2012 at 03:56:35PM +0300, Martin Storsjö wrote: > Compilation seems to fail on some GCC 3.4 instances due to this > duplicate declaration. > --- > libavfilter/vf_hqdn3d.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c > index 5bb896c..71b670d 100644 > --- a/libavfilter/vf_hqdn3d.c > +++ b/libavfilter/vf_hqdn3d.c > @@ -56,7 +56,7 @@ void ff_hqdn3d_row_16_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant, uint16 > : AV_WN16A(dst+(x)*2, RIGHTSHIFT(val, 16-depth))) > > av_always_inline > -static inline uint32_t lowpass(int prev, int cur, int16_t *coef, int depth) > +static uint32_t lowpass(int prev, int cur, int16_t *coef, int depth) > { > int d = (prev - cur) >> (8 - LUT_BITS); > return cur + coef[d]; > -- looks OK
diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c index 5bb896c..71b670d 100644 --- a/libavfilter/vf_hqdn3d.c +++ b/libavfilter/vf_hqdn3d.c @@ -56,7 +56,7 @@ void ff_hqdn3d_row_16_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant, uint16 : AV_WN16A(dst+(x)*2, RIGHTSHIFT(val, 16-depth))) av_always_inline -static inline uint32_t lowpass(int prev, int cur, int16_t *coef, int depth) +static uint32_t lowpass(int prev, int cur, int16_t *coef, int depth) { int d = (prev - cur) >> (8 - LUT_BITS); return cur + coef[d];