diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-07 13:07:48 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-07 13:15:37 +0300 |
| commit | 267a3f4c9c00848f32c341595d2d831157a79bee (patch) | |
| tree | cdef15bb746e3a41b1813076f24035fcc8385c30 /stream | |
| parent | 5484215d044522bcd30516e458e421f403ca8e35 (diff) | |
| parent | 96fa9c4e249e9467f21e32191882e511e762fb1f (diff) | |
| download | mpv-267a3f4c9c00848f32c341595d2d831157a79bee.tar.bz2 mpv-267a3f4c9c00848f32c341595d2d831157a79bee.tar.xz | |
Merge svn changes up to r26680
Conflicts:
Makefile
configure
osdep/timer-darwin.c
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/librtsp/rtsp_rtp.h | 1 | ||||
| -rw-r--r-- | stream/librtsp/rtsp_session.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/stream/librtsp/rtsp_rtp.h b/stream/librtsp/rtsp_rtp.h index ffdc806add..ea96150777 100644 --- a/stream/librtsp/rtsp_rtp.h +++ b/stream/librtsp/rtsp_rtp.h @@ -21,6 +21,7 @@ #ifndef MPLAYER_RTSP_RTP_H #define MPLAYER_RTSP_RTP_H +#include <sys/types.h> #include "rtsp.h" #define MAX_PREVIEW_SIZE 4096 diff --git a/stream/librtsp/rtsp_session.h b/stream/librtsp/rtsp_session.h index 53f0f3ea10..15fef5b5d0 100644 --- a/stream/librtsp/rtsp_session.h +++ b/stream/librtsp/rtsp_session.h @@ -31,6 +31,8 @@ #ifndef MPLAYER_RTSP_SESSION_H #define MPLAYER_RTSP_SESSION_H +#include <stdint.h> + typedef struct rtsp_session_s rtsp_session_t; rtsp_session_t *rtsp_session_start(int fd, char **mrl, char *path, char *host, |