From patchwork Sat Mar 6 12:07:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26215 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 3987C44A76B for ; Sat, 6 Mar 2021 14:07:53 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 08F5168A91A; Sat, 6 Mar 2021 14:07:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A14E68A64E for ; Sat, 6 Mar 2021 14:07:47 +0200 (EET) Received: by mail-ej1-f52.google.com with SMTP id w1so9202558ejf.11 for ; Sat, 06 Mar 2021 04:07:47 -0800 (PST) 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=afemZKNesYh0B0KZmp19ql9BG/77wszBD2YpEKsDy4U=; b=gXjyQLM1w0S2Iik8We9N4VS1YKZgUhMTU5VXnzXWFGAjocdaSjG+eLYcn3jpe+QYzT pS1jkPQd3L0Rg24skuVZeJgw82IROr7QAJdwRHoOCf2+TnYZFIX9TYE8nrXKkuz4REOb 7UgkepNVxC7FqWgUlw+56KGs+e5T3nLYPbODuTr5hwi1ggfdl7T0z0k3tsurpVIi0y9f D98TWSygAgVOw5el3geeUmPRBVHlXLdOVNj8QtTr7DY/JUX+pJq/irdn12iU7NhFkPc+ UNucOHR6MtTgmsqnJfgDHE1oibvM7ERZtHXfGnudEHJnZUdX1QKqLgHMfiz4DPo1MaQJ pEkg== 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=afemZKNesYh0B0KZmp19ql9BG/77wszBD2YpEKsDy4U=; b=i3rMgLEeSLMafQkYCMcbV0C9NG0zeeuhYcOyKkvJILN1JLcf/3kVOvcafOTE6VNggT d892WT2UNP6rW/oVd7/hVscarHrDuiGcluLGH48zG90uWc4GWNP6bvJfVDGlZ9ZahgZG 8Iv4sYKa95Y9fugGAeTe1ue0tIrwoB62XkYH4xBHnD8DLRHNYYw+eQmSyb6YouDSKJ+1 678k5SQO7dpZYqbi1nbTFSiQR94gS4XlKwyTly/jJqY/T3p1KWOogaHsKRhJodpsa3BN mOmEgShKW8PD5kCVFi0Yu72FzPP9k03IG+QW9YMoOWFfRIBqqdYsjwDOpHfoIvDYymqG Upkw== X-Gm-Message-State: AOAM531tcANhS7WNu7k9PR1dsYcy8at3J6o/NW+IYrskxOoU/QiwasUE 0k8ogeX88s6ldro9DHsx4GjmnBXQgT8= X-Google-Smtp-Source: ABdhPJwTx9m06n3UgSlvOAEpKmCMCkPsQECiP9jfn9Zdb2+v2pWoDZJ1VB6FFetcdmDyzP/dDlHviw== X-Received: by 2002:a17:907:7014:: with SMTP id wr20mr6783729ejb.179.1615032466365; Sat, 06 Mar 2021 04:07:46 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id lu5sm3197668ejb.97.2021.03.06.04.07.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 04:07:45 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Mar 2021 13:07:40 +0100 Message-Id: <20210306120740.681391-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libxvid: Remove unnecessary header 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" Forgotten in a1c6fc773f941fd6a6ef3f12f102a7902ae69453. Signed-off-by: Andreas Rheinhardt --- Will apply this soon. libavcodec/libxvid.c | 1 - libavcodec/libxvid.h | 36 ------------------------------------ libavcodec/mpegvideo_enc.c | 1 - 3 files changed, 38 deletions(-) delete mode 100644 libavcodec/libxvid.h diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 857077dc3b..dda8b94c4a 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -40,7 +40,6 @@ #include "avcodec.h" #include "internal.h" -#include "libxvid.h" #include "mpegutils.h" #include "packet_internal.h" diff --git a/libavcodec/libxvid.h b/libavcodec/libxvid.h deleted file mode 100644 index 58bef61660..0000000000 --- a/libavcodec/libxvid.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * copyright (C) 2006 Corey Hickey - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_LIBXVID_H -#define AVCODEC_LIBXVID_H - -/** - * @file - * common functions for use with the Xvid wrappers - */ - -struct MpegEncContext; - -/* rate control */ -int ff_xvid_rate_control_init(struct MpegEncContext *s); -void ff_xvid_rate_control_uninit(struct MpegEncContext *s); -float ff_xvid_rate_estimate_qscale(struct MpegEncContext *s, int dry_run); - -#endif /* AVCODEC_LIBXVID_H */ diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 34dcf8c313..5a5cff4570 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -67,7 +67,6 @@ #include "wmv2.h" #include "rv10.h" #include "packet_internal.h" -#include "libxvid.h" #include #include "sp5x.h"