diff mbox

[FFmpeg-devel] lavf/matroskaenc: Do not write two CodecID elements for rawvideo

Message ID 20170111185516.GS4749@nb4
State Not Applicable
Headers show

Commit Message

Michael Niedermayer Jan. 11, 2017, 6:55 p.m. UTC 
On Tue, Jan 10, 2017 at 05:23:04PM +0100, Carl Eugen Hoyos wrote:
> Hi!
> 
> Attached patch fixes ticket #6068.
> 
> Please comment, Carl Eugen

>  matroskaenc.c |    1 +
>  1 file changed, 1 insertion(+)
> 41a44b306b4f66f182c30289e093372556ca184c  0001-lavf-matroskaenc-Do-not-write-two-CodecID-elements-f.patch
> From b100ef83e257d8a106eefa3d2da9463ccd0e87d8 Mon Sep 17 00:00:00 2001
> From: Carl Eugen Hoyos <cehoyos@ag.or.at>
> Date: Tue, 10 Jan 2017 17:21:08 +0100
> Subject: [PATCH] lavf/matroskaenc: Do not write two CodecID elements for
>  rawvideo.
> 
> Fixes ticket #6068.

breaks fate

Test rgb24-mkv failed. Look at tests/data/fate/rgb24-mkv.err for details.
make: *** [fate-rgb24-mkv] Error 1
make: *** Waiting for unfinished jobs....


[...]
diff mbox

Patch

--- ./tests/ref/fate/rgb24-mkv  2017-01-08 23:01:44.544754748 +0100
+++ tests/data/fate/rgb24-mkv   2017-01-11 19:22:58.398776647 +0100
@@ -1,5 +1,5 @@ 
-94cce0d7d5b14b4c86e74a1ca454c5aa *tests/data/fate/rgb24-mkv.matroska
-58361 tests/data/fate/rgb24-mkv.matroska
+55270be3b5d393d770a1dfcb19b68271 *tests/data/fate/rgb24-mkv.matroska
+58345 tests/data/fate/rgb24-mkv.matroska
 #tb 0: 1/10
 #media_type 0: video
 #codec_id 0: rawvideo