From patchwork Sun Aug 28 16:24:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Hebb X-Patchwork-Id: 322 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp1303424vsd; Sun, 28 Aug 2016 09:41:26 -0700 (PDT) X-Received: by 10.28.15.3 with SMTP id 3mr6701114wmp.31.1472402486316; Sun, 28 Aug 2016 09:41:26 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r8si28589612wjf.267.2016.08.28.09.41.25; Sun, 28 Aug 2016 09:41:26 -0700 (PDT) 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; 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; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E575689BB9; Sun, 28 Aug 2016 19:41:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw0-f193.google.com (mail-yw0-f193.google.com [209.85.161.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB817689BB9 for ; Sun, 28 Aug 2016 19:40:39 +0300 (EEST) Received: by mail-yw0-f193.google.com with SMTP id u134so5444024ywg.3 for ; Sun, 28 Aug 2016 09:40:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=7VPK3Sx4gY8/n/x9qgtDXSMdjG4u8fUBWHhB2WnoD0I=; b=rvLf2QlMOLyRUr3hqlcHfSA7vP1WLDQiZMKrXMNfM1YhOPfppfKyceo4gry5Cg+v4n yXLdx2MSgsINSgpfjtKgWZDing55N1rLti7IDii106uNzG+E/w3OJko/Ww8Ha1K4Ysss 5jnntJne3H1NooFgnQfbI6crgu4OtRc6TjCbhULt30E7h7wOjDv/ZzmiNn91x0sErTlJ 7LpmHR5Cq9yVfd0sOaqdThQkLQV9ZjEXquhLtaYYtFJBBUI8GZ0qmUh5adxnljzxrXgp uXOaR5AWvP9T/ntkEt/b+9Fb0hVEEs2/bP25/j7JI8Lkc93o/VggVXEKHR4KY8/s0jBO xT+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7VPK3Sx4gY8/n/x9qgtDXSMdjG4u8fUBWHhB2WnoD0I=; b=R4o+y400iS3FTvwz2yQgpQtY5oz1zdFNpIMj/SjcC7BFmLf+HMPSkr7HiccMGg6u6p 4pqSz/6BB4TbQXb0k4OVMd2QvGUNrxZU5a+HRpOHT94fOzEp3zU6LDDWqZJDbiZ51qII Nbu7vHsfnNkAGRu2FwC6etPgNjT4E7PVZ9iHWup1yx+Qo39lLyI7SavovJGaYM2uf/Be RhyQUH/zj/oHkgqN8KsWqmOdUi3zgqcYUkuMcReRszlBF5kn3pI2HOFVNol7CoFzkPoX Hep04nqfSRzeSa3OsTfJ4RufNNq4RnArPqcm77XK7voxRTzb93fBvugUR7gvaghOfFyz KLmA== X-Gm-Message-State: AE9vXwNIXgjwmRrQ/Ys/Q2+CQ/uXSMttnA5ueQg4vH6CECIExdH200Xn/4WJVIfoNWMI4Q== X-Received: by 10.13.255.134 with SMTP id p128mr11190584ywf.72.1472401520137; Sun, 28 Aug 2016 09:25:20 -0700 (PDT) Received: from glados.0x41.us (pool-71-184-142-86.bstnma.fios.verizon.net. [71.184.142.86]) by smtp.gmail.com with ESMTPSA id j189sm14790101ywc.32.2016.08.28.09.25.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Aug 2016 09:25:19 -0700 (PDT) From: Thomas Hebb To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Aug 2016 12:24:55 -0400 Message-Id: <56d1d7e4f0dafdc57958ae561b126afceed3a2de.1472400439.git.tommyhebb@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] avformat/mov: aax: pass proper AVClass to av_log() 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: Thomas Hebb MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" av_log() expects its first parameter to be a pointer to a struct whose first element is a pointer to an AVClass. In what I can only imagine is a typo, one call to av_log() in the AAX decryption code instead passes a pointer to an AVSHA struct, which doesn't even contain a pointer as its first element, much less a pointer to an AVClass. Change the call to pass the current MOVContext, as surrounding calls do. The incorrect AVClass was causing mpv to emit the warning "av_log callback called with bad parameters" when playing an .aax file. Signed-off-by: Thomas Hebb --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 6282d8f..f499906 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -997,7 +997,7 @@ static int mov_read_adrm(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_INFO, "[aax] file checksum == "); // required by external tools for (i = 0; i < 20; i++) - av_log(sha, AV_LOG_INFO, "%02x", file_checksum[i]); + av_log(c->fc, AV_LOG_INFO, "%02x", file_checksum[i]); av_log(c->fc, AV_LOG_INFO, "\n"); /* verify activation data */