# HG changeset patch
# User diego
# Date 1160653894 0
# Node ID f7e99d20ef62df3f504fe7951eecdc6e6f476ed2
# Parent  38ccf93476a1430c48ceb758df12570a2343f3c8
Rename internal.h --> xvid_internal.h, it clashes with libavutil/internal.h.

diff -r 38ccf93476a1 -r f7e99d20ef62 internal.h
--- a/internal.h	Thu Oct 12 10:26:07 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +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 INTERNAL_H
-#define INTERNAL_H
-
-/**
- * @file internal.h
- * common functions for internal libavcodec use
- */
-
-
-int av_tempfile(char *prefix, char **filename);
-
-#endif /* INTERNAL_H */
diff -r 38ccf93476a1 -r f7e99d20ef62 xvid_internal.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xvid_internal.h	Thu Oct 12 11:51:34 2006 +0000
@@ -0,0 +1,32 @@
+/*
+ * 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 XVID_INTERNAL_H
+#define XVID_INTERNAL_H
+
+/**
+ * @file xvid_internal.h
+ * common functions for use with the XviD wrappers
+ */
+
+
+int av_tempfile(char *prefix, char **filename);
+
+#endif /* XVID_INTERNAL_H */
diff -r 38ccf93476a1 -r f7e99d20ef62 xvid_rc.c
--- a/xvid_rc.c	Thu Oct 12 10:26:07 2006 +0000
+++ b/xvid_rc.c	Thu Oct 12 11:51:34 2006 +0000
@@ -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 -r 38ccf93476a1 -r f7e99d20ef62 xvidff.c
--- a/xvidff.c	Thu Oct 12 10:26:07 2006 +0000
+++ b/xvidff.c	Thu Oct 12 11:51:34 2006 +0000
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include "common.h"
 #include "avcodec.h"
-#include "internal.h"
+#include "xvid_internal.h"
 
 /**
  * Buffer management macros.