From patchwork Mon Dec 3 00:17:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 11255 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 A218744C632 for ; Mon, 3 Dec 2018 02:17:43 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4772F68A376; Mon, 3 Dec 2018 02:17:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f169.google.com (mail-it1-f169.google.com [209.85.166.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ADBEA689EFD for ; Mon, 3 Dec 2018 02:17:37 +0200 (EET) Received: by mail-it1-f169.google.com with SMTP id m8so6968122itk.0 for ; Sun, 02 Dec 2018 16:17:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=lZjumfilEEmjZ0AjOhVP8YmC/QZOYsuP7IpFkXR8U8Y=; b=hJSaCNomK0bOByFJwkMGPLwcsK/XCRTd1IRedjTfGOngwf/+afssVaqGawMlY4NDJX XcGaax982Gf3DkrE7Ak1U1izVPRQIvLLxYSGQxXk3THV6sEPfY0ptxqCWNbCJOCxa2QR j8pWXem+pp993ElFfZtbxpOTHGPdnjQFIKrj0ROCt6EUhT8woi4YZ2O9rZvRQm2Rs1yO v/KCgo9Sxtub6QYiKtvzR7JZZazNwAhv1zjmw+minIIO8maD7aCWPrBGUupVyb2SHqnw lbEak/L6drcYnXq4DfYb3s8zLJga1tD2SAIkeZ4PMOpfwEofMxicDUuSF8EYR/AjBWDY nGTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=lZjumfilEEmjZ0AjOhVP8YmC/QZOYsuP7IpFkXR8U8Y=; b=eki+Q55WFOuPDUF/TloIS1y8isP9Ueqv7JV5bg4+zmOtRAbD4s2YU5biHesVn7G92O cLVGo+RaCj0jrYVtqiIvIBDC4wGqkDdabti93eOX6IYIZbZPYjo2pUiNO7INHmI70LIi jprRML/xyMeG3yuDMa6LQFaTpN0K9KRGwPvBHIWdy+0p9aEx/rNEbm6P+aQlsbMiy3cU dPu2zrABID/EYTWfQ0970t6R/Pfq5/DkHZnypuL+C8Srtwq1N1MsYS7iuT+4k/urKWGF AilPs7dJvED12V6YdkmeQJXUpw6NsTPum0jtMYO4H8r1zFYMNSXPB3KZ/AVMVt9l1O5S Ap8w== X-Gm-Message-State: AA+aEWaeUk+n+kCnV+2rG2dfW3OpzgBeoS/0c+BacoKojjRWkIqLepJl mhrK5ebo0Gr8mRuY8YXRWqxjVJaf2mO+vw4YaeHi2w== X-Google-Smtp-Source: AFSGD/Ug8E+2f1QIX2YBZ8NSQqXsCLhg34NuGH8PcJ2fus6Tw7LhfU3/8aWFCTEhDcZau/rzmVLyLMKTvfAh6byowQ0= X-Received: by 2002:a24:130a:: with SMTP id 10mr6207274itz.58.1543796262841; Sun, 02 Dec 2018 16:17:42 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a02:5f11:0:0:0:0:0 with HTTP; Sun, 2 Dec 2018 16:17:42 -0800 (PST) From: Carl Eugen Hoyos Date: Mon, 3 Dec 2018 01:17:42 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]tests/api-flac-test: Rename NUMBER_OF_FRAMES as NUMBER_OF_AUDIO_FRAMES 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" Hi! Both aix and sunos define NUMBER_OF_FRAMES in a system header (as _NUMBER_OF_FRAMES), attached patch fixes a warning when running fate. Please comment, Carl Eugen From 7360f2e9721b88bb58e55f05911b16222c249e59 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 3 Dec 2018 01:14:24 +0100 Subject: [PATCH] tests/api-flac-test: Rename NUMBER_OF_FRAMES as NUMBER_OF_AUDIO_FRAMES. Both sunos and aix define NUMBER_OF_FRAMES in a system header, causing redefinition warnings. --- tests/api/api-flac-test.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/api/api-flac-test.c b/tests/api/api-flac-test.c index 2e90812..e8e8cbf 100644 --- a/tests/api/api-flac-test.c +++ b/tests/api/api-flac-test.c @@ -31,7 +31,7 @@ #include "libavutil/common.h" #include "libavutil/samplefmt.h" -#define NUMBER_OF_FRAMES 200 +#define NUMBER_OF_AUDIO_FRAMES 200 #define NAME_BUFF_SIZE 100 /* generate i-th frame of test audio */ @@ -137,19 +137,19 @@ static int run_test(AVCodec *enc, AVCodec *dec, AVCodecContext *enc_ctx, return AVERROR(ENOMEM); } - raw_in = av_malloc(in_frame->linesize[0] * NUMBER_OF_FRAMES); + raw_in = av_malloc(in_frame->linesize[0] * NUMBER_OF_AUDIO_FRAMES); if (!raw_in) { av_log(NULL, AV_LOG_ERROR, "Can't allocate memory for raw_in\n"); return AVERROR(ENOMEM); } - raw_out = av_malloc(in_frame->linesize[0] * NUMBER_OF_FRAMES); + raw_out = av_malloc(in_frame->linesize[0] * NUMBER_OF_AUDIO_FRAMES); if (!raw_out) { av_log(NULL, AV_LOG_ERROR, "Can't allocate memory for raw_out\n"); return AVERROR(ENOMEM); } - for (i = 0; i < NUMBER_OF_FRAMES; i++) { + for (i = 0; i < NUMBER_OF_AUDIO_FRAMES; i++) { av_init_packet(&enc_pkt); enc_pkt.data = NULL; enc_pkt.size = 0; @@ -209,7 +209,7 @@ static int run_test(AVCodec *enc, AVCodec *dec, AVCodecContext *enc_ctx, av_packet_unref(&enc_pkt); } - if (memcmp(raw_in, raw_out, out_frame_bytes * NUMBER_OF_FRAMES) != 0) { + if (memcmp(raw_in, raw_out, out_frame_bytes * NUMBER_OF_AUDIO_FRAMES) != 0) { av_log(NULL, AV_LOG_ERROR, "Output differs\n"); return 1; } -- 1.7.10.4