diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-01-13 23:36:06 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-01-13 23:36:06 +0000 |
| commit | 959da985b03570cfe7d239c0ba6d550ecb04c460 (patch) | |
| tree | 31266eefb85a4a29461ec5127e8b493af85b4028 | |
| parent | 17bdc2903933cdd5c89f6bf02d6bd8fbd442d3e7 (diff) | |
| download | ffmpeg-959da985b03570cfe7d239c0ba6d550ecb04c460.tar.gz | |
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
| -rw-r--r-- | ffserver.c | 5 |
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> |