summaryrefslogtreecommitdiff
path: root/ffserver.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2009-01-13 23:36:06 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2009-01-13 23:36:06 +0000
commit959da985b03570cfe7d239c0ba6d550ecb04c460 (patch)
tree31266eefb85a4a29461ec5127e8b493af85b4028 /ffserver.c
parent17bdc2903933cdd5c89f6bf02d6bd8fbd442d3e7 (diff)
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
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ffserver.c b/ffserver.c
index 23bb64ca08..231697eec5 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -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>