[SCM] libav/experimental: Treat disposition==0 as undefined and don't write the default flag

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:35:30 UTC 2013


The following commit has been merged in the experimental branch:
commit 1c3db2aa5010c7a55b882f2691fa6fa15b78ec5a
Author: David Conrad <lessen42 at gmail.com>
Date:   Sat Jan 17 04:31:14 2009 +0000

    Treat disposition==0 as undefined and don't write the default flag
    
    Originally committed as revision 16651 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 59016ca..368c351 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -560,6 +560,7 @@ static int mkv_write_tracks(AVFormatContext *s)
         else
             put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, "und");
 
+        if (st->disposition)
         put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGDEFAULT, !!(st->disposition & AV_DISPOSITION_DEFAULT));
 
         // look for a codec ID string specific to mkv to use,

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list