From ca871d6ea02b3118969f6bcfa7ecb3f4f1ddfeca Mon Sep 17 00:00:00 2001 From: Lukas Hejtmanek Date: Wed, 17 Feb 2010 17:22:03 +0100 Subject: [PATCH] move AUX_* macros to video_codec.h, will use them --- ultragrid/src/video_codec.h | 8 ++++++++ ultragrid/src/video_display/quicktime.h | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ultragrid/src/video_codec.h b/ultragrid/src/video_codec.h index 08540ff9b..4bd73eaaf 100644 --- a/ultragrid/src/video_codec.h +++ b/ultragrid/src/video_codec.h @@ -111,4 +111,12 @@ void vc_copyliner10k(unsigned char *dst, unsigned char *src, int len, int rshift void vc_copylineRGBA(unsigned char *dst, unsigned char *src, int len, int rshift, int gshift, int bshift); void vc_copylineDVS10toV210(unsigned char *dst, unsigned char *src, int dst_len); +#define AUX_INTERLACED 1<<0 +#define AUX_PROGRESSIVE 1<<1 +#define AUX_SF 1<<2 +#define AUX_RGB 1<<3 /* if device supports both, set both */ +#define AUX_YUV 1<<4 +#define AUX_10Bit 1<<5 + + #endif diff --git a/ultragrid/src/video_display/quicktime.h b/ultragrid/src/video_display/quicktime.h index ef7b7a301..d8bb33e04 100644 --- a/ultragrid/src/video_display/quicktime.h +++ b/ultragrid/src/video_display/quicktime.h @@ -48,13 +48,6 @@ #define DISPLAY_QUICKTIME_ID 0xba370f2f -#define AUX_INTERLACED 1<<0 -#define AUX_PROGRESSIVE 1<<1 -#define AUX_SF 1<<2 -#define AUX_RGB 1<<3 /* if device supports both, set both */ -#define AUX_YUV 1<<4 -#define AUX_10Bit 1<<5 - typedef struct { char *device; char *mode;