From patchwork Sun Dec 31 09:46:06 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: 7050 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp12439042jad; Sun, 31 Dec 2017 01:54:04 -0800 (PST) X-Google-Smtp-Source: ACJfBotz1qqzliZKrCOJKBnCOhlDcC1xkRMnzXR73APB+crKW3yH2Hdex9l3sLJnEdNNHm3YS7vx X-Received: by 10.28.74.147 with SMTP id n19mr34683332wmi.134.1514714044165; Sun, 31 Dec 2017 01:54:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514714044; cv=none; d=google.com; s=arc-20160816; b=eR59noYmG8JiU16jta2lc1qCFC68fEpK7f7109fvAU+petWEvN8hRx+Uyy4eAFjFmI SXcvFYmNoRighqUZOCmq/npSrRSfaLLvyQwq9aL8G1dy4EaZfqoldbuVLWcoEc6LjV9b 9Z7xfbA/x2co/NiPfR6+F2rXmUmy0DYonpOKz7vKZEpmv79gtSCj1/ltxgMBwD6RPLi9 1wA9bj4NduBghfWkDHJMQVJ7TdwF5104SlFkZbS8PoxYIrUinBO3SgCDTobC524NNG+a rFSHeOJdRs3xD7o78aa16RkNzYgqnuW/sl00+MTmZF4FOmJORyVC+6j0yozjaArY7SNZ KsPQ== 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=pvDPaUEzUrPSq024pzOzAhuJFQ2LL6jPbUKvwIrLRB4m84zZYMofaeFcvb7Rbqvd1d Ue8vAUAFWmSQnkLAVBHc2XrZKQJwrpXBUPXH2cGukVQr3vdafrRV8Bpc+vTmb8KmbdNw Y53SPS+30aCTSNT0iU5uwaDqtGzhvXDo1NTGO5F59P9968mm/dYBf8rRWQabIrdrCRt5 rvBiMCtL0vZrqE/B1ChUMYea5dzxMPhGkEvaX0ovp0XTRELjDC9/gmvBi0/MrI5Zw+Q/ TqqO2MM7iIjo73o33DHDMDnuG45Q+oyq0Zblf6cAxW5Zs7ZBof6hifZHv4tKEAD7D/J6 2AeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Sezxh6Ca; 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 o36si4507776wrf.523.2017.12.31.01.54.03; Sun, 31 Dec 2017 01:54:04 -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=Sezxh6Ca; 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 EA9E36808BC; Sun, 31 Dec 2017 11:53:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28DE268064A for ; Sun, 31 Dec 2017 11:53:41 +0200 (EET) Received: by mail-pg0-f65.google.com with SMTP id j4so22515245pgp.1 for ; Sun, 31 Dec 2017 01:53:56 -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=Sezxh6CasSKXNp9h86nNeb8LyI0vjZ9R2Dqg5MTtUnL+uGM7xOiFPN9INVD78giuPY clRGvk1priuOUvpgLS0AmfdC9cNmguZH9z2ULh7MCgHiat6jfOeC7RHPpMM14ZtRmtNH gnmzUYVcRkTmnP5uip/I7GU9n1BJ7QY6jVk50eb+uzITURAYfiA4XulIm1mtcN0Pvt1+ fvDuh6RtvsLdbLy1UK14Cm13kWaYYwRNWbn/RBKIG1GvNz2HP+IX6/En0KIepnQkQxB8 1CiaaCUjhE13/FwpHiEScifqnKKm9/IcyXTbM8QJ64RC5pXOks2ofUjlNKtjLuio6e4x 2r1A== 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=jMROTDjBQU6db8RgdsKl+QzyglRe2yrQ/4Pta1IUezn9Q2EaAeEBl/Km+BmciIOqgB tDnWOfKgWdjVJ/rUlh9+bnQpJKKs8/2TPNcyf7ZrkvmY5sHgoXZZT8RrZ8WIv6ZpwKb/ Mww6rDWINmVbdRN1mqVzWflIIehyTZNV7ZQgeq0TSQTgCrX2FfQ6sob1AZjwMrkYGtM6 UaRxcKKcrB1VjS2nCvRDckr9hVhB0ZI8IBkLcXsUfRPB4JiCVy6F8UtyjOVQPLKVqEi5 8rcFOwxiXBEY2GCMT3zfG8sa6y4x4RSM79Pq6c+bzLU8BPbFnv/rnXqiO1pqpYUxlpNr qImQ== X-Gm-Message-State: AKGB3mIJthwwMBySyclySX+3caZV/PEeH1fQP27B8Kk0VBnfs8KI1zQ7 9JU2Vs6+pIljcNWBwLeHWWvN7Q3L X-Received: by 10.98.224.7 with SMTP id f7mr39903539pfh.177.1514713601320; Sun, 31 Dec 2017 01:46:41 -0800 (PST) Received: from localhost.localdomain (58-7-95-79.dyn.iinet.net.au. [58.7.95.79]) by smtp.gmail.com with ESMTPSA id c2sm13957332pgq.48.2017.12.31.01.46.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 31 Dec 2017 01:46:40 -0800 (PST) From: misty@brew.sh To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Dec 2017 17:46:06 +0800 Message-Id: <20171231094607.68768-6-misty@brew.sh> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171231094607.68768-1-misty@brew.sh> References: <20171227005143.GV4926@michaelspb> <20171231094607.68768-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 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; }