diff options
| author | Stephen Hutchinson <qyot27@gmail.com> | 2013-03-08 17:42:24 -0500 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2013-03-08 20:45:49 -0500 |
| commit | 98c4268ecac1dfb5d3e534bbea684fc80e8aef17 (patch) | |
| tree | 565914c942e8c370e280eaad32caccaca351eda2 /libavcodec/libutvideo.h | |
| parent | 309d6f5077e4b81cf519c004abace374f5d357b4 (diff) | |
| download | ffmpeg-98c4268ecac1dfb5d3e534bbea684fc80e8aef17.tar.gz | |
libutvideo: Prioritize compatibility with new versions
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/libutvideo.h')
| -rw-r--r-- | libavcodec/libutvideo.h | 16 |
1 files changed, 10 insertions, 6 deletions
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 <utvideo/utvideo.h> #include <utvideo/Codec.h> -/* 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 { |