[FFmpeg-cvslog] r16589 - trunk/ffserver.c

[stefano]

Author: stefano
Date: Wed Jan 14 00:36:06 2009
New Revision: 16589

Log:
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.

Modified:
   trunk/ffserver.c

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	Tue Jan 13 22:20:03 2009	(r16588)
+++ trunk/ffserver.c	Wed Jan 14 00:36:06 2009	(r16589)
@@ -28,13 +28,14 @@
 #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 "libavutil/avstring.h"
+#include "libavutil/random.h"
 #include "libavcodec/opt.h"
 #include <stdarg.h>
 #include <unistd.h>