diff options
| author | James Almer <jamrial@gmail.com> | 2017-01-28 13:44:59 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-01-28 13:46:26 -0300 |
| commit | dce863421b64d4d00c1384997b826ffe3c945620 (patch) | |
| tree | cbf6ea51ecc5b458af5ea0e5c43bae002e421da9 | |
| parent | 4cfa1f80a97641d9d4673e43c5ba4319d8290b06 (diff) | |
| download | ffmpeg-dce863421b64d4d00c1384997b826ffe3c945620.tar.gz | |
avformat/matroskaenc: don't reserve more bytes than needed for the Colour master size
Found-by: Aaron Colwell <acolwell@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/matroskaenc.c | 2 | ||||
| -rw-r--r-- | tests/fate/matroska.mak | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 88f6c647b9..d19646c1e4 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -910,7 +910,7 @@ static int mkv_write_video_color(AVIOContext *pb, AVCodecParameters *par, AVStre colorinfo_size = avio_close_dyn_buf(dyn_cp, &colorinfo_ptr); if (colorinfo_size) { - ebml_master colorinfo = start_ebml_master(pb, MATROSKA_ID_VIDEOCOLOR, 0); + ebml_master colorinfo = start_ebml_master(pb, MATROSKA_ID_VIDEOCOLOR, colorinfo_size); avio_write(pb, colorinfo_ptr, colorinfo_size); end_ebml_master(pb, colorinfo); } diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index f131f2e8eb..48b710c26c 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -4,7 +4,7 @@ FATE_MATROSKA-$(call DEMMUX, MATROSKA, MATROSKA) += fate-matroska-remux fate-matroska-remux: CMD = md5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-2pass-akiyo.webm -color_trc 4 -c:v copy -fflags +bitexact -strict -2 -f matroska fate-matroska-remux: CMP = oneline -fate-matroska-remux: REF = 9b8398b42804ba12c39d2f47299a0996 +fate-matroska-remux: REF = 1ed49a4f2b6790357fac268938357353 FATE_MATROSKA_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER) += fate-matroska-spherical-mono fate-matroska-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mkv/spherical.mkv |