RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 08:12:44 +00:00
Code Issues Projects Releases Wiki Activity

Rename libavutil/assert.h to avassert.h

Browse Source 
This avoids conflicts with the system assert.h.

Originally committed as revision 25284 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2010-10-01 13:55:13 +00:00
parent 8a47d90b29
commit b64b4134d5
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg.c
View File

@ -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;

2
libavutil/Makefile
View File

@ -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 \

4
libavutil/assert.h → libavutil/avassert.h
View File

@ -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"

2
libavutil/rational.c
View File

@ -25,7 +25,7 @@
* @author Michael Niedermayer <michaelni@gmx.at>
*/
#include "assert.h"
#include "avassert.h"
//#include <math.h>
#include <limits.h>