Include libavformat/avformat.h before all the other libav* headers.

This is safer since they may use the symbol LIBAVFORMAT_BUILD defined
in avformat.h.

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

diff --git a/ffserver.c b/ffserver.c
index 23bb64c..231697e 100644 (file)
--- a/ffserver.c
+++ b/ffserver.c
@@ -28,13 +28,14 @@
 #include <string.h>
 #include <strings.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 #include <stdlib.h>

-#include "libavutil/random.h"
-#include "libavutil/avstring.h"
+/* avformat.h defines LIBAVFORMAT_BUILD, include it before all the other libav* headers which use it */

 #include "libavformat/avformat.h"
 #include "libavformat/network.h"
 #include "libavformat/os_support.h"
 #include "libavformat/rtp.h"
 #include "libavformat/rtsp.h"
 #include "libavformat/avformat.h"
 #include "libavformat/network.h"
 #include "libavformat/os_support.h"
 #include "libavformat/rtp.h"
 #include "libavformat/rtsp.h"

+#include "libavutil/avstring.h"
+#include "libavutil/random.h"

 #include "libavcodec/opt.h"
 #include <stdarg.h>
 #include <unistd.h>
 #include "libavcodec/opt.h"
 #include <stdarg.h>
 #include <unistd.h>