aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRostislav Pehlivanov <atomnuker@gmail.com>2017-01-15 13:56:53 +0000
committerRostislav Pehlivanov <atomnuker@gmail.com>2017-01-15 17:49:21 +0000
commite7dec52d4da7fad61f65529d5a396968e3dfe777 (patch)
tree4585eacff61943999f6a0296ee825b1eb0e2cb42
parent0ba0187535498b34d23aa73196f0ed2414dfa15c (diff)
downloadffmpeg-e7dec52d4da7fad61f65529d5a396968e3dfe777.tar.gz
matroskaenc: remove unofficial compliance on color information
When support for this was added the details weren't yet finalized. This is no longer the case. Fixes writing of mkv/webm files with HDR. Reported-by: Kagami Hiiragi <kagami@genshiken.org> Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com> Reviewed-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavformat/matroskaenc.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 4e4afc17db..f731b678b9 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1248,11 +1248,9 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
uint32_t color_space = av_le2ne32(par->codec_tag);
put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLORSPACE, &color_space, sizeof(color_space));
}
- if (s->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL) {
- ret = mkv_write_video_color(pb, par, st);
- if (ret < 0)
- return ret;
- }
+ ret = mkv_write_video_color(pb, par, st);
+ if (ret < 0)
+ return ret;
end_ebml_master(pb, subinfo);
break;