From patchwork Tue Dec 26 08:06:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: misty@brew.sh X-Patchwork-Id: 6977 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp6564363jad; Tue, 26 Dec 2017 00:07:53 -0800 (PST) X-Google-Smtp-Source: ACJfBov38BZizUhWY9EBskzKH/oPZwwV4iheOHmMNWrXUOiFGr/s9w0Wuq+xwPqs+LDqwH+Hy2Vt X-Received: by 10.223.208.201 with SMTP id z9mr8738182wrh.170.1514275673487; Tue, 26 Dec 2017 00:07:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514275673; cv=none; d=google.com; s=arc-20160816; b=cxJZTgcO3rp80sSo/JwyE35+hY8zERT9eKUaUp3gAQLe2DKUo71wK037H2ftIYeLI9 DWW18aQ9i5tAmbSj2it52Z3zvpSIOrZvlV4JfbVkl+Kpp4zhkptsR8Xy/dPoOCRJmNxJ oqsijKedTrqe4ZvbxJFe2LnAMtgmNSkS+ON3MABTCIsdVoWCu9gjFed48Z0Iw+1cF5Iu mxFoa8gGPHSlZl9nCB1HwwLhEFx+VwWPyC3DhrBdj4Vwl8r3gOTOnV380BzX+9UXPqYY O0H8opcZPYosxBQTTy87pfgswxTuM+D5aG+3JtMM01WLonoN/cLG4X6b76DF6OGNU/bK QlsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=7DDwwN5t2MiTqs9Yqw31iSyqP4zcSw0FGGJ0IVqqrlM=; b=WWcH6rHkoTUUY/tU82NcXP4ss5n5dfc308WabxU7DPacLz+TcbDU7Z7WEetbHbuo+1 A9Tls6YcdlJ442h7jQ3j8fue9aj90Pp65DBhTNa2EEDSPuQJsJnDJa+wB+UIWctc3/H3 60t7+/BC7kIEVDIIB5d0a8uSa3uOL7JUcjGWuH0znPNEdEtcwQTzXb42dinaBFuCBvOm O5D1T+vN2IherobAjvPAF+iZM+VXfhFbcuCVt7qWxcGCBSrCBLSEI8RU31c55KYYT30K UBvXpaCkBB1O6DlWjmmjhHM3WJkKx7dIriLYW3Oet1Ib982hlsZplHANXOs93ANmmXN6 8chQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=T45v9eZR; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n6si11592678wmd.173.2017.12.26.00.07.53; Tue, 26 Dec 2017 00:07:53 -0800 (PST) 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=@gmail.com header.s=20161025 header.b=T45v9eZR; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6EE71688319; Tue, 26 Dec 2017 10:07:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 58FAC688291 for ; Tue, 26 Dec 2017 10:07:06 +0200 (EET) Received: by mail-pg0-f67.google.com with SMTP id k134so17556680pga.3 for ; Tue, 26 Dec 2017 00:07:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=F7kXne8XfhSxNGgYGHRzqXFLW9cnjtRJjvBP/tcT4rg=; b=T45v9eZRfo7ou/9NRAY+6Oy24E7eQyfPi2HEyimbejfWTYnegF/5xSJz8JOzFSd4gL pFtHC11jSHv8us/UsiifDlQYq/z+K6KOVBdLt5skBDsBYJ8NE0IcKYpWbwGkG2+E1VUo e7gNsuiPwEcTBU7+YoToTdCKtuQVI0nkdabc+yFp0+l7NzrJVHHSH1iw3dLbzR6vg4CF O0fiBvR04ce1fNJXIXFn3qjlfNIP7VpqBqTVikWSN4TZHI3Ff2Ye0iGC81DqdaUJlD06 9/lPPBznAvpqUwPuM1aVT/Y6F8cYp18fqPG3LJAxK/ZoBzl8Td1ud7WEzEidLsQg6CDn JYBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=F7kXne8XfhSxNGgYGHRzqXFLW9cnjtRJjvBP/tcT4rg=; b=amFPwbVIOfAE4MWg6l1RXEXvl2/a9rglkXuUJ5uE3lO1CJ/WF2ccgzHeZOlNiwGbWr wLRtsxL6VWgx8uTM2HN4OEtV/BlevIWzfxLNXFXC/dRqmnBvut6rTeiXQLaBlCL5pW4m jeIvorKsv375u1tt8Z7XRUkEgtmAzuRsvudhf0ISL1gaabExwcD8RdXqhyczbI9EzZrg HEzZP6ebDGDzcsKLs+ME4hWdj59TmQja0heaHSef2BzyHtwWgZ60cxHIO9gQfN1kemsW 0CCybvFSXY94C3zD2Dpw6qNLv5N76aRE9CruRL0r6LGsUuEUwHleT6ontXqfUTUeeefJ FWuA== X-Gm-Message-State: AKGB3mJhTIi4Ui7TJizit+2T6PVHVgARXm+rTpyjdqpVGpK29j7oVzGI YK7/D6KPUe3VI6Ls9YzWSvSWtV9z X-Received: by 10.99.101.6 with SMTP id z6mr8536317pgb.12.1514275637996; Tue, 26 Dec 2017 00:07:17 -0800 (PST) Received: from localhost.localdomain (124-148-94-180.dyn.iinet.net.au. [124.148.94.180]) by smtp.gmail.com with ESMTPSA id g9sm5641682pgr.4.2017.12.26.00.07.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Dec 2017 00:07:17 -0800 (PST) From: misty@brew.sh To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Dec 2017 16:06:51 +0800 Message-Id: <20171226080652.84864-5-misty@brew.sh> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171226080652.84864-1-misty@brew.sh> References: <20171226080652.84864-1-misty@brew.sh> Subject: [FFmpeg-devel] [PATCH 4/5] mpeg: fix use of deprecated struct 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: Misty De Meo MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Misty De Meo --- libavformat/mpeg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index a366ece0ed..210424faf3 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -547,8 +547,8 @@ redo: len--; for (i = 0; i < s->nb_streams; i++) { st = s->streams[i]; - if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && - st->codec->codec_id == AV_CODEC_ID_ATRAC3P && + if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && + st->codecpar->codec_id == AV_CODEC_ID_ATRAC3P && st->id - 0x1BD0 == (startcode & 0xF)) goto found; }