From patchwork Tue Jul 2 12:19:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Alfred E. Heggestad" X-Patchwork-Id: 13799 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D27E1449AE9 for ; Tue, 2 Jul 2019 15:26:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ADC3368A1D8; Tue, 2 Jul 2019 15:26:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B990689A7A for ; Tue, 2 Jul 2019 15:26:18 +0300 (EEST) Received: by mail-ed1-f65.google.com with SMTP id k21so8552253edq.3 for ; Tue, 02 Jul 2019 05:26:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=CvrK8nqPn3LiSZfr0qK47HD99ZCgXDLCz4Ou/GvBCs8=; b=OfCrZOb7MRJz8yEDiHMK2V/s04yOtgj6xF8FS2GtCDCMzocyy4njZM2LbtiqiKnMZt zkm+k3gjE/CEqNqU/aWFPznq5LU6qT+bG/6vUfqPp19oI8Vh5eAREYUbIjlFTq3yUD5k aUn2zKBMYIdyEMAUYhC9phnLYY0tVXcPcyH8pkrTzhkm+zlYG8PwCAUOa7KJPWBVKEl2 +9Oiuu8NEwl1SKkms7WONsK5sKIp1Px/F6oG93ZKv0J8xmpUWPyQY7wpPiI3pbHOgCy0 m3aSLsQHGTKhQFhvDCkyke9Z3Xy5/6EJJ250s41uKMCi/hpHY3tAqt5XPlpK68tZeKRU hNbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=CvrK8nqPn3LiSZfr0qK47HD99ZCgXDLCz4Ou/GvBCs8=; b=r1GtnCzoiROyV5CMLp3P/xM/5pDBo3S8gKyjtzyHfUzTBkV93yD0QTZ0zHmw5DjRrb t3h/zASB8fysE9fOwRm2QanHzBTBt/FfJbc+PyUP6MdWzhjMoefsPVp1jy5XswzrfKn6 87XvOWLV18jRA49Ur/d45qVO0L/3TDVZ+bJ+jl/uQgdxOhk8vgtlUaeryWPFrFxJeDPI ADLlj+a3ScNLqG93L5bdxpz2TSmoPCsK8Dtj19179KMrTgHTDtn29F9pYNAojlhspOnn y9Pi8oo6Z4fxt8rMTBpO53EYvpU/zk8WGoeiwrsvD4rji0sGhovzrcckCNYjetkufHCw FNuw== X-Gm-Message-State: APjAAAX8OEak/TrZP9BEXuYV8dEJOZh5ysMdBWGCfmgyuoAwhTygYkSK 2p7y9bIF88l/5xb9sqvJszYAZYyR X-Google-Smtp-Source: APXvYqwFRM64c0VUNIOHjS0moEjHPI6Fg0/s8mruTqtw/nbp/eAAAthdo6ZDTRuhbiLUQ7TRC3ll7A== X-Received: by 2002:a50:d2d3:: with SMTP id q19mr35365488edg.64.1562069981276; Tue, 02 Jul 2019 05:19:41 -0700 (PDT) Received: from Alfreds-MacBook-Pro.local (d126-gw.mnsbone.net. [109.205.9.123]) by smtp.gmail.com with ESMTPSA id u10sm2786092ejr.20.2019.07.02.05.19.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2019 05:19:40 -0700 (PDT) To: FFmpeg development discussions and patches From: "Alfred E. Heggestad" Message-ID: <1e00eb0b-18ae-94c3-afbf-99d0d78ef8a0@gmail.com> Date: Tue, 2 Jul 2019 14:19:37 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] movenc: fix warning if CONFIG_AC3_PARSER not defined 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" this patch fixes a compiler warning if CONFIG_AC3_PARSER is not defined. The label 'end' is removed and all the code use the label 'err' instead. --- libavformat/movenc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) } else { @@ -5533,7 +5533,6 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) ff_mov_add_hinted_packet(s, pkt, trk->hint_track, trk->entry, reformatted_data, size); -end: err: av_free(reformatted_data); diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 46d314ff17..f1a226313e 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -5379,7 +5379,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) if (size < 0) return size; else if (!size) - goto end; + goto err; avio_write(pb, pkt->data, size); #endif