aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-10-01 13:55:13 +0000
committerMåns Rullgård <mans@mansr.com>2010-10-01 13:55:13 +0000
commitb64b4134d565e22fcdd50132456d8289690aaec8 (patch)
treebf83ac640a4aa993c42c7aa2db04cbf3582fad05 /ffmpeg.c
parent8a47d90b2918c74a26bd313e8e70452bdc969a02 (diff)
downloadffmpeg-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 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index b9ae4cae0c..88ef7985a3 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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;