diff options
| author | James Almer <jamrial@gmail.com> | 2013-09-14 19:17:55 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-15 02:08:15 +0200 |
| commit | d59213b5d345bf1e6792ad79a9e8c5e81334c367 (patch) | |
| tree | d7ffd44701174c0391f3ebe54001605df619c372 | |
| parent | 2fcef19c383060133731bc3351906f780fa56d2f (diff) | |
| download | ffmpeg-d59213b5d345bf1e6792ad79a9e8c5e81334c367.tar.gz | |
matroskaenc: Bump DocTypeVersion to 4
The muxer has been creating files with v4 elements for some time now,
and especially now that we can mux non-experimental Opus files, reporting
the DocTypeVersion as 2 is not correct.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/matroskaenc.c | 2 | ||||
| -rw-r--r-- | tests/fate/wavpack.mak | 4 | ||||
| -rw-r--r-- | tests/ref/lavf/mkv | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index a14750b968..d502147cd5 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1060,7 +1060,7 @@ static int mkv_write_header(AVFormatContext *s) put_ebml_uint (pb, EBML_ID_EBMLMAXIDLENGTH , 4); put_ebml_uint (pb, EBML_ID_EBMLMAXSIZELENGTH , 8); put_ebml_string (pb, EBML_ID_DOCTYPE , s->oformat->name); - put_ebml_uint (pb, EBML_ID_DOCTYPEVERSION , 2); + put_ebml_uint (pb, EBML_ID_DOCTYPEVERSION , 4); put_ebml_uint (pb, EBML_ID_DOCTYPEREADVERSION , 2); end_ebml_master(pb, ebml_header); diff --git a/tests/fate/wavpack.mak b/tests/fate/wavpack.mak index 04207c3d07..8d94e28610 100644 --- a/tests/fate/wavpack.mak +++ b/tests/fate/wavpack.mak @@ -91,12 +91,12 @@ fate-wavpack-matroskamode: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/matros FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-mono fate-wavpack-matroska_mux-mono: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -c copy -flags +bitexact -f matroska fate-wavpack-matroska_mux-mono: CMP = oneline -fate-wavpack-matroska_mux-mono: REF = 769c19bcd931d9e15f7d5aa7b390b0db +fate-wavpack-matroska_mux-mono: REF = efdf3d3e33f22fb6ca782b9e361fda83 FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-61 fate-wavpack-matroska_mux-61: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -c copy -flags +bitexact -f matroska fate-wavpack-matroska_mux-61: CMP = oneline -fate-wavpack-matroska_mux-61: REF = 7f13234f0f3d5b7e00a4661412be025b +fate-wavpack-matroska_mux-61: REF = 76db34aa6b620908dd6e00f89e740d18 FATE_SAMPLES_AVCONV += $(FATE_WAVPACK-yes) fate-wavpack: $(FATE_WAVPACK-yes) diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index 4bb97fd6bf..5f91bc794d 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,6 +1,6 @@ -6273e6c20231e89e167f99706388b1b5 *./tests/data/lavf/lavf.mkv +15361115e62aa4c2413262a00bafadbe *./tests/data/lavf/lavf.mkv 472542 ./tests/data/lavf/lavf.mkv ./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 -36633da729b88a171a0dfc969db23bcc *./tests/data/lavf/lavf.mkv +5aab87ea7208b2dd302fde558ee516a3 *./tests/data/lavf/lavf.mkv 320274 ./tests/data/lavf/lavf.mkv ./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 |