[SCM] libav/experimental: Rename internal.h --> xvid_internal.h, it clashes with libavutil/internal.h.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit cb690cadaf25c6574e58cd05be2881780c3b5bbb
Author: Diego Biurrun <diego at biurrun.de>
Date:   Thu Oct 12 11:51:34 2006 +0000

    Rename internal.h --> xvid_internal.h, it clashes with libavutil/internal.h.
    
    Originally committed as revision 6670 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/internal.h b/libavcodec/xvid_internal.h
similarity index 84%
rename from libavcodec/internal.h
rename to libavcodec/xvid_internal.h
index adeb11e..49c59c2 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 b1d1cff..6a0029e 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 7341e52..e48bfe5 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.

-- 
Libav/FFmpeg packaging