[FFmpeg-cvslog] matroskaenc: remove unofficial compliance on color information
Rostislav Pehlivanov
git at videolan.org
Sun Jan 15 19:50:21 EET 2017
ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker at gmail.com> | Sun Jan 15 13:56:53 2017 +0000| [e7dec52d4da7fad61f65529d5a396968e3dfe777] | committer: Rostislav Pehlivanov
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 at genshiken.org>
Signed-off-by: Rostislav Pehlivanov <atomnuker at gmail.com>
Reviewed-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e7dec52d4da7fad61f65529d5a396968e3dfe777
---
libavformat/matroskaenc.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 4e4afc1..f731b67 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;
More information about the ffmpeg-cvslog
mailing list