[FFmpeg-devel] [PATCH] libavutil/mastering_display_metadata.h: change fields to be rationals as this is how they are typically coded.

Neil Birkbeck neil.birkbeck at gmail.com
Tue Jan 26 22:09:02 CET 2016


From: "Vittorio Gambaletta (VittGam)" <ffmpeg-dev at vittgam.net>

(this structure is not referenced anywhere yet)

Signed-off-by: Neil Birkbeck <neil.birkbeck at gmail.com>
---
 libavutil/mastering_display_metadata.h | 10 ++++++----
 libavutil/version.h                    |  3 +--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/libavutil/mastering_display_metadata.h b/libavutil/mastering_display_metadata.h
index 781c1fd..936533f 100644
--- a/libavutil/mastering_display_metadata.h
+++ b/libavutil/mastering_display_metadata.h
@@ -22,6 +22,8 @@
 #define AVUTIL_MASTERING_DISPLAY_METADATA_H
 
 #include "frame.h"
+#include "rational.h"
+
 
 /**
  * Mastering display metadata capable of representing the color volume of
@@ -37,22 +39,22 @@ typedef struct AVMasteringDisplayMetadata {
     /**
      * CIE 1931 xy chromaticity coords of color primaries (r, g, b order).
      */
-    float display_primaries[3][2];
+    AVRational display_primaries[3][2];
 
     /**
      * CIE 1931 xy chromaticity coords of white point.
      */
-    float white_point[2];
+    AVRational white_point[2];
 
     /**
      * Min luminance of mastering display (cd/m^2).
      */
-    float min_luminance;
+    AVRational min_luminance;
 
     /**
      * Max luminance of mastering display (cd/m^2).
      */
-    float max_luminance;
+    AVRational max_luminance;
 
     /**
      * Flag indicating whether the display primaries (and white point) are set.
diff --git a/libavutil/version.h b/libavutil/version.h
index 42f7cde..d63696d 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -65,7 +65,7 @@
 
 #define LIBAVUTIL_VERSION_MAJOR  55
 #define LIBAVUTIL_VERSION_MINOR  15
-#define LIBAVUTIL_VERSION_MICRO 100
+#define LIBAVUTIL_VERSION_MICRO 101
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                LIBAVUTIL_VERSION_MINOR, \
@@ -126,4 +126,3 @@
  */
 
 #endif /* AVUTIL_VERSION_H */
-
-- 
2.7.0.rc3.207.g0ac5344



More information about the ffmpeg-devel mailing list