[FFmpeg-cvslog] r25284 - in trunk: ffmpeg.c libavutil/Makefile libavutil/assert.h libavutil/avassert.h libavutil/rational.c

[mru]

Author: mru
Date: Fri Oct  1 15:55:13 2010
New Revision: 25284

Log:
Rename libavutil/assert.h to avassert.h

This avoids conflicts with the system assert.h.

Added:
   trunk/libavutil/avassert.h
      - copied, changed from r25283, trunk/libavutil/assert.h
Deleted:
   trunk/libavutil/assert.h
Modified:
   trunk/ffmpeg.c
   trunk/libavutil/Makefile
   trunk/libavutil/rational.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Fri Oct  1 14:00:29 2010	(r25283)
+++ trunk/ffmpeg.c	Fri Oct  1 15:55:13 2010	(r25284)
@@ -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;

Modified: trunk/libavutil/Makefile
==============================================================================
--- trunk/libavutil/Makefile	Fri Oct  1 14:00:29 2010	(r25283)
+++ trunk/libavutil/Makefile	Fri Oct  1 15:55:13 2010	(r25284)
@@ -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                                                      \

Copied and modified: trunk/libavutil/avassert.h (from r25283, trunk/libavutil/assert.h)
==============================================================================
--- trunk/libavutil/assert.h	Fri Oct  1 14:00:29 2010	(r25283, copy source)
+++ trunk/libavutil/avassert.h	Fri Oct  1 15:55:13 2010	(r25284)
@@ -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"

Modified: trunk/libavutil/rational.c
==============================================================================
--- trunk/libavutil/rational.c	Fri Oct  1 14:00:29 2010	(r25283)
+++ trunk/libavutil/rational.c	Fri Oct  1 15:55:13 2010	(r25284)
@@ -25,7 +25,7 @@
  * @author Michael Niedermayer <michaelni at gmx.at>
  */
 
-#include "assert.h"
+#include "avassert.h"
 //#include <math.h>
 #include <limits.h>