[Ffmpeg-cvslog] r6670 - in trunk/libavcodec: internal.h xvid_internal.h xvid_rc.c xvidff.c

[diego]

Author: diego
Date: Thu Oct 12 13:51:34 2006
New Revision: 6670

Added:
   trunk/libavcodec/xvid_internal.h
      - copied, changed from r6668, /trunk/libavcodec/internal.h
Removed:
   trunk/libavcodec/internal.h
Modified:
   trunk/libavcodec/xvid_rc.c
   trunk/libavcodec/xvidff.c

Log:
Rename internal.h --> xvid_internal.h, it clashes with libavutil/internal.h.


Copied: trunk/libavcodec/xvid_internal.h (from r6668, /trunk/libavcodec/internal.h)
==============================================================================
--- /trunk/libavcodec/internal.h	(original)
+++ trunk/libavcodec/xvid_internal.h	Thu Oct 12 13:51:34 2006
@@ -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 */

Modified: trunk/libavcodec/xvid_rc.c
==============================================================================
--- trunk/libavcodec/xvid_rc.c	(original)
+++ trunk/libavcodec/xvid_rc.c	Thu Oct 12 13:51:34 2006
@@ -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"
 

Modified: trunk/libavcodec/xvidff.c
==============================================================================
--- trunk/libavcodec/xvidff.c	(original)
+++ trunk/libavcodec/xvidff.c	Thu Oct 12 13:51:34 2006
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include "common.h"
 #include "avcodec.h"
-#include "internal.h"
+#include "xvid_internal.h"
 
 /**
  * Buffer management macros.