Patch with corrected "From:" is attached.
On Tue, Jan 26, 2016 at 2:28 PM, Vittorio Gambaletta (VittGam)
<ffmpeg-...@vittgam.net> wrote:
> On 26/01/2016 23:05:22 CET, Neil Birkbeck wrote:
>>
>> Some sort of squash fail. Apologies.
>
>
> No problem!
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
From f6c9ccc0899c10faffb98b224affc081a523b1ca Mon Sep 17 00:00:00 2001
From: Neil Birkbeck <neil.birkb...@gmail.com>
Date: Tue, 26 Jan 2016 14:14:20 -0800
Subject: [PATCH] libavutil/mastering_display_metadata.h: change fields to be
rationals as this is how they are typically coded.
(this structure is not referenced anywhere yet)
Signed-off-by: Neil Birkbeck <neil.birkb...@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
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
