diff options
| author | James Almer <jamrial@gmail.com> | 2016-10-17 14:17:35 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-10-22 15:00:15 -0300 |
| commit | cc71fa319fd7edc54c02a1c552a72cebd0fc4287 (patch) | |
| tree | 9626423a503b1c48a5b40221ef8533f2a339726b | |
| parent | 178eebd79e5bf3f4a4471576cd1a48bf9df59e09 (diff) | |
| download | ffmpeg-cc71fa319fd7edc54c02a1c552a72cebd0fc4287.tar.gz | |
avformat/matroskaenc: write DisplayWidth and DisplayHeight elements only if they differ from PixelWidth and PixelHeight
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/matroskaenc.c | 6 | ||||
| -rw-r--r-- | tests/fate/matroska.mak | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 6f2957c1c6..03d5326a59 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1192,8 +1192,10 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, av_log(s, AV_LOG_ERROR, "Overflow in display width\n"); return AVERROR(EINVAL); } - put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , d_width / display_width_div); - put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, par->height / display_height_div); + if (d_width != par->width || display_width_div != 1 || display_height_div != 1) { + put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , d_width / display_width_div); + put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, par->height / display_height_div); + } } 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); diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 63a42523f6..35ed41f354 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -4,6 +4,6 @@ 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 = 84e950f59677e306f944fca484888c5d +fate-matroska-remux: REF = 9b8398b42804ba12c39d2f47299a0996 FATE_SAMPLES_AVCONV += $(FATE_MATROSKA-yes) |