falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

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
tags/v0.5
François Revol Michael Niedermayer 22 years ago
parent
dfdfa47cd1
commit
9eb826478c
7 changed files with 12 additions and 8 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +6
    -2
      ffserver.c
  2. +1
    -1
      libav/http.c
  3. +1
    -1
      libav/rtp.c
  4. +1
    -1
      libav/rtpproto.c
  5. +1
    -1
      libav/rtsp.c
  6. +1
    -1
      libav/tcp.c
  7. +1
    -1
      libav/udp.c

+ 6
- 2
ffserver.c View File

@@ -17,10 +17,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#define HAVE_AV_CONFIG_H #define HAVE_AV_CONFIG_H
#include <netinet/in.h>
#include "avformat.h" #include "avformat.h"


#include <stdarg.h> #include <stdarg.h>
#include <netinet/in.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@@ -31,7 +31,11 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/wait.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 <netdb.h>
#include <ctype.h> #include <ctype.h>
#include <signal.h> #include <signal.h>


+ 1
- 1
libav/http.c View File

@@ -16,11 +16,11 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <sys/socket.h>
#include "avformat.h" #include "avformat.h"
#include <unistd.h> #include <unistd.h>
#include <ctype.h> #include <ctype.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#ifndef __BEOS__ #ifndef __BEOS__
# include <arpa/inet.h> # include <arpa/inet.h>


+ 1
- 1
libav/rtp.c View File

@@ -16,11 +16,11 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <sys/socket.h>
#include "avformat.h" #include "avformat.h"


#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#ifndef __BEOS__ #ifndef __BEOS__
# include <arpa/inet.h> # include <arpa/inet.h>


+ 1
- 1
libav/rtpproto.c View File

@@ -16,12 +16,12 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <sys/socket.h>
#include "avformat.h" #include "avformat.h"


#include <unistd.h> #include <unistd.h>
#include <stdarg.h> #include <stdarg.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#ifndef __BEOS__ #ifndef __BEOS__
# include <arpa/inet.h> # include <arpa/inet.h>


+ 1
- 1
libav/rtsp.c View File

@@ -16,10 +16,10 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <netinet/in.h>
#include "avformat.h" #include "avformat.h"


#include <sys/time.h> #include <sys/time.h>
#include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
#ifndef __BEOS__ #ifndef __BEOS__
# include <arpa/inet.h> # include <arpa/inet.h>


+ 1
- 1
libav/tcp.c View File

@@ -16,11 +16,11 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <sys/socket.h>
#include "avformat.h" #include "avformat.h"
#include <unistd.h> #include <unistd.h>
#include <ctype.h> #include <ctype.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#ifndef __BEOS__ #ifndef __BEOS__
# include <arpa/inet.h> # include <arpa/inet.h>


+ 1
- 1
libav/udp.c View File

@@ -16,10 +16,10 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <sys/socket.h>
#include "avformat.h" #include "avformat.h"
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#ifndef __BEOS__ #ifndef __BEOS__
# include <arpa/inet.h> # include <arpa/inet.h>


Write Preview
Loading…
Cancel
Save