From patchwork Thu Jun 20 00:09:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13638 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 69BE84494F2 for ; Thu, 20 Jun 2019 03:10:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C8FC68AB33; Thu, 20 Jun 2019 03:10:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 990A968A7BB for ; Thu, 20 Jun 2019 03:10:38 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id r16so1035362wrl.11 for ; Wed, 19 Jun 2019 17:10:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vwOsv5AyxT6oTQ5peTAIW5cqmFvV6KIa20suWXY9FC0=; b=GuJCqUZxO5bG0Udvm4uqOUHw0/RtLqqL7F7dCsesU3JXXL5kWCoLjEspNLevPuNJzX MfVzWcfpB9oZCvo5JEuFMekQmwLROS9a2oJSPyNZNbPKVDrlUji6l2FfHEpM6rJCkONl E/QAO38dYx9wkATgacNJQ83VX9zIdPWZhF4AjWvkNCo2Cd7sfpeZSzgvi6CyHUH9TTjO P/Mu/ihlilmxMhLc+8igXABld1Y5C1wzxYrl8ZTwIPynSN0W+tk3icw5ZnSaMpnWVg1A w4YfYaZ2vAH9YiyXRjemX631m9CnUR+8fCnGiVu+jCf0tWSt1Q8gjubcwb+YgV2aUMkc mXjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vwOsv5AyxT6oTQ5peTAIW5cqmFvV6KIa20suWXY9FC0=; b=G65i/cSRLqS4kBjVyyicSx7mCnAncXGwdx4Lym1U+oOdWnSt+9WOUASOdsulg3M0r7 EfavudbLUHVZV83EcxvY/MPQp94/Lwy/S/lNN44m36QwKIvvGkq7McbuzRi28I+CVz2Y oe0IolTWhA3i8r5136HbWpTmPB0uzZkn4AtfjZxXBvwZWF8XW5IbU/7oGq9BH4BKDA5f QPX9K+rx3sGXnWgCVp0qxaUiofaUqnKEF7AClSXTQC1YvbKSytMn7dqgJDj/xj8vyLQb DBuC0mwvjDuUQIlKvvz62rl4YzQnYUW7KfmyUx3ey4tm6J62DrTVMXLqs6xcx4KBihwV GG1Q== X-Gm-Message-State: APjAAAUVBUDhbmlgq9ZhmP4gQL5N+W/ZZy9fj9C8sLQZMhN2S88j6DY0 nq+aZfp2sfzbdkp40vPijX5tmb6B X-Google-Smtp-Source: APXvYqz+RRe71v3a+5nTKkoEQNun7l4r7RS4V6BU1di9vWMX1UkY6Vp/+BhyBjslQEqtPtzQ2WptvQ== X-Received: by 2002:a5d:4286:: with SMTP id k6mr27380470wrq.151.1560989438039; Wed, 19 Jun 2019 17:10:38 -0700 (PDT) Received: from localhost.localdomain (ipbcc063db.dynamic.kabel-deutschland.de. [188.192.99.219]) by smtp.gmail.com with ESMTPSA id 72sm15723957wrk.22.2019.06.19.17.10.37 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 19 Jun 2019 17:10:37 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jun 2019 02:09:27 +0200 Message-Id: <20190620000927.16521-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/flvenc: Use avpriv_mpeg4audio_sample_rates 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Up until now flvenc.c included aacenctab.h which included mpeg4audio_sample_rates (a clone of avpriv_mpeg4audio_sample_rates) as static const array. But given that avpriv_mpeg4audio_sample_rates is avpriv, it can be used instead. Signed-off-by: Andreas Rheinhardt --- libavformat/flvenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index e4863f1fc7..01873e5c5a 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -33,7 +33,7 @@ #include "metadata.h" #include "libavutil/opt.h" #include "libavcodec/put_bits.h" -#include "libavcodec/aacenctab.h" +#include "libavcodec/mpeg4audio.h" static const AVCodecTag flv_video_codec_ids[] = { @@ -514,7 +514,7 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par, i for (samplerate_index = 0; samplerate_index < 16; samplerate_index++) if (flv->audio_par->sample_rate - == mpeg4audio_sample_rates[samplerate_index]) + == avpriv_mpeg4audio_sample_rates[samplerate_index]) break; init_put_bits(&pbc, data, sizeof(data));