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/video.c | |
| 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/video.c')
| -rw-r--r-- | libmpdemux/video.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 6379635e1a..fbd9a2a012 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -79,6 +79,13 @@ switch(d_video->demuxer->file_format){ #endif break; } +#ifdef STREAMING_LIVE_DOT_COM + case DEMUXER_TYPE_RTP: + // If the RTP stream is a MPEG stream, then we use this code to check + // for MPEG headers: + if (!demux_is_mpeg_rtp_stream(d_video->demuxer)) break; + // otherwise fall through to... +#endif case DEMUXER_TYPE_MPEG_ES: case DEMUXER_TYPE_MPEG_PS: { //mpeg_header_parser: @@ -211,7 +218,11 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** *start=NULL; - if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES || demuxer->file_format==DEMUXER_TYPE_MPEG_PS){ + if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES || demuxer->file_format==DEMUXER_TYPE_MPEG_PS +#ifdef STREAMING_LIVE_DOT_COM + || (demuxer->file_format==DEMUXER_TYPE_RTP && demux_is_mpeg_rtp_stream(demuxer)) +#endif + ){ int in_frame=0; //float newfps; //videobuf_len=0; |