ffmpeg | branch: master | Neil Birkbeck <neil.birkb...@gmail.com> | Tue Jan 26 14:14:20 2016 -0800| [c323c98ee34861de1ef21a5d20fa1dec3eb436d9] | committer: Michael Niedermayer
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> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c323c98ee34861de1ef21a5d20fa1dec3eb436d9 --- 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 b3127ff..8e1963c 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -65,7 +65,7 @@ #define LIBAVUTIL_VERSION_MAJOR 55 #define LIBAVUTIL_VERSION_MINOR 16 -#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 */ - _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
