[MPlayer-cvslog] CVS: main/libmpdemux video.c,1.61,1.62
Diego Biurrun CVS
syncmail at mplayerhq.hu
Sun Apr 23 14:29:13 CEST 2006
CVS change done by Diego Biurrun CVS
Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv13725/libmpdemux
Modified Files:
video.c
Log Message:
Rename some forgotten #ifdef STREAMING_LIVE_DOT_COM to STREAMING_LIVE555.
patch by Lyakhovets Andrey, lyakhovets <<@>> rovercomputers <<.>> ru
Index: video.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/video.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- video.c 26 Mar 2006 14:10:52 -0000 1.61
+++ video.c 23 Apr 2006 12:29:10 -0000 1.62
@@ -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
){
More information about the MPlayer-cvslog
mailing list