aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-03-08 21:28:58 +0000
committerMåns Rullgård <mans@mansr.com>2010-03-08 21:28:58 +0000
commit2acb5e10b9a3145192b3624896672073faa24385 (patch)
treef2e32765493614eb79ca9d0c431fdaf54142223d /libavutil
parent2791730dbf99f3bbade1eb9eabb49424ce75c0c5 (diff)
downloadffmpeg-2acb5e10b9a3145192b3624896672073faa24385.tar.gz
Merge two adjacent ifdef blocks
Originally committed as revision 22347 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/common.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/libavutil/common.h b/libavutil/common.h
index 0ba6911f5f..010fe4cbc3 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -38,9 +38,6 @@
#ifdef HAVE_AV_CONFIG_H
#include "config.h"
-#endif
-
-#ifdef HAVE_AV_CONFIG_H
# include "intmath.h"
#endif