generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libavutil/mastering_display_metadata.h: change fields to be rationals as this is how they are typically coded.

Browse Source 
(this structure is not referenced anywhere yet)

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Neil Birkbeck 2016-01-26 14:14:20 -08:00 committed by Michael Niedermayer
parent 6cc156793d
commit c323c98ee3
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavutil/mastering_display_metadata.h
View File

@ -22,6 +22,8 @@
#define AVUTIL_MASTERING_DISPLAY_METADATA_H #define AVUTIL_MASTERING_DISPLAY_METADATA_H
#include "frame.h" #include "frame.h"
#include "rational.h"
/** /**
* Mastering display metadata capable of representing the color volume of * 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). * 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. * CIE 1931 xy chromaticity coords of white point.
*/ */
float white_point[2]; AVRational white_point[2];
/** /**
* Min luminance of mastering display (cd/m^2). * Min luminance of mastering display (cd/m^2).
*/ */
float min_luminance; AVRational min_luminance;
/** /**
* Max luminance of mastering display (cd/m^2). * 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. * Flag indicating whether the display primaries (and white point) are set.

3
libavutil/version.h
View File

@ -65,7 +65,7 @@
#define LIBAVUTIL_VERSION_MAJOR 55 #define LIBAVUTIL_VERSION_MAJOR 55
#define LIBAVUTIL_VERSION_MINOR 16 #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, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \ LIBAVUTIL_VERSION_MINOR, \
@ -126,4 +126,3 @@
*/ */
#endif /* AVUTIL_VERSION_H */ #endif /* AVUTIL_VERSION_H */