@@ -40,7 +40,6 @@
#include "avcodec.h"
#include "internal.h"
-#include "libxvid.h"
#include "mpegutils.h"
#include "packet_internal.h"
deleted file mode 100644
@@ -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 */
@@ -67,7 +67,6 @@
#include "wmv2.h"
#include "rv10.h"
#include "packet_internal.h"
-#include "libxvid.h"
#include <limits.h>
#include "sp5x.h"
Forgotten in a1c6fc773f941fd6a6ef3f12f102a7902ae69453. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- 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