aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-02-21 21:14:17 -0300
committerJames Almer <jamrial@gmail.com>2017-02-21 21:18:07 -0300
commit36fff6c75459a7e23ad04be60264643e9c3d2ce8 (patch)
tree43ed448d3430d9b25b22045768db6d7373c931b0
parent5546294f63e4ce52535eddd8772a00a27e542bf5 (diff)
downloadffmpeg-36fff6c75459a7e23ad04be60264643e9c3d2ce8.tar.gz
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 (cherry picked from commit 1ad60e4e70ecc71b1301bdc041fa133129338393)
-rw-r--r--libavformat/matroskaenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index d91055f89e..bbfdd4ff89 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1202,7 +1202,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) {