diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-07-01 17:37:42 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-07-01 17:37:42 +0400 |
commit | 6cbb04ca0bd4d7feba3e510187231a7065153149 (patch) | |
tree | 04c24c00094d70d7f5d819f46169def6e153b629 /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mathops.h | |
parent | 2fa91881376e2755415efcb52973a3fa482c2e97 (diff) |
updated ffmpeg
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2092 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mathops.h')
-rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mathops.h | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mathops.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mathops.h index 28d96ccc0..2c43787e0 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mathops.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mathops.h @@ -136,17 +136,41 @@ if ((y) < (x)) {\ # define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s))) #endif -#ifndef PACK4x8 -# if HAVE_BIGENDIAN -# define PACK4UINT8(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) -# else -# define PACK4UINT8(a,b,c,d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) +#if HAVE_BIGENDIAN +# ifndef PACK_2U8 +# define PACK_2U8(a,b) (((a) << 8) | (b)) # endif +# ifndef PACK_4U8 +# define PACK_4U8(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) +# endif +# ifndef PACK_2U16 +# define PACK_2U16(a,b) (((a) << 16) | (b)) +# endif +#else +# ifndef PACK_2U8 +# define PACK_2U8(a,b) (((b) << 8) | (a)) +# endif +# ifndef PACK_4U2 +# define PACK_4U8(a,b,c,d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) +# endif +# ifndef PACK_2U16 +# define PACK_2U16(a,b) (((b) << 16) | (a)) +# endif +#endif + +#ifndef PACK_2S8 +# define PACK_2S8(a,b) PACK_2U8((a)&255, (b)&255) #endif /* ffdshow custom code */ #ifndef INT_BIT -# define INT_BIT (8 * sizeof(int)) +# define INT_BIT (8 * sizeof(int)) +#endif +#ifndef PACK_4S8 +# define PACK_4S8(a,b,c,d) PACK_4U8((a)&255, (b)&255, (c)&255, (d)&255) +#endif +#ifndef PACK_2S16 +# define PACK_2S16(a,b) PACK_2U16((a)&0xffff, (b)&0xffff) #endif #endif /* AVCODEC_MATHOPS_H */ |