aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hutchinson <qyot27@gmail.com>2013-01-15 01:15:10 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-01-15 01:15:10 +0100
commitdf4203ac6f00bb222e93438967a1e4b6209e7919 (patch)
tree186b6f83d1d71224f9d23327c668ff4a0bcfc63d
parent5ce023b790e53c8da54c411b5ddec058e8036b8d (diff)
downloadffmpeg-df4203ac6f00bb222e93438967a1e4b6209e7919.tar.gz
Fix compilation with libutvideo version 12.0.0
Reviewed-by: Derek Buitenhuis
-rw-r--r--libavcodec/libutvideo.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/libutvideo.h b/libavcodec/libutvideo.h
index a9387e134e..ac665b2190 100644
--- a/libavcodec/libutvideo.h
+++ b/libavcodec/libutvideo.h
@@ -31,6 +31,16 @@
#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
+#endif
+
+#if !defined(UTVF_RGB32_WIN)
+#define UTVF_RGB32_WIN UTVF_NFCC_BGRA_BU
+#endif
+
typedef struct {
uint32_t version;
uint32_t original_format;