diff options
author | Diego Biurrun <diego@biurrun.de> | 2013-02-07 22:37:00 +0100 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2013-02-08 23:10:17 +0100 |
commit | bf6b3ec924b4fb64d14df33077f4d4541d525dbf (patch) | |
tree | 43f8cd8bd8091698c3e454090caeb029377b8926 /libavcodec/dsputil.h | |
parent | b9c2408b19dc9408e9dc0ce4a099af529bbfba3b (diff) | |
download | ffmpeg-bf6b3ec924b4fb64d14df33077f4d4541d525dbf.tar.gz |
dsputil: Move rnd_avg inline functions to a separate header
Diffstat (limited to 'libavcodec/dsputil.h')
-rw-r--r-- | libavcodec/dsputil.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 112f2c4434..70e2489d32 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -403,29 +403,6 @@ int ff_check_alignment(void); void ff_set_cmp(DSPContext* c, me_cmp_func *cmp, int type); -#define BYTE_VEC32(c) ((c)*0x01010101UL) -#define BYTE_VEC64(c) ((c)*0x0001000100010001UL) - -static inline uint32_t rnd_avg32(uint32_t a, uint32_t b) -{ - return (a | b) - (((a ^ b) & ~BYTE_VEC32(0x01)) >> 1); -} - -static inline uint32_t no_rnd_avg32(uint32_t a, uint32_t b) -{ - return (a & b) + (((a ^ b) & ~BYTE_VEC32(0x01)) >> 1); -} - -static inline uint64_t rnd_avg64(uint64_t a, uint64_t b) -{ - return (a | b) - (((a ^ b) & ~BYTE_VEC64(0x01)) >> 1); -} - -static inline uint64_t no_rnd_avg64(uint64_t a, uint64_t b) -{ - return (a & b) + (((a ^ b) & ~BYTE_VEC64(0x01)) >> 1); -} - void ff_dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_arm(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_bfin(DSPContext* c, AVCodecContext *avctx); |