summaryrefslogtreecommitdiff
path: root/src/video_out
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_out')
-rw-r--r--src/video_out/alphablend.c12
-rw-r--r--src/video_out/alphablend.h7
2 files changed, 8 insertions, 11 deletions
diff --git a/src/video_out/alphablend.c b/src/video_out/alphablend.c
index b86968c43..bba685418 100644
--- a/src/video_out/alphablend.c
+++ b/src/video_out/alphablend.c
@@ -33,17 +33,7 @@
#include <inttypes.h>
#include "video_out.h"
-
-/* FIXME: CLUT_T should go elsewhere. */
-#ifndef CLUT_T
-#define CLUT_T
-typedef struct { // CLUT == Color LookUp Table
- uint8_t:8;
- uint8_t y:8;
- uint8_t cr:8;
- uint8_t cb:8;
-} __attribute__ ((packed)) clut_t;
-#endif
+#include "alphablend.h"
#define BLEND_COLOR(dst, src, mask, o) ((((src&mask)*o + ((dst&mask)*(0x0f-o)))/0xf) & mask)
diff --git a/src/video_out/alphablend.h b/src/video_out/alphablend.h
index 6043c6071..66f4e512b 100644
--- a/src/video_out/alphablend.h
+++ b/src/video_out/alphablend.h
@@ -28,6 +28,13 @@
#include "video_out.h"
+typedef struct { /* CLUT == Color LookUp Table */
+ uint8_t cb : 8;
+ uint8_t cr : 8;
+ uint8_t y : 8;
+ uint8_t foo : 8;
+} __attribute__ ((packed)) clut_t;
+
void blend_rgb16 (uint8_t * img, vo_overlay_t * overlay, int width,
int height);
void blend_rgb24 (uint8_t * img, vo_overlay_t * overlay, int width,