diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-09-02 23:44:19 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-09-02 23:44:19 +0100 |
| commit | b26897dd84ac9b09e7d262989a75984aab0bdc91 (patch) | |
| tree | d14c792262269342fe4b73740a45762ee119ccfd /gst/videomixer/blendorc-dist.h | |
| parent | 477caae5e8e473f78c6e80bc134ab914db89c5c0 (diff) | |
Release 0.10.25
Diffstat (limited to 'gst/videomixer/blendorc-dist.h')
| -rw-r--r-- | gst/videomixer/blendorc-dist.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gst/videomixer/blendorc-dist.h b/gst/videomixer/blendorc-dist.h index bb87cdb2f..4ddb04c7d 100644 --- a/gst/videomixer/blendorc-dist.h +++ b/gst/videomixer/blendorc-dist.h @@ -10,8 +10,6 @@ extern "C" { #endif - - #ifndef _ORC_INTEGER_TYPEDEFS_ #define _ORC_INTEGER_TYPEDEFS_ #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L @@ -49,10 +47,10 @@ typedef long orc_int64; typedef unsigned long orc_uint64; #endif #endif -typedef union { orc_int16 i; orc_int8 x2[2]; } orc_union16; -typedef union { orc_int32 i; float f; orc_int16 x2[2]; orc_int8 x4[4]; } orc_union32; -typedef union { orc_int64 i; double f; orc_int32 x2[2]; orc_int16 x4[4]; } orc_union64; +typedef union { orc_int32 i; float f; } orc_union32; +typedef union { orc_int64 i; double f; } orc_union64; #endif + void orc_splat_u32 (guint32 * d1, int p1, int n); void orc_memcpy_u32 (guint32 * d1, const guint32 * s1, int n); void orc_blend_u8 (guint8 * d1, int d1_stride, const guint8 * s1, int s1_stride, int p1, int n, int m); |