Mercurial > mplayer.hg
changeset 18219:2ea5d88eacd4
Rename some forgotten #ifdef STREAMING_LIVE_DOT_COM to STREAMING_LIVE555.
patch by Lyakhovets Andrey, lyakhovets <<@>> rovercomputers <<.>> ru
author | diego |
---|---|
date | Sun, 23 Apr 2006 12:29:10 +0000 |
parents | a1ad37ef0a30 |
children | 9876dc5d0ebe |
files | libmpdemux/video.c |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/video.c Sun Apr 23 11:38:06 2006 +0000 +++ b/libmpdemux/video.c Sun Apr 23 12:29:10 2006 +0000 @@ -33,7 +33,7 @@ /* biCompression constant */ #define BI_RGB 0L -#ifdef STREAMING_LIVE_DOT_COM +#ifdef STREAMING_LIVE555 #include "demux_rtp.h" #endif @@ -59,7 +59,7 @@ (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_PS && ((! sh_video->format) || (sh_video->format==0x10000001) || (sh_video->format==0x10000002))) || (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_TY) || (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_TS && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002))) -#ifdef STREAMING_LIVE_DOT_COM +#ifdef STREAMING_LIVE555 || ((d_video->demuxer->file_format == DEMUXER_TYPE_RTP) && demux_is_mpeg_rtp_stream(d_video->demuxer)) #endif ) @@ -429,7 +429,7 @@ || demuxer->file_format==DEMUXER_TYPE_PVA || ((demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002))) || demuxer->file_format==DEMUXER_TYPE_MPEG_TY -#ifdef STREAMING_LIVE_DOT_COM +#ifdef STREAMING_LIVE555 || (demuxer->file_format==DEMUXER_TYPE_RTP && demux_is_mpeg_rtp_stream(demuxer)) #endif ){