Commit b64b4134 authored by Måns Rullgård's avatar Måns Rullgård

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
parent 8a47d90b
......@@ -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;
......
......@@ -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 \
......
......@@ -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"
......
......@@ -25,7 +25,7 @@
* @author Michael Niedermayer <michaelni@gmx.at>
*/
#include "assert.h"
#include "avassert.h"
//#include <math.h>
#include <limits.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment