diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-23 12:29:10 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-23 12:29:10 +0000 |
| commit | 469c91859a71ac946ff19a980edb2d8b534171b0 (patch) | |
| tree | 1d13966e3b5a6222b84d93eef15deb2e60d0be8e /libmpdemux | |
| parent | c96851a3f0fd30f784203258e032969b6a4f8af8 (diff) | |
| download | mpv-469c91859a71ac946ff19a980edb2d8b534171b0.tar.bz2 mpv-469c91859a71ac946ff19a980edb2d8b534171b0.tar.xz | |
Rename some forgotten #ifdef STREAMING_LIVE_DOT_COM to STREAMING_LIVE555.
patch by Lyakhovets Andrey, lyakhovets <<@>> rovercomputers <<.>> ru
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18220 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/video.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 5d4b62ce2a..d5092f7f75 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -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 @@ if((d_video->demuxer->file_format == DEMUXER_TYPE_PVA) || (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 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** || 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 ){ |