From: James Almer <jamrial@gmail.com>
Date: Wed, 22 Feb 2017 00:14:17 +0000 (-0300)
Subject: avformat/matroskaenc: don't write DisplayUnit with value Unknown on WebM files
X-Git-Tag: android-x86-7.1-r1~2017
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1ad60e4e70ecc71b1301bdc041fa133129338393;p=android-x86%2Fexternal-ffmpeg.git

avformat/matroskaenc: don't write DisplayUnit with value Unknown on WebM files

Value 4 (Unknown) is for the time being part of the Matroska spec but not
supported by WebM

Addresses ticket #6176
---

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index d19646c1e4..7cb88935fb 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1258,7 +1258,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
         } else if (display_width_div != 1 || display_height_div != 1) {
             put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , par->width / display_width_div);
             put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, par->height / display_height_div);
-        } else
+        } else if (mkv->mode != MODE_WEBM)
             put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYUNIT, MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN);
 
         if (par->codec_id == AV_CODEC_ID_RAWVIDEO) {