Mercurial > mplayer.hg
diff libmpdemux/video.c @ 6910:1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
see <http://www.live.com/mplayer/> for details.
author | arpi |
---|---|
date | Mon, 05 Aug 2002 00:39:07 +0000 |
parents | a3b2f80f3a26 |
children | 79fb883d9769 |
line wrap: on
line diff
--- a/libmpdemux/video.c Mon Aug 05 00:27:26 2002 +0000 +++ b/libmpdemux/video.c Mon Aug 05 00:39:07 2002 +0000 @@ -79,6 +79,13 @@ #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 @@ *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;