[FFmpeg-cvslog] Fix compilation with libutvideo version 12.0.0

Stephen Hutchinson git at videolan.org
Tue Jan 15 01:15:52 CET 2013


ffmpeg | branch: master | Stephen Hutchinson <qyot27 at gmail.com> | Tue Jan 15 01:15:10 2013 +0100| [df4203ac6f00bb222e93438967a1e4b6209e7919] | committer: Carl Eugen Hoyos

Fix compilation with libutvideo version 12.0.0

Reviewed-by: Derek Buitenhuis

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df4203ac6f00bb222e93438967a1e4b6209e7919
---

 libavcodec/libutvideo.h |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/libavcodec/libutvideo.h b/libavcodec/libutvideo.h
index a9387e1..ac665b2 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;



More information about the ffmpeg-cvslog mailing list