From patchwork Fri Sep 29 15:08:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Rapp X-Patchwork-Id: 5340 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.61.197 with SMTP id n188csp881570jan; Fri, 29 Sep 2017 08:08:35 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBApfDxSJLeJFRy8qwPSnmD9TsvRnyUmasArNR4NYFfKbKvmVZEDEtl8cqcR6kfkYnRV6T4 X-Received: by 10.223.157.11 with SMTP id k11mr8616899wre.252.1506697714946; Fri, 29 Sep 2017 08:08:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506697714; cv=none; d=google.com; s=arc-20160816; b=BEDzEsw5nKfUS8/EtLR+wIgsyp35qefJSp6XPLFeNMiiMR2gO25Evde27Sb5Y1r9sX oiuioRVuILU2te66ObGKRR8MNhZ4coTBnbmPSR3QIgnM5zqd1sVqTIOTK4NZC+vdFN6z bAxV2PEfKf3GKn12ysekyWTJqKUQqy5aFzk1tJHlUCLDdjHfcRDEHLkRcnnBKG+E2nWF EhvUMahfX8VOUgc2bvSjPqd8GxMge+s0aBgNP2xp1h399U9u3usH64u2R2z/ouRyv/0g z4fHAQYwkFeGMhi5Rtla/8BsmxvxwS+6QIaj6MXwXcfY23FMdqSYZmfAZguEiE+ks5XG gFcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=SyB3GP6kn5Vi5eQXyhr8HimgHHgGObpiqzOVY8oOJCc=; b=sicnorukcwLUqjYC53BP1rQMObt7gkcm1BrIOeGgUlo6zyQGb9UHZLiG0uQkCZeiNV 4CCy40H2L5as0NE6Xew1yyDdOZ1IeVi5w7x94UkgjasXTTbczfvFAqm93lrWx2kdNtw6 XfGgnuhZqlzYyreWjkzbQTLmB56NejJh8SobjLWHyv3Iqz+lf0Ih8aPVGb0+T75EYgaF +WQuoBPnUXLsjayLjlwTX5uCQoCcukwb0ltC+PW1fLL7UZFefXuPPF0xDKdW8TLeOwi6 oRMHffOeVsKVgUekSvVm6yma4wGTuzN/pqbFGG39v/0kM706BgcXL9NNAUsLOjGscwng n1sw== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b25si3720409wrc.383.2017.09.29.08.08.34; Fri, 29 Sep 2017 08:08:34 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6F09168988E; Fri, 29 Sep 2017 18:08:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx01.mail.netstorage.at (mx01.mail.netstorage.at [89.207.144.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C24ED6809AC for ; Fri, 29 Sep 2017 18:08:14 +0300 (EEST) Received: from p1002.netstorage.at (p1002.netstorage.at [89.207.146.186]) by mx01.mail.netstorage.at (Postfix) with ESMTPS id C4FA7A067F for ; Fri, 29 Sep 2017 17:08:16 +0200 (CEST) Received: from mailix (noaport.de [46.237.252.213]) by p1002.netstorage.at (Postfix) with ESMTPA id 6E9F680BD8 for ; Fri, 29 Sep 2017 17:08:16 +0200 (CEST) Received: from frogstar-a.kuhnle.local (frogstar-a.kuhnle.local [192.168.0.26]) by mailix with ESMTPA ; Fri, 29 Sep 2017 17:08:16 +0200 From: Tobias Rapp To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Sep 2017 17:08:15 +0200 Message-Id: <1506697696-21235-1-git-send-email-t.rapp@noa-archive.com> X-Mailer: git-send-email 2.7.4 X-PPP-Message-ID: <20170929150816.17475.18418@p1002.netstorage.at> X-PPP-Vhost: noa-archive.com X-NetStorage-MailScanner-Information: Please contact the ISP for more information X-NetStorage-MailScanner-ID: C4FA7A067F.A92D5 X-NetStorage-MailScanner: Found to be clean X-NetStorage-MailScanner-SpamCheck: not spam (whitelisted), SpamAssassin (nicht zwischen gespeichert, Wertung=-0.5, benoetigt 6, autolearn=not spam, BAYES_00 -0.50) X-NetStorage-MailScanner-From: t.rapp@noa-archive.com X-Spam-Status: No Subject: [FFmpeg-devel] [PATCH 1/2] avformat/wavenc: replace literal numbers with enum constants 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" Signed-off-by: Tobias Rapp --- libavformat/wavenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c index 7f3059e..adb20cb 100644 --- a/libavformat/wavenc.c +++ b/libavformat/wavenc.c @@ -331,7 +331,7 @@ static int wav_write_header(AVFormatContext *s) ffio_fill(pb, 0, 28); } - if (wav->write_peak != 2) { + if (wav->write_peak != PEAK_ONLY) { /* format header */ fmt = ff_start_tag(pb, "fmt "); if (ff_put_wav_header(s, pb, s->streams[0]->codecpar, 0) < 0) { @@ -363,7 +363,7 @@ static int wav_write_header(AVFormatContext *s) wav->maxpts = wav->last_duration = 0; wav->minpts = INT64_MAX; - if (wav->write_peak != 2) { + if (wav->write_peak != PEAK_ONLY) { /* info header */ ff_riff_write_info(s); @@ -381,7 +381,7 @@ static int wav_write_packet(AVFormatContext *s, AVPacket *pkt) AVIOContext *pb = s->pb; WAVMuxContext *wav = s->priv_data; - if (wav->write_peak != 2) + if (wav->write_peak != PEAK_ONLY) avio_write(pb, pkt->data, pkt->size); if (wav->write_peak) { @@ -426,7 +426,7 @@ static int wav_write_trailer(AVFormatContext *s) avio_flush(pb); if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) { - if (wav->write_peak != 2 && avio_tell(pb) - wav->data < UINT32_MAX) { + if (wav->write_peak != PEAK_ONLY && avio_tell(pb) - wav->data < UINT32_MAX) { ff_end_tag(pb, wav->data); avio_flush(pb); }