[SCM] libav/experimental: do not set isom if ctype is not set, happens in mov

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


The following commit has been merged in the experimental branch:
commit 2229a5c60e44cad0a7f5feadea990a9ff6cb8863
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Mon Mar 16 05:13:55 2009 +0000

    do not set isom if ctype is not set, happens in mov
    
    Originally committed as revision 17998 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 10aaac2..74e1c1d 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -233,8 +233,7 @@ static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
             ((char *)&ctype)[2], ((char *)&ctype)[3], (int) ctype);
     dprintf(c->fc, "stype= %c%c%c%c\n",
             *((char *)&type), ((char *)&type)[1], ((char *)&type)[2], ((char *)&type)[3]);
-    if(!ctype)
-        c->isom = 1;
+
     if     (type == MKTAG('v','i','d','e'))
         st->codec->codec_type = CODEC_TYPE_VIDEO;
     else if(type == MKTAG('s','o','u','n'))

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list