diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-11-10 11:46:59 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-11-10 11:46:59 +0000 |
| commit | b8a78f419dd67cebc70f78e3d183c7eb4ed10c0e (patch) | |
| tree | f502064c04d45369a01aa2722ac173b80301b8d3 /ffserver.c | |
| parent | f11d3f23105f8c7e195990ab2c1728d3dd2f206f (diff) | |
reversing header game
MIN/MAX -> FFMIN/FFMAX
Originally committed as revision 1184 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 8 |
1 files changed, 2 insertions, 6 deletions
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> |