From patchwork Sat Dec 24 18:19:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: foo86 X-Patchwork-Id: 1924 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp429644vsb; Sat, 24 Dec 2016 12:17:52 -0800 (PST) X-Received: by 10.28.216.65 with SMTP id p62mr19429484wmg.92.1482610672182; Sat, 24 Dec 2016 12:17:52 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 203si36677112wms.92.2016.12.24.12.17.51; Sat, 24 Dec 2016 12:17:52 -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; 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 F1194689B24; Sat, 24 Dec 2016 22:17:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A925B68921B for ; Sat, 24 Dec 2016 20:26:18 +0200 (EET) Received: by mail-lf0-f66.google.com with SMTP id x140so8066153lfa.2 for ; Sat, 24 Dec 2016 10:26:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=v5lWVs08TFc5Ynj/pd59Vf9j3Fvs33ik1f/I847QzF4=; b=EAhhNTECJRv4i8hVdmpQbn3ssphmKmVJvgc2u7UFmTE67SBopPmojzmQwbKZvQkfsP QRPsKHMSp//s7hjEl1lso2BqJ6PzAJZ+sHqBwVzo6g2SHWykwLwI7e8zrcDK0eO527hq aeBeS8RelwRRv9+0n3GRKzLwjrCwbn5NnwjgMXUBBZeEkNbxrmHxzDdpcaiNSiYJY6k+ Z4DZnP2CQH0P/zQioRAUtgRFtR+ezUcHC7G4l+lVRPBDoO91dGbjtRxGpFXtozmv0tl6 I/Q3t2N/tvcYpwQQrOtBqL9eKpit/m+cYnaq/2vQn6JdhADdZVdL250dP4PO+OQHo3Tt yHHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=v5lWVs08TFc5Ynj/pd59Vf9j3Fvs33ik1f/I847QzF4=; b=Fci7jVnQH8sMElYhSeUYygNCRcs4oa2nOtskigJjykq+PCn0Q0t5EolpFdk+qWGkQF mpLrMeg+LTOAeTCWOvx13sHjCxZIMGKz/+2kzKgXQgr9My0WW8uKO8kBb/Aw8+a/Ir0p rRMflok/QOQ31szv0hWYc7lren2JkTR18RqQo+TEeg+vY9lNQY4dGKRo28gMwgWCUEzW U20Ht3lIXoJ66dUj/thPATqZP7CVQRS2cE2Ne1S+ft1qhDQH1atrhXh4rL/0f3FeAf5W SP4Bo0B7iYokErN1S9IsCHxSJMe5ldqiRlX83uzKbK5XX9kW4XiKvXxZRqIAS3Ah9Wfp LJvg== X-Gm-Message-State: AIkVDXLxl/0ZNXlXiI1zp7mrzpCdopEwVLgCovclH8Tc2ILnr2r6lndSfsdntFFikKlGLg== X-Received: by 10.25.72.215 with SMTP id v206mr7591290lfa.12.1482603579295; Sat, 24 Dec 2016 10:19:39 -0800 (PST) Received: from foohost.foodomain ([2001:470:28:661::4]) by smtp.gmail.com with ESMTPSA id x4sm9244483lff.15.2016.12.24.10.19.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Dec 2016 10:19:38 -0800 (PST) From: foo86 To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Dec 2016 21:19:17 +0300 Message-Id: <20161224181917.20315-1-foobaz86@gmail.com> X-Mailer: git-send-email 2.11.0 X-Mailman-Approved-At: Sat, 24 Dec 2016 22:17:45 +0200 Subject: [FFmpeg-devel] [PATCH] avcodec/dca: set initial sample_fmt to FLTP 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" Fixes regression introduced in 39f7620d76c7a133535ed7a535f7a74fefa6e435. Not setting default sample_fmt can result in failed transcode when audio stream starts later in a file. Set initial sample_fmt to FLTP, which is the "baseline" format decoder produces. Fixes ticket #5998. --- libavcodec/dcadec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 4146a85ec5..f772406691 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -362,6 +362,8 @@ static av_cold int dcadec_init(AVCodecContext *avctx) break; } + avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; + return 0; }