From patchwork Fri Oct 14 11:56:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendrik Leppkes X-Patchwork-Id: 1000 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp167295vsd; Fri, 14 Oct 2016 05:15:10 -0700 (PDT) X-Received: by 10.28.23.204 with SMTP id 195mr5358953wmx.101.1476447310251; Fri, 14 Oct 2016 05:15:10 -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 m3si24742748wjg.271.2016.10.14.05.15.09; Fri, 14 Oct 2016 05:15:10 -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 919E9689ABC; Fri, 14 Oct 2016 15:15:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4981687EE6 for ; Fri, 14 Oct 2016 15:14:59 +0300 (EEST) Received: by mail-lf0-f65.google.com with SMTP id l131so15038075lfl.0 for ; Fri, 14 Oct 2016 05:15:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=KjIkWd5M7CxZYQKFUEz91tBr+17swCrC0WfrQibZEoc=; b=dw3o7UgW4x6mOBZlUt9VgoRNmDslwxpb/4AQ2jfzvCLMTgeqk5gc78PrNTw7pvnPHv 89QjOI5Bd6OKBzN8/1ygVZpwK42yOfo1PcTpsAOQv4bROGkFh2R3QlkZbPYhEX2c2oV9 mFOVFp6hC1w3eDlXR+PF0kdmOaZcx9l8lKn0DAeSJXVnxZC3EKAISgI2km06qO6I7wp2 l7mGsxJUoCvaE7iX2Kb1CKY1EzHSIcrINTPIOd+ccaNChMWdQx136I5BElquYslui84w 8qrltnJqctFjZBtTbsb6Ht7xhji/1uyhzKnCINOojoeq4hsdThtBttS694DRp1H9nhR9 UUcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=KjIkWd5M7CxZYQKFUEz91tBr+17swCrC0WfrQibZEoc=; b=jfbq/XAVVTIhYLf380QrYM1PRe0TdZlOIdE3MEDT1PBgD4yhcwPHQepncfmhEPR/x1 GCaXJ4k6goy+b8JWtAdg9g5Y9wZzdOcelOt/MkN1aamUkK5RZpC38WAnHK9sHDYXiIfJ hTmGm6IEtvHPETxEogPf2pn4EwJPVH11hdtlweG05IIVXkbSLHuE9TvIzxFG1KE4ENnf 7NCOszJwjcpEiqC2/ofMc58j/5OTBgpx9ZQkrHwwj9Z029KZKjsQaFt+/uubmPiyZr5D 3HStXWCKD/tB+i0G8fsJi9IHOhellK86WxpLsapB90EDBH+O47AxSNQtWv7+sIaQDBIK podA== X-Gm-Message-State: AA6/9RkW+ltWSRgMQRsjJEy3xo1h6jbdhxO+s7ru8PtW0pKlTtAXYh59RN6Gu4TTofznEA== X-Received: by 10.195.17.226 with SMTP id gh2mr1712247wjd.15.1476446199781; Fri, 14 Oct 2016 04:56:39 -0700 (PDT) Received: from localhost (p5DC18CA7.dip0.t-ipconnect.de. [93.193.140.167]) by smtp.gmail.com with ESMTPSA id au8sm31246931wjc.12.2016.10.14.04.56.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Oct 2016 04:56:38 -0700 (PDT) From: Hendrik Leppkes To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Oct 2016 13:56:34 +0200 Message-Id: <20161014115634.5008-1-h.leppkes@gmail.com> X-Mailer: git-send-email 2.10.1.windows.1 Subject: [FFmpeg-devel] [PATCH] mov: move stsd finalization to an appropriate place 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" mov_finalize_stsd_codec parses stream information from the ALAC extradata, so run it after the extradata processing is completed in mov_read_stsd. Fixes playback of 96kHz ALAC streams muxed by qaac or the reference alac encoder. --- libavformat/mov.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index a15c8d1..5ede1ed 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2288,7 +2288,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) if (pb->eof_reached) return AVERROR_EOF; - return mov_finalize_stsd_codec(c, pb, st, sc); + return 0; } static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom) @@ -2340,7 +2340,7 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom) memcpy(st->codecpar->extradata, sc->extradata[0], sc->extradata_size[0]); } - return 0; + return mov_finalize_stsd_codec(c, pb, st, sc); fail: av_freep(&sc->extradata); av_freep(&sc->extradata_size);