projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b30a936
)
Fix crash on opening properties window for FFmpeg content.
author
Carl Hetherington
<cth@carlh.net>
Sun, 10 Jul 2016 21:31:32 +0000
(22:31 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Sun, 10 Jul 2016 21:31:32 +0000
(22:31 +0100)
src/lib/ffmpeg_content.cc
patch
|
blob
|
history
diff --git
a/src/lib/ffmpeg_content.cc
b/src/lib/ffmpeg_content.cc
index 7416630c13799a47dd5ebeba7a90d4d9ad95c78d..76ee663ff14e3bdec4689c546eebaba12e566c84 100644
(file)
--- a/
src/lib/ffmpeg_content.cc
+++ b/
src/lib/ffmpeg_content.cc
@@
-543,10
+543,11
@@
FFmpegContent::add_properties (list<UserProperty>& p) const
_("BT2020 for a 10-bit system"),
_("BT2020 for a 12-bit system"),
_("SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"),
- _("SMPTE ST 428-1")
+ _("SMPTE ST 428-1"),
+ _("ARIB STD-B67 ('Hybrid log-gamma')")
};
- DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 1
8
);
+ DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 1
9
);
p.push_back (UserProperty (UserProperty::VIDEO, _("Colour transfer characteristic"), transfers[_color_trc]));
char const * spaces[] = {