From b8a78f419dd67cebc70f78e3d183c7eb4ed10c0e Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 10 Nov 2002 11:46:59 +0000
Subject: reversing header game MIN/MAX -> FFMIN/FFMAX

Originally committed as revision 1184 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 ffserver.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'ffserver.c')

diff --git a/ffserver.c b/ffserver.c
index 33508ec5eb..aa8e72c896 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,11 +31,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
-#ifndef __BEOS__
-# include <arpa/inet.h>
-#else
-# include "libav/barpainet.h"
-#endif
+#include <arpa/inet.h>
 #include <netdb.h>
 #include <ctype.h>
 #include <signal.h>
-- 
cgit v1.2.3