From patchwork Mon Dec 25 02:28:33 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: 6955 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp5294333jad; Sun, 24 Dec 2017 18:29:47 -0800 (PST) X-Google-Smtp-Source: ACJfBovEAdqFzUDKbq+ZrtlZMpHNb7zlMSSwhDf4kzPmj7UjsdsSbUg8IBcCKz1YkfEGmb0PhVPP X-Received: by 10.223.136.67 with SMTP id e3mr19768799wre.150.1514168987666; Sun, 24 Dec 2017 18:29:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514168987; cv=none; d=google.com; s=arc-20160816; b=oOZqUNg4Nq/EcJcLnZxRxT2CMXjKNQJRa8jrTLxvaIZpkJwjcYJHVuW6ZuiK7vQuNI hWjPGs6+7hMlMjL/7qQv9LXAmiSULrHaDMj71Ry6U+/fwmY4YbKYEYhDUhVfeennDZE0 OvEO3f3FwuRjyYdThTEY7YdgxT4K4grBqcLY1YfBW2DWt3lntMwbsPPxze4YsLPzYkfq LVFfMOC0zwuK329roZQ/OY1rf0aLbtlG62NxVBNjWhP3CqQz68PZ93DjQKyPj9nCUetE eQStNrOZcVQsQrey6ZOxuYKbrqmcXV2EHOy95oY34L/J9/zhYJHOb4nSeLue5HteJon2 zj9w== 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=Q3l56gwcnAybSCyulvA1P+8xHSgb/4GtPgD1ux/wSISKGBROaQAkWHMWQLGR81BhaJ yuJcihz4QWxyAKKMRKAZDnHnbSVPJUfM8843cRJhx9XBvESwRbZL6CchjjvYNDHfkZlL s8EPq/TOxiwfbrih+lZivqIfNEGVC2WkdT9DM/jW/lJ2Nq9xkhsSe83xYHWqegHi2w7O 8iDx+ZU7UeHOj++PauPYRpNNfglsudwIu/MxMUeJ0EAh5r/M7wpbCx5pWgJWHI4JgWEd MvYYJdFgPncL08DXSVMzPjmR8yBvQ6WQjlncgK9XPt3GtUf6srRYo1j0GkcYU0gRXgIx h7LA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nyNuyADK; 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 b105si21887178wrd.541.2017.12.24.18.29.47; Sun, 24 Dec 2017 18:29:47 -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=nyNuyADK; 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 93D39688291; Mon, 25 Dec 2017 04:29:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A424F68096F for ; Mon, 25 Dec 2017 04:28:57 +0200 (EET) Received: by mail-pl0-f66.google.com with SMTP id s3so16078544plp.4 for ; Sun, 24 Dec 2017 18:29:10 -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=nyNuyADKHzgLCsgjtWjEikwt2saiJWHBVI8K18ToU0X5GpeeSa9OY5yZIzbZf+HYBY KZZKYS1SO3dZmLiuEbplvsKqvqcvBfeqjsQH9gOgcs/j+jaT+HOMTwKHbVxhgdj9V9hr XvWhXHIU/j+TRc/T2givYNjzs97Ywdjlb0usdhPsPSlXkF9xmt90GFq4fL9XexzsJFBP U8x30LEIiDJyn7ZffQlc14QccIR/zuvh7FOr1A5jlze0ilexCeAmoqGNQQ73q+9xRYI3 wW5mc8ZpC4rr859m6ExUXKp3gdphwBCZOc0GevbN2pn2FVkbB7uzVomtu7pXt0PoQZ6E F4zw== 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=q8xuFqQV027EKLK3AycchOaV7Q1NrYFyJvtPq1jZdcuBXS/+jI2LFGfBjBPzibsBAQ +nC81vlCyhKxbJnMYout0jbGQtq3gmWYx0gzR/u3g1kNlK+Z6xMHBtPmNPJkw1WNC77U 0zDkmHIw/FiVL/zzjtDyuMdJtlGnpoEtgu6NYMtR8NUGcCDydeK0PXe6O8DCmTobZ9PK LoBz9FizEIgowFf1JZdMg3nNQnoTVUUGcYUPWc9HVdvnvhKU67H8oPj0b7g4F191v5qi XaWtvtU4IUvCPnABQqeH9q6rpP9ZM1DVXoYTtN9Qf9kIpH0Mu8FoaHUQxNMmeUyYRVsT eDAQ== X-Gm-Message-State: AKGB3mL0PBk1qYjXpymA1LFVZH65GSZx6/GDCWFM4uzP1bhyTJ1iaVK/ TzoF1onzCBuTiaLnaNRflv//Y2CK X-Received: by 10.159.241.133 with SMTP id s5mr21201752plr.40.1514168948934; Sun, 24 Dec 2017 18:29:08 -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 n22sm27888708pgc.76.2017.12.24.18.29.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 Dec 2017 18:29:08 -0800 (PST) From: misty@brew.sh To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Dec 2017 10:28:33 +0800 Message-Id: <20171225022834.33865-6-misty@brew.sh> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171225022834.33865-1-misty@brew.sh> References: <20171225022834.33865-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; }