Merge two adjacent ifdef blocks

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

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