From 98c4268ecac1dfb5d3e534bbea684fc80e8aef17 Mon Sep 17 00:00:00 2001 From: Stephen Hutchinson Date: Fri, 8 Mar 2013 17:42:24 -0500 Subject: libutvideo: Prioritize compatibility with new versions Signed-off-by: Derek Buitenhuis --- libavcodec/libutvideo.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'libavcodec/libutvideo.h') diff --git a/libavcodec/libutvideo.h b/libavcodec/libutvideo.h index ac665b2190..b35d19ce19 100644 --- a/libavcodec/libutvideo.h +++ b/libavcodec/libutvideo.h @@ -31,14 +31,18 @@ #include #include -/* Ut Video version 12.0.0 removed the _WIN names, so if those are - * absent, redefine them to maintain compatibility with pre-v12 versions.*/ -#if !defined(UTVF_RGB24_WIN) -#define UTVF_RGB24_WIN UTVF_NFCC_BGR_BU +/* + * Ut Video version 12.0.0 changed the RGB format names and removed + * the _WIN names, so if the new names are absent, define them + * against the old names so compatibility with pre-v12 versions + * is maintained. + */ +#if !defined(UTVF_NFCC_BGR_BU) +#define UTVF_NFCC_BGR_BU UTVF_RGB24_WIN #endif -#if !defined(UTVF_RGB32_WIN) -#define UTVF_RGB32_WIN UTVF_NFCC_BGRA_BU +#if !defined(UTVF_NFCC_BGRA_BU) +#define UTVF_NFCC_BGRA_BU UTVF_RGB32_WIN #endif typedef struct { -- cgit v1.2.3