[SCM] libav/experimental: matroskadec: Revert adding the doctype to metadata; it has no meaning elsewhere

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:07:32 UTC 2013


The following commit has been merged in the experimental branch:
commit 8daed34e484175400978b08b269c67aeeeea4cb3
Author: David Conrad <lessen42 at gmail.com>
Date:   Sun May 23 22:20:04 2010 +0000

    matroskadec: Revert adding the doctype to metadata; it has no meaning elsewhere
    
    Originally committed as revision 23275 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 45bea61..3e33d08 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1160,7 +1160,6 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
     if (i >= FF_ARRAY_ELEMS(matroska_doctypes)) {
         av_log(s, AV_LOG_WARNING, "Unknown EBML doctype '%s'\n", ebml.doctype);
     }
-    av_metadata_set2(&s->metadata, "doctype", ebml.doctype, 0);
     ebml_free(ebml_syntax, &ebml);
 
     /* The next thing is a segment. */

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list