OSDN Git Service

Use correct RTSP_DEMUXER checks instead of NETWORK.
authorAlex Beregszaszi <alex@rtfs.hu>
Thu, 26 Apr 2007 18:09:16 +0000 (18:09 +0000)
committerAlex Beregszaszi <alex@rtfs.hu>
Thu, 26 Apr 2007 18:09:16 +0000 (18:09 +0000)
Originally committed as revision 8835 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffplay.c

index 96615d8..51495d2 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -1908,7 +1908,7 @@ static int decode_thread(void *arg)
         goto fail;
     }
     is->ic = ic;
-#ifdef CONFIG_NETWORK
+#ifdef CONFIG_RTSP_DEMUXER
     use_play = (ic->iformat == &rtsp_demuxer);
 #else
     use_play = 0;
@@ -2410,7 +2410,7 @@ static void opt_frame_pix_fmt(const char *arg)
     frame_pix_fmt = avcodec_get_pix_fmt(arg);
 }
 
-#ifdef CONFIG_NETWORK
+#ifdef CONFIG_RTSP_DEMUXER
 static void opt_rtp_tcp(void)
 {
     /* only tcp protocol */
@@ -2482,7 +2482,7 @@ const OptionDef options[] = {
     { "idct", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&idct}, "set idct algo",  "algo" },
     { "er", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_resilience}, "set error detection threshold (0-4)",  "threshold" },
     { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options",  "bit_mask" },
-#ifdef CONFIG_NETWORK
+#ifdef CONFIG_RTSP_DEMUXER
     { "rtp_tcp", OPT_EXPERT, {(void*)&opt_rtp_tcp}, "force RTP/TCP protocol usage", "" },
 #endif
     { "sync", HAS_ARG | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" },