diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-05-09 17:20:36 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-05-09 18:18:05 +0200 |
| commit | c8b4a3999bc7f3732a537cdec6475918a65d6e78 (patch) | |
| tree | 55cbf8a9892aea3d43b76c5c4aacb26203f976e1 | |
| parent | 5b432d66ce49cbadcac832bffd6e22fda83807d3 (diff) | |
| download | ffmpeg-c8b4a3999bc7f3732a537cdec6475918a65d6e78.tar.gz | |
libxvid: Give more suitable names to libxvid-related files.
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/libxvid.c (renamed from libavcodec/libxvidff.c) | 2 | ||||
| -rw-r--r-- | libavcodec/libxvid.h (renamed from libavcodec/libxvid_internal.h) | 6 | ||||
| -rw-r--r-- | libavcodec/libxvid_rc.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c542f6e20b..da8aa8ac20 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -616,7 +616,7 @@ OBJS-$(CONFIG_LIBVPX_DECODER) += libvpxdec.o OBJS-$(CONFIG_LIBVPX_ENCODER) += libvpxenc.o OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o -OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvidff.o +OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o # parsers OBJS-$(CONFIG_AAC_PARSER) += aac_parser.o aac_ac3_parser.o \ diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvid.c index e95bb7d3b9..3d63beaffd 100644 --- a/libavcodec/libxvidff.c +++ b/libavcodec/libxvid.c @@ -31,7 +31,7 @@ #include "libavutil/cpu.h" #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" -#include "libxvid_internal.h" +#include "libxvid.h" #include "mpegvideo.h" /** diff --git a/libavcodec/libxvid_internal.h b/libavcodec/libxvid.h index a2dc6ef50c..413d3537f2 100644 --- a/libavcodec/libxvid_internal.h +++ b/libavcodec/libxvid.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_LIBXVID_INTERNAL_H -#define AVCODEC_LIBXVID_INTERNAL_H +#ifndef AVCODEC_LIBXVID_H +#define AVCODEC_LIBXVID_H /** * @file @@ -29,4 +29,4 @@ int ff_tempfile(const char *prefix, char **filename); -#endif /* AVCODEC_LIBXVID_INTERNAL_H */ +#endif /* AVCODEC_LIBXVID_H */ diff --git a/libavcodec/libxvid_rc.c b/libavcodec/libxvid_rc.c index 959edd49b4..bf9f6f0738 100644 --- a/libavcodec/libxvid_rc.c +++ b/libavcodec/libxvid_rc.c @@ -28,7 +28,7 @@ #endif #include "avcodec.h" -#include "libxvid_internal.h" +#include "libxvid.h" //#include "dsputil.h" #include "mpegvideo.h" |