]> git.sesse.net Git - ffmpeg/commitdiff
matroskaenc: remove unofficial compliance on color information
authorRostislav Pehlivanov <atomnuker@gmail.com>
Sun, 15 Jan 2017 13:56:53 +0000 (13:56 +0000)
committerRostislav Pehlivanov <atomnuker@gmail.com>
Sun, 15 Jan 2017 17:49:21 +0000 (17:49 +0000)
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>
libavformat/matroskaenc.c

index 4e4afc17dbc486ad6bf1b95d805bbee7c5ce2bff..f731b678b9dbeb7660df527ece549316594a37ba 100644 (file)
@@ -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;