From patchwork Tue Aug 7 20:12:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 9931 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp17259jad; Tue, 7 Aug 2018 13:13:00 -0700 (PDT) X-Google-Smtp-Source: AA+uWPy5GuFl1HwDsiLp/u3udpMW7UeHZNAgZ85Rg1UPpxM7ST2rHCgSNFBjQJe0k/5GqsPb3C9I X-Received: by 2002:a1c:eb03:: with SMTP id j3-v6mr2551237wmh.150.1533672780422; Tue, 07 Aug 2018 13:13:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533672780; cv=none; d=google.com; s=arc-20160816; b=YpTQYrT1yZMBshsd65eZXq2Ck7FGtnsFB/0hf8EMGK4z+d8Bxy1gNfP5bXW4tXyEA9 UGet6WC9D40aUZhdZNgyLzU2LdGbr54Mml5AlMxBVzq672jTZJWIa0R3EVdnA5B2Up5z Iwq4VM/WqL0y684+YEZBxILqD90w03iLctyN8znSzmqm+KLkJPcsoSmAbl0UoEZRfJt2 cV0XNK2qnuLkOnhKtXJTNrdWNpMPQRTQK/W2QK2rQETodpCC8DkD0066l4WpOXX3Cxw/ glASCvRv5ww8bqQbycoqMYoW0m2YQRF2k4BNXONi8/h0AjDBDncHqazwm7GCVDYnKlwB 5Iyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:content-language :accept-language:message-id:date:thread-index:thread-topic:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=6k3XZH1BeUldvYKsvcNVZtTsUzgk02sFLZQeA/9b30M=; b=fwnWhGbHIH3UJZ9NBsEP9CGFj2KBCkB7A/LxgkvzQCG5i4ZkgFATrnoy1wehhDDJgk t12waT72Fcu8JBgdqzJGFiXNk1wWGYgE7sde+ilTRlb1P3XJY8fRo1ZNOtvAC/1bzQNv 6YXxSUhG3w0sU4qNP4rWhfMCZ8HRC47ykO760+9943RlGmAUoNPyRFXTXkr753a1m4Wb D43HXbsDgYnrOxXgn3nZ7Qei0J4igicBjrb5tdAk7AT6OHs07hB87QauScUMf+Je8PBd w/M0K5gikmyvlMJlvauzcWLZwSaCek1Nylf+vdN8tcVx2fO6o4R/0IG6okvMEvDJTouV rlhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=fGJOCXNG; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=hotmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g11-v6si1933960wmf.223.2018.08.07.13.12.48; Tue, 07 Aug 2018 13:13:00 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=fGJOCXNG; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3843068A37B; Tue, 7 Aug 2018 23:12:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-oln040092008068.outbound.protection.outlook.com [40.92.8.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 622EA680320 for ; Tue, 7 Aug 2018 23:12:19 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=C9TmxVY4RqpXmFfiqyY2+/5XqsY0ezIBwGed480LKqs=; b=fGJOCXNGUBjQYKqO7vL5HB0XKRzZ/fS6OdqFH+ZfDQ7czwM3U8P1I4IwW+Fx/rNADYrt5OsO5DvLagFsNRefWWI8HWfVnSfPLV/f61KO/7yc0+63jw/uPXLrS9QgUmZQANGV/oTAO6cpcWmfAGfOA6YsSVIW503MOJCaQtQxcDYxHr1Skjtyr1ud//ipncPnl91OftY0112XBpZSYBhVZZy1/01GK5cRGRdCH2pxJuXZZZm0eydRb8kjg0HGOE84lJWIeiVgaSyy+DPb0LycMLBItHwj2+3WU7fsRmu6aekGiwI5bkriNM0IRTIswPsoRD1gr74dRKN12QavnIUlVw== Received: from DM3NAM03FT037.eop-NAM03.prod.protection.outlook.com (10.152.82.55) by DM3NAM03HT092.eop-NAM03.prod.protection.outlook.com (10.152.82.223) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.1038.13; Tue, 7 Aug 2018 20:12:37 +0000 Received: from BN6PR22MB0337.namprd22.prod.outlook.com (10.152.82.58) by DM3NAM03FT037.mail.protection.outlook.com (10.152.83.55) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.1038.3 via Frontend Transport; Tue, 7 Aug 2018 20:12:37 +0000 Received: from BN6PR22MB0337.namprd22.prod.outlook.com ([fe80::51e6:d20a:b79d:a79f]) by BN6PR22MB0337.namprd22.prod.outlook.com ([fe80::51e6:d20a:b79d:a79f%10]) with mapi id 15.20.1017.019; Tue, 7 Aug 2018 20:12:37 +0000 From: Colin NG To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavformat/dashdec: Fix for Bug #7338 Thread-Index: AQHULor8tKV2R/X1A0ag7kfSPn+BXA== Date: Tue, 7 Aug 2018 20:12:37 +0000 Message-ID: Accept-Language: en-CA, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: YTXPR0101CA0003.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b00::16) To BN6PR22MB0337.namprd22.prod.outlook.com (2603:10b6:404:9a::19) x-incomingtopheadermarker: OriginalChecksum:4D76ED4AF92BB17698C02ED41D095CAC212DF9F521768F6ACB8C6445097D2406; UpperCasedChecksum:37C4DD2DBA96035AA8433CF55F6DB9A0B8A3DDB0831AB9A4E0191BD0933F70F3; SizeAsReceived:7307; Count:48 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [ZEXYkhTYkq+VkNOAnNqbaOfcHcTeNFybmdfEj7xxnyY=] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM3NAM03HT092; 6:u7CYFd73PZmNxhDiYSGJDpjCLPUfs8WlzDM3Dlbfxr/1l8Vw8b5MxQGpS75QaaSeudINRf+hmG3vTs+cYCC3bWQyTdyr6j9Yq575I/81s7rfbn5f1bLFUdlURhVP0LUKMeu9Mgvqt2sjvK2CIooaMNHaFkGdxZuYPdHUmnkfq2IzshvUn3bSwcDhhVBj6D7ysbul+GlkAYh7gyqZQQmjWLOrU8JVjAFKnPjTc8AqIK6nkmr4vnv1gzIUWjElwwxd7QUpd3iklqnhI9Vb5nWyTc9UC3Je+LPSjyh/Ax9yLmIeFeWDn9Q4MX4uoksyy/NipSm4vfowUF3onZZpylD/B9UVih09/KCX9AHdi6cspuKPVQJ+3N5JC9wyYmBFj5pv236OewA4op9ycP7FsuoXIpIsR9JkcJ+c74wJlwCUBQLOGATxC/0WjO1GSJbOsXl1Qh/H5NnRICPsW1ieLzOHYw==; 5:RMe9Xrunv7dLet5+f5T+RfxKZhfB2YRUek++VSmkhJ6Gfuz1PkDFM1om47g+YKDvs6yI1dmHJFi9TH8oIyIN5l/d5HNMWAkM+iTSOMLmZ+yY7acKPZTTWI+WFXc52odVm90wUNDyO+OdKOvYYTqXV+eHk9+N/jAMnyeNEJ2onzo=; 7:mrg3igmvR1QkindsPaxkqOs+mUBLp/gfd8BL2MwD0caI9fEMmRNclju0PYNX9aj2Jcg88fN2S6/kacZdYK+/NWOWb72v27cDGBEBUYWhNVkxMzwDDozX8JwdNDHSdFtjn8P05GJQ0zIj9LtFE9vgyRuyQr7GE0uy+xpzvI+Gq/kBYKP+Ehxj9OQ0IBNLn3B5mxc853S8HcTW+7PqpNAPtrdiy6HmmKQmbNkQYzyLMXSq+KvgOozKFCeDViHyHnxg x-incomingheadercount: 48 x-eopattributedmessage: 0 x-ms-exchange-slblob-mailprops: cF9fn+9l+ftLm9wDNhZ3LQzS5JEOt0/4EvhQ3tcq5Iy+gU3YDUXSSN1VxdDRPV+q2MB+RiUpgf0wJKETXmqU+bPWhe2wl1vigN/MZH8YFs8/XcBR815od+X9XCbhBLUT+5nk6pX0AlRWEkQXdjbbZ6kM4fLbKx5+yAbqGu1ysbweGnqzZWFwAynC4g5PdijS/xd8KhBaFItASKJ9GxjWzJsBka+GGyknNhn0iWwj+ASl7OwL2OAhpsTnQzLNu51bMJ1EaMXwx+3MP+AXtfkdUkjtMbjPkkqb5s0HT9fjGfL+iTw2BJcKNc252c0CLSMu24S+EnS2gCR2KuoycQQh7iDcbBobhaTnZM+YYAjMrKGggZ3F5jR/DA049fdP4Y1rco5DK9zTMobZ2hGcuAbpJc0CpMryPLXH1FbYFs+pI1mTRSKtDW9NsVbkHA4/r/iVUZ9NMJiotQEcGR9nHN85TL2IkB+IBJRXwq3CCxPZ6JIAdzWavBpWwWHQCY3r92IJGfJYVcCGiabJsyM/eKwA3NqJrvW5S+DPS6gABrjkdr3nR6177yi0uYsrmGrzFRFNrv1H8vbvYSk4XSFmrktq/l3IKFObWF0vx/mKRkhWEt5MF/ANBXPUvp5YorJdqbj9 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(201702181274)(2017031322404)(1601125500)(1603101475)(1701031045); SRVR:DM3NAM03HT092; x-ms-traffictypediagnostic: DM3NAM03HT092: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(4566010)(82015058); SRVR:DM3NAM03HT092; BCL:0; PCL:0; RULEID:; SRVR:DM3NAM03HT092; x-forefront-prvs: 0757EEBDCA x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(189003)(199004)(104016004)(55016002)(9686003)(7696005)(86362001)(39060400002)(4326008)(6916009)(26005)(33656002)(6506007)(14454004)(386003)(83332001)(2501003)(102836004)(6436002)(1857600001)(6346003)(5660300001)(5640700003)(25786009)(20460500001)(5250100002)(99286004)(82202002)(106356001)(8676002)(74316002)(73972006)(105586002)(87572001)(81156014)(8936002)(305945005)(2900100001)(2351001)(486006)(56003)(476003)(97736004)(68736007)(256004)(15852004); DIR:OUT; SFP:1901; SCL:1; SRVR:DM3NAM03HT092; H:BN6PR22MB0337.namprd22.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: hotmail.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=colin_ng@hotmail.com; x-microsoft-antispam-message-info: LEQ9bmQRB8QRGj6bzUyfmP6XZ1+5LOJf+EGuJgg1DNwkGisPUDUovM9bF869+2fYmsr7k/isMT6oRbYWWZRn4rLFR2LbJKdE+Yei3dcxz+jb58A6kqbZtQ9eOlJUEPwGsvVNV/dR5ZMWP4cWZvNpSRd6afOm09wuOl6FJ6ljbFLUE7ZYNPXSfm8tCIqV8Av8QLjAZ3V41DymNajP1DDIi33/a37uHCIawHA51vHDh3c= MIME-Version: 1.0 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 9bd8b953-1c55-4da7-b616-8bcad099ae8b X-MS-Exchange-CrossTenant-Network-Message-Id: 8224a1e3-768b-49bc-4ef8-08d5fca21e4e X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 9bd8b953-1c55-4da7-b616-8bcad099ae8b X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Aug 2018 20:12:37.5210 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3NAM03HT092 Subject: [FFmpeg-devel] [PATCH] libavformat/dashdec: Fix for Bug #7338 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Colin NG Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/dashdec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 09b06ef..fa784f1 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1040,7 +1040,6 @@ end: xmlFree(rep_bandwidth_val); if (rep_framerate_val) xmlFree(rep_framerate_val); - return ret; } @@ -1869,7 +1868,7 @@ static int is_common_init_section_exist(struct representation **pls, int n_pls) url = first_init_section->url; url_offset = first_init_section->url_offset; size = pls[0]->init_section->size; - for (i=0;iinit_section->url,url) || pls[i]->init_section->url_offset != url_offset || pls[i]->init_section->size != size) { return 0; } @@ -1879,7 +1878,6 @@ static int is_common_init_section_exist(struct representation **pls, int n_pls) static void copy_init_section(struct representation *rep_dest, struct representation *rep_src) { - *rep_dest->init_section = *rep_src->init_section; rep_dest->init_sec_buf = av_mallocz(rep_src->init_sec_buf_size); memcpy(rep_dest->init_sec_buf, rep_src->init_sec_buf, rep_src->init_sec_data_len); rep_dest->init_sec_buf_size = rep_src->init_sec_buf_size;