[FFmpeg-devel] [PATCH] matroskaenc: Bump DocTypeVersion to 4

Michael Niedermayer michaelni at gmx.at
Sat Sep 14 23:16:33 CEST 2013


On Sat, Sep 14, 2013 at 01:56:48AM -0300, James Almer wrote:
> 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 at gmail.com>
> ---
>  libavformat/matroskaenc.c | 2 +-
>  tests/ref/lavf/mkv        | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
> index a14750b..d502147 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/ref/lavf/mkv b/tests/ref/lavf/mkv
> index 4bb97fd..5f91bc7 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


Fails fate:
--- -   2013-09-14 23:11:54.069502261 +0200
+++ tests/data/fate/wavpack-matroska_mux-mono   2013-09-14 23:11:54.060150344 +0200
@@ -1 +1 @@
-769c19bcd931d9e15f7d5aa7b390b0db
+efdf3d3e33f22fb6ca782b9e361fda83
TEST    wmapro-5.1
Test wavpack-matroska_mux-mono failed. Look at tests/data/fate/wavpack-matroska_mux-mono.err for details.
make: *** [fate-wavpack-matroska_mux-mono] Error 1
make: *** Waiting for unfinished jobs....
--- -   2013-09-14 23:11:54.075777514 +0200
+++ tests/data/fate/wavpack-matroska_mux-61 2013-09-14 23:11:54.068150344 +0200
@@ -1 +1 @@
-7f13234f0f3d5b7e00a4661412be025b
+76db34aa6b620908dd6e00f89e740d18
Test wavpack-matroska_mux-61 failed. Look at tests/data/fate/wavpack-matroska_mux-61.err for details.
make: *** [fate-wavpack-matroska_mux-61] Error 1


Try make fate -k to see all failures


[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

During times of universal deceit, telling the truth becomes a
revolutionary act. -- George Orwell
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20130914/2418dc0c/attachment.asc>


More information about the ffmpeg-devel mailing list