aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2021-03-06 13:05:42 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2021-03-06 13:05:42 +0100
commit2570663966482152f383bf3ad85a9db9f87197c0 (patch)
tree95a7c7907058250d334cfe685ef3cc931923bdf0
parent17127f81c5b9962293af01b73a6b0c27fffb080f (diff)
downloadffmpeg-2570663966482152f383bf3ad85a9db9f87197c0.tar.gz
avcodec/libxvid: Remove unnecessary header
Forgotten in a1c6fc773f941fd6a6ef3f12f102a7902ae69453. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-rw-r--r--libavcodec/libxvid.c1
-rw-r--r--libavcodec/libxvid.h36
-rw-r--r--libavcodec/mpegvideo_enc.c1
3 files changed, 0 insertions, 38 deletions
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 <limits.h>
#include "sp5x.h"