diff options
author | Måns Rullgård <mans@mansr.com> | 2010-10-01 13:55:13 +0000 |
---|---|---|
committer | Måns Rullgård <mans@mansr.com> | 2010-10-01 13:55:13 +0000 |
commit | b64b4134d565e22fcdd50132456d8289690aaec8 (patch) | |
tree | bf83ac640a4aa993c42c7aa2db04cbf3582fad05 /libavutil/Makefile | |
parent | 8a47d90b2918c74a26bd313e8e70452bdc969a02 (diff) | |
download | ffmpeg-b64b4134d565e22fcdd50132456d8289690aaec8.tar.gz |
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
Diffstat (limited to 'libavutil/Makefile')
-rw-r--r-- | libavutil/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 \ |