[SCM] libav/experimental: Rename libavutil/assert.h to avassert.h

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit b64b4134d565e22fcdd50132456d8289690aaec8
Author: Måns Rullgård <mans at mansr.com>
Date:   Fri Oct 1 13:55:13 2010 +0000

    Rename libavutil/assert.h to avassert.h
    
    This avoids conflicts with the system assert.h.
    
    Originally committed as revision 25284 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index b9ae4ca..88ef798 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -79,7 +79,7 @@
 
 #include "cmdutils.h"
 
-#include "libavutil/assert.h"
+#include "libavutil/avassert.h"
 
 const char program_name[] = "FFmpeg";
 const int program_birth_year = 2000;
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 3f13092..b0d0de8 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -3,8 +3,8 @@ include $(SUBDIR)../config.mak
 NAME = avutil
 
 HEADERS = adler32.h                                                     \
-          assert.h                                                      \
           attributes.h                                                  \
+          avassert.h                                                    \
           avstring.h                                                    \
           avutil.h                                                      \
           base64.h                                                      \
diff --git a/libavutil/assert.h b/libavutil/avassert.h
similarity index 97%
rename from libavutil/assert.h
rename to libavutil/avassert.h
index cf76912..fe307fa 100644
--- a/libavutil/assert.h
+++ b/libavutil/avassert.h
@@ -24,8 +24,8 @@
  * @author Michael Niedermayer <michaelni at gmx.at>
  */
 
-#ifndef AVUTIL_ASSERT_H
-#define AVUTIL_ASSERT_H
+#ifndef AVUTIL_AVASSERT_H
+#define AVUTIL_AVASSERT_H
 
 #include "avutil.h"
 #include "log.h"
diff --git a/libavutil/rational.c b/libavutil/rational.c
index 4e3c50b..0e0571e 100644
--- a/libavutil/rational.c
+++ b/libavutil/rational.c
@@ -25,7 +25,7 @@
  * @author Michael Niedermayer <michaelni at gmx.at>
  */
 
-#include "assert.h"
+#include "avassert.h"
 //#include <math.h>
 #include <limits.h>
 

-- 
Libav/FFmpeg packaging