diff options
| -rw-r--r-- | ffmpeg.c | 2 | ||||
| -rw-r--r-- | libavutil/Makefile | 2 | ||||
| -rw-r--r-- | libavutil/avassert.h (renamed from libavutil/assert.h) | 4 | ||||
| -rw-r--r-- | libavutil/rational.c | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -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 3f13092c3c..b0d0de88a7 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 index cf76912564..fe307fa894 100644 --- a/libavutil/assert.h +++ b/libavutil/avassert.h @@ -24,8 +24,8 @@ * @author Michael Niedermayer <michaelni@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 4e3c50be81..0e0571e136 100644 --- a/libavutil/rational.c +++ b/libavutil/rational.c @@ -25,7 +25,7 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#include "assert.h" +#include "avassert.h" //#include <math.h> #include <limits.h> |