Merge two adjacent ifdef blocks

Originally committed as revision 22347 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/common.h b/libavutil/common.h
index 0ba6911..010fe4c 100644 (file)
--- 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