diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-05 00:39:07 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-05 00:39:07 +0000 |
| commit | fa788640e26698f98070cc01be09dc5071580881 (patch) | |
| tree | 3963d1dd69d48ad440e02251286001d90f5fbb01 /libmpdemux/demuxer.h | |
| parent | 11bc29e6cc3aaa2a70562f1142609d2800e2f6b9 (diff) | |
| download | mpv-fa788640e26698f98070cc01be09dc5071580881.tar.bz2 mpv-fa788640e26698f98070cc01be09dc5071580881.tar.xz | |
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
see <http://www.live.com/mplayer/> for details.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6911 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.h')
| -rw-r--r-- | libmpdemux/demuxer.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 255c525062..6f8b9c5aa6 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -29,10 +29,11 @@ #define DEMUXER_TYPE_OGG 18 #define DEMUXER_TYPE_BMP 19 #define DEMUXER_TYPE_RAWAUDIO 20 +#define DEMUXER_TYPE_RTP 21 // This should always match the higest demuxer type number. // Unless you want to disallow users to force the demuxer to some types #define DEMUXER_TYPE_MIN 0 -#define DEMUXER_TYPE_MAX 20 +#define DEMUXER_TYPE_MAX 21 #define DEMUXER_TYPE_DEMUXERS (1<<16) // A virtual demuxer type for the network code @@ -123,9 +124,9 @@ typedef struct demuxer_st { } demuxer_t; inline static demux_packet_t* new_demux_packet(int len){ - demux_packet_t* dp=malloc(sizeof(demux_packet_t)); + demux_packet_t* dp=(demux_packet_t*)malloc(sizeof(demux_packet_t)); dp->len=len; - dp->buffer=len?malloc(len+8):NULL; + dp->buffer=len?(unsigned char*)malloc(len+8):NULL; dp->next=NULL; dp->pts=0; dp->pos=0; @@ -136,7 +137,7 @@ inline static demux_packet_t* new_demux_packet(int len){ } inline static demux_packet_t* clone_demux_packet(demux_packet_t* pack){ - demux_packet_t* dp=malloc(sizeof(demux_packet_t)); + demux_packet_t* dp=(demux_packet_t*)malloc(sizeof(demux_packet_t)); while(pack->master) pack=pack->master; // find the master memcpy(dp,pack,sizeof(demux_packet_t)); dp->next=NULL; |