# HG changeset patch # User michael # Date 1140253714 0 # Node ID d3b4919dd5ec6d393fe903fc94650ceaac0b26ae # Parent 583f564da55bcc81c5a24095f8a4c3d719f6221d simplify mov_read_hdlr patch by (Baptiste COUDURIER ) diff -r 583f564da55b -r d3b4919dd5ec mov.c --- a/mov.c Sat Feb 18 09:05:07 2006 +0000 +++ b/mov.c Sat Feb 18 09:08:34 2006 +0000 @@ -517,21 +517,14 @@ dprintf("ctype= %c%c%c%c (0x%08lx)\n", *((char *)&ctype), ((char *)&ctype)[1], ((char *)&ctype)[2], ((char *)&ctype)[3], (long) ctype); dprintf("stype= %c%c%c%c\n", *((char *)&type), ((char *)&type)[1], ((char *)&type)[2], ((char *)&type)[3]); - if(ctype == MKTAG('m', 'h', 'l', 'r')) { /* MOV */ - /* helps parsing the string hereafter... */ + if(ctype == MKTAG('m', 'h', 'l', 'r')) /* MOV */ c->mp4 = 0; - if(type == MKTAG('v', 'i', 'd', 'e')) - st->codec->codec_type = CODEC_TYPE_VIDEO; - else if(type == MKTAG('s', 'o', 'u', 'n')) - st->codec->codec_type = CODEC_TYPE_AUDIO; - } else if(ctype == 0) { /* MP4 */ - /* helps parsing the string hereafter... */ + else if(ctype == 0) c->mp4 = 1; - if(type == MKTAG('v', 'i', 'd', 'e')) - st->codec->codec_type = CODEC_TYPE_VIDEO; - else if(type == MKTAG('s', 'o', 'u', 'n')) - st->codec->codec_type = CODEC_TYPE_AUDIO; - } + if(type == MKTAG('v', 'i', 'd', 'e')) + st->codec->codec_type = CODEC_TYPE_VIDEO; + else if(type == MKTAG('s', 'o', 'u', 'n')) + st->codec->codec_type = CODEC_TYPE_AUDIO; get_be32(pb); /* component manufacture */ get_be32(pb); /* component flags */ get_be32(pb); /* component flags mask */