From patchwork Fri Dec 16 00:44:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Harris X-Patchwork-Id: 1817 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1057351vsa; Thu, 15 Dec 2016 16:45:39 -0800 (PST) X-Received: by 10.28.188.87 with SMTP id m84mr283217wmf.14.1481849139231; Thu, 15 Dec 2016 16:45:39 -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 kw6si4541323wjb.292.2016.12.15.16.45.38; Thu, 15 Dec 2016 16:45:39 -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 A777868798D; Fri, 16 Dec 2016 02:45:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E2956808CE for ; Fri, 16 Dec 2016 02:45:24 +0200 (EET) Received: by mail-pg0-f66.google.com with SMTP id p66so7761149pga.2 for ; Thu, 15 Dec 2016 16:45:30 -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; bh=zFQu8lm+BSAPjfBBgXjPhujvugc0jtH1wKFQlK7T/r4=; b=dDOgnxK6XX+X6x3jn3B2YQNfAbRx9j6lpU1MeFYAHS20vLjBtKUW0AMs4pDbVxCXbK 8nkddkF4WicTeGwYvQ1zzSDt2xvFpkylau5aKlVDMKRX2FFFJ6LnIqEnkBQnLdXK5+0i MxElkVnizTmwE3EG66DstyQ1eMSExn+epfGVn7vFxC8Cj/1n2Qly/frsEDXNmDY5PPOb hpeQvDlV6utjzuiOvtaojmcDcvYV96f3Z22vPl+t53ukawa2UyNvob/9PwAWvYtXAbtO KmGDe8d+CSHWv6uodJq6sw6HnjBVXgvPLXvgZwCz2rqtAI9oL0Dtm9olmgtsW+bkMtnW sLag== 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; bh=zFQu8lm+BSAPjfBBgXjPhujvugc0jtH1wKFQlK7T/r4=; b=gcGua/BjSr81T3jC8M2vImTVedCvo0FqHraFA49q5dP32r5L3H5wUD79bS1meVk0aK ZPP4/K5EV0ptXdzGzXi4rFBRTEFFU074pqeoIFsbqTQXVXCeg8RSsaVQr6eRAy9rLBRf yacyJ/FqNmmcGm9gQrOaue00/f1pLJJjL+slm96Exne/KQHbT52I2dW5UVdpowZ0TYvP RqovMdfmF+YzdiX4GBF9sCcD69xk+OZ0doLhszcmQU8OnM/pJfRclIpHcGG0GWEUYzAr RcSbeaV5YYf4t5pUxEPn0jq4Me/wZj8un8UMRJGMiXA083nOEg9QrJ0Danpl/EEj0jRh Ln6A== X-Gm-Message-State: AKaTC00QvDnI+DylZsD2y4BqF8Wvm+Ft6BB8SNZQKwViSIzeCxq4MaGZGCC8lr4oj/mW3w== X-Received: by 10.84.167.168 with SMTP id d37mr650900plb.71.1481849129281; Thu, 15 Dec 2016 16:45:29 -0800 (PST) Received: from kira.gmail.com (c-50-136-173-19.hsd1.ca.comcast.net. [50.136.173.19]) by smtp.gmail.com with ESMTPSA id l69sm7052350pfk.34.2016.12.15.16.45.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2016 16:45:28 -0800 (PST) From: Mark Harris To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Dec 2016 16:44:57 -0800 Message-Id: <20161216004457.95321-1-mark.hsj@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] avformat/wavdec: Eliminate goto for clang -O0 DCE 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: Mark Harris MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Clang is not able to eliminate the reference to ff_spdif_probe() when there is a goto target in the same block and optimization is disabled. This fixes the following build failure on OS X: ./configure --disable-everything --disable-doc \ --enable-decoder=pcm_s16le --enable-demuxer=wav \ --enable-protocol=file --disable-optimizations --cc=clang make ... Undefined symbols for architecture x86_64: "_ff_spdif_probe", referenced from: _set_spdif in libavformat.a(wavdec.o) ld: symbol(s) not found for architecture x86_64 --- libavformat/wavdec.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 7176cd6f2d..ae42a6167f 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -64,34 +64,30 @@ static void set_spdif(AVFormatContext *s, WAVDemuxContext *wav) { if (CONFIG_SPDIF_DEMUXER && s->streams[0]->codecpar->codec_tag == 1) { enum AVCodecID codec; - uint8_t *buf = NULL; int len = 1<<16; int ret = ffio_ensure_seekback(s->pb, len); - int64_t pos = avio_tell(s->pb); - if (ret < 0) - goto end; - - buf = av_malloc(len); - if (!buf) { - ret = AVERROR(ENOMEM); - goto end; + if (ret >= 0) { + uint8_t *buf = av_malloc(len); + if (!buf) { + ret = AVERROR(ENOMEM); + } else { + int64_t pos = avio_tell(s->pb); + len = ret = avio_read(s->pb, buf, len); + if (len >= 0) { + ret = ff_spdif_probe(buf, len, &codec); + if (ret > AVPROBE_SCORE_EXTENSION) { + s->streams[0]->codecpar->codec_id = codec; + wav->spdif = 1; + } + } + avio_seek(s->pb, pos, SEEK_SET); + av_free(buf); + } } - len = ret = avio_read(s->pb, buf, len); - if (ret < 0) - goto end; - - ret = ff_spdif_probe(buf, len, &codec); - if (ret > AVPROBE_SCORE_EXTENSION) { - s->streams[0]->codecpar->codec_id = codec; - wav->spdif = 1; - } -end: - avio_seek(s->pb, pos, SEEK_SET); if (ret < 0) av_log(s, AV_LOG_WARNING, "Cannot check for SPDIF\n"); - av_free(buf); } }