summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-10-17 09:16:21 +0000
committerDiego Biurrun <diego@biurrun.de>2007-10-17 09:16:21 +0000
commit52703a6459d164f30f850f31333946393f1dd414 (patch)
tree4489c1af2aa5a35a68a3ba79dac9584679a6934d
parent7f3c02fc219428e47f5efeac687f37b8773b9204 (diff)
Use filename as multiple inclusion guard.
Originally committed as revision 10760 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/libxvid_internal.h6
-rw-r--r--libavformat/ogg2.h6
-rw-r--r--libavutil/avstring.h6
-rw-r--r--libpostproc/postprocess.h6
4 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/libxvid_internal.h b/libavcodec/libxvid_internal.h
index a86ee565f5..37df2080da 100644
--- a/libavcodec/libxvid_internal.h
+++ b/libavcodec/libxvid_internal.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef XVID_INTERNAL_H
-#define XVID_INTERNAL_H
+#ifndef LIBXVID_INTERNAL_H
+#define LIBXVID_INTERNAL_H
/**
* @file libxvid_internal.h
@@ -29,4 +29,4 @@
int av_tempfile(char *prefix, char **filename);
-#endif /* XVID_INTERNAL_H */
+#endif /* LIBXVID_INTERNAL_H */
diff --git a/libavformat/ogg2.h b/libavformat/ogg2.h
index 1230787825..55a4a75e3f 100644
--- a/libavformat/ogg2.h
+++ b/libavformat/ogg2.h
@@ -22,8 +22,8 @@
DEALINGS IN THE SOFTWARE.
**/
-#ifndef OGG_H
-#define OGG_H
+#ifndef OGG2_H
+#define OGG2_H
#include "avformat.h"
@@ -84,4 +84,4 @@ extern ogg_codec_t ogm_old_codec;
extern int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
-#endif
+#endif /* OGG2_H */
diff --git a/libavutil/avstring.h b/libavutil/avstring.h
index f25dd31d03..954174555c 100644
--- a/libavutil/avstring.h
+++ b/libavutil/avstring.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVUTIL_STRING_H
-#define AVUTIL_STRING_H
+#ifndef AVUTIL_AVSTRING_H
+#define AVUTIL_AVSTRING_H
#include <stddef.h>
@@ -87,4 +87,4 @@ size_t av_strlcat(char *dst, const char *src, size_t size);
*/
size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...);
-#endif /* AVUTIL_STRING_H */
+#endif /* AVUTIL_AVSTRING_H */
diff --git a/libpostproc/postprocess.h b/libpostproc/postprocess.h
index aa5714d047..ac4533b2c2 100644
--- a/libpostproc/postprocess.h
+++ b/libpostproc/postprocess.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef NEWPOSTPROCESS_H
-#define NEWPOSTPROCESS_H
+#ifndef POSTPROCESS_H
+#define POSTPROCESS_H
/**
* @file postprocess.h
@@ -75,4 +75,4 @@ void pp_free_context(pp_context_t *ppContext);
#define PP_PICT_TYPE_QP2 0x00000010 ///< MPEG2 style QScale
-#endif
+#endif /* POSTPROCESS_H */