From patchwork Fri Jan 5 11:34:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: misty@brew.sh X-Patchwork-Id: 7143 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp661801jaa; Fri, 5 Jan 2018 03:36:03 -0800 (PST) X-Google-Smtp-Source: ACJfBovc3DyI/5sJPGcxE1HacUPjyweB0h/rQdZkjRi6p4FRge2BIpyOfuq8HsN2g/2JUOCYvoKi X-Received: by 10.28.124.1 with SMTP id x1mr2080677wmc.20.1515152162934; Fri, 05 Jan 2018 03:36:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515152162; cv=none; d=google.com; s=arc-20160816; b=yrcSLSeJwn5YNAj+iM9AAj3I8c5tglDW1o9qmxfslMgLwhJb/0AY32jqjW1Ari4lw2 qAwaufCcHfxDxJxSSh///zCvr9AUHJDd05KrWLfw3tpjIkxozy6JyP04KLyDKIBFxVrz v22l36pvlN28JaAjZjuulOUwyG3fM9frvOSMf8XRpAH4baJlLnjYujIsPDQjNPUUvRL0 ad98ia39Qcwbd5tev5BkO9A/ptTLG7aakHPXjrxrQhKlzec2+Q64cM3kNHH6JOtddgiv ssgCYccVnDPot2TLK3iag/wTosaHQViN3foEZF+lKDaAeLA8ydvg9oklO8ItXO/ck4ya wJ9Q== 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=Dm+xyn/MVCHy8bi3TVYup5ew39Q4sdd1g5AiGvG+3+g=; b=cuqxvgutQYv6ib+VmHyTJxT8fNNyuC8b6fFDoZ3HKoN1QOgIMp4MD3kuB+uW0C3zQZ khqKUxNWg+ZJ8Kw26mEVUDCRAKYYUg8a9z1snMdbjUphr9MTFr/Z2MBYgXpvTUvaehYG nDdVenJWcPhsLaf4irTUT9yp+BioyXdMTs2uYuTeLC7mQXqNvK59bcZI/JsI7dMgvBXz y05yrPHB3WvL0ZiRyOd0BjCN6LU18s3V833BId+aNNhSC/GiyzutYsQb4BWcB8o+SSnh BZ6EnlcmaEKaxOZpfBL9qLuuy6T20EoaQ9UqjpBUMiqe55O/mFSiTjrvJtN88rcqeR4n bcvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qO+ioMD0; 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 p7si3444024wmh.105.2018.01.05.03.36.02; Fri, 05 Jan 2018 03:36:02 -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=qO+ioMD0; 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 A0910689A61; Fri, 5 Jan 2018 13:35:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 721AE689A61 for ; Fri, 5 Jan 2018 13:34:58 +0200 (EET) Received: by mail-pl0-f65.google.com with SMTP id s3so2895984plp.4 for ; Fri, 05 Jan 2018 03:35:15 -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=ul5xiG/B8d0M9sskMX8Lx5Eoj6MJIvclMPXmOsz8vYk=; b=qO+ioMD0err1nBNfrL37NMy88Ku5P423e+62Z4kTOhOilEuj3FA/rpCQsolLTedhz+ vw9FaHYca/MsJ36UJrlD1ZxKn1P8tDVaI+TJX6thHzcOzI9YoVGpPjgNz8KsrHHcYBP3 Q/KTlFMZClQ8LLY5rPfY1ta8dfBZho0UReZnQX6NPKVlGPOk8njSxrv364Gn1JLPi+hb 53p8p/xqjYnGn0kqXRJ3hZrLqvGnqO8QSsQ71Iew6c8euCqgeZVd/dckIqBYeff6eUEx jWKAgwxVZ1qiJ6KTXgfEWx0ForW7FuncY5GodgAmzt0kxnymryini0j2uVT88nnSff04 2+iw== 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=ul5xiG/B8d0M9sskMX8Lx5Eoj6MJIvclMPXmOsz8vYk=; b=LSEkYOf66Es8B5Ng4rKaBlrLxfQg37txZC8ctczozI+gFd9feNBv5k3/QvHRgHoirJ uL00UAE/XxQK1/Cm0VWvn90MXzai7pMKNP9zEYqxSdNJc8f/CMIR5Ri4/cb7TJcFY9q6 J1Qf+ch2XPe3MQn5MuDrb4GBPJBw9Gb8QEMRTcM+4jq1l3yfUc6a1eQJcwcXeMqGw6jn 9XY4Uo9/kDC0pkXfnGamkXLs6rXJUUnjI3g6kGhKf1PYP1yTO+0UcgBropBz/ZEeePlU xb2OI5H+gFs2raf6Idt60FPViBF+63GiS6yDMc5qAGyWidlXiMfRNkk85cqWbRnHMLbh bAqQ== X-Gm-Message-State: AKGB3mIOwkHRxJP18aWBGlrBuPuKmlhsNjSXOzjfIrbYakh1SXxw+wtq Mt4ls5jkRYGNK3axNrSyZm3o5gIG X-Received: by 10.159.253.146 with SMTP id q18mr2809185pls.243.1515152114122; Fri, 05 Jan 2018 03:35:14 -0800 (PST) Received: from localhost.localdomain (180-150-45-216.NBN.mel.aussiebb.net. [180.150.45.216]) by smtp.gmail.com with ESMTPSA id s184sm11549586pfb.9.2018.01.05.03.35.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Jan 2018 03:35:13 -0800 (PST) From: misty@brew.sh To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Jan 2018 22:34:47 +1100 Message-Id: <20180105113448.13917-6-misty@brew.sh> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180105113448.13917-1-misty@brew.sh> References: <20180102213143.GE4926@michaelspb> <20180105113448.13917-1-misty@brew.sh> Subject: [FFmpeg-devel] [PATCH 5/6] 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 afde768199..ca848cacbb 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -561,8 +561,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; }