From patchwork Fri Dec 22 14:35:12 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: 6908 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp2739395jad; Fri, 22 Dec 2017 11:49:55 -0800 (PST) X-Google-Smtp-Source: ACJfBour6iDiujAsXTAjRHFiVmXCidKaL7i6f/NABkUFYxTYkwNj6CDhjEy5Rf3nK5aCDZZvpTZk X-Received: by 10.223.192.69 with SMTP id c5mr2008253wrf.214.1513972195541; Fri, 22 Dec 2017 11:49:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513972195; cv=none; d=google.com; s=arc-20160816; b=GSpfZVbcLYLTNUdxcc/kdk4WviyPR0iw2OeSAvs9rFhuo54EYfgJsXsnxE01RDwPD+ 4eIBs8UizrRGr1Pc2uLwSKvz1ZPKcBrv5hqnv0+6EAi5RHeg9rku6LGxLQfFXw81++An 5ha4giuaF2P0pTUYMEtroGXBXZ8gjDTfZ4ywz5qs5JVWyeMpbuxcmhOUrx61LZY8J9KY f7RXDri/L36IegRlZzojuZ7vywkd52wqraZ/PMt6EvnHyIJN8lKyD6tUxNwXmXNVyZQZ 4Nwiu5AFiLqavOvrmQt/+Nm9KA9UHfYgR6AkvJzU9wfjlByT/jBoZFZn3m5n36xubtqI 2oUQ== 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=ZJKQ1/HWHFOj4FnPXdJbT/9LJGn6tW/b82Z1tb+XpMukJcmmrRLEaI/G/j0TVcbZ0U vtd5btRRvpc0EzuZxJx4JUpFoqRCuSUJ+TGJcOKEYlOt1yzC35e9DSseYlrz1N9m6rQz LXB/BlCIt55eqwpn/Hhjvl5sF6frFvOxwmy0KJ1HafD5il5WSUPJvZLWZltFiOioCjwh iSGZ74qAe/WdcZX57Z5jHVIXMASBXdQD6xj0c8DrWcjPOuJM2JRjE4p6nJKF/enpouvm g7CwCREOZidUk/Uey/bhiXLeUXX0mfoWSLtcnkjc5MTrfC7kC7hpUrUy8w7BkuwSoL1p BgLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=bF4twiqJ; 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 o2si6783960wma.153.2017.12.22.11.49.55; Fri, 22 Dec 2017 11:49:55 -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=bF4twiqJ; 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 7A354688279; Fri, 22 Dec 2017 21:49:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CEC4A680596 for ; Fri, 22 Dec 2017 16:36:16 +0200 (EET) Received: by mail-pf0-f193.google.com with SMTP id n6so15379483pfa.4 for ; Fri, 22 Dec 2017 06:36:28 -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=bF4twiqJYnUBsQfcXpYnEyGRhAPFGjamLip7hfrnpzX7R0KccVlzNF5zQ0Hu/8Bf8N SZ6EwnYsfnr9qsK+zZ2kR48cYUnReMQhtcGxFiEkBz75nv5ThAbU0OU83htHvb1yIj4l sVtrQj1E0nBVTY5sXe5WQ2Y/b/ZYsnh/BgTSwCEWxRd1kpYrAoBt8/tC8cV7jxPsyyVP xuHwFfAS12efJWCcvmAAYGfW/fnsPHLISTDCc63gsLgkBSQ4HYuPi9sOTS2jbB6FB9KH zzW6vjH3WTINX6Klp6oACLejb60j+Y9h9gOVLJ/oC56LEiB6ngXMXAGIMVBoGN3YMYjV EKYw== 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=h7G/ohbxm5Bw7j64MNK3BgPXshPO2669isHl5EXq/ROZVteGA4Q/9L7aLcqy7dX5hp +OV39Yzk8NXTSht6cMjRZ64ybXB6Gd6YPQxULTD/N6IwasZNtowsPrM+eqACq+4JLzuG QF9BTAXpT1aXdOVM51eV8xY/ah/VeDaRH1p/cMPPPJnXUJ+IKAQnxi8N9AogqjIORwqV Hk04N86biGzbiMAW2Sr/BpKfJswloC1bK+7SbIeQeK734t5fXeS6zhDg/le6nxayPJhl K6+4SNkfE62TR5HFJd+gkRWsJzPFBlP7Sh6uRX0yW9ZFdhmpxUXHIBO1u5wp/5KNuW8U UFMw== X-Gm-Message-State: AKGB3mLUsg3jV0frHyBCHZqSpyXqTCHFN4XX+xTttIBbRh5GH51UHUsF /GCXprzkxcTxOlftRDJsBjN5BxBC X-Received: by 10.99.178.8 with SMTP id x8mr12986965pge.243.1513953387135; Fri, 22 Dec 2017 06:36:27 -0800 (PST) Received: from localhost.localdomain (220-253-129-240.dyn.iinet.net.au. [220.253.129.240]) by smtp.gmail.com with ESMTPSA id 73sm47522026pfr.145.2017.12.22.06.36.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Dec 2017 06:36:26 -0800 (PST) From: misty@brew.sh To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Dec 2017 22:35:12 +0800 Message-Id: <20171222143512.92271-6-misty@brew.sh> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171222143512.92271-1-misty@brew.sh> References: <20171222143512.92271-1-misty@brew.sh> X-Mailman-Approved-At: Fri, 22 Dec 2017 21:49:23 +0200 Subject: [FFmpeg-devel] [PATCH 5/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; }