diff options
| author | François Revol <revol@free.fr> | 2002-11-05 00:56:08 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-11-05 00:56:08 +0000 |
| commit | 9eb826478c0fea0137eacad09c662682b80ad216 (patch) | |
| tree | 1db9d4c7a151217a5c184378bd566f7c93c969d6 /ffserver.c | |
| parent | dfdfa47cd1e8887a99e19ba9291a8ffc52dd251c (diff) | |
MIN/MAX sys/param.h patch by (François Revol <revol at free dot fr>)
Originally committed as revision 1164 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ffserver.c b/ffserver.c index aa8e72c896..33508ec5eb 100644 --- a/ffserver.c +++ b/ffserver.c @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define HAVE_AV_CONFIG_H +#include <netinet/in.h> #include "avformat.h" #include <stdarg.h> -#include <netinet/in.h> #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> @@ -31,7 +31,11 @@ #include <sys/types.h> #include <sys/socket.h> #include <sys/wait.h> -#include <arpa/inet.h> +#ifndef __BEOS__ +# include <arpa/inet.h> +#else +# include "libav/barpainet.h" +#endif #include <netdb.h> #include <ctype.h> #include <signal.h> |