diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-10-12 11:51:34 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-10-12 11:51:34 +0000 |
| commit | cb690cadaf25c6574e58cd05be2881780c3b5bbb (patch) | |
| tree | 47babd9441e645f4e9d5fa31705966b50090ebd5 | |
| parent | a5db5bda07fa3cec06024d1e18fcbcb855a37d37 (diff) | |
| download | ffmpeg-cb690cadaf25c6574e58cd05be2881780c3b5bbb.tar.gz | |
Rename internal.h --> xvid_internal.h, it clashes with libavutil/internal.h.
Originally committed as revision 6670 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/xvid_internal.h (renamed from libavcodec/internal.h) | 10 | ||||
| -rw-r--r-- | libavcodec/xvid_rc.c | 2 | ||||
| -rw-r--r-- | libavcodec/xvidff.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/internal.h b/libavcodec/xvid_internal.h index adeb11e05d..49c59c2055 100644 --- a/libavcodec/internal.h +++ b/libavcodec/xvid_internal.h @@ -18,15 +18,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef INTERNAL_H -#define INTERNAL_H +#ifndef XVID_INTERNAL_H +#define XVID_INTERNAL_H /** - * @file internal.h - * common functions for internal libavcodec use + * @file xvid_internal.h + * common functions for use with the XviD wrappers */ int av_tempfile(char *prefix, char **filename); -#endif /* INTERNAL_H */ +#endif /* XVID_INTERNAL_H */ diff --git a/libavcodec/xvid_rc.c b/libavcodec/xvid_rc.c index b1d1cffb1b..6a0029e6d8 100644 --- a/libavcodec/xvid_rc.c +++ b/libavcodec/xvid_rc.c @@ -23,7 +23,7 @@ #include <xvid.h> #include <unistd.h> #include "avcodec.h" -#include "internal.h" +#include "xvid_internal.h" //#include "dsputil.h" #include "mpegvideo.h" diff --git a/libavcodec/xvidff.c b/libavcodec/xvidff.c index 7341e52144..e48bfe558d 100644 --- a/libavcodec/xvidff.c +++ b/libavcodec/xvidff.c @@ -29,7 +29,7 @@ #include <unistd.h> #include "common.h" #include "avcodec.h" -#include "internal.h" +#include "xvid_internal.h" /** * Buffer management macros. |