On 2/14/15, zhaoxiu.zeng <zhaoxiu.z...@gmail.com> wrote:
> From 2f68090470ce1f4eb738e7a4af80c78a7b5d461a Mon Sep 17 00:00:00 2001
> From: Zeng Zhaoxiu <zhaoxiu.z...@gmail.com>
> Date: Sat, 14 Feb 2015 21:11:18 +0800
> Subject: [PATCH 5/5] avcodec/vc1_mc: move median4() to mathops.h
>
> ---
> libavcodec/mathops.h | 14 ++++++++++++++
> libavcodec/vc1_mc.c | 11 -----------
> 2 files changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h
> index 87fca0c..87d110b 100644
> --- a/libavcodec/mathops.h
> +++ b/libavcodec/mathops.h
> @@ -121,6 +121,20 @@ static inline av_const int mid_pred(int a, int b, int
> c)
> }
> #endif
>
> +#ifndef median4
> +#define median4 median4
> +static inline av_const int median4(int a, int b, int c, int d)
> +{
> + if (a < b) {
> + if (c < d) return (FFMIN(b, d) + FFMAX(a, c)) / 2;
> + else return (FFMIN(b, c) + FFMAX(a, d)) / 2;
> + } else {
> + if (c < d) return (FFMIN(a, d) + FFMAX(b, c)) / 2;
> + else return (FFMIN(a, c) + FFMAX(b, d)) / 2;
> + }
> +}
> +#endif
> +
> #ifndef sign_extend
> static inline av_const int sign_extend(int val, unsigned bits)
> {
> diff --git a/libavcodec/vc1_mc.c b/libavcodec/vc1_mc.c
> index 15840fa..74f34a3 100644
> --- a/libavcodec/vc1_mc.c
> +++ b/libavcodec/vc1_mc.c
> @@ -279,17 +279,6 @@ void ff_vc1_mc_1mv(VC1Context *v, int dir)
> }
> }
>
> -static inline int median4(int a, int b, int c, int d)
> -{
> - if (a < b) {
> - if (c < d) return (FFMIN(b, d) + FFMAX(a, c)) / 2;
> - else return (FFMIN(b, c) + FFMAX(a, d)) / 2;
> - } else {
> - if (c < d) return (FFMIN(a, d) + FFMAX(b, c)) / 2;
> - else return (FFMIN(a, c) + FFMAX(b, d)) / 2;
> - }
> -}
> -
> /** Do motion compensation for 4-MV macroblock - luminance block
> */
> void ff_vc1_mc_4mv_luma(VC1Context *v, int n, int dir, int avg)
> --
> 2.1.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
why?
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
