[FFmpeg-cvslog] r25343 - trunk/libavformat/rtsp.c

[diego]

Author: diego
Date: Tue Oct  5 13:06:32 2010
New Revision: 25343

Log:
Remove some pointless CONFIG_RTSP_DEMUXER #ifdefs.
They reside within a large CONFIG_RTSP_DEMUXER block and are thus pointless.

Modified:
   trunk/libavformat/rtsp.c

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Tue Oct  5 13:03:48 2010	(r25342)
+++ trunk/libavformat/rtsp.c	Tue Oct  5 13:06:32 2010	(r25343)
@@ -1726,7 +1726,6 @@ static int udp_read_packet(AVFormatConte
                     }
                 }
             }
-#if CONFIG_RTSP_DEMUXER
             if (tcp_fd != -1 && FD_ISSET(tcp_fd, &rfds)) {
                 RTSPMessageHeader reply;
 
@@ -1737,7 +1736,6 @@ static int udp_read_packet(AVFormatConte
                 if (rt->state != RTSP_STATE_STREAMING)
                     return 0;
             }
-#endif
         } else if (n == 0 && ++timeout_cnt >= MAX_TIMEOUTS) {
             return FF_NETERROR(ETIMEDOUT);
         } else if (n < 0 && errno != EINTR)
@@ -1850,11 +1848,9 @@ static int rtsp_fetch_packet(AVFormatCon
 
     switch(rt->lower_transport) {
     default:
-#if CONFIG_RTSP_DEMUXER
     case RTSP_LOWER_TRANSPORT_TCP:
         len = tcp_read_packet(s, &rtsp_st, rt->recvbuf, RECVBUF_SIZE);
         break;
-#endif
     case RTSP_LOWER_TRANSPORT_UDP:
     case RTSP_LOWER_TRANSPORT_UDP_MULTICAST:
         len = udp_read_packet(s, &rtsp_st, rt->recvbuf, RECVBUF_SIZE, wait_end);